Changeset 1180 for GTP/trunk/Lib

Timestamp:

08/03/06 09:11:06 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis

Files:

• Preprocessing/src/ViewCellsManager.cpp (modified) (4 diffs)
• Preprocessing/src/ViewCellsManager.h (modified) (1 diff)
• Preprocessing/src/VspOspTree.cpp (modified) (9 diffs)
• Preprocessing/src/VspOspTree.h (modified) (2 diffs)
• shared/scripts/GtpVisibility.suo (modified) (previous)

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

@@ -4884 +4884 @@
 
         VssRayContainer::const_iterator vit, vit_end = constructionRays.end();
+
         for (vit = constructionRays.begin(); vit != vit_end; ++ vit)
         {
@@ -4901 +4902 @@
 
         cout << "Computing remaining ray contributions ... ";
-
 
         // recast rest of rays
@@ -5688 +5688 @@
                                         else
                                         {
-                                                /// get current leaf the point
+                                                // get current leaf the point is located in
                                                 KdLeaf *leaf = mOspTree->GetLeaf(ray.mTermination);
                                                 KdIntersectable *entry = mOspTree->GetOrCreateKdIntersectable(leaf);
@@ -5726 +5726 @@
 }
 
-#if 0
+#if 1
 void VspOspViewCellsManager::EvalViewCellPartition()
 {
         int samplesPerPass;
         int numSamples;
-        int castSamples = 0;
+        int castSamples = (int)storedRays.size();
 
         char s[64]; 
-
-        Environment::GetSingleton()->GetIntValue("ViewCells.Evaluation.samplesPerPass", samplesPerPass);
-        Environment::GetSingleton()->GetIntValue("ViewCells.Evaluation.samples", numSamples);
-
         char statsPrefix[100];
+
         Environment::GetSingleton()->GetStringValue("ViewCells.Evaluation.statsPrefix", statsPrefix);
 
-        Debug << "view cell evaluation samples per pass: " << samplesPerPass << endl;
-        Debug << "view cell evaluation samples: " << numSamples << endl;
         Debug << "view cell stats prefix: " << statsPrefix << endl;
 

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

@@ -1011 +1011 @@
 
 protected:
-#if 0
+
+#if 1
         virtual void EvalViewCellPartition();
 #endif

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

@@ -606 +606 @@
         float sampCon = 0.0f;
 
-        //-- update pvs
         if (updatePvs)
         {
+                //-- update pvs of view cell
                 AddSamplesToPvs(leaf, *tData.mRays, sampCon, conSamp);
 
@@ -715 +715 @@
                 float sampCon = 0.0f;
 
-
+#if 0
                 //-- store pvs optained from rays
+
                 AddSamplesToPvs(leaf, *tData.mRays, sampCon, conSamp);
 
@@ -725 +726 @@
                 mVspStats.contributingSamples += conSamp;
                 mVspStats.sampleContributions += (int)sampCon;
-
+#endif
                 //-- store additional info
                 if (mStoreRays)
@@ -974 +975 @@
 
 void VspTree::AddSamplesToPvs(VspLeaf *leaf,
-                                                         const RayInfoContainer &rays,
-                                                         float &sampleContributions,
-                                                         int &contributingSamples)
+                                                          const RayInfoContainer &rays,
+                                                          float &sampleContributions,
+                                                          int &contributingSamples)
 {
         sampleContributions = 0;
@@ -2940 +2941 @@
         mBoundingBox = kdTree.GetBox();
         mRoot = kdTree.GetRoot();
+
         mSplitCandidates = new vector<SortableEntry>;
 }
@@ -2946 +2948 @@
 OspTree::~OspTree()
 {
+        // delete kd intersectables
         KdIntersectableMap::iterator it, it_end = mKdIntersectables.end();
 
@@ -3478 +3481 @@
 
         const float oldRenderCost = (float)totalPvs * totalVol + Limits::Small;
-        const float newRenderCost = 
-                (float)pvsFront * volFront + 
-                (float)pvsBack * volBack +
-                (float)totalPvs * frontAndBackVol;
+        const float newRenderCost = (float)pvsFront * volFront + 
+                                                                (float)pvsBack * volBack +
+                                                                (float)totalPvs * frontAndBackVol;
 
 
@@ -4492 +4494 @@
 
 
+float OspTree::EvalViewCellsVolume(const RayInfoContainer &rays) const
+{
+        float vol = 0;
+        ViewCell::NewMail();
+
+        RayInfoContainer::const_iterator rit, rit_end = rays.end();
+
+        for (rit = rays.begin(); rit != rays.end(); ++ rit)
+        {
+                VssRay *ray = (*rit).mRay;
+
+                if (!ray->mTerminationObject && !ray->mOriginObject)
+                        continue;
+                
+                ViewCellContainer viewCells;
+                mVspTree->CastLineSegment(ray->mOrigin, ray->mTermination, viewCells);
+
+                ViewCellContainer::const_iterator vit, vit_end = viewCells.end();
+                        
+                for (vit = viewCells.begin(); vit != vit_end; ++ vit)
+                {
+                        ViewCell *vc = *vit;
+
+                        if (!vc->Mailed())
+                        {
+                                vc->Mail();
+                                vol += vc->GetVolume();
+                        }
+                }               
+        }
+
+        return vol;
+}
+
 
 /********************************************************************/
@@ -4632 +4668 @@
         mOspTree.EvalSplitCandidate(*oSplitCandidate);
 
-        mOspTree.mTotalCost = (float)objects.size();
+        const float vol = mOspTree.EvalViewCellsVolume(rays);
+
+        mOspTree.mTotalCost = (float)objects.size() * vol;
         mOspTree.EvalSubdivisionStats(*oSplitCandidate);
 

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

@@ -1406 +1406 @@
 
 
-        /** Compute "pvs size of this object container
-                @ note bot relly pvs size just weighted sum of object taking their
+        /** Compute "pvs size" of this object container
+                @note not really pvs size just weighted sum of object taking their
                 appearances in pvss into account
         */
@@ -1704 +1704 @@
                 float &volRight);
 
+        float EvalViewCellsVolume(const RayInfoContainer &rays) const;
+
+
 protected: