Changeset 242 for trunk/VUT

Timestamp:

08/17/05 18:01:16 (19 years ago)

Author:

mattausch

Message:

added output functions and castray method for bsp viewcells

Location:

trunk/VUT/GtpVisibilityPreprocessor/src

Files:

• Camera.cpp (modified) (1 diff)
• Exporter.h (modified) (2 diffs)
• Polygon3.cpp (modified) (2 diffs)
• Polygon3.h (modified) (1 diff)
• Preprocessor.cpp (modified) (2 diffs)
• Preprocessor.h (modified) (1 diff)
• SamplingPreprocessor.cpp (modified) (2 diffs)
• ViewCellBsp.cpp (modified) (6 diffs)
• ViewCellBsp.h (modified) (3 diffs)
• X3dExporter.cpp (modified) (6 diffs)
• X3dExporter.h (modified) (4 diffs)
• main.cpp (modified) (1 diff)

trunk/VUT/GtpVisibilityPreprocessor/src/Camera.cpp

@@ -97 +97 @@
     exporter->SetWireframe();
     exporter->ExportKdTree(*tree);
+//      exporter->ExportBspTree(*tree);
     exporter->ExportRays(rays, 10000);
     exporter->SetFilled();

trunk/VUT/GtpVisibilityPreprocessor/src/Exporter.h

@@ -9 +9 @@
 
 class KdTree;
+class BspTree;
 class SceneGraphNode;
 class Ray;
@@ -43 +44 @@
 
   virtual bool
+  ExportBspTree(const BspTree &tree) = 0;
+
+  virtual bool
   ExportRays(const vector<Ray> &rays,
              const float length=1000,

trunk/VUT/GtpVisibilityPreprocessor/src/Polygon3.cpp

@@ -2 +2 @@
 #include "Mesh.h"
 
-#define SIDE_TOLERANCE 0.002
+#define SIDE_TOLERANCE 0.002 // TODO: Test different values
 
-Polygon3::Polygon3()
+Polygon3::Polygon3(): mMaterial(NULL)
 {}
 
-Polygon3::Polygon3(const VertexContainer &vertices): mVertices(vertices) 
+Polygon3::Polygon3(const VertexContainer &vertices): mVertices(vertices), mMaterial(NULL)
 {}
 
@@ -17 +17 @@
         {
                 mVertices.push_back(parent->mVertices[*it]);
+                mMaterial = parent->mMaterial;
+                
                 Debug << parent->mVertices[*it] << endl;
         }

trunk/VUT/GtpVisibilityPreprocessor/src/Polygon3.h

@@ -59 +59 @@
         /// vertices are connected in counterclockwise order.
         VertexContainer mVertices;
+
+        /// we can also store materials with polygons
+        Material *mMaterial;
 };
 

trunk/VUT/GtpVisibilityPreprocessor/src/Preprocessor.cpp

@@ -121 +121 @@
 Preprocessor::Export( const string filename,
                       const bool scene,
-                      const bool kdtree
+                      const bool kdtree,
+                          const bool bsptree
                       )
 {
@@ -135 +136 @@
     }
 
+        if (bsptree) {
+                exporter->SetWireframe();
+                exporter->ExportBspTree(*mBspTree);
+        }
+
     delete exporter;
     return true;

trunk/VUT/GtpVisibilityPreprocessor/src/Preprocessor.h

@@ -76 +76 @@
   Export( const string filename,
           const bool scene,
-          const bool kdtree
+          const bool kdtree,
+          const bool bsptree
           );
   

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

@@ -238 +238 @@
     exporter->SetExportRayDensity(true);
     exporter->ExportKdTree(*mKdTree);
+        exporter->ExportBspTree(*mBspTree);
+
     delete exporter;
   }
@@ -247 +249 @@
     exporter->SetWireframe();
     exporter->ExportKdTree(*mKdTree);
+        exporter->ExportBspTree(*mBspTree);
 
     for (i=0; i < pvsOut; i++) 

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -7 +7 @@
 #include "Polygon3.h"
 #include "Ray.h"
-
+#include "AxisAlignedBox3.h"
 #include <stack>
 #include <time.h>
@@ -110 +110 @@
                 {
                         case Polygon3::COINCIDENT:
-                                break; // do nothing
+                                break; // TODO: compare normals
                         case Polygon3::FRONT_SIDE:
                                 frontPolys->push_back(poly);
@@ -676 +676 @@
 }
 
