Changeset 2660 for GTP/trunk/Lib/Vis/Preprocessing/src

Timestamp:

04/28/08 02:10:37 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• GtpVisibility05.vcproj (modified) (1 diff)
• Preprocessor.cpp (modified) (2 diffs)
• QtInterface/QtGlRenderer.cpp (modified) (1 diff)
• QtInterface/QtInterface05.vcproj (modified) (1 diff)
• RayCaster.cpp (modified) (3 diffs)
• RayCaster.h (modified) (1 diff)
• TestPreprocessor05.vcproj (modified) (2 diffs)
• ViewCellsManager.cpp (modified) (2 diffs)
• ViewCellsParser.cpp (modified) (4 diffs)
• main.cpp (modified) (6 diffs)

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

@@ -115 +115 @@
                         <Tool
                                 Name="VCCLCompilerTool"
-                                AdditionalIncludeDirectories="..\src;Timer;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost;..\src\havran;..\MultiLevelRayTracing;&quot;$(CG_INC_PATH)&quot;"
+                                AdditionalIncludeDirectories="..\src;Timer;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;&quot;..\..\..\..\..\..\NonGTP\Xerces\xerces-c_2_8_0-x86-windows-vc_8_0\include&quot;;..\..\..\..\..\..\NonGTP\Boost;..\src\havran;..\MultiLevelRayTracing;&quot;$(CG_INC_PATH)&quot;"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_VERBOSE_PVS;USE_QT;GTP_INTERNAL;USE_CG"
                                 RuntimeLibrary="2"

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

