Changeset 1972 for GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp

Timestamp:

01/12/07 22:41:01 (17 years ago)

Author:

mattausch

Message:

implemented improved ray casting

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp (modified) (1 diff)

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

@@ -1151 +1151 @@
         const long t1 = GetTime();
 
-        for (int i = 0; i < (int)rays.size();)
-        {
-                // HACK: does not really go together with the 16 ray bundles
-                if (rays[i].mDistribution == SamplingStrategy::HW_GLOBAL_LINES_DISTRIBUTION)
-                {
-                        mGlobalLinesRenderer->CastGlobalLines(rays[i], vssRays);
-                        i ++;
+        SimpleRayContainer::const_iterator rit, rit_end = rays.end();
+
+        SimpleRayContainer rayBucket;
+        int i = 0;
+        for (rit = rays.begin(); rit != rit_end; ++ rit, ++ i)
+        {
+                SimpleRay ray = *rit;
+                // HACK: global lines must be treated special
+                if (ray.mDistribution == SamplingStrategy::HW_GLOBAL_LINES_DISTRIBUTION)
+                {
+                        mGlobalLinesRenderer->CastGlobalLines(ray, vssRays);
                         continue;
                 }
 
-                if (i + 16 < (int)rays.size()) 
+                rayBucket.push_back(ray);
+
+                // 16 rays gathered => do ray casting
+                if ((int)rayBucket.size() >= 16)
                 {
                         mRayCaster->CastRays16(
-                                                                   i,
-                                                                   rays,                                
+                                                                   rayBucket,                           
                                                                    vssRays,
                                                                    mViewCellsManager->GetViewSpaceBox(),
                                                                    castDoubleRays,
                                                                    pruneInvalidRays);
-                        i += 16;
-                }
-                else 
+
+                        rayBucket.clear();
+                }
+        
+                if ((int)rays.size() > 10000 && i % 10000 == 0)
+                        cout<<"\r"<<i<<"/"<<(int)rays.size()<<"\r";
+        }
+    
+        // cast rest of rays
+        SimpleRayContainer::const_iterator sit, sit_end = rayBucket.end();
+
+        for (sit = rayBucket.begin(); sit != sit_end; ++ sit)
+        {
+                SimpleRay ray = *sit;
+                // HACK: global lines must be treated special
+                if (ray.mDistribution == SamplingStrategy::HW_GLOBAL_LINES_DISTRIBUTION)
+                {
+                        mGlobalLinesRenderer->CastGlobalLines(ray, vssRays);
+                }
+                else
                 {
                         mRayCaster->CastRay(
-                                                                rays[i],
+                                                                ray,
                                                                 vssRays,
                                                                 mViewCellsManager->GetViewSpaceBox(),
                                                                 castDoubleRays,
                                                                 pruneInvalidRays);
-                        ++ i;
-                }
-
-                if (rays.size() > 10000 && i % 10000 == 0)
-                  cout<<"\r"<<i<<"/"<<(int)rays.size()<<"\r";
-        }
-
-        if (rays.size() > 10000) 
+                }
+        }
+
+        if ((int)rays.size() > 10000) 
         {
                 cout << endl;
-
-                long t2 = GetTime();
+        long t2 = GetTime();
 
 #if SHOW_RAYCAST_TIMING
                 if (castDoubleRays)
-            cout << 2 * rays.size() / (1e3f * TimeDiff(t1, t2)) << "M rays/s" << endl;
+                        cout << 2 * rays.size() / (1e3f * TimeDiff(t1, t2)) << "M rays/s" << endl;
                 else
                         cout << rays.size() / (1e3f * TimeDiff(t1, t2)) << "M rays/s" << endl;