Changeset 3282 for GTP

Timestamp:

01/16/09 17:32:00 (15 years ago)

Author:

mattausch

Message:

probably found export error

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• VisibilitySolutionConverter/VisibilitySolutionConverter.cpp (modified) (2 diffs)
• VisibilitySolutionConverter/VisibilitySolutionConverter.h (modified) (1 diff)
• default.env (modified) (1 diff)
• src/Bvh.h (modified) (5 diffs)
• src/BvhExporter.cpp (modified) (3 diffs)
• src/BvhLoader.cpp (modified) (1 diff)
• src/Geometry.cpp (modified) (1 diff)
• src/VisibilitySolutionLoader.cpp (modified) (3 diffs)
• src/chcdemo.cpp (modified) (2 diffs)

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

@@ -230 +230 @@
         mGeometry.clear();
 
+        if (!LoadSolutionTest(bvhInputFilename))
         //if (!LoadSolution(bvhInputFilename))
-        if (!LoadSolution(bvhInputFilename))
         {
                 cerr << "could not read solution file" << endl;
@@ -648 +648 @@
 BvhNode *VisibilitySolutionConverter::LoadNode(FILE *fr, int depth)
 {
-        //cout<<"here4"<<endl;
         ++ mNumNodes;
         

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

@@ -110 +110 @@
         bool LoadSolution(const std::string &filename);
 
-
         BvhNode *LoadNode(FILE *fr, int depth);
 

GTP/trunk/App/Demos/Vis/FriendlyCulling/default.env

@@ -9 +9 @@
 #filename=vienna_full_hp
 #bvhname=vienna_full_hp
-filename=tryvienna
-bvhname=tryvienna
+filename=tryvienna2
+bvhname=tryvienna2
 #filename=mypompeii
 #bvhname=mypompeii
 #filename=pompeii/pompeii_full
 #filename=pompeii/pompeii_part
-filename=city
-bvhname=city
+#filename=city
+#bvhname=city
 useLODs=1
 # shadow map size

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

@@ -88 +88 @@
         */
         inline float GetDistance() const;
+        /** Returns id of the first scene entity in the node.
+        */
+        inline int GetFirstEntity() const;
+        /** Returns id of the last scene entity in the node.
+        */
+        inline int GetLastEntity() const;
 
 
@@ -505 +511 @@
         void RenderBoundsForViz(BvhNode *node, RenderState *state, bool useTightBounds);
 
-
+        
 protected:
 
@@ -527 +533 @@
         */
         void Init();
+
 
         /////////////
@@ -844 +851 @@
 
 
+inline int BvhNode::GetFirstEntity() const
+{
+        return mFirst;
+}
+
+
+inline int BvhNode::GetLastEntity() const
+{
+        return mLast;
+}
+
+
 inline BvhNode *BvhInterior::GetBack()
 {
@@ -856 +875 @@
 
 
+
+//////////////////////////////
+
+        
 inline int Bvh::GetNumNodes() const
 {

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

@@ -59 +59 @@
                 BvhInterior *interior = static_cast<BvhInterior *>(node);
 
-                ConstructTriangleRangeMap(bvh, interior->GetFront(), first, m);
+                ConstructTriangleRangeMap(bvh, interior->GetBack(), first, m);
                 int newFirst = m + 1;
-                ConstructTriangleRangeMap(bvh, interior->GetBack(), newFirst, last);
+                ConstructTriangleRangeMap(bvh, interior->GetFront(), newFirst, last);
 
                 mTriangleRangeMap[node] = pair<int, int>(first, last);
@@ -69 +69 @@
                 //first = currentIdx;
                 last = first + bvh->CountTriangles(node) - 1;
+                //cout << "x " << node->GetFirstEntity() << " " << node->GetLastEntity() << " " << first << " " << last << endl;
                 //currentIdx = last;
-
                 mTriangleRangeMap[node] = pair<int, int>(first, last);
         }
@@ -109 +109 @@
                  BvhNode *node = *it;
 
-                 int f = mTriangleRangeMap[node].first;
-                 int l = mTriangleRangeMap[node].second;
+                 const int f = mTriangleRangeMap[node].first;
+                 const int l = mTriangleRangeMap[node].second;
 
                  for (int i = f; i <= l; ++ i)
-                 {
                          triangles.push_back(i);
-                 }
          }
 

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

@@ -140 +140 @@
         Bvh *bvh = new Bvh(staticEntities, dynamicEntities, maxDepthForTestingChildren);
 
-        BvhConstructor bvhConstructor(bvh->mGeometry, 
-                                          0,
+        BvhConstructor bvhConstructor(bvh->mGeometry, 0,
                                                                   (int)bvh->mStaticGeometrySize - 1);
 

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/VisibilitySolutionLoader.cpp

@@ -2 +2 @@
 #include "ViewCellsTree.h"
 #include "Bvh.h"
+#include "SceneEntity.h"
 #include <stack>
 
@@ -120 +121 @@
         nodes.push_back(n);
 
-        if (!n->IsVirtualLeaf())
+        if (!n->IsLeaf() && !n->IsVirtualLeaf())
         {
                 BvhInterior *interior = static_cast<BvhInterior *>(n);
@@ -157 +158 @@
         ofstream outstream("test.log");
 
+        BvhNode *f = ((BvhInterior *)bvh->GetStaticRoot())->GetFront();
+        BvhNode *b = ((BvhInterior *)bvh->GetStaticRoot())->GetBack();
+
+        outstream << "front: " << f->GetFirstEntity() << " " << f->GetLastEntity() << endl;
+        outstream << "back: " << b->GetFirstEntity() << " " << b->GetLastEntity() << endl;
+
         for (size_t i = 0; i < nodes.size(); ++ i)
         {
-                if (nodes[i]->GetId() >= nodes.size())
-                        cout << "id " << nodes[i]->GetId() << endl;
-
-                outstream << "id " << nodes[i]->GetId() << endl;
-        }
-                
-        cout << "nodes: " << nodes.size() << endl;
-
-
+                BvhNode *n = nodes[i];
+                //if (nodes[i]->GetId() >= nodes.size()) cout << "id " << nodes[i]->GetId() << endl;
+                if (n->IsVirtualLeaf())
+                {
+                        int geometrySize;
+                        AxisAlignedBox3 box;
+                        SceneEntity **ent = bvh->GetGeometry(n, geometrySize);
+                        box = SceneEntity::ComputeBoundingBox(ent, geometrySize);
+
+                        outstream << n->GetFirstEntity() << " " << n->GetLastEntity() << " " << n->GetBox() << " " << box << endl;
+                        
+                }
+        }
+                
         outstream.close();
         

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

@@ -603 +603 @@
         //LoadModel("sibenik.dem", dynamicObjects);
 
-        if (1) LoadPompeiiFloor();
+        if (0) LoadPompeiiFloor();
 
 #if 0
@@ -672 +672 @@
 
 
-        //ObjExporter().Export(model_path + "mypompeii.obj", bvh);
-        //BvhExporter().Export(model_path + "mypompeii.bv", bvh);
+        //ObjExporter().Export(model_path + "mytest.obj", bvh);
+        //BvhExporter().Export(model_path + "mytest.bv", bvh);