Changeset 810

Timestamp:

04/24/06 18:46:20 (18 years ago)

Author:

mattausch

Message:

added from point visibility tree:
this tree is constructed using from point visibility information

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/Preprocessor.vcproj (modified) (1 diff)
• src/Containers.h (modified) (2 diffs)
• src/FromPointVisibilityTree.cpp (added)
• src/FromPointVisibilityTree.h (added)
• src/ViewCell.h (modified) (1 diff)
• src/ViewCellsManager.h (modified) (1 diff)
• src/VspBspTree.cpp (modified) (7 diffs)
• src/VspBspTree.h (modified) (1 diff)

GTP/trunk/Lib/Vis/Preprocessing/scripts/Preprocessor.vcproj

@@ -163 +163 @@
                         </File>
                         <File
+                                RelativePath="..\src\FromPointVisibilityTree.cpp">
+                        </File>
+                        <File
+                                RelativePath="..\src\FromPointVisibilityTree.h">
+                        </File>
+                        <File
                                 RelativePath="..\src\GlRenderer.cpp">
                         </File>

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

@@ -14 +14 @@
 class Ray;
 class Mesh;
+
+struct VisibilityPoint;
 
 /** Container storing polygons used during BSP tree construction.
@@ -45 +47 @@
 typedef vector<Mesh *> MeshContainer;
 
+/** Container storing visibility points, i.e. locations in space storing from point visibility
+        information.
+*/
+typedef vector<VisibilityPoint *> VisibilityPointsContainer;
 
 #endif // _Container_H__

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

@@ -95 +95 @@
         friend class BspViewCellsManager;
         friend class VspBspTree;
+        friend class FromPointVisibilityTree;
         friend class BspTree;
 

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

@@ -316 +316 @@
         /** sets validy of all viewcells 
         */
-        virtual void SetValidity(
-                                                         int minPvsSize, 
+        virtual void SetValidity(int minPvsSize, 
                                                          int maxPvsSize) const;
 

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

@@ -1197 +1197 @@
                 
                 mSplitCandidates->push_back(SortableEntry(positive ? SortableEntry::ERayMin : SortableEntry::ERayMax, 
-                        pos, (*ri).mRay));
+                                                                        pos, (*ri).mRay));
 
                 pos = (*ri).ExtrapTermination(axis);
@@ -1204 +1204 @@
 
                 mSplitCandidates->push_back(SortableEntry(positive ? SortableEntry::ERayMax : SortableEntry::ERayMin, 
-                        pos, (*ri).mRay));
+                                                                        pos, (*ri).mRay));
         }
 
@@ -1230 +1230 @@
         // C = ct_div_ci  + (ql*rl + qr*rr)/queries
 
-        int pvsl = 0, pvsr = pvsSize;
+        int pvsl = 0;
+        int pvsr = pvsSize;
 
         int pvsBack = pvsl;
@@ -1329 +1330 @@
                         sum = pvsl * ((*ci).value - minBox) + pvsr * (maxBox - (*ci).value);
 
-                        //  cout<<"pos="<<(*ci).value<<"\t q=("<<ql<<","<<qr<<")\t r=("<<rl<<","<<rr<<")"<<endl;
-                        // cout<<"cost= "<<sum<<endl;
+                        //cout << "pos=" << (*ci).value << "\t pvs=(" <<  pvsl << "," << pvsr << ")" << endl;
+                        //cout<<"cost= "<<sum<<endl;
 
                         if (sum < minSum)
@@ -1343 +1344 @@
         }
         
-        //Debug << "pos: " << position << " sizebox: " << sizeBox << " pvs: " << pvsSize << endl;
+        Debug << "pos: " << position << " sizebox: " << sizeBox << " pvs: " << pvsSize << endl;
 
         // -- compute cost
@@ -1413 +1414 @@
 
         int sAxis = 0;
-        bool maxDepthForDrivingAxis = 0;
-
-        const bool useSpecialAxis = mOnlyDrivingAxis || mUseRandomAxis || 
+        // hack : subdivide along driving axis up to certain depth
+        int maxDepthForDrivingAxis = 0;
+
+    const bool useSpecialAxis = mOnlyDrivingAxis || mUseRandomAxis || 
                 mCirculatingAxis || (tData.mDepth < maxDepthForDrivingAxis);
 
@@ -1529 +1531 @@
                                                          int &splitAxis)
 {
-        // hack
+        // HACK matt: subdivide regularily to certain depth
         if (data.mDepth < 0)    
         {

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

@@ -28 +28 @@
 struct BspRay;
 
-//#define OCTREE_HACK 0
+
 /**
         This is a view space partitioning specialised BSPtree.