Changeset 1589 for GTP/trunk/Lib

Timestamp:

10/09/06 17:16:40 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.h (modified) (1 diff)
• GlRenderer.cpp (modified) (1 diff)
• HierarchyManager.h (modified) (3 diffs)
• ViewCellsManager.cpp (modified) (1 diff)

GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.h

@@ -804 +804 @@
         */
         void CreateRoot(const ObjectContainer &objects);
-
+/*void
+RenderBvhNode(BvhNode *node)
+{
+  if (node->IsLeaf()) {
+        BvhLeaf *leaf = (BvhLeaf *) node;
+        for (int i=0; i < mObjects.size(); i++)
+                cout << "leaf obj " << i << endl;
+          //RenderIntersectable(mObjects[i]);
+  } else {
+        BvhInterior *in = (BvhInterior *)node;
+        RenderBvhNode(in->GetBack());
+        RenderBvhNode(in->GetFront());
+  }
+  
+}*/
 protected:
         

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

@@ -627 +627 @@
   if (node->IsLeaf()) {
         BvhLeaf *leaf = (BvhLeaf *) node;
-        for (int i=0; i < mObjects.size(); i++)
-          RenderIntersectable(mObjects[i]);
+        for (int i=0; i < leaf->mObjects.size(); i++)
+                cout << "leaf obj " << i << endl;
+          //RenderIntersectable(mObjects[i]);
   } else {
         BvhInterior *in = (BvhInterior *)node;

GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.h

@@ -345 +345 @@
     int mViewSpaceSubdivisionType;
 
+        /// the traversal queue
+        SplitQueue mTQueue;
+        
         ////////////
         //-- helper variables
@@ -355 +358 @@
         SubdivisionCandidate *mCurrentCandidate;
 
-        ///////////////////
-
 
         ///////////////////
@@ -365 +366 @@
         /// object space partition kd tree
         OspTree *mOspTree;
+        public:
         /// bounding volume hierarchy
         BvHierarchy *mBvHierarchy;
-
-        //////////////////////
-        
-
-        /// the traversal queue
-        SplitQueue mTQueue;
-        
+        
+protected:
+
 
         //////////

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

@@ -5690 +5690 @@
                 ViewCell *vc = GetViewCell(point);
         }
+        //RenderBvhNode(mHierarchyManager->mBvHierarchy->GetRoot());
+
         disposeRays(evaluationSamples, NULL);
 }