Changeset 663

Timestamp:

02/27/06 07:58:27 (18 years ago)

Author:

mattausch

Message:

 

Files:

• GTP/trunk/Lib/Vis/Preprocessing/src/Environment.cpp (modified) (3 diffs)
• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp (modified) (2 diffs)
• GTP/trunk/Lib/Vis/Preprocessing/src/VspBspTree.cpp (modified) (13 diffs)
• GTP/trunk/Lib/Vis/Preprocessing/src/VspBspTree.h (modified) (6 diffs)
• GTP/trunk/Lib/Vis/shared/scripts/GtpVisibility.suo (modified) (previous)
• OGRE/trunk/ogrenew/Ogre.suo (modified) (previous)
• OGRE/trunk/ogrenew/Samples/Common/bin/Release/resources.cfg (modified) (1 diff)

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

@@ -1172 +1172 @@
                                  "100000");
 
-
-
   RegisterOption("VssPreprocessor.useImportanceSampling",
                                  optBool,
@@ -1992 +1990 @@
                         "0.5");
 
-
         RegisterOption("VspBspTree.Construction.randomize", 
                 optBool, 
@@ -1998 +1995 @@
                 "false");
 
-        
+        RegisterOption("VspBspTree.simulateOctree", 
+                optBool, 
+                "vsp_bsp_simulate_octree=", 
+                "false");
+
         RegisterOption("VspBspTree.maxTotalMemory", 
                 optFloat, 

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

@@ -277 +277 @@
         if (SAMPLE_AFTER_SUBDIVISION)
                 ComputeSampleContributions(postProcessSamples, true, storeViewCells);
+
         // merge the view cells
         PostProcess(preprocessor->mObjects, postProcessSamples);
@@ -310 +311 @@
         environment->GetIntValue("ViewCells.Evaluation.samples", numSamples);
 
+        Debug << "view cells evaluation samples per pass: " << samplesPerPass << endl;
+        Debug << "view cells evaluation samples: " << numSamples << endl;
+
         while (castSamples < numSamples)
         {
+
         }
         //char s[64]; sprintf(s, "bsp-pvs%04d.x3d", i);

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

@@ -37 +37 @@
 int VspBspTree::sFrontAndBackId = 0;
 
-
+bool VspBspTraversalData::sBreathFirstSplits = false;
 
 
@@ -129 +129 @@
         environment->GetBoolValue("VspBspTree.useCostHeuristics", mUseCostHeuristics);
         environment->GetBoolValue("VspBspTree.useSplitCostQueue", mUseSplitCostQueue);
+        environment->GetBoolValue("VspBspTree.simulateOctree", mSimulateOctree);
+        environment->GetBoolValue("VspBspTree.breathFirstSplits", VspBspTraversalData::sBreathFirstSplits);
 
         char subdivisionStatsLog[100];
@@ -143 +145 @@
         Debug << "min rays: " << mTermMinRays << endl;
         Debug << "max ray contri: " << mTermMaxRayContribution << endl;
-        //Debug << "VSP BSP mininam accumulated ray lenght: ", mTermMinAccRayLength) << endl;
         Debug << "max cost ratio: " << mTermMaxCostRatio << endl;
         Debug << "miss tolerance: " << mTermMissTolerance << endl;
         Debug << "max view cells: " << mMaxViewCells << endl;
         Debug << "max polygon candidates: " << mMaxPolyCandidates << endl;
-        Debug << "max plane candidates: " << mMaxRayCandidates << endl;
+        //Debug << "max plane candidates: " << mMaxRayCandidates << endl;
         Debug << "randomize: " << randomize << endl;
 
         Debug << "using area for pvs: " << mUseAreaForPvs << endl;
         Debug << "render cost weight: " << mRenderCostWeight << endl;
+        Debug << "min global cost ratio: " << mTermMinGlobalCostRatio << endl;
+        Debug << "global cost miss tolerance: " << mTermGlobalCostMissTolerance << endl;
+        Debug << "only driving axis: " << mOnlyDrivingAxis << endl;
+        Debug << "max memory: " << mMaxMemory << endl;
+        Debug << "use poly split if available: " << mUsePolygonSplitIfAvailable << endl;
+        Debug << "use cost heuristics: " << mUseCostHeuristics << endl;
+        Debug << "use split cost queue: " << mUseSplitCostQueue << endl;
+        Debug << "subdivision stats log: " << subdivisionStatsLog << endl;
+        
+
         Debug << "Split plane strategy: ";
 
@@ -163 +174 @@
                 Debug << "axis aligned ";
         }
