Changeset 1770

Timestamp:

11/20/06 13:54:14 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.cpp (modified) (2 diffs)
• QtPreprocessorThread.cpp (modified) (2 diffs)
• TestPreprocessor.vcproj (modified) (1 diff)

GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.cpp

@@ -1344 +1344 @@
         PrepareLocalSubdivisionCandidates(tData, axis);
         
-        VssRayContainer rays;
-        // maximal 2 objects share the same ray
-        rays.reserve(tData.mNumRays * 2);
-        CollectRays(tData.mNode->mObjects, rays);
-
-        const float prop = (float)mMaxTests / ((float)tData.mNumRays + Limits::Small);
-
-        VssRay::NewMail();
-
-        //cout << "here7 " << tData.mNumRays << " " << rays.size() << endl;
-        //cout << "here5 prop: " << prop << " " << mMaxTests << " " << tData.mNumRays << endl;
-        // only use a subset of the rays
-        VssRayContainer::const_iterator rit, rit_end = rays.end();
-
-        int nRays = 0;
-
-        for (rit = rays.begin(); rit != rit_end; ++ rit)
-        {
-                if ((mMaxTests >= (int)rays.size()) || (Random(1.0f) < prop))
-                {
-                        (*rit)->Mail();
-                        ++ nRays;
-                }
-        }
-        
-        //cout << "here99 " << nRays << " obj " << tData.mNode->mObjects.size() << endl;
         // collect and mark the view cells as belonging to front pvs
         ViewCellContainer viewCells;
@@ -1469 +1443 @@
                 sAxis = box.Size().DrivingAxis();
         }
-        
+
+
+        // only use a subset of the rays for visibility based heuristics
+        if (mUseCostHeuristics && useVisibilityBasedHeuristics)
+        {
+                VssRayContainer rays;
+                // maximal 2 objects share the same ray
+                rays.reserve(tData.mNumRays * 2);
+                CollectRays(tData.mNode->mObjects, rays);
+
+                const float prop = (float)mMaxTests / (float)tData.mNumRays;
+
+                VssRay::NewMail();
+
+                VssRayContainer::const_iterator rit, rit_end = rays.end();
+
+                int nRays = 0;
+
+                for (rit = rays.begin(); rit != rit_end; ++ rit)
+                {
+                        if ((mMaxTests >= (int)rays.size()) || (Random(1.0f) < prop))
+                        {
+                                (*rit)->Mail();
+                                ++ nRays;
+                        }
+                }
+        }
+
         ////////////////////////////////////
         //-- evaluate split cost for all three axis

GTP/trunk/Lib/Vis/Preprocessing/src/QtPreprocessorThread.cpp

@@ -1 @@
-#if USE_QT
+#ifdef GTP_INTERNAL
+#ifndef NO_QT
 #include <QApplication>
 #include "QtPreprocessorThread.h"
@@ -31 +32 @@
 
 #endif
+#endif

GTP/trunk/Lib/Vis/Preprocessing/src/TestPreprocessor.vcproj

@@ -206 +206 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="xerces-c_2.lib glew32.lib zdll.lib zziplib.lib devil.lib glut32.lib OpenGL32.Lib glu32.lib Preprocessor.lib RTScene.lib RTWorld.lib QtCore4.lib qtmain.lib QtOpenGL4.lib Qt3Support4.lib QtTest4.lib QtGui4.lib QtGlRenderer.lib"
-                                OutputFile="../bin/release/Preprocessor2.exe"
+                                OutputFile="../bin/release/Preprocessor.exe"
                                 LinkIncremental="1"
                                 AdditionalLibraryDirectories="..\src\GL;..\lib\release;..\..\Preprocessing\lib\release;..\..\..\..\..\..\NonGTP\Boost\lib;..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\..\..\..\NonGTP\Zlib\lib;..\..\..\..\..\..\NonGTP\Devil\lib;..\MultiLevelRayTracing\RTScene\Release;..\MultiLevelRayTracing\RTWorld\Release;"$(QTDIR)\lib";.\QtGlRenderer\Release"