Changeset 1302 for GTP/trunk/Lib/Vis/Preprocessing/src/RssPreprocessor.cpp

Timestamp:

08/30/06 21:54:49 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/RssPreprocessor.cpp (modified) (8 diffs)

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

@@ -521 +521 @@
                 // use a small box outside of the scene
                 box.Scale(Vector3(0.1f,0.5f,0.5f));
-                box.Translate(Vector3(Magnitude(mKdTree->GetBox().Size())*0.5, 0, 0));
+                box.Translate(Vector3(Magnitude(mKdTree->GetBox().Size())*0.5f, 0, 0));
           } else {
                 float s = box.Size(0);
@@ -692 +692 @@
           GenerateRays(mRssSamplesPerPass*ratios[0], RSS_BASED_DISTRIBUTION, rays);
 
-          rays.NormalizePdf((int)rays.size());
+          rays.NormalizePdf((float)rays.size());
           
           CastRays(rays, tmpVssRays);
@@ -702 +702 @@
 #endif
           times[0] = TimeDiff(t1, GetTime());
-          nrays[0] = rays.size();
+          nrays[0] = (int)rays.size();
           
           mStats<<"#RssRelContrib"<<endl<<contributions[0]/nrays[0]<<endl;
@@ -713 +713 @@
                 GenerateRays(mRssSamplesPerPass*ratios[1], SPATIAL_BOX_BASED_DISTRIBUTION, rays);
                 CastRays(rays, tmpVssRays);
-                castRays += rays.size();
+                castRays += (int)rays.size();
 #if ADD_RAYS_IN_PLACE 
                 contributions[1] = mViewCellsManager->ComputeSampleContributions(tmpVssRays, true, false);
@@ -720 +720 @@
 #endif
           times[1] = TimeDiff(t1, GetTime());
-          nrays[1] = rays.size();
+          nrays[1] = (int)rays.size();
 
           mStats<<"#SpatialRelContrib"<<endl<<contributions[1]/nrays[1]<<endl;
@@ -735 +735 @@
                 GenerateRays(mRssSamplesPerPass*ratios[2], DIRECTION_BASED_DISTRIBUTION, rays);
                 CastRays(rays, tmpVssRays);
-                castRays += rays.size();
+                castRays += (int)rays.size();
 #if ADD_RAYS_IN_PLACE 
                 contributions[2] = mViewCellsManager->ComputeSampleContributions(tmpVssRays, true, false);
@@ -742 +742 @@
 #endif
                 times[2] = TimeDiff(t1, GetTime());
-                nrays[2] = rays.size();
+                nrays[2] = (int)rays.size();
                 
                 mStats<<"#DirectionalRelContrib"<<endl<<contributions[2]/nrays[2]<<endl;
@@ -790 +790 @@
           CastRays(rays, vssRays);
           cout<<"done."<<endl;
-          castRays += rays.size();
+          castRays += (int)rays.size();
           if (mUseViewcells) {
                 /// compute view cell contribution of rays