Changeset 2187 for GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp

Timestamp:

03/05/07 11:07:44 (17 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp (modified) (9 diffs)

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

@@ -32 +32 @@
 namespace GtpVisibilityPreprocessor {
 
-  const static bool ADDITIONAL_GEOMETRY_HACK = false;
-
-  Preprocessor *preprocessor = NULL;
-  
-// HACK: Artificially modify scene to watch rendercost changes
-static void AddGeometry(SceneGraph *scene)
-{
-        scene->GetRoot()->UpdateBox();
-
-        AxisAlignedBox3 sceneBox = scene->GetBox();
-
-        int n = 200;
-
-        if (0)
-        {
-                // form grid of boxes
-                for (int i = 0; i < n; ++ i)
-                {
-                        for (int j = 0; j < n; ++ j)
-                        {
-                                const Vector3 scale2((float)j * 0.8f / n + 0.1f,  0.05f, (float)i * 0.8f  / (float)n + 0.1f);
-
-                                const Vector3 pt2 = sceneBox.Min() + scale2 * (sceneBox.Max() - sceneBox.Min());
-
-                                const Vector3 boxSize = sceneBox.Size() * Vector3(0.0025f, 0.01f, 0.0025f);
-                                AxisAlignedBox3 box(pt2, pt2 + boxSize);
-                                Mesh *mesh = CreateMeshFromBox(box);
-
-                                mesh->Preprocess();
-
-                                MeshInstance *mi = new MeshInstance(mesh);
-                                scene->GetRoot()->mGeometry.push_back(mi);
-                        }
-                }
-
-                for (int i = 0; i < n; ++ i)
-                {
-                        for (int j = 0; j < n; ++ j)
-                        {
-                                const Vector3 scale2(0.15f, (float)j * 0.8f / n + 0.1f, (float)i * 0.8f  / (float)n + 0.1f);
-
-                                Vector3 pt2 = sceneBox.Min() + scale2 * (sceneBox.Max() - sceneBox.Min());
-
-                                Vector3 boxSize = sceneBox.Size() * Vector3(0.0025f, 0.01f, 0.0025f);
-                                AxisAlignedBox3 box(pt2, pt2 + boxSize);
-                                Mesh *mesh = CreateMeshFromBox(box);
-
-                                mesh->Preprocess();
-
-                                MeshInstance *mi = new MeshInstance(mesh);
-                                scene->GetRoot()->mGeometry.push_back(mi);
-                        }
-                }
-
-                for (int i = 0; i < n; ++ i)
-                {
-                        const Vector3 scale2(2, 0.2f, (float)i * 0.8f  / (float)n + 0.1f);
-
-                        Vector3 pt2 = sceneBox.Min() + scale2 * (sceneBox.Max() - sceneBox.Min());
-                        Vector3 boxSize = sceneBox.Size() * Vector3(0.005f, 0.02f, 0.005f);
-
-                        AxisAlignedBox3 box(pt2 + 0.1f, pt2 + boxSize);
-                        Mesh *mesh = CreateMeshFromBox(box);
-
-                        mesh->Preprocess();
-
-                        MeshInstance *mi = new MeshInstance(mesh);
-                        scene->GetRoot()->mGeometry.push_back(mi);
-                }
-
-                scene->GetRoot()->UpdateBox();
-        }
-
-        if (1)
-        {
-                // plane separating view space regions
-                const Vector3 scale(1.0f, 0.0, 0);
-
-                Vector3 pt = sceneBox.Min() + scale * (sceneBox.Max() - sceneBox.Min());
-
-                Plane3 cuttingPlane(Vector3(1, 0, 0), pt);
-                Mesh *planeMesh = new Mesh();
-
-                Polygon3 *poly = sceneBox.CrossSection(cuttingPlane);
-                IncludePolyInMesh(*poly, *planeMesh);
-
-                planeMesh->Preprocess();
-
-                MeshInstance *planeMi = new MeshInstance(planeMesh);
-                scene->GetRoot()->mGeometry.push_back(planeMi);
-        }       
-}
-
+
+Preprocessor *preprocessor = NULL;
+  
 
 Preprocessor::Preprocessor():
@@ -599 +509 @@
         if (result) 
         { 
-          // HACK 
-                if (ADDITIONAL_GEOMETRY_HACK)
-                        AddGeometry(mSceneGraph);
 
                 mSceneGraph->AssignObjectIds();
@@ -1228 +1135 @@
         Environment::GetSingleton()->GetBoolValue("ViewCells.loadFromFile", loadViewCells);
 
-        int reserveRays;
+        int reserveRays;        
+        int constructionSamples;
 
         if (!loadViewCells)
         {
-                cout << "setting ray pool size to view cell construction ize" << endl;
+                cout << "hack: setting ray pool size to view cell construction or evaluation size" << endl;
+
+                constructionSamples = 1000000;
 
                 char buf[100];
                 Environment::GetSingleton()->GetStringValue("ViewCells.type", buf);     
-                
+
                 if (strcmp(buf, "vspBspTree") == 0)
                 {
-                        Environment::GetSingleton()->GetIntValue("VspBspTree.Construction.samples", reserveRays);
-                        reserveRays *= 2;
+                        Environment::GetSingleton()->GetIntValue("VspBspTree.Construction.samples", constructionSamples);
+                        
                 }
                 else if (strcmp(buf, "vspOspTree") == 0)
                 {
-                        Environment::GetSingleton()->GetIntValue("Hierarchy.Construction.samples", reserveRays);
-                        reserveRays *= 2;                       
-                }
+                        Environment::GetSingleton()->GetIntValue("Hierarchy.Construction.samples", constructionSamples);                
+                }
+
+                int evalSamplesPerPass;
+
+                Environment::GetSingleton()->GetIntValue("ViewCells.Evaluation.samplesPerPass", evalSamplesPerPass);
+
+                reserveRays = max(constructionSamples, evalSamplesPerPass);
+                reserveRays *= 2;
         }
         else
         {
-                cout << "setting ray pool size to samples per pass" << endl;
-        
+                cout << "setting ray pool size to samples per pass" << endl;       
                 reserveRays = mSamplesPerPass * 2;
         }
@@ -1274 +1189 @@
         const long t1 = GetTime();
         
-        if ((int)rays.size() > 10000) {
+        if (1 && (rays.size() > 10000))
+        {
         
                 mRayCaster->SortRays(rays);
@@ -1298 +1214 @@
 
         if (mUseHwGlobalLines) 
+        {
           CastRaysWithHwGlobalLines(
                                                                 rays,
@@ -1304 +1221 @@
                                                                 pruneInvalidRays
                                                                 );
+        }
         else
+        {
           mRayCaster->CastRays(
                                                  rays,                          
@@ -1311 +1230 @@
                                                  castDoubleRays,
                                                  pruneInvalidRays);
-  
-        if ((int)rays.size() > 10000) 
+        }
+
+        if (rays.size() > 10000) 
         {
                 cout << endl;
@@ -1328 +1248 @@
 }
 
-
   
 void
 Preprocessor::CastRaysWithHwGlobalLines(
                                                                                 SimpleRayContainer &rays,
-                                                                          VssRayContainer &vssRays,
-                                                                          const bool castDoubleRays,
-                                                                          const bool pruneInvalidRays
-                                                                          )
+                                                                                VssRayContainer &vssRays,
+                                                                                const bool castDoubleRays,
+                                                                                const bool pruneInvalidRays)
 {
   SimpleRayContainer::const_iterator rit, rit_end = rays.end();
@@ -1352 +1270 @@
                 }
 #endif
-          rayBucket.push_back(ray);
-          
-          // 16 rays gathered => do ray casting
-          if ((int)rayBucket.size() >= 16)
-                {
-                  mRayCaster->CastRays16(
-                                                                 rayBucket,                             
-                                                                 vssRays,
-                                                                 mViewCellsManager->GetViewSpaceBox(),
-                                                                 castDoubleRays,
-                                                                 pruneInvalidRays);
-                  
-                  rayBucket.clear();
-                }
-        
-                if ((int)rays.size() > 100000 && i % 100000 == 0)
+                rayBucket.push_back(ray);
+
+                // 16 rays gathered => do ray casting
+                if (rayBucket.size() >= 16)
+                {
+                        mRayCaster->CastRays16(
+                                rayBucket,                              
+                                vssRays,
+                                mViewCellsManager->GetViewSpaceBox(),
+                                castDoubleRays,
+                                pruneInvalidRays);
+
+                        rayBucket.clear();
+                }
+
+                if (rays.size() > 100000 && i % 100000 == 0)
                         cout<<"\r"<<i<<"/"<<(int)rays.size()<<"\r";
         }