Changeset 1106 for GTP/trunk/Lib/Vis/Preprocessing/src/X3dExporter.cpp

Timestamp:

07/10/06 01:57:41 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/X3dExporter.cpp (modified) (3 diffs)

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

@@ -9 +9 @@
 #include "Polygon3.h"
 #include "VssRay.h"
-//#include "VspOspTree.h"
+#include "VspOspTree.h"
 #include "VssTree.h"
 #include "VspBspTree.h"
@@ -538 +538 @@
 }
 
-#if 0
-bool X3dExporter::ExportVspOspTree(const VspOspTree &tree, const int maxPvs)
-{
-        stack<VspKdNode *> tStack;
-
-        tStack.push(tree.GetRoot());
-
-        //Mesh *mesh = new Mesh;
-  
-        if (maxPvs > 0)
-                mUseForcedMaterial = true;
-
-        while (!tStack.empty()) 
-        {
-                VspKdNode *node = tStack.top();
-    
-                tStack.pop();
-
-                if (node->IsLeaf())
-                {
-                        AxisAlignedBox3 box = tree.GetBBox(node);
-
-                        Mesh *mesh = new Mesh;
-
-                        // add 6 vertices of the box
-                        int index = (int)mesh->mVertices.size();
-
-                        for (int i=0; i < 8; ++ i) 
-                        {
-                                Vector3 v;
-                                box.GetVertex(i, v);
-                                mesh->mVertices.push_back(v);
-                        }
-
-                        mesh->AddFace(new Face(index + 0, index + 1, index + 3, index + 2) );
-                        mesh->AddFace(new Face(index + 0, index + 2, index + 6, index + 4) );
-                        mesh->AddFace(new Face(index + 4, index + 6, index + 7, index + 5) );
-
-                        mesh->AddFace(new Face(index + 3, index + 1, index + 5, index + 7) );
-                        mesh->AddFace(new Face(index + 0, index + 4, index + 5, index + 1) );
-                        mesh->AddFace(new Face(index + 2, index + 3, index + 7, index + 6) );
-
-                        if (maxPvs > 0)
-                        {
-                                VspKdLeaf *leaf = dynamic_cast<VspKdLeaf *>(node);
-
-                                mForcedMaterial.mDiffuseColor.b = 1.0f;
-                                
-                                leaf->UpdatePvsSize();
-                        
-                                const float importance = (float)leaf->GetPvsSize() / (float)maxPvs;
-                                mForcedMaterial.mDiffuseColor.r = importance;
-                                mForcedMaterial.mDiffuseColor.g = 1.0f - mForcedMaterial.mDiffuseColor.r;
-                        }
-
-                        ExportMesh(mesh);
-                        DEL_PTR(mesh);
-                }
-                else  
-                {
-                        VspKdInterior *interior = dynamic_cast<VspKdInterior *>(node);
-                        tStack.push(interior->GetFront());
-                        tStack.push(interior->GetBack());
-                }
-        }
-  
-        //ExportMesh(mesh);
-        //DEL_PTR(mesh);
-
-        return true;
-}
-#endif
 
 bool X3dExporter::ExportKdTree(const KdTree &tree)
@@ -1309 +1237 @@
 }
 
-}
+
+bool X3dExporter::ExportOspTree(const OspTree &ospTree)
+{
+        vector<KdLeaf *> leaves;
+        ospTree.CollectLeaves(leaves);
+
+        vector<KdLeaf *>::const_iterator it, it_end = leaves.end();
+
+        for (it = leaves.begin(); it != it_end; ++ it)
+        {
+                ExportBox(ospTree.GetBBox(*it));
+        }
+
+        return true;
+}
+
+
+}