Changeset 3274 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Timestamp:

01/13/09 16:40:27 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Files:

• Bvh.cpp (modified) (1 diff)
• Bvh.h (modified) (1 diff)
• BvhExporter.cpp (modified) (3 diffs)
• Geometry.cpp (modified) (1 diff)
• ObjExporter.cpp (modified) (5 diffs)
• ObjExporter.h (modified) (1 diff)
• ResourceManager.cpp (modified) (1 diff)
• chcdemo.cpp (modified) (2 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Bvh.cpp

@@ -355 +355 @@
 
 
+int Bvh::CountNumVirtualNodes(BvhNode *node) const
+{
+        int numNodes = 0;
+
+        stack<BvhNode *> tStack;
+
+        tStack.push(node);
+
+        while (!tStack.empty())
+        {
+                BvhNode *node = tStack.top();
+                tStack.pop();
+
+                ++ numNodes;
+
+                if (!node->IsVirtualLeaf())
+                {
+                        BvhInterior *interior = static_cast<BvhInterior *>(node);
+
+                        tStack.push(interior->mFront);
+                        tStack.push(interior->mBack);
+                }
+        }
+
+        return numNodes;
+}
+
+
 void Bvh::CollectNodes(BvhNode *node, BvhNodeContainer &nodes)
 {

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Bvh.h

@@ -359 +359 @@
         */
         inline int GetNumNodes() const;
-        /** Counts the number of bvh nodes under this node
+        /** Counts the number of nodes in this subtree
         */
         int CountNumNodes(BvhNode *node) const;
+        /** Counts the number of virtual nodes in this subtree
+        */
+        int CountNumVirtualNodes(BvhNode *node) const;
+
         /** Returns number of bvh leaves.
         */

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/BvhExporter.cpp

@@ -22 +22 @@
         int buffer[4];
 
-        if (node->IsLeaf()) 
+        if (node->IsVirtualLeaf()) 
         {
                 BvhLeaf *leaf = (BvhLeaf*)node;
@@ -55 +55 @@
                                                                                         int &last)
 {
-        if (!node->IsLeaf())
+        if (!node->IsVirtualLeaf())
         {
                 int m;
@@ -94 +94 @@
          buffer[3] = 0; // construction method
          buffer[4] = 1; // termination leaves
-         buffer[5] = bvh->CountNumNodes(bvh->GetStaticRoot());
+         buffer[5] = bvh->CountNumVirtualNodes(bvh->GetStaticRoot());
 
          int first = 0, last;

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Geometry.cpp

@@ -40 +40 @@
         if (delData)
         {
-                DEL_ARRAY_PTR(mVertices);
+                //DEL_ARRAY_PTR(mVertices);
                 DEL_ARRAY_PTR(mNormals);
                 DEL_ARRAY_PTR(mTexCoords);

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/ObjExporter.cpp

@@ -3 +3 @@
 #include "Shape.h"
 #include "Geometry.h"
+#include "Transform3.h"
 
 
@@ -20 +21 @@
 
 
-int ObjExporter::WriteGeometry(Geometry *geom, ofstream &ostream)
+int ObjExporter::WriteGeometry(Geometry *geom, ofstream &ostream, Transform3 *trafo)
 {
         int numVertices;
@@ -30 +31 @@
         for (int i = 0; i < numVertices; ++ i)
         {
-                Vector3 v = vertices[i];
+                Vector3 v = trafo->GetMatrix() * vertices[i];
+
                 sprintf(str, "v %f %f %f\n", v.x, v.z, -v.y);
                 ostream << str;
@@ -75 +77 @@
                  for (int i = 0; i < geometrySize; ++ i)
                  {
+                         Transform3 *trafo = entities[i]->GetTransform();
+
                          ShapeContainer::iterator sit, send;
                          entities[i]->GetLODLevel(0, sit, send);
@@ -89 +93 @@
                                  }
 
-                                 numVertices += WriteGeometry(geom, ostream);
+                                 numVertices += WriteGeometry(geom, ostream, trafo);
                          }
                  }

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/ObjExporter.h

@@ -21 +21 @@
 public:
 
-        int WriteGeometry(Geometry *geom, std::ofstream &ostream);
+        int WriteGeometry(Geometry *geom, std::ofstream &ostream, Transform3 *trafo);
 };
 

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/ResourceManager.cpp

@@ -382 +382 @@
         }
 
-        //const bool delGeometry = true;
-        const bool delGeometry = false;
+        const bool delGeometry = true;
+        //const bool delGeometry = false;
         return new Geometry(vertices, normals, texcoords, vertexCount, delGeometry, NULL);//tangents);
 }

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp

@@ -600 +600 @@
         AxisAlignedBox3 pompeiiBox = SceneEntity::ComputeBoundingBox(staticObjects);
 
-        cout << "here34 " << pompeiiBox << endl;
-        
-#if 0
+#if 1
         // todo: dispose texture
         Texture *floorTex = new Texture(model_path + "stairs.c.01.tif");
@@ -726 +724 @@
 
 
-        ObjExporter().Export(model_path + "myvienna.obj", bvh);
-        BvhExporter().Export(model_path + "myvienna.bv", bvh);
+        ObjExporter().Export(model_path + "mypompeii.obj", bvh);
+        BvhExporter().Export(model_path + "mypompeii.bv", bvh);