Changeset 395 for trunk

Timestamp:

11/09/05 15:09:09 (19 years ago)

Author:

bittner

Message:

vss preprocessor updates

Location:

trunk/VUT/GtpVisibilityPreprocessor/src

Files:

• VssTree.cpp (modified) (13 diffs)
• VssTree.h (modified) (6 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/VssTree.cpp

@@ -196 +196 @@
 
 
+void
+VssTreeLeaf::EvalPvsSize()
+{
+        if (!mValidPvs) {
+                Intersectable::NewMail();
+                int pvsSize = 0;
+                for(VssTreeNode::RayInfoContainer::iterator ri = rays.begin();
+                                ri != rays.end();
+                                ri++)
+                        if ((*ri).mRay->IsActive()) {
+                                Intersectable *object;
+#if BIDIRECTIONAL_RAY
+                                object = (*ri).mRay->mOriginObject;
+                                if (object && !object->Mailed()) {
+                                        pvsSize++;
+                                        object->Mail();
+                                }
+#endif
+                                object = (*ri).mRay->mTerminationObject;
+                                if (object && !object->Mailed()) {
+                                        pvsSize++;
+                                        object->Mail();
+                                }
+                        }
+                mPvsSize = pvsSize;
+                mValidPvs = true;
+        }
+}
 
 
@@ -238 +266 @@
         
         
-        if (forcedBoundingBox)
+        if ( forcedBoundingBox )
                 bbox = *forcedBoundingBox;
 
@@ -245 +273 @@
 
   stat.rays = leaf->rays.size();
-        EvalLeafPvs(leaf);
-  stat.initialPvsSize = leaf->mPvsSize;
+        leaf->EvalPvsSize();
+  stat.initialPvsSize = leaf->GetPvsSize();
   // Subdivide();
   root = Subdivide(TraversalData(leaf, bbox, 0));
@@ -263 +291 @@
 }
 
-void
-VssTree::EvalLeafPvs(VssTreeLeaf *leaf)
-{
-        Intersectable::NewMail();
-        int pvsSize = 0;
-        for(VssTreeNode::RayInfoContainer::iterator ri = leaf->rays.begin();
-                        ri != leaf->rays.end();
-                        ri++)
-                if ((*ri).mRay->IsActive()) {
-                        Intersectable *object;
-#if BIDIRECTIONAL_RAY
-                        object = (*ri).mRay->mOriginObject;
-                        if (object && !object->Mailed()) {
-                                pvsSize++;
-                                object->Mail();
-                        }
-#endif
-                        object = (*ri).mRay->mTerminationObject;
-                        if (object && !object->Mailed()) {
-                                pvsSize++;
-                                object->Mail();
-                        }
-                }
-        leaf->mPvsSize = pvsSize;
-}
 
 
@@ -433 +436 @@
         
         // eval pvs size
-        int pvsSize = leaf->mPvsSize;
+        int pvsSize = leaf->GetPvsSize();
 
         Intersectable::NewMail(3);
@@ -600 +603 @@
         
         int rl=0, rr = leaf->rays.size();
-        int pl=0, pr = leaf->mPvsSize;
+        int pl=0, pr = leaf->GetPvsSize();
         float minBox = box.Min(axis);
         float maxBox = box.Max(axis);
@@ -675 +678 @@
   }
   
-  float oldCost = leaf->mPvsSize;
+  float oldCost = leaf->GetPvsSize();
   float newCost = ct_div_ci + minSum/sizeBox;
   float ratio = newCost/oldCost;
@@ -739 +742 @@
         //  if ( (int)(leaf->rays.size()) < termMinCost)
         //    stat.minCostNodes++;
-        if ( leaf->mPvsSize < termMinPvs)
+        if ( leaf->GetPvsSize() < termMinPvs)
                 stat.minCostNodes++;
   
