Changeset 387 for trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp

Timestamp:

11/07/05 23:17:14 (19 years ago)

Author:

bittner

Message:

vss preprocessor updates

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp (modified) (6 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp

@@ -76 +76 @@
         
         if (mKdTree->CastRay(ray)) {
+                
                 objectB = ray.intersections[0].mObject;
           pointB = ray.Extrap(ray.intersections[0].mT);
+
         } else {
                 objectB = NULL;
@@ -92 +94 @@
         VssRay *vssRay  = NULL;
 
-        if (objectA) {
-                vssRay = new VssRay(pointB,
-                                                                                                pointA,
-                                                                                                objectB,
-                                                                                                objectA);
-                mVssRays.push_back(vssRay);
-                hits ++;
-        }
-        
-        if (objectB) {
-                vssRay = new VssRay(pointA,
-                                                                                                pointB,
-                                                                                                objectA,
-                                                                                                objectB);
-                mVssRays.push_back(vssRay);
-                hits ++;
-
+        bool validSample = true;
+        if (detectEmptyViewSpace) {
+                if (Distance(pointA, pointB) <
+                                Distance(viewPoint, pointA) + Distance(viewPoint, pointB) - Limits::Small) {
+                        validSample = false;
+                }
+        }
+        
+        if (validSample) {
+                if (objectA) {
+                        vssRay = new VssRay(pointB,
+                                                                                                        pointA,
+                                                                                                        objectB,
+                                                                                                        objectA);
+                        mVssRays.push_back(vssRay);
+                        hits ++;
+                }
+                
+                if (objectB) {
+                        vssRay = new VssRay(pointA,
+                                                                                                        pointB,
+                                                                                                        objectA,
+                                                                                                        objectB);
+                        mVssRays.push_back(vssRay);
+                        hits ++;
+                }
         }
         
@@ -122 +133 @@
         if (viewSpaceBox)
                 box =*viewSpaceBox;
-        else
+        else 
                 box = mKdTree->GetBox();
         
@@ -146 +157 @@
   
   mSceneGraph->CollectObjects(&mObjects);
-        cout<<"#NUM_OBJECTS (Total numner of objects)\n"<<mObjects.size()<<endl;
         
   long startTime = GetTime();
@@ -155 +165 @@
 
         AxisAlignedBox3 box = mKdTree->GetBox();
-        box.Enlarge(box.Size()*-Vector3(0.45, 0.45, 0.45));
-
-        bool useViewSpaceBox = false;
+
+        
+        if (1)
+                box.Enlarge(box.Size()*-Vector3(0.45, 0.45, 0.45));
+        else {
+                // sample city like heights
+                box.SetMin(1, box.Min(1) + box.Size(1)*0.1);
+                box.SetMax(1, box.Min(1) + box.Size(1)*0.2);
+        }
+        
+        bool useViewSpaceBox = true;
         if (useViewSpaceBox)
                 viewSpaceBox = &box;
@@ -243 +261 @@
         vssTree->Construct(mVssRays, viewSpaceBox);
 
+        cout<<"VssTree root PVS size = "<<vssTree->GetRootPvsSize()<<endl;