Changeset 2094

Timestamp:

02/05/07 16:45:46 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• HierarchyManager.cpp (modified) (5 diffs)
• HierarchyManager.h (modified) (4 diffs)
• TraversalTree.cpp (modified) (1 diff)
• ViewCellsManager.cpp (modified) (3 diffs)

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

@@ -22 +22 @@
 #include "BvHierarchy.h"
 #include "ViewCell.h"
+#include "TraversalTree.h"
 
 
@@ -28 +29 @@
 
 #define USE_FIXEDPOINT_T 0
-
 #define STUPID_METHOD 0
 
@@ -41 +41 @@
 mObjectSpaceSubdivisionType(objectSpaceSubdivisionType),
 mOspTree(NULL), 
-mBvHierarchy(NULL)
+mBvHierarchy(NULL),
+mTraversalTree(NULL)
 {
         switch(mObjectSpaceSubdivisionType)
@@ -396 +397 @@
                 mBvHierarchy->SetUniqueNodeIds();
         }
+
+        if (0) CreateTraversalTree();
 }
 
@@ -2483 +2486 @@
 void HierarchyManager::CreateTraversalTree()
 {
-}
-
-
-}
+        mTraversalTree = new TraversalTree;
+
+        ViewCellContainer viewCells;
+
+        // add mesh instances of the scene graph to the root of the tree
+        TraversalLeaf *root = (TraversalLeaf *)mTraversalTree->GetRoot();
+
+        //mVspTree->CollectViewCells(root->mViewCells, false);
+        
+        const long startTime = GetTime();
+        cout << "building traversal tree ... " << endl;
+
+        mTraversalTree->Construct();
+
+        cout << "finished kd tree construction in " << TimeDiff(startTime, GetTime()) * 1e-3 
+                 << " secs " << endl;
+}
+
+
+int HierarchyManager::CastLineSegment(const Vector3 &origin,
+                                                                          const Vector3 &termination,
+                                                                          ViewCellContainer &viewcells,
+                                                                          const bool useMailboxing)
+{
+        if (!mTraversalTree)
+                return mVspTree->CastLineSegment(origin,termination, viewcells, useMailboxing);
+        else
+                return mTraversalTree->CastLineSegment(origin,termination, viewcells, useMailboxing);
+}
+
+
+}

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

@@ -42 +42 @@
 class Exporter;
 class ViewCellsParseHandlers;
+class TraversalTree;
+
 
 
@@ -305 +307 @@
 
 
+        /** Casts line segment into the view cells tree.
+                @param origin the origin of the line segment
+                @param termination the end point of the line segment
+                @returns view cells intersecting the line segment.
+        */
+    int CastLineSegment(const Vector3 &origin,
+                                                const Vector3 &termination,
+                                                ViewCellContainer &viewcells,
+                                                const bool useMailboxing = true);
+        
 protected:
 
@@ -351 +363 @@
         */
         void RunConstruction(const bool repairQueue);
-                
+        
+        
         ////////////////////////////////////////////////
 
@@ -651 +664 @@
         bool mConsiderMemory;
 
+        TraversalTree *mTraversalTree;
+
         int mMaxRepairs;
 

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

@@ -152 +152 @@
 
         mBox.Initialize();
+
         ObjectContainer::const_iterator mi;
         for ( mi = leaf->mObjects.begin(); mi != leaf->mObjects.end(); ++ mi) 
         {
-                //      cout<<(*mi)->GetBox()<<endl;
                 mBox.Include((*mi)->GetBox());
         }

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

@@ -1063 +1063 @@
                 {
                         // create the meshes and compute volumes
-                        vm->FinalizeViewCells(false);
-                        // vm->mViewCellsTree->AssignRandomColors();
-                }
-
-                if (0)
-                {
-                        cout << "=============== " << vm->GetViewCellById(5318)->GetPvs().GetSize() << "========" << endl;
+                        const bool createMeshes = true;
+                        //const bool createMeshes = false;
+
+                        vm->FinalizeViewCells(createMeshes);
                 }
 
@@ -2778 +2775 @@
         if (lastVssRay == NULL ||
                 !(ray.mOrigin == lastVssRay->mTermination) ||
-                !(ray.mTermination == lastVssRay->mOrigin)) {
-          viewCells.clear();
-          // traverse the view space subdivision
-          CastLineSegment(origin, termination, viewCells);
-          lastVssRay = &ray;
+                !(ray.mTermination == lastVssRay->mOrigin)) 
+        {
+                viewCells.clear();
+                
+                // traverse the view space subdivision
+                CastLineSegment(origin, termination, viewCells);
+                lastVssRay = &ray;
         }
         
@@ -6556 +6555 @@
                                                                                         ViewCellContainer &viewcells)
 {
-        return mHierarchyManager->
-                GetVspTree()->CastLineSegment(origin, termination, viewcells);
+        return mHierarchyManager->CastLineSegment(origin, termination, viewcells);
 }