Changeset 609

Timestamp:

02/09/06 01:18:31 (18 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/GtpVisibilityPreprocessor/src

Files:

• ViewCell.h (modified) (1 diff)
• ViewCellsManager.cpp (modified) (6 diffs)
• ViewCellsManager.h (modified) (7 diffs)
• VspBspTree.cpp (modified) (1 diff)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCell.h

@@ -199 +199 @@
         bool mIsActive;
 
+        
 protected:
-
 
         /// the potentially visible objects

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -699 +699 @@
         int axis = 0;
 
-        const float factor = 0.35;
+        const float factor = 0.65;
         Vector3 point = mViewSpaceBox.Min() +  mViewSpaceBox.Size() * factor;
 
@@ -2613 +2613 @@
 
 
-bool VspBspViewCellsManager::EqualToSpatialNode(ViewCell *viewCell)
-{
-        BspNode *node;
-        return EqualToSpatialNode(viewCell, &node);
-}
-
-
-bool VspBspViewCellsManager::EqualToSpatialNode(ViewCell *viewCell, BspNode **node)
+bool VspBspViewCellsManager::EqualToSpatialNode(ViewCell *viewCell) const
+{
+        return GetSpatialNode(viewCell) != NULL;
+}
+
+
+BspNode *VspBspViewCellsManager::GetSpatialNode(ViewCell *viewCell) const
 {
         if (!viewCell->IsLeaf())
@@ -2626 +2625 @@
                 BspViewCell *bspVc = dynamic_cast<BspViewCell *>(viewCell);
 
-                *node = bspVc->mLeaf;
-        return true;
-        }
+                return bspVc->mLeaf;
+        }
         else
         {
@@ -2635 +2633 @@
                 // cannot be node of binary tree
                 if (interior->mChildren.size() != 2)
-                        return false;
+                        return NULL;
 
                 ViewCell *left = interior->mChildren[0];
                 ViewCell *right = interior->mChildren[1];
 
-                BspNode *leftNode;
-                BspNode *rightNode;
-
-                if (EqualToSpatialNode(left, &leftNode) && EqualToSpatialNode(right, &rightNode))
-                {
-                        *node = leftNode->GetParent();
-                        return leftNode->IsSibling(rightNode);  
-                }
-
-                *node = NULL;
-
-                return false;
-        }
+                BspNode *leftNode = GetSpatialNode(left);
+                BspNode *rightNode = GetSpatialNode(right);
+
+                if (leftNode && rightNode && leftNode->IsSibling(rightNode))
+                {
+                        return leftNode->GetParent(); 
+                }
+        }
+
+        return NULL;
 }
 
@@ -2691 +2686 @@
 
 
-        // view cells already finished before post processing step (i.e. because they were loaded)
+        // view cells already finished before post processing step 
+        // (i.e. because they were loaded)
         if (mViewCellsFinished)
         {
@@ -2790 +2786 @@
 {
         return VSP_BSP;
+}
+
+
+void VspBspViewCellsManager::CreateMergeHierarchy()
+{
+        
 }
 

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.h

@@ -213 +213 @@
         /** Returns render cost of a single view cell given the render cost of an object.
         */
-        virtual float GetRendercost(ViewCell *viewCell, float objRendercost) const ;
+        float GetRendercost(ViewCell *viewCell, float objRendercost) const;
 
         /** Returns container of loaded / generated view cells.
@@ -293 +293 @@
                                                          int maxPvsSize) const;
 
-  /** set valid viewcells in the range of pvs. sorts the viewcells
+
+        /** set valid viewcells in the range of pvs. sorts the viewcells
           according to the pvs and then pickups those in the ranges */
-  
-  void
-  SetValidityPercentage(
-                                                const float minValid,
-                                                const float maxValid
-                                                );
-
-  int
-  CountValidViewcells() const;
+
+    
+        void SetValidityPercentage(const float minValid,        const float maxValid);
+
+    int CountValidViewcells() const;
 
         /** Returns maximal allowed pvs size.
@@ -352 +349 @@
                                                                                 vector<MergeCandidate> &candidates) = 0;
 
-         
-        void CollectViewCells(const int n) 
-        {
-                mNumActiveViewCells = n;
-                mViewCells.clear();
-                CollectViewCells();
-        }
-
-        bool EqualToSpatialNode(ViewCell *viewCell) { return false;} // implemented in subclasses
-
-
-
+        
+  
+  void CollectViewCells(const int n) {
+        mNumActiveViewCells = n;
+        mViewCells.clear();
+        CollectViewCells();
+  }
+
+
+  virtual bool EqualToSpatialNode(ViewCell *viewCell) const { return false;}
 protected:
-        
+
 
         /**
@@ -606 +601 @@
 
         float GetProbability(ViewCell *viewCell);
-
+        
 
         void CreateMesh(ViewCell *vc);
@@ -672 +667 @@
 
         float GetProbability(ViewCell *viewCell);
-        
+
 
         void CreateMesh(ViewCell *vc);
@@ -732 +727 @@
         float GetProbability(ViewCell *viewCell);
         
-        
         ViewCell *GetViewCell(const Vector3 &point) const;
 
@@ -756 +750 @@
         void CollectMergeCandidates(const VssRayContainer &rays, vector<MergeCandidate> &candidates);
 
-        bool EqualToSpatialNode(ViewCell *viewCell);
+        bool EqualToSpatialNode(ViewCell *viewCell) const;
 
 protected:
 
-        bool EqualToSpatialNode(ViewCell *viewCell, BspNode **node);
-
+        BspNode *GetSpatialNode(ViewCell *viewCell) const;
         /** HACK
         */

trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

@@ -430 +430 @@
 
         tQueue.push(tData);
+
 
         mTotalCost = tData.mPvs * tData.mProbability / mBox.GetVolume();