Changeset 2020 for GTP/trunk/Lib

Timestamp:

01/23/07 00:20:59 (18 years ago)

Author:

bittner

Message:

power plant updates

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Environment.cpp (modified) (1 diff)
• VspTree.cpp (modified) (3 diffs)
• main.cpp (modified) (1 diff)
• preprocessor.pro (modified) (2 diffs)
• run_test_powerplant (modified) (2 diffs)

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

@@ -1620 +1620 @@
 
 
+        
 
         /****************************************************************************/

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

@@ -268 +268 @@
 
 
-bool VspInterior::IsLeaf() const
-{ 
-        return false; 
-}
-
-
-VspNode *VspInterior::GetBack() 
-{
-        return mBack;
-}
-
-
-VspNode *VspInterior::GetFront() 
-{
-        return mFront;
-}
-
-
-AxisAlignedPlane VspInterior::GetPlane() const
-{
-        return mPlane;
-}
-
-
-float VspInterior::GetPosition() const
-{
-        return mPlane.mPosition;
-}
-
-
-int VspInterior::GetAxis() const
-{
-        return mPlane.mAxis;
-}
+
+
 
 
@@ -388 +356 @@
 
 
-ViewCellLeaf *VspLeaf::GetViewCell() const
-{
-        return mViewCell;
-}
 
 
@@ -400 +364 @@
 
 
-bool VspLeaf::IsLeaf() const 
-{ 
-        return true; 
-}
 
 

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

@@ -175 +175 @@
 
         InitTiming();
-
+#if 0
         Debug.open("debug.log");
-  
+
+        cout<<"Allocating 1.5GB..."<<endl;
+
+        
+        for (int i=0; i < 1000; i++) {
+          void *p = malloc(1250000000);
+          if (p != NULL) {
+                cout<<"success"<<(i+1)*1000<<"MB"<<endl;
+          }
+          else {
+                cout<<"fail"<<endl;
+                exit(1);
+          }
+        }
+#endif
         Environment::GetSingleton()->Parse(argc, argv, USE_EXE_PATH);
         MeshKdTree::ParseEnvironment();

GTP/trunk/Lib/Vis/Preprocessing/src/preprocessor.pro

@@ -1 @@
-CONFIG += qt release
+CONFIG += release 
 CONFIG += console warn_off thread mlrt qt
 
@@ -75 +75 @@
 }
 
-
 QMAKE_LFLAGS_CONSOLE=/NODEFAULTLIB:LIBCMT
 

GTP/trunk/Lib/Vis/Preprocessing/src/run_test_powerplant

@@ -2 +2 @@
 
 #COMMAND="./release/preprocessor.exe -preprocessor_quit_on_finish+"
-COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer- -preprocessor_evaluate_filter- -preprocessor_detect_empty_viewspace+"
+COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer+ -preprocessor_evaluate_filter- -preprocessor_detect_empty_viewspace+"
 
 
@@ -14 +14 @@
 $COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
  -rss_distributions=mutation+object_direction+spatial -view_cells_filter_max_size=1 \
+ -view_cells_use_kd_pvs- -af_use_kd_pvs- \
  -preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4a.xml \
  -preprocessor_stats=$PREFIX-i-mixed-b1-n4a.log \