@@ -630 +630 @@
 bool Preprocessor::PrepareViewCells()
 {
+#if 0
         // load the view cells assigning the found objects to the pvss
-#if 0
         cerr << "loading binary view cells" << endl;
         ViewCellsManager *dummyViewCellsManager = 
@@ -668 +668 @@
                 const bool finalizeViewCells = true;
                 cout << "loading view cells from " << buf << endl;
-cout<<"here965"<<endl;
+                
                 mViewCellsManager = ViewCellsManager::LoadViewCells(buf, 
                                                                                                                         pvsObjects,

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.cpp

@@ -437 +437 @@
         {
 #if USE_TRANSFORMED_MESH_INSTANCE_HACK
-                //cerr << "here45\n****"<<endl;
                 RenderIntersectable(*dit);
 #else

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtInterface05.vcproj

@@ -104 +104 @@
                                 Name="VCCLCompilerTool"
                                 WholeProgramOptimization="true"
-                                AdditionalIncludeDirectories="..\src;..\..\src\;..\..\..\..\..\..\..\NonGTP\Zlib\include;"$(QTDIR)\include\QtOpenGL";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtCore";"$(QTDIR)\include";"$(CG_INC_PATH)""
+                                AdditionalIncludeDirectories="..\src;..\..\src\;..\..\..\..\..\..\..\NonGTP\Zlib\include;"$(QTDIR)\include\QtOpenGL";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtCore";"$(QTDIR)\include";"$(CG_INC_PATH)";"..\..\..\..\..\..\NonGTP\Xerces\xerces-c_2_8_0-x86-windows-vc_8_0\include""
                                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GTP_INTERNAL;USE_QT;USE_VERBOSE_PVS;USE_CG"
                                 RuntimeLibrary="2"

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

@@ -156 +156 @@
 #endif
   
+#if REMOVE_TEMP
   _SortRays(rays,
                         0,
@@ -162 +163 @@
                         b
                         );
+#endif
 }
                                         
@@ -169 +171 @@
                                          const int r,
                                          const int depth,
-                                         float box[12])
+                                         float *box)
 {
   // pick-up a pivot
-  int axis;
+  int axis = 0;
   
   float maxDiff = -1.0f;

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

@@ -187 +187 @@
                  const int r,
                  const int depth,
-                 float box[12]);
+                 float *box);
 
   void _SortRays2(SimpleRayContainer &rays,

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

@@ -129 +129 @@
                                 EnableFiberSafeOptimizations="false"
                                 WholeProgramOptimization="true"
-                                AdditionalIncludeDirectories="..\src;..\include;..\..\..\..\..\..\NonGTP\Boost;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;"$(QTDIR)\include\QtOpenGl";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtCore";"$(QTDIR)\include";QtInterface;..\src\sparsehash\src\;..\src\ootl\src\include\ootl;..\src\ootl\src\include\ootl\sandbox;$(NOINHERIT)"
+                                AdditionalIncludeDirectories="..\src;..\include;..\..\..\..\..\..\NonGTP\Boost;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;"$(QTDIR)\include\QtOpenGl";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtCore";"$(QTDIR)\include";QtInterface;..\src\sparsehash\src\;..\src\ootl\src\include\ootl;..\src\ootl\src\include\ootl\sandbox;"..\..\..\..\..\..\NonGTP\Xerces\xerces-c_2_8_0-x86-windows-vc_8_0\include";$(NOINHERIT)"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GTP_INTERNAL;USE_QT;USE_CG;USE_VERBOSE_PVS"
                                 StringPooling="true"
@@ -156 +156 @@
                                 OutputFile="../bin/$(ConfigurationName)/Preprocessor.exe"
                                 LinkIncremental="1"
-                                AdditionalLibraryDirectories=""$(QTDIR)\lib";..\src\GL;"..\lib05\$(ConfigurationName)";..\..\..\..\..\..\NonGTP\Boost\lib;..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\..\..\..\NonGTP\Zlib\lib;..\..\..\..\..\..\NonGTP\Devil\lib;"..\MultiLevelRayTracing\RTScene\$(ConfigurationName)";"..\MultiLevelRayTracing\RTWorld\$(ConfigurationName)";"QtInterface\$(ConfigurationName)";"$(CG_LIB_PATH)""
+                                AdditionalLibraryDirectories=""$(QTDIR)\lib";..\src\GL;"..\lib05\$(ConfigurationName)";..\..\..\..\..\..\NonGTP\Boost\lib;..\..\..\..\..\..\NonGTP\Zlib\lib;..\..\..\..\..\..\NonGTP\Devil\lib;"..\MultiLevelRayTracing\RTScene\$(ConfigurationName)";"..\MultiLevelRayTracing\RTWorld\$(ConfigurationName)";"QtInterface\$(ConfigurationName)";"..\..\..\..\..\..\NonGTP\Xerces\xerces-c_2_8_0-x86-windows-vc_8_0\lib";"$(CG_LIB_PATH)""
                                 GenerateDebugInformation="true"
                                 SubSystem="1"

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

@@ -806 +806 @@
         ViewCellsParser parser;
         ViewCellsManager *vm = NULL;
-cout<<"780088"<<endl;
+
         const long startTime = GetTime();
         const bool success = parser.ParseViewCellsFile(filename, 
@@ -2435 +2435 @@
         if (addSamplesToPvs) 
         {
-                //if (obj->Type() == Intersectable::TRANSFORMED_MESH_INSTANCE)cout << "here12 " << endl;
-
                 hasAbsContribution = viewCell->GetPvs().AddSampleDirtyCheck(obj, ray.mPdf);
                 //hasAbsContribution = viewCell->GetPvs().AddSample(obj,ray.mPdf);

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

@@ -457 +457 @@
 void ViewCellsParseHandlers::startElement(const XMLCh* const name,
                                                                                   AttributeList& attributes)
-{cout<<"here9978"<<endl;
+{
         StrX lname(name);
         string element(lname.LocalForm());
@@ -598 +598 @@
 
 void ViewCellsParseHandlers::StartViewSpaceHierarchy(AttributeList& attributes)
-{cout<<"78"<<endl;
+{
         int len = attributes.getLength();
 
@@ -643 +643 @@
 
 void ViewCellsParseHandlers::StartObjectSpaceHierarchy(AttributeList& attributes)
-{cout<<"here45"<<endl;
+{
         const int len = attributes.getLength();
         Vector3 bmin, bmax;
@@ -1442 +1442 @@
         parser->setDocumentHandler(&handler);
         parser->setErrorHandler(&handler);
-cout<<"1178"<<endl;
+
         unsigned long duration;
         int errorCount = 0;

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

@@ -220 +220 @@
                 exit(1);
         }
-
+        
         // export objects as obj
         if (preprocessor->mExportObj)
@@ -244 +244 @@
                 }
         }
-        
+
         // parse view cells related options
         if (!preprocessor->PrepareViewCells())
@@ -276 +276 @@
         }
 
+
         bool useHwGlobalLines;
         Environment::GetSingleton()->GetBoolValue("Preprocessor.useHwGlobalLines",
@@ -298 +299 @@
         bool evalPixelError;
         Environment::GetSingleton()->GetBoolValue("Preprocessor.evaluatePixelError", evalPixelError);
-return 0;
+
+
 #ifdef USE_QT
 
@@ -305 +307 @@
         pt = new QtPreprocessorThread(preprocessor);    
         
-        //      if (preprocessor->mUseGlRenderer && (importRandomViewCells || frames))
-
         if (evalPixelError && (importRandomViewCells || frames))
         {
@@ -384 +384 @@
                 if (evaluatePixelError)
                 {
-                cout << "evaluating pixel error" << endl;
-                preprocessor->ComputeRenderError();
+                        cout << "evaluating pixel error" << endl;
+                        preprocessor->ComputeRenderError();
                 }*/