-        if (mSplitPlaneStrategy & LEAST_RAY_SPLITS)
+        /*if (mSplitPlaneStrategy & LEAST_RAY_SPLITS)
         {
                 mCostNormalizer += mLeastRaySplitsFactor;
@@ -177 +188 @@
                 mCostNormalizer += mPvsFactor;
                 Debug << "pvs";
-        }
+        }*/
 
 
@@ -451 +462 @@
                                                           prop,
                                                           geom);
-#if OCTREE_HACK
-tData.mAxis = 0;
-#endif
+
+        tData.mPriority = mBreathFirstSplits ? 
+                (float)-frontData.mDepth : tData.mPvs * tData.mProbability;
+
+        if (mSimulateOctree)
+        tData.mAxis = 0;
+
         // first node is kd node, i.e. an axis aligned box
         if (1)
@@ -560 +575 @@
                                                           geom);
 
+        tData.mPriority = mBreathFirstSplits ? 
+                (float)-tData.mDepth : tData.mPvs * tData.mProbability;
+
         // compute first split candidate
         VspBspSplitCandidate splitCandidate;
@@ -684 +702 @@
                 VspBspTraversalData tBackData;
 
-#if OCTREE_HACK
-                //Debug << "new axis:" << (tData.mAxis + 1) % 3 << endl;
-                tFrontData.mAxis = (tData.mAxis + 1) % 3;
-                tBackData.mAxis = (tData.mAxis + 1) % 3;
-#endif
+                if (mSimulateOctree)
+                {       // choose axes in circular motion
+                        tFrontData.mAxis = (tData.mAxis + 1) % 3;
+                        tBackData.mAxis = (tData.mAxis + 1) % 3;
+                }
+
                 // create new interior node and two leaf nodes
                 // or return leaf as it is (if maxCostRatio missed)
-
                 int splitAxis;
                 bool splitFurther = true;
@@ -721 +739 @@
 
                         tFrontData.mIsKdNode = tBackData.mIsKdNode = (tData.mIsKdNode && splitAxis < 3);
+
                         // how often was max cost ratio missed in this branch?
                         tFrontData.mMaxCostMisses = maxCostMisses;
                         tBackData.mMaxCostMisses = maxCostMisses;
+
+                        ComputePriority(tFrontData);
+                        ComputePriority(tBackData);
 
                         if (1)
@@ -843 +865 @@
                 tBackData.mMaxCostMisses = maxCostMisses;
                 
-
+                ComputePriority(tFrontData);
+                ComputePriority(tBackData);
+
+                frontData.mPriority = mBreathFirstSplits ? 
+                (float)-frontData.mDepth : frontData.mPvs * frontData.mProbability;
+        backData.mPriority = mBreathFirstSplits ? 
+                (float)-backData.mDepth : backData.mPvs * backData.mProbability;
                 if (1)
                 {
@@ -937 +965 @@
 
         // compute locally best split plane
-        bool success = SelectPlane(splitData.mSplitPlane, leaf, tData, frontData, backData, splitAxis);
+        bool success = SelectPlane(splitData.mSplitPlane, leaf, tData, 
+                                                           frontData, backData, splitAxis);
 
         // TODO: reuse
@@ -1004 +1033 @@
                 }
         }
-        
+
         
     // subdivide polygons
@@ -1324 +1353 @@
                         box.Include((*ri).ExtrapTermination());
         }
