Changeset 1841 for GTP/trunk

Timestamp:

12/02/06 00:15:15 (18 years ago)

Author:

mattausch

Message:

removed bug in initial subdivision

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.cpp (modified) (4 diffs)
• QtGlRenderer/QtGlRenderer.cpp (modified) (1 diff)
• RssTree.cpp (modified) (1 diff)
• TestPreprocessor.vcproj (modified) (3 diffs)
• ViewCellsManager.cpp (modified) (1 diff)
• main.cpp (modified) (1 diff)

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

@@ -2179 +2179 @@
                 for (cit = candidateContainer.begin(); cit != cit_end; ++ cit)
                 {
+                        BvhSubdivisionCandidate *sCandidate = dynamic_cast<BvhSubdivisionCandidate *>(*cit);
+                        
                         // reevaluate priority
-                        EvalSubdivisionCandidate(*oSubdivisionCandidate);
-                        tQueue.Push(*cit);
+                        EvalSubdivisionCandidate(*sCandidate);
+                        tQueue.Push(sCandidate);
                 }
         }
@@ -2193 +2195 @@
         }
                 
-        cout << "!!size: " << GetStatistics().Leaves() << endl;
+        cout << "size of initial bv subdivision: " << GetStatistics().Leaves() << endl;
 }
 
@@ -2580 +2582 @@
         ObjectContainer::const_iterator backObjectsStart = objects->begin();
 
-    for (oit = objects->begin(); oit != (objects->end() - 1); ++ oit)
+        for (oit = objects->begin(); oit != (objects->end() - 1); ++ oit)
         {
                 Intersectable *objS = *oit;
@@ -2630 +2632 @@
                         );
 
-        cout << "criteria met: " << terminationCriteriaMet << " " << (int)tData.mNode->mObjects.size() << " " << mInitialMinObjects << endl
-                 << AreaRatio(tData.mNode->mObjects.front(), tData.mNode->mObjects.back()) << " " << mInitialMaxAreaRatio << endl
-                 << tData.mNode->mObjects.back()->GetBox().SurfaceArea() << " " << mInitialMinArea << endl;
+        cout << "criteria met: "<< terminationCriteriaMet << "\n" 
+                 << "size: " << (int)tData.mNode->mObjects.size() << " max: " << mInitialMinObjects << endl
+                 << "ratio: " << AreaRatio(tData.mNode->mObjects.front(), tData.mNode->mObjects.back()) << " max: " << mInitialMaxAreaRatio << endl
+                 << "area: " << tData.mNode->mObjects.back()->GetBox().SurfaceArea() << " max: " << mInitialMinArea << endl << endl;
 
         return terminationCriteriaMet;

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

@@ -1539 +1539 @@
 
 /***********************************************************************/
-/*                     QtGlDebuggerWidget implementation                                   */
+/*                     QtGlDebuggerWidget implementation                           */
 /***********************************************************************/
 

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

@@ -2864 +2864 @@
         
         // $$ 
-        sumWeights = leaf->mTotalRays;
+        sumWeights = (float)leaf->mTotalRays;
 
         //$$ test 30.11. 2006 

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

@@ -35 +35 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="xerces-c_2D.lib zdll.lib zziplibd.lib devil.lib glut32.lib OpenGL32.Lib glu32.lib Preprocessor.lib glew32.lib"
-                                OutputFile="$(OutDir)/Preprocessor.exe"
+                                OutputFile="$(OutDir)/Preprocessor.exe2"
                                 LinkIncremental="2"
                                 AdditionalLibraryDirectories="..\include;..\src\GL;"..\lib\$(ConfigurationName)";..\..\..\..\..\..\NonGTP\Boost\lib;..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\..\..\..\NonGTP\Zlib\lib;..\..\..\..\..\..\NonGTP\Devil\lib"
@@ -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""
-                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GTP_INTERNAL"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GTP_INTERNAL;NO_QT"
                                 RuntimeLibrary="2"
                                 RuntimeTypeInfo="TRUE"
@@ -206 +206 @@
                                 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 QtCore4.lib qtmain.lib QtOpenGL4.lib Qt3Support4.lib QtTest4.lib QtGui4.lib QtGlRenderer.lib"
-                                OutputFile="../bin/release/Preprocessor.exe"
+                                OutputFile="../bin/release/Preprocessor2.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;"$(QTDIR)\lib";.\QtGlRenderer\Release"

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

@@ -5735 +5735 @@
         }
 
-        // export some view cell
+        // export some view cells
         int leafOut;
         Environment::GetSingleton()->GetIntValue("ViewCells.Visualization.maxOutput", leafOut);

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

@@ -37 +37 @@
 #include "GlRenderer.h"
 
-#if USE_QT
+//#if USE_QT
 #include "QtPreprocessorThread.h"
 #include "QtGlRenderer.h"
 #include "QtGlViewer.h"
-#endif
+//#endif
 
 #define USE_EXE_PATH false