Changeset 2012 for GTP/trunk/Lib

Timestamp:

01/22/07 16:00:07 (18 years ago)

Author:

bittner

Message:

vss ray updates

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• CombinedPreprocessor.cpp (modified) (4 diffs)
• Preprocessor.cpp (modified) (1 diff)
• Preprocessor.h (modified) (2 diffs)
• RayCaster.cpp (modified) (2 diffs)
• RayCaster.h (modified) (2 diffs)

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

@@ -12 +12 @@
 #include "PreprocessorThread.h"
 #include "CombinedPreprocessor.h"
+#include "RayCaster.h"
 
 
@@ -66 +67 @@
   mPass = 0;
   
-
+  vector<VssRayContainer> rayBuffer;
+  rays.reserve(mSamplesPerPass);
+  rayBuffer.reserve(2*mSamplesPerPass);
   
-  vector<VssRayContainer> rayBuffer;
-  
-
   long startTime = GetTime();
   for (int i=0; i < mTotalSamples; i += mSamplesPerPass, mPass++) {
-
+        mRayCaster->InitPass();
+        
         cout<<"Progress : "<<(100.0f*i)/mTotalSamples<<"%"<<endl;
         rays.clear();
         vssRays.clear();
+        
         
         mMixtureDistribution->GenerateSamples(mSamplesPerPass, rays);
@@ -124 +126 @@
         }
 
+#if 0
         cerr<<"deleting rays"<<endl;
         //clear all unreferenced rays
@@ -131 +134 @@
         }
         cerr<<"done."<<endl;
-          
+#endif  
         
         //      if (!mMixtureDistribution->RequiresRays())

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

@@ -1187 +1187 @@
         }
         
+        mRayCaster->ReserveVssRayPool(2*mSamplesPerPass);
+        
         return true;
 }

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

@@ -262 +262 @@
         /////////////////////////
 
-        GlobalLinesRenderer *mGlobalLinesRenderer;
-        RayCaster *mRayCaster;
-        /// samples used for construction of the BSP view cells tree.
+  GlobalLinesRenderer *mGlobalLinesRenderer;
+  RayCaster *mRayCaster;
+  /// samples used for construction of the BSP view cells tree.
         int mBspConstructionSamples;
         /// samples used for construction of the VSP OSP tree.
@@ -274 +274 @@
 
 
+  
         /// if box around view space should be used
         bool mUseViewSpaceBox;

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

@@ -291 +291 @@
 
           if (!pruneInvalidRays || hitA.mObject) {
-                VssRay *vssRay = new VssRay(
-                                                                        !castDoubleRay ? simpleRay.mOrigin : clipB,
-                                                                        hitA.mPoint,
-                                                                        hitB.mObject,
-                                                                        hitA.mObject,
-                                                                        mPreprocessor.mPass,
-                                                                        simpleRay.mPdf
-                                                                        );
+                VssRay *vssRay = mVssRayPool.Alloc();
+
+                *vssRay = VssRay(
+                                                 !castDoubleRay ? simpleRay.mOrigin : clipB,
+                                                 hitA.mPoint,
+                                                 hitB.mObject,
+                                                 hitA.mObject,
+                                                 mPreprocessor.mPass,
+                                                 simpleRay.mPdf
+                                                 );
 
                 if (validA)
@@ -317 +319 @@
           if (castDoubleRay && (!pruneInvalidRays || hitB.mObject))
                 {
-                  VssRay *vssRay = new VssRay(
-                                                                          clipA,
-                                                                          hitB.mPoint,
-                                                                          hitA.mObject,
-                                                                          hitB.mObject,
-                                                                          mPreprocessor.mPass,
-                                                                          simpleRay.mPdf
-                                                                          );
+                  VssRay *vssRay = mVssRayPool.Alloc();
+                  *vssRay = VssRay(
+                                                   clipA,
+                                                   hitB.mPoint,
+                                                   hitA.mObject,
+                                                   hitB.mObject,
+                                                   mPreprocessor.mPass,
+                                                   simpleRay.mPdf
+                                                   );
                   if (validB)
                         vssRay->mFlags |= VssRay::Valid;

GTP/trunk/Lib/Vis/Preprocessing/src/RayCaster.h

@@ -64 +64 @@
   SortRays(SimpleRayContainer &rays);
 
-        
+
+
+  // pool of vss rays to be used in one pass of the sampling
+  struct VssRayPool {
+        VssRayPool():mRays(), mIndex(0) {}
+        void Reserve(const int number) {
+          mRays.reserve(number);
+        }
+        void Clear() {
+          mIndex = 0;
+        }
+        VssRay *Alloc() {
+          return &mRays[mIndex++];
+        }
+        vector<VssRay> mRays;
+        int mIndex;
+  };
+
+  
+  VssRayPool mVssRayPool;
+
+  void ReserveVssRayPool(const int n) {
+        mVssRayPool.Reserve(n);
+  }
+  
+  void InitPass() {
+        mVssRayPool.Clear();
+  }
+
 
 protected:
@@ -114 +142 @@
                                                    Vector3 &clippedTermination);
         
-        const Preprocessor &mPreprocessor;
+
+
+
+  
+
+  const Preprocessor &mPreprocessor;
 };