-#if OCTREE_HACK
-        //Debug << "choosing axis:" << tData.mAxis << endl;
-        const int sAxis = tData.mAxis;
-#else
-        const int sAxis = mUseRandomAxis ? Random(3) : box.Size().DrivingAxis();
-#endif
+
+        int sAxis = 0;
+
+        bool useSpecialAxis = false;
+
+        if (mSimulateOctree)
+        {
+                sAxis = tData.mAxis;
+                useSpecialAxis = true;
+        }
+        else if (mUseRandomAxis)
+        {
+                sAxis = Random(3);
+                useSpecialAxis = true;
+        }
+        else if (mOnlyDrivingAxis)
+        {
+                sAxis = box.Size().DrivingAxis();
+                useSpecialAxis = true;
+        }
+
         for (axis = 0; axis < 3; ++ axis)
         {
-                if (!mOnlyDrivingAxis || (axis == sAxis))
+                if (!useSpecialAxis || (axis == sAxis))
                 {
                         if (!mUseCostHeuristics)

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

@@ -28 +28 @@
 struct BspRay;
 
-#define OCTREE_HACK 0
+//#define OCTREE_HACK 0
 /**
         This is a view space partitioning specialised BSPtree.  
@@ -44 +44 @@
         /** Additional data which is passed down the BSP tree during traversal.
         */
-        struct VspBspTraversalData
+        class VspBspTraversalData
         {  
+        public:
                 /// the current node
                 BspNode *mNode;
@@ -64 +65 @@
                 /// if this node is a kd-node (i.e., boundaries are axis aligned
                 bool mIsKdNode;
-
-
-#if OCTREE_HACK // OCTREE HACK
+                // hack for octree
                 int mAxis;
-#endif
-                /// bounding box of current view space.
-                ///AxisAlignedBox3 mBbox;
-                
+                float mPriority;
+
+                static bool sBreathFirstSplits;
+
                 /** Returns average ray contribution.
                 */
@@ -129 +128 @@
                 float GetCost() const
                 {
-#if 1
-                        return mPvs * mProbability;
-#endif
-#if 0
-                        return (float) (-mDepth); // for regular grid
-#endif
-#if 0
-                        return (float)(mPvs * (int)mRays->size());
-#endif
-#if 0
-                        return (float)mPvs;
-#endif
-#if 0
-                        return mProbabiliy * (float)mRays->size();
-#endif
+                        if (sBreathFirstSplits)
+                                return mPvs * mProbability;
+                        else
+                                return (float) (-mDepth); // for kd tree
                 }
 
@@ -160 +148 @@
     };
         
+
         typedef std::priority_queue<VspBspTraversalData> VspBspTraversalQueue;
         
@@ -788 +777 @@
 
         //int mSplits;
-
+        /// subdivision stats output file
         ofstream mSubdivsionStats;
-
+        /// if random split axis should be used
         bool mUseRandomAxis;
-
+        /// use polygon split whenever there are polys left
         bool mUsePolygonSplitIfAvailable;
-
+        /// current time stamp (used for keeping split history)
         int mTimeStamp;
-
+        /// number of currenly generated view cells
         int mCreatedViewCells;
+        /// if vsp bsp tree should simulate octree
+        bool mSimulateOctree;
+
+        int mBreathFirstSplits;
 
 private:

OGRE/trunk/ogrenew/Samples/Common/bin/Release/resources.cfg

@@ -15 +15 @@
 FileSystem=../../../Media/particle
 FileSystem=../../../Media/gui
-FileSystem=D:/svn/gametools/OGRE/trunk/resources/materials/scripts
-FileSystem=D:/svn/gametools/OGRE/trunk/resources/materials/textures
-FileSystem=D:/svn/gametools/OGRE/trunk/resources/models
-FileSystem=D:/svn/gametools/OGRE/trunk/resources/models/trees
-FileSystem=D:/svn/gametools/OGRE/trunk/resources/overlays
-FileSystem=D:/svn/gametools/OGRE/trunk/resources/media
+FileSystem=E:/svn/gametools/OGRE/trunk/resources/materials/scripts
+FileSystem=E:/svn/gametools/OGRE/trunk/resources/materials/textures
+FileSystem=E:/svn/gametools/OGRE/trunk/resources/models
+FileSystem=E:/svn/gametools/OGRE/trunk/resources/models/trees
+FileSystem=E:/svn/gametools/OGRE/trunk/resources/overlays
+FileSystem=E:/svn/gametools/OGRE/trunk/resources/media
 Zip=../../../Media/packs/cubemap.zip
 Zip=../../../Media/packs/cubemapsJS.zip