Changeset 3241 for GTP/trunk/App/Demos/Vis/FriendlyCulling/VisibilitySolutionConverter/VisibilitySolutionConverter.h

Timestamp:

01/02/09 13:47:05 (15 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/VisibilitySolutionConverter/VisibilitySolutionConverter.h (modified) (7 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/VisibilitySolutionConverter/VisibilitySolutionConverter.h

@@ -3 +3 @@
 
 
-#include "SimpleVec.h"
+#include "Vector3.h"
+#include "Triangle3.h"
 #include <string>
 #include <vector>
 #include "AxisAlignedBox3.h"
 
+        
 
-typedef std::vector<SimpleVec> VertexArray;
+typedef std::vector<CHCDemoEngine::Vector3> VertexArray;
 typedef std::pair<float, float> TexCoord;
 
@@ -15 +17 @@
 
 struct BvhInterior;
+
+
+
+struct Geometry
+{
+        CHCDemoEngine::Vector3 *mVertices;
+        CHCDemoEngine::Vector3 *mNormals;
+        TexCoord *mTexCoords;
+
+        int mVertexCount;
+        int mTexcoordCount;
+};
+
 
 struct BvhNode
@@ -36 +51 @@
         int Count() const { return last - first + 1; }
 
-        SimpleVec bmin;
-        SimpleVec bmax;
+        CHCDemoEngine::AxisAlignedBox3 box;
 
         BvhInterior *parent;
@@ -54 +68 @@
 struct BvhLeaf: public BvhNode
 {
-        //Color color;
-        int texture;
+        Geometry *geometry;
 
-        BvhLeaf(): BvhNode(), texture(0) {}
+        BvhLeaf(): BvhNode(), geometry(NULL) {}
 };
 
@@ -79 +92 @@
 protected:
 
-        struct Geometry
-        {
-                SimpleVec *mVertices;
-                SimpleVec *mNormals;
-                TexCoord *mTexCoords;
-
-                int mVertexCount;
-                int mTexcoordCount;
-        };
 
         void LoadShape(const VertexArray &vertices,
@@ -136 +140 @@
         void WriteNextNode(ogzstream &stream, BvhNode *parent);
 
+        void UpdateLeafBox(BvhLeaf *leaf);
+
+        void UpdateNodeBox(BvhNode *node);
 
 
@@ -146 +153 @@
         std::vector<int> mGlobalTriangleIds;
 
-        std::vector<BvhNode *> mBvhNodes;
+        std::vector<BvhLeaf *> mBvhLeaves;
 
         BvhNode *mRoot;