Changeset 727

Timestamp:

04/05/06 00:57:25 (18 years ago)

Author:

mattausch

Message:

added view cell description bsp tree

Location:

GTP/trunk/Lib/Vis

Files:

• OnlineCullingCHC/OGRE/include/ViewCellBspTree.h (added)
• OnlineCullingCHC/OGRE/scripts/Plugin_VisibilitySceneManager.vcproj (modified) (2 diffs)
• OnlineCullingCHC/OGRE/src/ViewCellBspTree.cpp (added)
• Preprocessing/src/ViewCellBsp.h (modified) (1 diff)
• Preprocessing/src/ViewCellsManager.cpp (modified) (4 diffs)
• Preprocessing/src/VspBspTree.cpp (modified) (1 diff)
• Preprocessing/src/VspBspTree.h (modified) (5 diffs)

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/scripts/Plugin_VisibilitySceneManager.vcproj

@@ -228 +228 @@
                                 </File>
                                 <File
-                                        RelativePath="..\include\VspBspTree.h">
+                                        RelativePath="..\include\ViewCellBspTree.h">
                                 </File>
                         </Filter>
@@ -266 +266 @@
                                 <File
                                         RelativePath="..\src\OgreVisibilitySceneManagerDll.cpp">
+                                </File>
+                                <File
+                                        RelativePath="..\src\ViewCellBspTree.cpp">
                                 </File>
                         </Filter>

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

@@ -914 +914 @@
                                   int &contributingSamples);
 
-        /** Preprocesses polygons and throws out all polygons which are coincident to
-                the view space box faces (they can be problematic).
+        /** Preprocesses polygons and throws out all polygons which 
+                are coincident to the view space box faces:
+                These polygons can can be problematic for bsp because they create
+                bad view cells.
         */
         void PreprocessPolygons(PolygonContainer &polys);
 
-        /** Returns view cell corresponding to 
-                the invalid view space. If it does not exist, it is created.
+        /** Returns view cell corresponding to the invalid view space. 
+                If it does not exist, it is created.
         */
         BspViewCell *GetOrCreateOutOfBoundsCell();

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

@@ -324 +324 @@
                 ConstructSubdivision(preprocessor->mObjects, initialSamples);
 
+        // initial samples count for overall samples ...
         numSamples += numInitialSamples;
 
@@ -369 +370 @@
         {
                 cout << "casting " << mSamplesPerPass << " samples of " << n << " ... ";
+                Debug << "casting " << mSamplesPerPass << " samples of " << n << " ... ";
+
                 VssRayContainer constructionSamples;
 
@@ -378 +381 @@
                 if (0) dirSamples = !dirSamples; // toggle sampling method
 
+                // cast new samples
                 numSamples += CastPassSamples(mSamplesPerPass, 
                                                                           samplingType,
@@ -386 +390 @@
                 cout << "computing sample contribution for " << (int)constructionSamples.size() << " samples ... ";
 
-                // TODO: leak?
-                if (1 || SAMPLE_AFTER_SUBDIVISION)
+                // computes sample contribution of cast rays TODO: leak?
+                if (SAMPLE_AFTER_SUBDIVISION)
                         ComputeSampleContributions(constructionSamples, true, false);
 

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

@@ -2463 +2463 @@
                         if (!onlyValid || node->TreeValid())
                         {
-                                ViewCell *viewCell = 
-                                        mViewCellsTree->GetActiveViewCell(dynamic_cast<BspLeaf *>(node)->GetViewCell());
+                                ViewCell *leafVc = dynamic_cast<BspLeaf *>(node)->GetViewCell();
+
+                                ViewCell *viewCell = mViewCellsTree->GetActiveViewCell(leafVc);
                                                 
                                 if (!onlyUnmailed || !viewCell->Mailed()) 

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

@@ -57 +57 @@
                 /// the probability that this node contains view point
                 float mProbability;
-                /// geometry of node induced by half planes
+                /// geometry of node as induced by planes
                 BspNodeGeometry *mGeometry;
                 /// pvs size
@@ -63 +63 @@
                 /// how often this branch has missed the max-cost ratio
                 int mMaxCostMisses;
-                /// if this node is a kd-node (i.e., boundaries are axis aligned)
+                /// if this node is a kd-node (i.e., boundaries are axis aligned
                 bool mIsKdNode;
-                /// current split axis: used for octree
+                // current axis
                 int mAxis;
-                /// for priority traversal: priority of this traversal data
+                // current priority
                 float mPriority;
 
@@ -89 +89 @@
                 mMaxCostMisses(0), 
                 mIsKdNode(false),
-                mPriority(0)
+                mPriority(0),
+                mAxis(0)
                 {}
                 
@@ -108 +109 @@
                 mMaxCostMisses(0),
                 mIsKdNode(false),
-                mPriority(0)
+                mPriority(0),
+                mAxis(0)
                 {}
 
@@ -123 +125 @@
                 mGeometry(geom),
                 mMaxCostMisses(0),
-                mIsKdNode(false)
+                mIsKdNode(false),
+                mAxis(0)
                 {}