Changeset 1632 for GTP/trunk/Lib/Vis/Preprocessing/src/VspBspTree.cpp

Timestamp:

10/17/06 12:06:36 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspBspTree.cpp (modified) (10 diffs)

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

@@ -241 +241 @@
 
 int VspBspTree::AddMeshToPolygons(Mesh *mesh,
-                                                                  PolygonContainer &polys,
-                                                                  MeshInstance *parent)
-{
-        if (!mesh)
-                return 0;
+                                                                  PolygonContainer &polys) const
+{
+        if (!mesh) return 0;
 
         FaceContainer::const_iterator fi;
@@ -256 +254 @@
                 if (poly->Valid(mEpsilon))
                 {
-                        poly->mParent = parent; // set parent intersectable
                         polys.push_back(poly);
                 }
@@ -269 +266 @@
 
 
-int VspBspTree::AddToPolygonSoup(const ViewCellContainer &viewCells,
-                                                                 PolygonContainer &polys,
-                                                                 int maxObjects)
-{
-        const int limit = (maxObjects > 0) ?
-                Min((int)viewCells.size(), maxObjects) : (int)viewCells.size();
-
-        int polysSize = 0;
-        
-        for (int i = 0; i < limit; ++ i)
-        {
-                Mesh *mesh = viewCells[i]->GetMesh();
-                if (mesh) 
-                {       // copy the mesh into polygons and add to BSP tree aabb
-                        mBoundingBox.Include(viewCells[i]->GetBox()); 
-                        polysSize += AddMeshToPolygons(mesh,
-                                                                                   polys,
-                                                                                   viewCells[i]);
-                }
-        }
-        
-        return polysSize;
+void VspBspTree::ExtractPolygons(Intersectable *object, PolygonContainer &polys) const
+{
+        // extract the polygons from the intersectables
+        switch (object->Type())
+        {
+                case Intersectable::MESH_INSTANCE:
+                        {
+                                Mesh *mesh = dynamic_cast<MeshInstance *>(object)->GetMesh();
+                                AddMeshToPolygons(mesh, polys);
+                        }
+                        break;
+                case Intersectable::VIEW_CELL:
+                        {
+                                Mesh *mesh = dynamic_cast<ViewCell *>(object)->GetMesh();
+                                AddMeshToPolygons(mesh, polys);
+                                break;
+                        }
+                case Intersectable::TRANSFORMED_MESH_INSTANCE:
+                        {
+                                TransformedMeshInstance *mi = 
+                                        dynamic_cast<TransformedMeshInstance *>(object);
+
+                                Mesh mesh;
+                                mi->GetTransformedMesh(mesh);
+                                AddMeshToPolygons(&mesh, polys);
+                        }
+                        break;
+                case Intersectable::TRIANGLE_INTERSECTABLE:
+                        {
+                                TriangleIntersectable *intersect = 
+                                        dynamic_cast<TriangleIntersectable *>(object);
+
+                                Polygon3 *poly = new Polygon3(intersect->GetItem());
+
+                                if (poly->Valid(mEpsilon))      
+                                {
+                                        polys.push_back(poly);
+                                }
+                                else
+                                {
+                                        delete poly;
+                                }
+                        }
+                        break;
+                default:
+                        Debug << "intersectable type not supported" << endl;
+                        break;
+        }
 }
 
@@ -304 +327 @@
         {
                 Intersectable *object = objects[i];//*it;
-                Mesh *mesh = NULL;
-
-                switch (object->Type()) // extract the meshes
-                {
-                case Intersectable::MESH_INSTANCE:
-                        mesh = dynamic_cast<MeshInstance *>(object)->GetMesh();
-                        AddMeshToPolygons(mesh, polys, NULL);
-                        break;
-                case Intersectable::VIEW_CELL:
-                        mesh = dynamic_cast<ViewCell *>(object)->GetMesh();
-                        AddMeshToPolygons(mesh, polys, NULL);
-                        break;
-                case Intersectable::TRANSFORMED_MESH_INSTANCE:
-                        {
-                                TransformedMeshInstance *mi = 
-                                        dynamic_cast<TransformedMeshInstance *>(object);
-
-                                Mesh mesh;
-                                mi->GetTransformedMesh(mesh);
-                                AddMeshToPolygons(&mesh, polys, NULL);
-                break;
-                        }
-                case Intersectable::TRIANGLE_INTERSECTABLE:
-                        {
-                                TriangleIntersectable *intersect = 
-                                        dynamic_cast<TriangleIntersectable *>(object);
-
-                                Polygon3 *poly = new Polygon3(intersect->GetItem());
-
-                                if (poly->Valid(mEpsilon))      
-                                        polys.push_back(poly);
-                                else
-                                        delete poly;
-                        }
-                default:
-                                Debug << "intersectable type not supported" << endl;
-                        break;
-                }
+                ExtractPolygons(object, polys);
 
                 mBoundingBox.Include(object->GetBox()); // add to BSP tree aabb
@@ -404 +390 @@
                         Intersectable *obj = ray->mTerminationObject;
 
-                        if ((mBoundingBox.IsInside(ray->mTermination) || !forcedBoundingBox) &&
-                                obj && !obj->Mailed())
-                        {
-                                obj->Mail();
-
-                                // handle intersectable
-                                switch (obj->Type())
-                                {
-                                        case Intersectable::TRANSFORMED_MESH_INSTANCE:
-                                                {
-                                                        Mesh mesh;
-                                
-                                                        TransformedMeshInstance *tmobj = 
-                                                                dynamic_cast<TransformedMeshInstance *>(obj);
-                                
-                                                        tmobj->GetTransformedMesh(mesh);
-                                                        AddMeshToPolygons(&mesh, polys, tmobj);
-                                                }
-                                                break;
-
-                                        case Intersectable::MESH_INSTANCE:
-                                                {
-                                                        MeshInstance *mobj = dynamic_cast<MeshInstance *>(obj);
-                                                        AddMeshToPolygons(mobj->GetMesh(), polys, mobj);
-                                                }
-                                                break;
-
-                                        case Intersectable::TRIANGLE_INTERSECTABLE:
-                                                {
-                                                        TriangleIntersectable *intersect = 
-                                                                        dynamic_cast<TriangleIntersectable *>(obj);
-
-                                                        Polygon3 *poly = new Polygon3(intersect->GetItem());
-
-                                                        if (poly->Valid(mEpsilon))      
-                                                                polys.push_back(poly);
-                                                        else
-                                                                delete poly;
-                                                }
-                                                break;
-
-                                        default:
-                                                cout << "not implemented yet" << endl;
-                                                break;
-                                }
-
-                                ++ numObj;
-
-                                /////////
-                                //-- compute bounding box
-
-                                if (!forcedBoundingBox)
-                                {
-                                        mBoundingBox.Include(ray->mTermination);
-                                }
+                        ++ numObj;
+
+                        /////////
+                        //-- compute bounding box
+
+                        if (!forcedBoundingBox)
+                        {
+                                mBoundingBox.Include(ray->mTermination);
                         }
 
@@ -466 +405 @@
                         {               
                                 ray->mOriginObject->Mail();
-                                MeshInstance *obj = dynamic_cast<MeshInstance *>(ray->mOriginObject);
-                                AddMeshToPolygons(obj->GetMesh(), polys, obj);
-                                
+                                ExtractPolygons(ray->mOriginObject, polys);
+                                                                
                                 ++ numObj;
                         }
@@ -475 +413 @@
                 // throw out unnecessary polygons
                 PreprocessPolygons(polys);
-
                 cout << "finished" << endl;
 
@@ -1021 +958 @@
         //////////////////
         //-- terminate traversal and create new view cell
+
         if (newNode->IsLeaf())
         {
@@ -1035 +973 @@
                 // update scalar pvs size value
                 ObjectPvs &pvs = viewCell->GetPvs();
-                mViewCellsManager->UpdateScalarPvsSize(viewCell, pvs.CountObjectsInPvs(), pvs.GetSize());
+                mViewCellsManager->UpdateScalarPvsSize(viewCell, 
+                                                                                           pvs.CountObjectsInPvs(), 
+                                                                                           pvs.GetSize());
 
                 mBspStats.contributingSamples += conSamp;
-                mBspStats.sampleContributions +=(int) sampCon;
+                mBspStats.sampleContributions += (int)sampCon;
 
                 viewCell->mLeaves.push_back(leaf);
@@ -1044 +984 @@
                 ///////////
                 //-- store additional info
+
                 if (mStoreRays)
                 {