Changeset 645 for GTP/trunk

Timestamp:

02/15/06 18:03:34 (19 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis

Files:

• OnlineCullingCHC/OGRE/src/OgreOcclusionQueriesQueryManager.cpp (modified) (1 diff)
• Preprocessing/scripts/default.env (modified) (4 diffs)
• Preprocessing/src/Polygon3.cpp (modified) (3 diffs)
• Preprocessing/src/ViewCellBsp.cpp (modified) (9 diffs)
• shared/scripts/GtpVisibility.suo (modified) (previous)

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOcclusionQueriesQueryManager.cpp

@@ -225 +225 @@
         }
 }
-//------j-----------------------------------------------------------------
+//------------------------------------------------------------------------
 void  OcclusionQueriesQueryManager::CollectNodeVisibility(
                                                 GtpVisibility::QueryList::iterator &visQueryIt, 

GTP/trunk/Lib/Vis/Preprocessing/scripts/default.env

@@ -289 +289 @@
         Construction {
                 samples 500000
-                epsilon 0.005
+                epsilon 0.00005
                 randomize false
                 renderCostWeight 1.0
@@ -331 +331 @@
                 missTolerance           6
                 
-                maxViewCells            10000
+                maxViewCells            50000
                 
                 # used for pvs criterium
@@ -354 +354 @@
 BspTree {
         Construction {
-                samples 500000
+                samples 50000
                 epsilon 0.005
         }
@@ -420 +420 @@
                 minProbability 0.001
                 maxRayContribution 9999
-                maxViewCells    2048
+                maxViewCells    1000
 
                 # used for pvs criterium

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

@@ -224 +224 @@
 
         //TODO: remove for performance
-#if 0
+#if 1
         if (1)
         {
@@ -234 +234 @@
                 }
         }
-        else
+        
+        if (1)
         {
                 Vector3 vtx = mVertices.back();
@@ -241 +242 @@
                 for (it = mVertices.begin(); it != it_end; ++it)
                 {
-                        if (!(EpsilonEqualV3(vtx, *it)))
+                        if (EpsilonEqualV3(vtx, *it, 0.0001))
                         {
                                 //Debug << "Malformed vertices:\n" << *this << endl;

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

@@ -963 +963 @@
                                                            new BoundedRayContainer(), 0, 0, new BspNodeGeometry());
 
-        int pvsData = tData.mPvs;
-        float cData = (float)tData.mPvs * tData.mProbability;
 
         // create new interior node and two leaf nodes
@@ -973 +971 @@
         if (1)
         {
+                int pvsData = tData.mPvs;
+                float cData = (float)pvsData * tData.mProbability;
+
                 float cFront = (float)tFrontData.mPvs * tFrontData.mProbability;
                 float cBack = (float)tBackData.mPvs * tBackData.mProbability;
                 
-                float costDecr = 
-                        (cFront + cBack - cData) / mBox.GetVolume();
+                Debug << "front pvs: " << tFrontData.mPvs << " p: " << tFrontData.mProbability << endl;
+                Debug << "back pvs: " << tBackData.mPvs << " p: " << tBackData.mProbability << endl;
+                Debug << "pvs: " << pvsData << " p: " << tData.mProbability << endl;
+
+                Debug << "data: " << cData << " front: " << cFront << " back: " << cBack << endl;
+                Debug << "cost ratio: " << (cFront + cBack) / cData << endl;
+
+                if ((cFront + cBack) / cData > 1)
+                        Debug << "ERROR!!" << endl;
+
+                float costDecr = (cFront + cBack - cData) / mBox.GetVolume();
 
                 
@@ -1017 +1027 @@
 }
 
+
 void BspTree::ExtractViewCells(BspTraversalData &frontData,
                                                            BspTraversalData &backData, 
@@ -1044 +1055 @@
         }
 }
+
 
 BspInterior *BspTree::SubdivideNode(BspTraversalData &tData,
@@ -1091 +1103 @@
                                                                            interior->mPlane,
                                                                            mBox,
-                                                                           mEpsilon);
+                                                                           0.000000000001);
+                                                                           //mEpsilon);
         
                 
@@ -1103 +1116 @@
                         frontData.mProbability = frontData.mGeometry->GetVolume();
                         backData.mProbability = tData.mProbability - frontData.mProbability;
+
+                        Debug << "************" << endl;
+                        Debug << "plane: " << interior->mPlane << endl;
+                        Debug << "box: " << mBox << endl;
+                        Debug << "all: " << tData.mProbability << " f: " << frontData.mProbability << " b: " << backData.mProbability << endl;
+                        Debug << "real back: " << backData.mGeometry->GetVolume() << endl;
+                        Debug << "data geom: " << tData.mGeometry->mPolys.size() << " f: " << frontData.mGeometry->mPolys.size() << " b: " << backData.mGeometry->mPolys.size() << endl;
                 }
         }
@@ -1443 +1463 @@
                 const float candidateCost = 
                         SplitPlaneCost(poly->GetSupportingPlane(), data);
+
+                Debug << "supporting plane: " << poly->GetSupportingPlane() << endl;
 
                 if (candidateCost < lowestCost)
@@ -1982 +2004 @@
                         if (!leaf->mViewCell->Mailed())
                         {
-                          //                            ray.bspIntersections.push_back(Ray::BspIntersection(maxt, leaf));
+                                //ray.bspIntersections.push_back(Ray::BspIntersection(maxt, leaf));
                                 leaf->mViewCell->Mail();
                                 ++ hits;
@@ -2061 +2083 @@
                         else // ray and plane are coincident
                         {
-                                // WHAT TO DO IN THIS CASE ?
-                                //break;
-                                node = in->GetFront();
-                                continue;
+                                // NOTE: what to do if ray is coincident with plane?
+                                if (extSide < 0)
+                                        node = in->GetBack();
+                                else 
+                                        node = in->GetFront();
+                                                                
+                                continue; // no far child
                         }