+AxisAlignedBox3 BspTree::GetBoundingBox() const
+{
+        return mBox;
+}
+
+BspNode *BspTree::GetRoot() const
+{
+        return mRoot;
+}
+
 void BspTree::EvaluateLeafStats(const BspTraversalData &data)
 {
@@ -723 +733 @@
         
         float position;
-
+        
         while (1) // endless loop
         {
@@ -742 +752 @@
                         if (entSide < 0)
                         {
-                                if(extSide > 0) // plane splits ray
-                                {
-                                        node = in->GetBack();
-                                        farChild = in->GetFront();
-                                } else
-                                {
-                                        node = in->GetBack();
+                                node = in->GetBack();
+
+                                if(extSide <= 0) 
                                         continue;
-                                } 
-                        }
+                                        
+                                farChild = in->GetFront(); // plane splits ray
+
                         } else if (entSide > 0)
                         {
-                                if (extSide < 0) // plane splits ray
-                                {
-                                        node = in->GetFront();
-                                        farChild = in->GetBack(); 
-                                } else
-                                {
-                                        node = in->GetFront();
+                                node = in->GetFront();
+
+                                if (extSide >= 0)
                                         continue;
-                                }
+
+                                farChild = in->GetBack();        // plane splits ray                    
                         }
-                        else // ray and plane are coincident // DOTO: WHAT IN THIS CASE ?
+                        else // ray and plane are coincident // WHAT TO DO IN THIS CASE ?
                         {
-                                //node = in->GetFront();
+                                node = in->GetFront();
                                 continue;
                         }
 
-                    // case N4 or P4
-                        float tdist = (position - ray.GetLoc(axis)) / ray.GetDir(axis);
-      tStack.push(RayTraversalData(farChild, extp, maxt));
-      extp = ray.GetLoc() + ray.GetDir()*tdist;
-      maxt = tdist;
-                        
-                        float tDist = 0;
-                        extp = splitPlane->FindIntersection(entp, extp, &t);
-
+                        //-- split
+
+                        // push data for far child
                         tStack.push(BspRayTraversalData(farChild, extp, maxt));
 
-                        
-
-                                maxt = tDist;
-                        }
+                        // find intersection with plane between ray origin and exit point
+                        extp = splitPlane->FindIntersection(ray.GetLoc(), extp, &maxt);
                 } else // compute intersections with objects in leaf
                 {
@@ -813 +809 @@
                         mint = maxt;
                         BspRayTraversalData &s  = tStack.top();
+
                         node = s.mNode;
                         extp = s.mExitPoint;

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.h

@@ -4 +4 @@
 #include "Mesh.h"
 #include "Containers.h"
-
-
-#include <queue>
 #include <stack>
 
@@ -12 +9 @@
 class Plane3;
 //class Mesh;
-
-//namespace GtpVisibilityPreprocessor {
 class BspTree;  
 class BspInterior;
 class Polygon3;
+class AxisAlignedBox3;
+
+
+//namespace GtpVisibilityPreprocessor {
 
 /** Container storing a soup of polygons used during BSP tree construction
@@ -245 +244 @@
         void Construct(const ObjectContainer &objects);
 
-        int BspTree::CollectLeafPvs();
+        int CollectLeafPvs();
 
         void CollectLeaves(vector<BspLeaf *> &leaves);
+
+        /** Returns box which bounds the whole tree.
+        */
+        AxisAlignedBox3 GetBoundingBox()const;
+
+        /** Returns root of BSP tree.
+        */
+        BspNode *GetRoot() const;
 
 protected:

trunk/VUT/GtpVisibilityPreprocessor/src/X3dExporter.cpp

@@ -5 +5 @@
 #include "Mesh.h"
 #include "KdTree.h"
+#include "ViewCellBsp.h"
+#include "ViewCell.h"
+#include "Polygon3.h";
 
 
@@ -98 +101 @@
   case Intersectable::TRANSFORMED_MESH_INSTANCE:
     ExportMeshInstance((MeshInstance *)object);
+        break;
+  case Intersectable::VIEWCELL:
+        ExportViewCell((ViewCell *)object);
     break;
   default:
@@ -112 +118 @@
   // and use a reference to the that mesh instead
   ExportMesh(object->GetMesh());
+}
+
+void
+X3dExporter::ExportViewCell(ViewCell *object)
+{
+        if (object->GetMesh())
+                ExportMesh(object->GetMesh());
 }
 
@@ -183 +196 @@
 }
 
+
+void X3dExporter::ExportPolygon(Polygon3 *poly)
+{
+        stream << "<Shape>" << endl;
+        stream << "<Appearance>" << endl;
+  
+        // $$ tmp -> random material
+  
+        float r, g, b;
+
+        if (mUseForcedMaterial) 
+        {
+                r = mForcedMaterial.mDiffuseColor.r;
+                g = mForcedMaterial.mDiffuseColor.g;
+                b = mForcedMaterial.mDiffuseColor.b;
+        } 
+        else if (poly->mMaterial) 
+        {
+                r = poly->mMaterial->mDiffuseColor.r;
+                g = poly->mMaterial->mDiffuseColor.g;
+                b = poly->mMaterial->mDiffuseColor.b;
+        } else 
+        {
+                r = RandomValue(0.5, 1.0);
+                g = RandomValue(0.5, 1.0);
+                b = RandomValue(0.5, 1.0);
+        }
+
+        stream << "<Material diffuseColor=\"" << r << " " << g << " " << b 
+                   << "\" specularColor=\"0.0 0.0 0.0\"/>" << endl;
+
+    stream << "</Appearance>" << endl;
+
+
+        if (mWireframe)
+                stream << "<IndexedLineSet ccw=\"TRUE\" coordIndex=\"" << endl;
+        else
+                stream << "<IndexedFaceSet ccw=\"TRUE\" coordIndex=\"" << endl;
+
+        VertexContainer::const_iterator vi = poly->mVertices.begin();
+
+        stream << "<Coordinate  point=\"" << endl;
+  
+        for (; vi != poly->mVertices.end(); ++vi) 
+        {
+                stream << (*vi).x << " " << (*vi).y << " " << (*vi).z;
+                stream << "," << endl;
+        }
+  
+        stream<<"\" >"<<endl;
+        stream<<"</Coordinate>"<<endl;
+
+        if (mWireframe)
+                stream << "</IndexedLineSet>" << endl;
+        else
+                stream << "</IndexedFaceSet>" << endl;
+  
+        stream << "</Shape>" << endl;
+}
+
+
 bool
 X3dExporter::ExportBox(const AxisAlignedBox3 &box)
@@ -209 +283 @@
 
 bool
-X3dExporter::ExportKdTree(const KdTree &tree)
-{
-  if (mExportRayDensity) {
+X3dExporter::ExportBspTree(const BspTree &tree)
+{
+        if (mExportRayDensity) 
+        {
+                return false;//ExportKdTreeRayDensity(tree);
+        }
+  
+        stack<BspNode *> tStack;
+
+        tStack.push(tree.GetRoot());
+
+        Mesh *mesh = new Mesh;
+
+        AxisAlignedBox3 box = tree.GetBoundingBox();
+        ExportBox(box);
+
+        while (!tStack.empty()) 
+        {
+                BspNode *node = tStack.top();
+    
+                tStack.pop();
+        
+                if (!node->IsLeaf()) 
+                {
+                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
+      
+                        tStack.push(interior->GetFront());
+                        tStack.push(interior->GetBack());
+                }
+                else
+                {
+                        BspLeaf *leaf = dynamic_cast<BspLeaf *>(node);
+                        // NOTE: could also export polygons to see if splits work
+                        if (leaf->GetViewCell())
+                                ExportViewCell(leaf->GetViewCell());
+                }
+  }
+  
+  ExportMesh(mesh);
+  delete mesh;
+  return true;
+}
+
+bool X3dExporter::ExportKdTree(const KdTree &tree)
+{
+         if (mExportRayDensity) {
     return ExportKdTreeRayDensity(tree);
   }
@@ -250 +367 @@
   delete mesh;
   return true;
+        // TODO
+        return true;
 }
 

trunk/VUT/GtpVisibilityPreprocessor/src/X3dExporter.h

@@ -14 +14 @@
 class Intersectable;
 class MeshInstance;
+class Polygon3;
+class ViewCell;
+class BspTree;
 
 class X3dExporter : public Exporter
@@ -34 +37 @@
   ExportKdTree(const KdTree &tree);
   
+  bool ExportBspTree(const BspTree &tree);
+
   bool
   ExportScene(SceneGraphNode *root) 
@@ -41 +46 @@
   }
   
+  virtual void 
+        ExportPolygon(Polygon3 *poly);
+
   virtual bool
   ExportBox(const AxisAlignedBox3 &box);
@@ -53 +61 @@
   ExportMesh(Mesh *mesh);
 
+  virtual void ExportViewCell(ViewCell *viewCell);
 
 protected:

trunk/VUT/GtpVisibilityPreprocessor/src/main.cpp

@@ -38 +38 @@
   //  p->mSceneGraph->Export("soda.x3d");
   if (0) {
-    p->Export(filename + "-out.x3d", true, false);
-    p->Export(filename + "-kdtree.x3d", false, true);
+    p->Export(filename + "-out.x3d", true, false, false);
+    p->Export(filename + "-kdtree.x3d", false, true, false);
   }