Changeset 1923

Timestamp:

12/28/06 20:02:12 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/default.env (modified) (2 diffs)
• src/BvHierarchy.cpp (modified) (1 diff)
• src/Environment.cpp (modified) (4 diffs)
• src/Preprocessor.cpp (modified) (1 diff)
• src/TestPreprocessor.vcproj (modified) (1 diff)
• src/ViewCellBsp.cpp (modified) (2 diffs)
• src/ViewCellBsp.h (modified) (1 diff)

GTP/trunk/Lib/Vis/Preprocessing/scripts/default.env

@@ -262 +262 @@
 }
 
-
 Simulation {
         objRenderCost 1.0
@@ -270 +269 @@
 }
 
-
-VspKdTree {
-        epsilon         1e-6
-
-        Construction {
-                samples 500000
-        }
-        
-        Termination {
-                maxDepth                40
-                minPvs                  0
-                minRays                 1
-                minSize                 0.001
-                maxCostRatio            5.9
-                maxViewCells            169
-                missTolerance           4
-                maxRayContribution      2.5
-        }
-        
-        maxTotalMemory  100
-        maxStaticMemory 40
-
-        splitType       regular
-        #splitType      heuristics
-        splitUseOnlyDrivingAxis true
-        ct_div_ci       0.0
-        
-        # maximal cost for merging a view cell
-        PostProcess {
-                maxCostRatio 0.005
-                minViewCells 10000
-                maxPvsSize   5000
-        }
-        
-        
-        Visualization {
-        }
-}
 
 VspBspTree {

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

@@ -2086 +2086 @@
 {
         ObjectContainer::const_iterator oit, oit_end = leaf->mObjects.end();
+
         for (oit = leaf->mObjects.begin(); oit != oit_end; ++ oit)
         {

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

@@ -1744 +1744 @@
         RegisterOption("Preprocessor.evaluateFilter",
                                    optBool,
-                                   "preprocessor_evaluate_filter",
+                                   "preprocessor_evaluate_filter=",
                                    "false");
 
@@ -1759 +1759 @@
         RegisterOption("Preprocessor.useGlRenderer",
                                         optBool,
-                                        "preprocessor_use_gl_renderer",
+                                        "preprocessor_use_gl_renderer=",
                                         "false");
 
         RegisterOption("Preprocessor.useGlDebugger",
                                         optBool,
-                                        "preprocessor_use_gl_debugger",
+                                        "preprocessor_use_gl_debugger=",
                                         "false");
 
@@ -1774 +1774 @@
         RegisterOption("Preprocessor.quitOnFinish",
                                    optBool,
-                                   "preprocessor_quit_on_finish",
+                                   "preprocessor_quit_on_finish=",
                                    "true");
 
@@ -1848 +1848 @@
 
    RegisterOption("Preprocessor.useViewSpaceBox",
-          optBool,
-          "preprocessor_use_viewspace_box=",
-          "false");   
+                                        optBool,
+                                        "preprocessor_use_viewspace_box=",
+                                        "false");   
 
    RegisterOption("Preprocessor.Export.rays", optBool, "export_rays=", "false");

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

@@ -189 +189 @@
         cout << "Deleting bsp tree ... \n";
         DEL_PTR(mBspTree);
-        cout << "done.\n";
-
-        cout << "Deleting kd tree...\n";
+        cout << "done.\n"; fflush(stdout);
+
+        cout << "Deleting kd tree ...\n";fflush(stdout);
         DEL_PTR(mKdTree);
         cout << "done.\n";
 
-        cout << "Deleting vspbsp tree...\n";
+        cout << "Deleting vspbsp tree ... \n";
         DEL_PTR(mVspBspTree);
         cout << "done.\n";
 
-        cout << "Deleting scene graph...\n";
+        cout << "Deleting scene graph ... \n";
         DEL_PTR(mSceneGraph);
         cout << "done.\n";

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

@@ -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/Preprocessor2.exe"
+                                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;"$(QTDIR)\lib";.\QtGlRenderer\Release"

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

@@ -102 +102 @@
 mPlane(plane), mFront(NULL), mBack(NULL)
 {}
+
 
 BspInterior::~BspInterior() 
@@ -437 +438 @@
         DEL_PTR(mRoot);
         
-        if (mOutOfBoundsCellPartOfTree)
+        if (!mOutOfBoundsCellPartOfTree)
         {
                 // out of bounds cell not part of tree =>

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

@@ -1087 +1087 @@
 
         ViewCellsTree *mViewCellsTree;
-
+        /// if out of bounds cell is part of the bsp tree
         bool mOutOfBoundsCellPartOfTree;