Changeset 879 for GTP/trunk

Timestamp:

05/02/06 18:08:04 (19 years ago)

Author:

mattausch

Message:

added parameter for fetching active view cell with getviewcell method in ViewCellsManager?

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/Preprocessor.vcproj (modified) (1 diff)
• src/ViewCellsManager.cpp (modified) (3 diffs)
• src/ViewCellsManager.h (modified) (5 diffs)
• src/VspBspTree.cpp (modified) (1 diff)
• src/VspBspTree.h (modified) (1 diff)

GTP/trunk/Lib/Vis/Preprocessing/scripts/Preprocessor.vcproj

@@ -333 +333 @@
                         </File>
                         <File
+                                RelativePath="..\src\RenderSampler.cpp">
+                        </File>
+                        <File
+                                RelativePath="..\src\RenderSampler.h">
+                        </File>
+                        <File
                                 RelativePath="..\src\RenderSimulator.cpp">
                         </File>

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

@@ -2686 +2686 @@
 
 
-ViewCell *BspViewCellsManager::GetViewCell(const Vector3 &point) const
+ViewCell *BspViewCellsManager::GetViewCell(const Vector3 &point, const bool active) const
 {
         if (!mBspTree)
@@ -4648 +4648 @@
 
 
-ViewCell *VspBspViewCellsManager::GetViewCell(const Vector3 &point) const
+ViewCell *VspBspViewCellsManager::GetViewCell(const Vector3 &point, const bool active) const
 {
         if (!mVspBspTree)
@@ -4656 +4656 @@
           return NULL;
 
-        return mVspBspTree->GetViewCell(point);
+        return mVspBspTree->GetViewCell(point, active);
 }
 

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

@@ -236 +236 @@
   
         /** Get a viewcell containing the specified point 
-        */
-        virtual ViewCell *GetViewCell(const Vector3 &point) const = 0;
+                @param active if the active or elementary view cell should be returned.
+        */
+        virtual ViewCell *GetViewCell(const Vector3 &point, const bool active = false) const = 0;
   
         virtual void PrintPvsStatistics(ostream &s);
@@ -667 +668 @@
         
 
-        /** Get a viewcell containing the specified point */
-        ViewCell *GetViewCell(const Vector3 &point) const;
+        /** Get a viewcell containing the specified point 
+        */
+        ViewCell *GetViewCell(const Vector3 &point, const bool active = false) const;
 
         void CreateMesh(ViewCell *vc);
@@ -749 +751 @@
         */
         //  virtual void PrintStatistics(ostream &s) const;
-        ViewCell *GetViewCell(const Vector3 &point) const { return NULL; }
+        ViewCell *GetViewCell(const Vector3 &point, const bool active = false) const { return NULL; }
 
         float GetProbability(ViewCell *viewCell);
@@ -817 +819 @@
                                                 ViewCellContainer &viewcells);
 
-        ViewCell *GetViewCell(const Vector3 &point) const { return NULL; }
+        ViewCell *GetViewCell(const Vector3 &point, const bool active = false) const { return NULL; }
 
         float GetProbability(ViewCell *viewCell);
@@ -881 +883 @@
         float GetProbability(ViewCell *viewCell);
         
-        ViewCell *GetViewCell(const Vector3 &point) const;
+        ViewCell *GetViewCell(const Vector3 &point, const bool active = false) const;
 
         bool GetViewPoint(Vector3 &viewPoint) const;

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

@@ -3747 +3747 @@
 
 
-ViewCell *VspBspTree::GetViewCell(const Vector3 &point)
-{
-  if (mRoot == NULL)
-        return NULL;
+ViewCell *VspBspTree::GetViewCell(const Vector3 &point, const bool active)
+{
+        if (mRoot == NULL)
+                return NULL;
+
+        stack<BspNode *> nodeStack;
+        nodeStack.push(mRoot);
   
-  stack<BspNode *> nodeStack;
-  nodeStack.push(mRoot);
+        ViewCell *viewcell = NULL;
   
-  ViewCell *viewcell = NULL;
+        while (!nodeStack.empty())  
+        {
+                BspNode *node = nodeStack.top();
+                nodeStack.pop();
+        
+                if (node->IsLeaf()) 
+                {
+                        viewcell = dynamic_cast<BspLeaf *>(node)->GetViewCell();
+                        break;
+                } 
+                else    
+                {       
+                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
+        
+                        // random decision
+                        if (interior->GetPlane().Side(point) < 0)
+                                nodeStack.push(interior->GetBack());
+                        else
+                                nodeStack.push(interior->GetFront());
+                }
+        }
   
-  while (!nodeStack.empty())  {
-        BspNode *node = nodeStack.top();
-        nodeStack.pop();
-        
-        if (node->IsLeaf()) {
-          viewcell = dynamic_cast<BspLeaf *>(node)->GetViewCell();
-          break;
-        } else {
-          
-          BspInterior *interior = dynamic_cast<BspInterior *>(node);
-                
-          // random decision
-          if (interior->GetPlane().Side(point) < 0)
-                nodeStack.push(interior->GetBack());
-          else
-                nodeStack.push(interior->GetFront());
-        }
-  }
-  
-  return viewcell;
+        if (active)
+                return mViewCellsTree->GetActiveViewCell(viewcell);
+        else
+                return viewcell;
 }
 

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

@@ -306 +306 @@
 
         /** Returns view cell the current point is located in.
-        */
-        ViewCell *GetViewCell(const Vector3 &point);
+                @param point the current view point
+                @param active if currently active view cells should be returned or
+                elementary view cell
+        */
+        ViewCell *GetViewCell(const Vector3 &point, const bool active = false);