Changeset 179 for trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

Timestamp:

07/18/05 17:59:54 (19 years ago)

Author:

mattausch

Message:

removed compiler errors

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp (modified) (2 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

@@ -73 +73 @@
     int passSampleContributions = 0;
     int passSamples = 0;
-    
+        int index = 0;
+    KdNode *visibleNode = NULL;
+
     for (i =0; i < objects.size(); i++) {
       KdNode *nodeToSample = NULL;
@@ -80 +82 @@
       int pvsSize = object->mKdPvs.GetSize();
       
-      if (0 && pvsSize) {
-        // 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();
+    if (0 && pvsSize) {
+                // 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;
+        
+                for (int tries = 0; tries < 10; tries++) {
+                        index = RandomValue(0, pvsSize - 1);
+                        KdPvsData data;
+                        object->mKdPvs.GetData(index, visibleNode, data);
+                        nodeToSample = mKdTree->FindRandomNeighbor(visibleNode, true);
+                        if (nodeToSample)
+                        break;
+                }
         }
-        int maxTries = 2*pvsSize;
-        for (int tries = 0; tries < 10; tries++) {
-          int index = RandomValue(0, pvsSize - 1);
-          KdPvsData data;
-          KdNode *visibleNode;
-          object->mKdPvs.GetData(index, visibleNode, data);
-          nodeToSample = mKdTree->FindRandomNeighbor(visibleNode, true);
-          if (nodeToSample)
-            break;
-        }
+
+    if (pvsSize) {
+                // 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();
+                }
+        
+                vector<KdNode *> invisibleNeighbors;
+                // get all neighbors of all PVS nodes
+                i = object->mKdPvs.mEntries.begin();
+                for (; i != object->mKdPvs.mEntries.end(); i++) {
+                        KdNode *node = (*i).first;
+                        mKdTree->FindNeighbors(visibleNode, invisibleNeighbors, true);
+                }
+
+                KdPvsData data;
+                KdNode *visibleNode;
+                object->mKdPvs.GetData(index, visibleNode, data);
+                nodeToSample = mKdTree->FindRandomNeighbor(visibleNode, true);
+                if (nodeToSample)
+                        break;
       }
-
-      if (pvsSize) {
-        // 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();
-        }
-        vector<KdNode *> invisibleNeighbors;
-        // get all neighbors of all PVS nodes
-        KdPvsMap::iterator i = object->mKdPvs.mEntries.begin();
-        for (; i != object->mKdPvs.mEntries.end(); i++) {
-          KdNode *node = (*i).first;
-          mKdTree->FindNeighbors(visibleNode, invisibleNeighbors, true);
-        }
-
-        KdPvsData data;
-        KdNode *visibleNode;
-        object->mKdPvs.GetData(index, visibleNode, data);
-        nodeToSample = mKdTree->FindRandomNeighbor(visibleNode, true);
-        if (nodeToSample)
-          break;
-      }
       
 
       for (int k=0; k < mSamplesPerPass; k++) {
-        object->GetRandomSurfacePoint(point, normal);
-        if (nodeToSample) {
-          int maxTries = 5;
-          for (int tries = 0; tries < maxTries; tries++) {
-            direction = mKdTree->GetBox(nodeToSample).GetRandomPoint() - point;
-            if (DotProd(direction, normal) > Limits::Small)
-              break;
-          }
-          if (tries == maxTries)
-            direction = UniformRandomVector(normal);
-        } else
-          direction = UniformRandomVector(normal);
-        
-        // construct a ray
-        SetupRay(ray, point, direction);
-        mKdTree->CastRay(ray);
-
-        if (i < pvsOut)
-          rays[i].push_back(ray);
-        
-        int sampleContributions = 0;
-        
-        if (ray.leaves.size()) {
-          sampleContributions += AddNodeSamples(object, ray);
+                  object->GetRandomSurfacePoint(point, normal);
+                  if (nodeToSample) {
+                          int maxTries = 5;
+                          for (int tries = 0; tries < maxTries; tries++) {
+                                  direction = mKdTree->GetBox(nodeToSample).GetRandomPoint() - point;
+                                  if (DotProd(direction, normal) > Limits::Small)
+                                        break;
+                          }
+                
+                          if (tries == maxTries)
+                                  direction = UniformRandomVector(normal);
+                  } else
+                          direction = UniformRandomVector(normal);
+        
+                  // construct a ray
+                  SetupRay(ray, point, direction);
+                  mKdTree->CastRay(ray);
+
+                  if (i < pvsOut)
+                          rays[i].push_back(ray);
+        
+                  int sampleContributions = 0;
+        
+                  
+                  if (ray.leaves.size()) {
+                          sampleContributions += AddNodeSamples(object, ray);
           
-          if (ray.intersections.size()) {
-            sampleContributions += AddNodeSamples(ray.intersections[0].mObject, ray);
-            // check whether we can add this to the rays
-            for (int j = 0; j < pvsOut; j++) {
-              if (objects[j] == ray.intersections[0].mObject) {
-                rays[j].push_back(ray);
-              }
-            }
-          }
-          passSamples++;
-          if (sampleContributions) {
-            passContributingSamples++;
-            passSampleContributions += sampleContributions;
+                          if (ray.intersections.size()) {
+                                  sampleContributions += AddNodeSamples(ray.intersections[0].mObject, ray);
+                                  // check whether we can add this to the rays
+                                  for (int j = 0; j < pvsOut; j++) {
+                                          if (objects[j] == ray.intersections[0].mObject) {
+                                                  rays[j].push_back(ray);
+                                          }
+                                  }
+                          }
+                
+                          passSamples++;
+                        
+                          if (sampleContributions) {
+                                  passContributingSamples++;
+                                  passSampleContributions += sampleContributions;
+                          }
+                  }
           }
         }
-      }
-    }
     totalSamples += passSamples;
     pass++;