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

Timestamp:

01/11/07 04:18:36 (18 years ago)

Author:

mattausch

Message:

early exit for global lines
preprocessor support

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp (modified) (12 diffs)

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

@@ -21 +21 @@
 #include "IntelRayCaster.h"
 #include "InternalRayCaster.h"
-
+#include "GlobalLinesRenderer.h"
 
 
@@ -134 +134 @@
 mRayCaster(NULL),
 mStopComputation(false),
-mThread(NULL)
+mThread(NULL),
+mGlobalLinesRenderer(NULL)
 {
         Environment::GetSingleton()->GetBoolValue("Preprocessor.useGlRenderer", mUseGlRenderer);
@@ -174 +175 @@
                                                                                          mSamplesPerEvaluation);
 
-        
         Debug << "******* Preprocessor Options **********" << endl;
         Debug << "detect empty view space=" << mDetectEmptyViewSpace << endl;
@@ -211 +211 @@
         DEL_PTR(renderer);
         DEL_PTR(mRayCaster);
+
+        DEL_PTR(mGlobalLinesRenderer);
 }
 
@@ -1074 +1076 @@
 
 
-bool Preprocessor::InitRayCast(const string externKdTree, const string internKdTree)
+bool Preprocessor::InitRayCast(const string externKdTree, 
+                                                           const string internKdTree)
 {
         // always try to load the kd tree
@@ -1081 +1084 @@
         if (!LoadKdTree(internKdTree))
         {
-                cout << "error loading kd tree with filename " << internKdTree << ", rebuilding it instead ... " << endl;
+                cout << "error loading kd tree with filename " 
+                         << internKdTree << ", rebuilding it instead ... " << endl;
                 // build new kd tree from scene geometry
                 BuildKdTree();
@@ -1091 +1095 @@
                 if (!ExportKdTree(internKdTree))
                 {
-                        cout << " error exporting kd tree with filename " << internKdTree << endl;
+                        cout << " error exporting kd tree with filename " 
+                                 << internKdTree << endl;
                 }
                 else
                 {
-                        cout << "finished in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
+                        cout << "finished in " 
+                                 << TimeDiff(startTime, GetTime()) * 1e-3 
+                                 << " secs" << endl;
                 }
         }
@@ -1114 +1121 @@
 
         int rayCastMethod;
-        Environment::GetSingleton()->GetIntValue("Preprocessor.rayCastMethod", rayCastMethod);
+        Environment::GetSingleton()->
+                GetIntValue("Preprocessor.rayCastMethod", rayCastMethod);
 
         if (rayCastMethod == 0)
@@ -1145 +1153 @@
         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 ++;
+                        continue;
+                }
+
                 if (i + 16 < (int)rays.size()) 
                 {
@@ -1173 +1189 @@
         if (rays.size() > 10000) 
         {
-          cout<<endl;
-        
-        long t2 = GetTime();
+                cout << endl;
+
+                long t2 = GetTime();
 
 #if SHOW_RAYCAST_TIMING
-        if (castDoubleRays)
-                cout << 2 * rays.size() / (1e3f * TimeDiff(t1, t2)) << "M rays/s" << endl;
-        else
-                cout << rays.size() / (1e3f * TimeDiff(t1, t2)) << "M rays/s" << endl;
+                if (castDoubleRays)
+            cout << 2 * rays.size() / (1e3f * TimeDiff(t1, t2)) << "M rays/s" << endl;
+                else
+                        cout << rays.size() / (1e3f * TimeDiff(t1, t2)) << "M rays/s" << endl;
 #endif
         }
@@ -1230 +1246 @@
         ray.Init(point, direction, Ray::LOCAL_RAY);     
 }
+
 
 void Preprocessor::EvalViewCellHistogram()
@@ -1326 +1343 @@
 }
 
-}
+
+void Preprocessor::PrepareHwGlobalLines()
+{
+        int texHeight, texWidth;
+        float eps;
+        int maxDepth;
+        bool sampleReverse;
+
+        Environment::GetSingleton()->GetIntValue("Preprocessor.HwGlobalLines.texHeight", texHeight);
+        Environment::GetSingleton()->GetIntValue("Preprocessor.HwGlobalLines.texHeight", texWidth);
+        Environment::GetSingleton()->GetFloatValue("Preprocessor.HwGlobalLines.stepSize", eps);
+        Environment::GetSingleton()->GetIntValue("Preprocessor.HwGlobalLines.maxDepth", maxDepth);
+        Environment::GetSingleton()->GetBoolValue("Preprocessor.HwGlobalLines.sampleReverse", sampleReverse);
+
+        mGlobalLinesRenderer = 
+                new GlobalLinesRenderer(this,
+                                                                texHeight,
+                                                                texWidth,
+                                                                eps,
+                                                                maxDepth,
+                                                                sampleReverse);
+
+        mGlobalLinesRenderer->InitGl();
+}
+
+}