Changeset 1501 for GTP/trunk/Lib

Timestamp:

09/26/06 19:10:40 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• GvsPreprocessor.cpp (modified) (7 diffs)
• Preprocessor.vcproj (modified) (1 diff)
• RssTree.cpp (modified) (1 diff)
• TestPreprocessor.vcproj (modified) (2 diffs)
• main.cpp (modified) (1 diff)

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

@@ -26 +26 @@
         Debug << "number of initial samples: " << mInitialSamples << endl;
         Debug << "number of samples per pass: " << mSamplesPerPass << endl;
+        Debug << "threshold: " << mThreshold << endl;
+        Debug << "eps: " << mEps << endl;
 
         mStats.open("gvspreprocessor.log");
@@ -55 +57 @@
 bool GvsPreprocessor::HandleRay(VssRay &vssRay)
 {
-        if (!mViewCellsManager->ComputeSampleContribution(vssRay, true, false))
-        {
+        if (mViewCellsManager->ComputeSampleContribution(vssRay, true, false))
+        {
+                //cout << "h";
                 mRayQueue.push(&vssRay);
                 return true;
@@ -198 +201 @@
         // add to ray queue
         EnqueueRays(vssRays);
-
+/*
     // recursivly subdivide each edge
         for (int i = 0; i < 9; ++ i)
@@ -210 +213 @@
                         currentRay);
         }
-
+*/
         return (int)vssRays.size();
 }
@@ -240 +243 @@
 {
         cout << "r" << endl;
-        
-        
         //-- The plane p = (xp, hit(x), hit(xold)) is intersected
         //-- with the newly found triangle (xold is the previous ray from
@@ -306 +307 @@
 
                 const int gvsSamples = ProcessQueue();
+#if 0
                 castSamples += gvsSamples;
+#else
+                castSamples += mInitialSamples;
+#endif
                 //cout << "\ncast " << castSamples << " of " << mSamplesPerPass << endl;
         }
@@ -324 +329 @@
                 mRayQueue.pop();
                 
-                castSamples += HandleRay(*ray);
+                castSamples += AdaptiveBorderSampling(*ray);
         }
 

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

@@ -217 +217 @@
                                 OptimizeForProcessor="3"
                                 OptimizeForWindowsApplication="TRUE"
-                                AdditionalIncludeDirectories="..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost;..\MultiLevelRayTracing"
+                                AdditionalIncludeDirectories="..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost;..\MultiLevelRayTracing;"$(QTDIR)\include\QtCore""
                                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GTP_INTERNAL"
                                 ExceptionHandling="TRUE"

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

@@ -2474 +2474 @@
 
   // prune more rays to amortize  the procedure
-  int desired = maxRays*0.8f;
+  int desired = (int)(maxRays * 0.8f);
 
   Debug<<"Prunning rays...\nOriginal size "<<stat.rayRefs<<endl<<flush;

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

@@ -193 +193 @@
                                 OptimizeForProcessor="3"
                                 OptimizeForWindowsApplication="TRUE"
-                                AdditionalIncludeDirectories="..\include;..\..\..\..\..\..\NonGTP\Boost;"$(QTDIR)\include\QtOpenGl";..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces"
+                                AdditionalIncludeDirectories="..\include;..\..\..\..\..\..\NonGTP\Boost;..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;"$(QTDIR)\include\QtOpenGl";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtCore";"$(QTDIR)\include""
                                 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GTP_INTERNAL"
                                 RuntimeLibrary="2"
@@ -205 +205 @@
                         <Tool
                                 Name="VCLinkerTool"
-                                AdditionalDependencies="xerces-c_2.lib glew32.lib zdll.lib zziplib.lib devil.lib glut32.lib OpenGL32.Lib glu32.lib Preprocessor.lib RTScene.lib RTWorld.lib"
+                                AdditionalDependencies="xerces-c_2.lib glew32.lib zdll.lib zziplib.lib devil.lib glut32.lib OpenGL32.Lib glu32.lib Preprocessor.lib RTScene.lib RTWorld.lib QtCore4.lib qtmain.lib QtOpenGL4.lib Qt3Support4.lib QtTest4.lib QtGui4.lib QtGlRenderer.lib"
                                 OutputFile="../bin/release/Preprocessor.exe"
                                 LinkIncremental="1"
-                                AdditionalLibraryDirectories="..\src\GL;..\lib\release;..\..\Preprocessing\lib\release;..\..\..\..\..\..\NonGTP\Boost\lib;..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\..\..\..\NonGTP\Zlib\lib;..\..\..\..\..\..\NonGTP\Devil\lib;..\MultiLevelRayTracing\RTScene\Release;..\MultiLevelRayTracing\RTWorld\Release"
+                                AdditionalLibraryDirectories="..\src\GL;..\lib\release;..\..\Preprocessing\lib\release;..\..\..\..\..\..\NonGTP\Boost\lib;..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\..\..\..\NonGTP\Zlib\lib;..\..\..\..\..\..\NonGTP\Devil\lib;..\MultiLevelRayTracing\RTScene\Release;..\MultiLevelRayTracing\RTWorld\Release;&quot;$(QTDIR)\lib&quot;;.\QtGlRenderer\Release"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"

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

@@ -1 +1 @@
 #ifdef GTP_INTERNAL
-//#define USE_QT 0
-#endif
-
-#define USE_QT 0
+        #define USE_QT 1
+#else
+        #define USE_QT 0
+#endif
+
 #if USE_QT
 #define USE_BOOST 0
 #else
-#define USE_BOOST 0
+#define USE_BOOST 1
 #endif