Changeset 2000

Timestamp:

01/20/07 00:29:03 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• GvsPreprocessor.cpp (modified) (2 diffs)
• SamplingStrategy.cpp (modified) (2 diffs)
• SamplingStrategy.h (modified) (1 diff)
• TestPreprocessor.vcproj (modified) (1 diff)

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

@@ -16 +16 @@
 {
   
-#define GVS_DEBUG 1
+#define GVS_DEBUG 0
 
 struct VizStruct
@@ -31 +31 @@
 GvsPreprocessor::GvsPreprocessor(): 
 Preprocessor(), 
-//mSamplingType(SamplingStrategy::VIEWCELL_BASED_DISTRIBUTION),
-mSamplingType(SamplingStrategy::DIRECTION_BASED_DISTRIBUTION),
+mSamplingType(SamplingStrategy::VIEWCELL_BASED_DISTRIBUTION),
+//mSamplingType(SamplingStrategy::DIRECTION_BASED_DISTRIBUTION),
 mProcessedViewCells(0),
 mCurrentViewCell(NULL)

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

@@ -750 +750 @@
         Vector3 normal, normal2;
         
-        float r[1];
-        sHalton.GetNext(1, r);
-
-        const int objIdx = (int)(r[0] * (float)mPreprocessor.mObjects.size() - 1.0f);
-                                //      = (int)RandomValue(0, (float)mPreprocessor.mObjects.size() - 0.5f);
-        Intersectable *object = mPreprocessor.mObjects[objIdx];
-
-        //cout << "obj: " << objIdx << endl;
-
-        object->GetRandomSurfacePoint(point, normal);
+        // float r[1];
+        // sHalton.GetNext(1, r);
+        // const int objIdx = (int)(r[0] * (float)mPreprocessor.mObjects.size() - 1.0f);
+        // Intersectable *object = mPreprocessor.mObjects[objIdx];
+        // object->GetRandomSurfacePoint(point, normal);
+        // cout << "obj: " << objIdx << endl;
+
+        float r[2];
+        sHalton.GetNext(2, r);
+
+        direction = UniformRandomVector(r[0], r[1]);
+        const float c = Magnitude(direction);
+
+    if (c <= Limits::Small) 
+                return false;
+
+        direction *= 1.0f / c;
+
+        // get point on view cell surface
         mViewCell->GetRandomSurfacePoint(origin, normal2);
 
-        direction = point - origin;
+        //direction = point - origin;
 
         // move a little bit back to avoid piercing through walls
@@ -769 +778 @@
 
         // $$ jb the pdf is yet not correct for all sampling methods!
-        const float c = Magnitude(direction);
-
-        if ((c <= Limits::Small) /*|| (DotProd(direction, normal) < 0)*/)
-        {
-                return false;
-        }
-
-        // $$ jb the pdf is yet not correct for all sampling methods!
         const float pdf = 1.0f;
 
-        direction *= 1.0f / c;
         ray = SimpleRay(origin, direction, VIEWCELL_BASED_DISTRIBUTION, pdf);
 

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

@@ -271 +271 @@
 private:
 
-  virtual bool GenerateSample(SimpleRay &ray) { return false; }
+  virtual bool GenerateSample(SimpleRay &ray);
 
         ViewCell *mViewCell;

GTP/trunk/Lib/Vis/Preprocessing/src/TestPreprocessor.vcproj

@@ -194 +194 @@
                                 OptimizeForWindowsApplication="TRUE"
                                 AdditionalIncludeDirectories="..\include;..\..\..\..\..\..\NonGTP\Boost;..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;"$(QTDIR)\include\QtOpenGl";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtCore";"$(QTDIR)\include";QtInterface"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GTP_INTERNAL;USE_QT"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GTP_INTERNAL;USE_QT3"
                                 RuntimeLibrary="2"
                                 RuntimeTypeInfo="TRUE"