Changeset 1723 for GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp

Timestamp:

11/07/06 21:32:10 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp (modified) (4 diffs)

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

@@ -161 +161 @@
         Environment::GetSingleton()->GetBoolValue("Preprocessor.exportObj", mExportObj);
         
+        Environment::GetSingleton()->GetBoolValue("Preprocessor.useViewSpaceBox", mUseViewSpaceBox);
+
         Debug << "******* Preprocessor Options **********" << endl;
         Debug << "detect empty view space=" << mDetectEmptyViewSpace << endl;
@@ -166 +168 @@
         Debug << "load meshes: " << mLoadMeshes << endl;
         Debug << "export obj: " << mExportObj << endl;
+        Debug << "use view space box: " << mUseViewSpaceBox << endl;
 }
 
@@ -515 +518 @@
                 // temp hack
                 //ExportObj("cropped_vienna.obj", mObjects);
-
                 mSceneGraph->GetRoot()->UpdateBox();
                                 
                 cout << "finished loading" << endl;
-
-                
-                if (0)
-                {
-                        Exporter *exporter = Exporter::GetExporter("testload.x3d");
-                        if (exporter)
-                        {
-                                exporter->ExportGeometry(mObjects);
-                                delete exporter;
-                        }
-                }
         }
 
@@ -658 +649 @@
 
                 // default view space is the extent of the scene
-                AxisAlignedBox3 box = mSceneGraph->GetBox();
-                                        
-                if (0)
-                {
+                AxisAlignedBox3 viewSpaceBox;
+                        
+                if (mUseViewSpaceBox)
+                {
+                        viewSpaceBox = mSceneGraph->GetBox();
+
                         // use a small box outside of the scene
-                        box.Scale(Vector3(0.1f,0.5f,0.5f));
-                        box.Translate(Vector3(Magnitude(mSceneGraph->GetBox().Size())*0.5f, 0, 0));
-                }
-
-                mViewCellsManager->SetViewSpaceBox(box);
-         
+                        viewSpaceBox.Scale(Vector3(0.15f, 0.3f, 0.5f));
+                        //viewSpaceBox.Translate(Vector3(Magnitude(mSceneGraph->GetBox().Size()) * 0.5f, 0, 0));
+                        viewSpaceBox.Translate(Vector3(Magnitude(mSceneGraph->GetBox().Size()) * 0.3f, 0, 0));
+                        mViewCellsManager->SetViewSpaceBox(viewSpaceBox);
+                }
+                else
+                {
+                        viewSpaceBox = mSceneGraph->GetBox();
+                        mViewCellsManager->SetViewSpaceBox(viewSpaceBox);
+                }
+
                 bool loadVcGeometry;
                 Environment::GetSingleton()->GetBoolValue("ViewCells.loadGeometry", loadVcGeometry);