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

Timestamp:

08/28/06 18:42:33 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -41 +41 @@
         int n = 200;
 
-        if (0){
-        // form grid of boxes
-        for (int i = 0; i < n; ++ i)
-        {
-                for (int j = 0; j < n; ++ j)
+        if (0)
+        {
+                // form grid of boxes
+                for (int i = 0; i < n; ++ i)
                 {
-                        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);
+                        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->mRoot->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->mRoot->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.0025, 0.01, 0.0025);
+                        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->mRoot->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->mRoot->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.0025, 0.01, 0.0025);
-                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->mRoot->mGeometry.push_back(mi);
-        }
-        
-        scene->mRoot->UpdateBox();
-        }
-                
+
+                scene->mRoot->UpdateBox();
+        }
+
         if (1)
         {
@@ -111 +112 @@
                 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->mRoot->mGeometry.push_back(planeMi);
@@ -145 +146 @@
         Environment::GetSingleton()->GetBoolValue("Preprocessor.detectEmptyViewSpace", mDetectEmptyViewSpace);
         Environment::GetSingleton()->GetBoolValue("Preprocessor.exportVisibility", mExportVisibility );
-//#if GTP_INTERNAL // choose other ray cast method
         Environment::GetSingleton()->GetIntValue("Preprocessor.rayCastMethod", mRayCastMethod);
-//#endif
+
         char buffer[256];
         Environment::GetSingleton()->GetStringValue("Preprocessor.visibilityFile",  buffer);
@@ -163 +163 @@
 Preprocessor::~Preprocessor()
 {
-  cout << "cleaning up" << endl;
-
-  cout << "Deleting view cells manager ... \n";
-  DEL_PTR(mViewCellsManager);
-  cout << "done.\n";
-
-  cout << "Deleting bsp tree ... \n";
-  DEL_PTR(mBspTree);
-  cout << "done.\n";
-
-  cout << "Deleting kd tree...\n";
-  DEL_PTR(mKdTree);
-  cout << "done.\n";
- 
-  cout << "Deleting vsp tree...\n";
-  DEL_PTR(mVspTree);
-  cout << "done.\n";
-
-  cout << "Deleting hierarchy manager...\n";
-  DEL_PTR(mHierarchyManager);
-  cout << "done.\n";
-
-  cout << "Deleting vspbsp tree...\n";
-  DEL_PTR(mVspBspTree);
-  cout << "done.\n";
-
-   cout << "Deleting scene graph...\n";
-  DEL_PTR(mSceneGraph);
-  cout << "done.\n";
-
-  DEL_PTR(mRenderSimulator);
-  DEL_PTR(renderer);
+        cout << "cleaning up" << endl;
+
+        cout << "Deleting view cells manager ... \n";
+        DEL_PTR(mViewCellsManager);
+        cout << "done.\n";
+
+        cout << "Deleting bsp tree ... \n";
+        DEL_PTR(mBspTree);
+        cout << "done.\n";
+
+        cout << "Deleting kd tree...\n";
+        DEL_PTR(mKdTree);
+        cout << "done.\n";
+
+        cout << "Deleting vsp tree...\n";
+        DEL_PTR(mVspTree);
+        cout << "done.\n";
+
+        cout << "Deleting hierarchy manager...\n";
+        DEL_PTR(mHierarchyManager);
+        cout << "done.\n";
+
+        cout << "Deleting vspbsp tree...\n";
+        DEL_PTR(mVspBspTree);
+        cout << "done.\n";
+
+        cout << "Deleting scene graph...\n";
+        DEL_PTR(mSceneGraph);
+        cout << "done.\n";
+
+        DEL_PTR(mRenderSimulator);
+        DEL_PTR(renderer);
 }
 
@@ -461 +461 @@
         if (strcmp(name, "osp") == 0)
         {
+                Debug << "hierarchy manager: osp" << endl;
                 // HACK for testing if per kd evaluation works!!
                 const bool ishack = true;
@@ -470 +471 @@
         else if (strcmp(name, "bvh") == 0)
         {
+                Debug << "hierarchy manager: bvh" << endl;
                 hierarchyManager = new HierarchyManager(mVspTree, HierarchyManager::BV_BASED_OBJ_SUBDIV);
+        }
+        else // only view space partition
+        {
+                Debug << "hierarchy manager: obj" << endl;
+                hierarchyManager = new HierarchyManager(mVspTree, HierarchyManager::NO_OBJ_SUBDIV);
         }