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

Timestamp:

11/07/05 11:27:38 (19 years ago)

Author:

bittner

Message:

VssPreprocessor? updates - directional rays, x3dexporter updates - removed duplicated code for ray exports

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

@@ -386 +386 @@
   int pvsOut = Min((int)objects.size(), 10);
 
-  vector<Ray> rays[10];
+  RayContainer rays[10];
 
   while (totalSamples < mTotalSamples) {
@@ -455 +455 @@
                                         }
 
-                                        if ( i < pvsOut )
-                                                rays[i].push_back(ray);
+                                        if ( i < pvsOut ) {
+                                                Ray *nray = new Ray(ray);
+                                                rays[i].push_back(nray);
+                                        }
                 
                                         if (!ray.intersections.empty()) {
@@ -462 +464 @@
                                                 for (int j = 0; j < pvsOut; j++) {
                                                         if (objects[j] == ray.intersections[0].mObject) {
-                                                                rays[j].push_back(ray);
+                                                                Ray *nray = new Ray(ray);
+                                                                rays[j].push_back(nray);
                                                         }
                                                 }
@@ -635 +638 @@
 
                 for (i=0; i < pvsOut; i++) 
-                exporter->ExportRays(rays[i], 1000, RgbColor(1, 0, 0));
+                        exporter->ExportRays(rays[i], 1000, RgbColor(1, 0, 0));
                 exporter->SetFilled();
-                  
+                
                 delete exporter;
         }
@@ -833 +836 @@
                 //-- some random view cells and rays for output
                 const int raysOut = min((int)mSampleRays.size(), 20000);
-                vector<Ray> vcRays[leafOut];
+                vector<Ray *> vcRays[leafOut];
                 vector<BspLeaf *> bspLeaves;
                 for (int i = 0; i < leafOut; ++ i)
@@ -852 +855 @@
                                         if (bspLeaves[i]->GetViewCell() == leaf->GetViewCell()) 
                                         {
-                                                vcRays[i].push_back(*ray);
+                                                vcRays[i].push_back(ray);
                                         }
                                 }