@@ -765 +768 @@
 {
   
-  if ( (leaf->mPvsSize < termMinPvs) ||
+  if ( (leaf->GetPvsSize() < termMinPvs) ||
                          (leaf->GetAvgRayContribution() > termMaxRayContribution ) ||
        (leaf->depth >= termMaxDepth) ||
@@ -813 +816 @@
 
   VssTreeLeaf *back = new VssTreeLeaf(node, raysBack);
-        back->mPvsSize = pvsBack;
+        back->SetPvsSize(pvsBack);
   VssTreeLeaf *front = new VssTreeLeaf(node, raysFront);
-        front->mPvsSize = pvsFront;
+        front->SetPvsSize(pvsFront);
 
   // replace a link from node's parent
@@ -968 +971 @@
   if (
                         //      leaf->rays.size() > (unsigned)termMinCost &&
-                        (leaf->mPvsSize >= termMinPvs) &&
+                        (leaf->GetPvsSize() >= termMinPvs) &&
       SqrMagnitude(leafBBox.Size()) > sizeThreshold) {
     
@@ -1130 +1133 @@
 
     if (!data.node->IsLeaf()) {
-
       TraverseInternalNode(data, tstack);
-
     } else {
       // remove the ray from the leaf
@@ -1196 +1197 @@
   else {
     // directional split
-//      if (DotProd(data.rayData.mRay->GetNormalizedDir(), in->refDir) > sinRefDir )
-//        tstack.push(RayTraversalData(in->front, data.rayData));
-//      else
-//        tstack.push(RayTraversalData(in->back, data.rayData));
-  }
-  
+                if (data.rayData.mRay->GetDirParametrization(in->axis - 3) > in->position)
+                        tstack.push(RayTraversalData(in->front, data.rayData));
+                else
+                        tstack.push(RayTraversalData(in->back, data.rayData));
+  }
 }
 

trunk/VUT/GtpVisibilityPreprocessor/src/VssTree.h

@@ -375 +375 @@
   public VssTreeNode
 {
+private:
+        int mPvsSize;
 public:
   static int mailID;
@@ -380 +382 @@
   
   RayInfoContainer rays;
-        int mPvsSize;
-  
+        bool mValidPvs;
+        
   VssTreeLeaf(VssTreeInterior *p,
                                                         const int nRays
-                                                        ):VssTreeNode(p), rays(), mPvsSize(0) {
+                                                        ):VssTreeNode(p), rays(), mPvsSize(0), mValidPvs(false) {
     rays.reserve(nRays);
   }
@@ -397 +399 @@
   
   void AddRay(const RayInfo &data) {
+                mValidPvs = false;
     rays.push_back(data);
     data.mRay->Ref();
   }
+        
+        int GetPvsSize() const {
+                return mPvsSize;
+        }
+        void SetPvsSize(const int s) {
+                mPvsSize = s;
+        }
+
+        void
+        EvalPvsSize();
 
   void Mail() { mailbox = mailID; }
@@ -410 +423 @@
 
         float GetAvgRayContribution() const {
-                return mPvsSize/(float)rays.size();
+                return GetPvsSize()/(float)rays.size();
         }
 };
@@ -471 +484 @@
 #if 1
                         return
-                                leafa->mPvsSize*a.bbox.GetVolume()
+                                leafa->GetPvsSize()*a.bbox.GetVolume()
                                 <
-                                leafb->mPvsSize*b.bbox.GetVolume();
+                                leafb->GetPvsSize()*b.bbox.GetVolume();
 #endif
 #if 0
                         return
-                                leafa->mPvsSize
+                                leafa->GetPvsSize()
                                 <
-                                leafb->mPvsSize;
+                                leafb->GetPvsSize();
 #endif
 #if 0
                         return
-                                leafa->mPvsSize/(leafa->rays.size()+1)
+                                leafa->GetPvsSize()/(leafa->rays.size()+1)
                                 >
-                                leafb->mPvsSize/(leafb->rays.size()+1);
+                                leafb->GetPvsSize()/(leafb->rays.size()+1);
 #endif
 #if 0
                         return
-                                leafa->mPvsSize*leafa->rays.size()
+                                leafa->GetPvsSize()*leafa->rays.size()
                                 <
-                                leafb->mPvsSize*leafb->rays.size();
+                                leafb->GetPvsSize()*leafb->rays.size();
 #endif
     }
@@ -751 +764 @@
   EvaluateLeafStats(const TraversalData &data);
 
-        void
-        EvalLeafPvs(VssTreeLeaf *leaf);
 
         int