Changeset 1001 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

Timestamp:

06/05/06 23:14:04 (18 years ago)

Author:

mattausch

Message:

added mesh instance support
improved support for occlusion queries + other extensions

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp (modified) (14 diffs)

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

@@ -17 +17 @@
 #include "BoundingBoxConverter.h"
 #include "GlRenderer.h"
-
+#include "ResourceManager.h"
 
 
@@ -211 +211 @@
         else
                 DEL_PTR(mViewCellsTree);
-
-        CLEAR_CONTAINER(mMeshContainer);
 }
 
@@ -942 +940 @@
         mEnvironment->GetIntValue("ViewCells.Evaluation.histoStepSize", histoStepSize);
 
-        Debug << "here21 " << histoStepSize << endl;
         const int numLeaves = mViewCellsTree->GetNumInitialViewCells(mViewCellsTree->GetRoot());
 
@@ -1442 +1439 @@
                         viewCells.push_back(viewCell);
                 }
-                //TODO: transformed meshes
+                else if (object->Type() == Intersectable::TRANSFORMED_MESH_INSTANCE)
+                {
+                        TransformedMeshInstance *mi = dynamic_cast<TransformedMeshInstance *>(object);
+
+                        Mesh *mesh = MeshManager::GetSingleton()->CreateResource();
+
+                        // copy mesh
+                        *mesh = *mi->GetMesh();
+
+                        // transform mesh
+                        Matrix4x4 m;
+                        mi->GetWorldTransform(m);
+                        mesh->ApplyTransformation(m);
+                        
+                        // create bb + kd tree
+                        mesh->Preprocess();
+
+                        ViewCell *viewCell = GenerateViewCell(mi->GetMesh());
+                        viewCells.push_back(viewCell);
+
+                        break;
+                }
         }
 }
@@ -1451 +1469 @@
 {
         // one mesh per view cell
-        Mesh *mesh = new Mesh();
+        Mesh *mesh = MeshManager::GetSingleton()->CreateResource();
 
         //-- construct prism
@@ -1501 +1519 @@
         // implemented in subclasses
 }
+
 
 // fast way of merging 2 view cells
@@ -1964 +1983 @@
         {
                 if (!(*it)->GetMesh())
+                {
                         CreateMesh(*it);
+                }
         }
 }
@@ -2010 +2031 @@
 }
 
+
 static const bool USE_ASCII = true;
+
 
 bool ViewCellsManager::ExportBoundingBoxes(const string filename, 
@@ -2776 +2799 @@
         mBspTree->ConstructGeometry(vc, geom);
 
-        Mesh *mesh = new Mesh();
+        Mesh *mesh = MeshManager::GetSingleton()->CreateResource();
 
         IncludeNodeGeomInMesh(geom, *mesh);
         vc->SetMesh(mesh);
-
-        // put mesh into mesh container so we can savely delete it
-        mMeshContainer.push_back(mesh);
 }
 
@@ -4712 +4732 @@
         cout << "starting sampling of render cost ... ";
         
-        preprocessor->GetRenderer()->SampleRenderCost(numSamples, samples);
+        preprocessor->GetRenderer()->SampleRenderCost(numSamples, samples, true);
 
         cout << "finished in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
@@ -4725 +4745 @@
         {
                 RenderCostSample sample = *rit;
-                
+
                 ViewCell *vc = GetViewCell(sample.mPosition);
                 
                 AxisAlignedBox3 box(sample.mPosition - Vector3(1, 1, 1), sample.mPosition + Vector3(1, 1, 1));
-        
                 Mesh *hMesh = CreateMeshFromBox(box);
                 
@@ -4791 +4810 @@
         {
                 // export mesh if available
-        /*      if (vc->GetMesh())
+                // TODO: some bug here?
+                if (0 && vc->GetMesh())
                 {
                         exporter->ExportMesh(vc->GetMesh());
                 }
                 else
-                {*/
+                {
                         BspNodeGeometry geom;
                         mVspBspTree->ConstructGeometry(vc, geom);
                         exporter->ExportPolygons(geom.GetPolys());
-                //}
+                }
         }
 }
@@ -4814 +4834 @@
         // compute max height difference
         for (int i = 0; i < (int)leaves.size(); ++ i)
+        {
                 for (int j = 0; j < (int)leaves.size(); ++ j)
-        {
-                BspLeaf *leaf = dynamic_cast<BspViewCell *>(leaves[i])->mLeaf;
-
-                if (i != j)
-                {
-                        BspLeaf *leaf2 =dynamic_cast<BspViewCell *>(leaves[j])->mLeaf;
-                        int dist = mVspBspTree->TreeDistance(leaf, leaf2);
-                        if (dist > maxDist)
-                                maxDist = dist;
+                {
+                        BspLeaf *leaf = dynamic_cast<BspViewCell *>(leaves[i])->mLeaf;
+
+                        if (i != j)
+                        {
+
+                                BspLeaf *leaf2 =dynamic_cast<BspViewCell *>(leaves[j])->mLeaf;
+                                
+                                int dist = mVspBspTree->TreeDistance(leaf, leaf2);
+                                
+                                if (dist > maxDist)
+                                        maxDist = dist;
+                        }
                 }
         }
@@ -4850 +4875 @@
         mVspBspTree->ConstructGeometry(vc, geom);
         
-        Mesh *mesh = new Mesh();
+        Mesh *mesh = MeshManager::GetSingleton()->CreateResource();
         IncludeNodeGeomInMesh(geom, *mesh);
 
         vc->SetMesh(mesh);
-        // put mesh into mesh container so we can savely delete it
-        mMeshContainer.push_back(mesh);
 }