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

Timestamp:

11/03/05 16:43:51 (19 years ago)

Author:

bittner

Message:

 

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp

@@ -28 +28 @@
 VssPreprocessor::SetupRay(Ray &ray, 
                                                                                                         const Vector3 &point, 
-                                                                                                        const Vector3 &direction,
-                                                                                                        const int type)
+                                                                                                        const Vector3 &direction
+                                                                                                        )
 {
   ray.intersections.clear();
-  ray.kdLeaves.clear();
-  ray.meshes.clear();
-
+        // do not store anything else then intersections at the ray
+        ray.kdLeaves.clear();
+        ray.mFlags = Ray::STORE_KDLEAVES;
+        
   //  cout<<point<<" "<<direction<<endl;
-  ray.Init(point, direction, type);
+  ray.Init(point, direction, Ray::LOCAL_RAY);
 }
 
@@ -51 +52 @@
 int
 VssPreprocessor::AddNodeSamples(const Ray &ray,
-                                                                                                                                                 Intersectable *sObject,
-                                                                                                                                                 Intersectable *tObject
-                                                                                                                                                 )
+                                                                                                                                Intersectable *sObject,
+                                                                                                                                Intersectable *tObject
+                                                                                                                                )
 {
   int contributingSamples = 0;
@@ -62 +63 @@
         if (tObject)
                 objects++;
-
+        
         if (objects) {
                 for (j=0; j < ray.kdLeaves.size(); j++) {
@@ -123 +124 @@
         KdNode *nodeToSample = NULL;
         
-        bool samplePvsBoundary = false;
-        if (pvsSize && samplePvsBoundary) {
-                // this samples the nodes from the boundary of the current PVS
-                // mail all nodes from the pvs
-                Intersectable::NewMail();
-                KdPvsMap::iterator i = object->mKdPvs.mEntries.begin();
-                
-                for (; i != object->mKdPvs.mEntries.end(); i++) {
-                        KdNode *node = (*i).first;
-                        node->Mail();
-                }
-                
-                int maxTries = 2*pvsSize;
-                Debug << "Finding random neighbour" << endl;    
-                for (int tries = 0; tries < 10; tries++) {
-                        int index = RandomValue(0, pvsSize - 1);
-                        KdPvsData data;
-                        KdNode *node;
-                        object->mKdPvs.GetData(index, node, data);
-                        nodeToSample = mKdTree->FindRandomNeighbor(node, true);
-                        if (nodeToSample)
-                                break;
-                }
-        } else {
-                // just pickup a random node
-                //              nodeToSample = mKdTree->GetRandomLeaf(Plane3(normal, point));
-                nodeToSample = mKdTree->GetRandomLeaf();
-        }
+        // just pickup a random node
+        nodeToSample = mKdTree->GetRandomLeaf();
         return nodeToSample;
 }
@@ -229 +204 @@
                                         
                                         // construct a ray
-                                        SetupRay(ray, point, direction, Ray::LOCAL_RAY);
+                                        SetupRay(ray, point, direction);
                                         
                                         sampleContributions = CastRay(reverseSample ? NULL : object, ray);
@@ -298 +273 @@
         }
         
-        if (ViewCell::sHierarchy == ViewCell::KD)       
-                cout << "#totalPvsSize=" << mKdTree->CollectLeafPvs() << endl;
-  
-        
-  //  HoleSamplingPass();
+        cout << "#totalPvsSize=" << mKdTree->CollectLeafPvs() << endl;
+  
+        
         if (0) {
                 Exporter *exporter = Exporter::GetExporter("ray-density.x3d");