Changeset 1289

Timestamp:

08/28/06 09:45:22 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• VspTree.cpp (modified) (3 diffs)
• VspTree.h (modified) (1 diff)

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

@@ -1591 +1591 @@
                         rayInf.ComputeRayIntersection(candidatePlane.mAxis, 
                                                                                   candidatePlane.mPosition, t);
-/*
-                if (!mUseKdPvsForHeuristics)
+
+                switch (mHierarchyManager->GetObjectSpaceSubdivisonType())
+                {
+                case HierarchyManager::NO_OBJ_SUBDIV:
                 {
                         // find front and back pvs for origing and termination object
                         UpdateObjPvsContri(ray->mTerminationObject, cf, pvsFront, pvsBack, totalPvs);
                         UpdateObjPvsContri(ray->mOriginObject, cf, pvsFront, pvsBack, totalPvs);
+
+                        break;
+                }
+                case HierarchyManager::KD_BASED_OBJ_SUBDIV:
+                {
+                        break;
+                }
+                case HierarchyManager::BV_BASED_OBJ_SUBDIV:
+                {
+                        BvhLeaf *tLeaf = mHierarchyManager->mBvHierarchy->GetLeaf(ray->mTerminationObject);
+                        BvhLeaf *oLeaf = mHierarchyManager->mBvHierarchy->GetLeaf(ray->mOriginObject);
+
+                        UpdateBvNodePvsContri(tLeaf, cf, pvsFront, pvsBack, totalPvs);
+                        UpdateBvNodePvsContri(oLeaf, cf, pvsFront, pvsBack, totalPvs);
+                        
+                        break;
+                }
+        default:
+                break;
+        }
+
+/*
+                if (!mUseKdPvsForHeuristics)
+                {
+                        
                 }
                 else
@@ -1702 +1729 @@
 
 void VspTree::UpdateObjPvsContri(Intersectable *obj,
-                                                  const int cf,
-                                                  float &frontPvs,
-                                                  float &backPvs,
-                                                  float &totalPvs) const
+                                                                 const int cf,
+                                                                 float &frontPvs,
+                                                                 float &backPvs,
+                                                                 float &totalPvs) const
 {
         if (!obj) return;
@@ -1750 +1777 @@
         }
 }
+
+
+void VspTree::UpdateBvhLeafPvsContri(BvhLeaf *leaf,
+                                                                         const int cf,
+                                                                         float &frontPvs,
+                                                                         float &backPvs,
+                                                                         float &totalPvs) const
+{
+        if (!leaf) return;
+
+        const int renderCost = (int)leaf->mObjects.size();
+
+        // leaf in no pvs => new
+        if (!leaf->Mailed() && !leaf->Mailed(1) && !leaf->Mailed(2))
+        {
+                totalPvs += renderCost;
+        }
+
+        // QUESTION matt: is it safe to assume that 
+        // the leaf belongs to no pvs in this case?
+        //if (cf == Ray::COINCIDENT) return;
+
+        if (cf >= 0) // front pvs
+        {
+                if (!leaf->Mailed() && !leaf->Mailed(2))
+                {
+                        frontPvs += renderCost;
+                
+                        // already in back pvs => in both pvss
+                        if (leaf->Mailed(1))
+                                leaf->Mail(2);
+                        else
+                                leaf->Mail();
+                }
+        }
+
+        if (cf <= 0) // back pvs
+        {
+                if (!leaf->Mailed(1) && !obj->Mailed(2))
+                {
+                        backPvs += renderCost;
+                
+                        // already in front pvs => in both pvss
+                        if (leaf->Mailed())
+                                leaf->Mail(2);
+                        else
+                                leaf->Mail(1);
+                }
+        }
+}
+
 
 

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

@@ -831 +831 @@
         
         */
-        void UpdateObjPvsContri(Intersectable *obj, 
-                                         const int cf, 
-                                         float &frontPvs, 
-                                         float &backPvs, 
-                                         float &totalPvs) const;
+        void UpdateObjPvsContri(
+                Intersectable *obj, 
+                const int cf, 
+                float &frontPvs, 
+                float &backPvs, 
+                float &totalPvs) const;
+
+        void UpdateBvhLeafPvsContri(
+                BvhLeaf *leaf,
+                const int cf,
+                float &frontPvs,
+                float &backPvs,
+                float &totalPvs) const;
+
         
         /** See UpdateObjPvsContri.