Changeset 577 for trunk/VUT/GtpVisibilityPreprocessor/src/Preprocessor.cpp

Timestamp:

01/25/06 17:45:45 (18 years ago)

Author:

mattausch

Message:

fixed loading function: the view cell manager is chosen depending on
the type in the file. the view space box is saved with the file

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/Preprocessor.cpp (modified) (4 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/Preprocessor.cpp

@@ -190 +190 @@
 bool Preprocessor::PrepareViewCells()
 {
-        //-- parse type of view cell container
-        char viewCellsStr[64];
-        environment->GetStringValue("ViewCells.type", viewCellsStr);
-
-        mViewCellsManager = CreateViewCellsManager(viewCellsStr);
+        //-- parse view cells construction method
+        environment->GetBoolValue("ViewCells.loadFromFile", mLoadViewCells);
+        char buf[100];
+        
+        if (mLoadViewCells)
+        {
+                environment->GetStringValue("ViewCells.filename", buf);
+                mViewCellsManager = ViewCellsManager::LoadViewCells(buf, &mObjects);
+        }
+        else
+        {
+                //-- parse type of view cell container
+                char viewCellsStr[64];
+                environment->GetStringValue("ViewCells.type", viewCellsStr);
+            mViewCellsManager = CreateViewCellsManager(viewCellsStr);
+        }
 
         float objRenderCost = 0, vcOverhead = 0, moveSpeed = 0;
@@ -207 +218 @@
         mViewCellsManager->SetRenderer(mRenderSimulator);
 
-        //-- parse view cells construction method
-        environment->GetBoolValue("ViewCells.loadFromFile", mLoadViewCells);
-        char buf[100];
-
-        if (mLoadViewCells)
-        {
-                environment->GetStringValue("ViewCells.filename", buf);
-                mViewCellsFilename = buf;
-        }
 
         if (mUseGlRenderer || mUseGlDebugger)
@@ -228 +230 @@
         environment->GetBoolValue("Preprocessor.detectEmptyViewSpace", mDetectEmptyViewSpace);
         
-
-
         return true;
 }
@@ -242 +242 @@
         else if (strcmp(name, "bspTree") == 0)
         {
+                Debug << "view cell type: Bsp" << endl;
+
                 mBspTree = new BspTree();
-
-                Debug << "view cell type: Bsp" << endl;
-
                 mViewCellsManager = new BspViewCellsManager(mBspTree);
         }
         else if (strcmp(name, "vspBspTree") == 0)
         {
+                Debug << "view cell type: VspBsp" << endl;
+
                 mVspBspTree = new VspBspTree();
-
-                Debug << "view cell type: VspBsp" << endl;
-
                 mViewCellsManager = new VspBspViewCellsManager(mVspBspTree);
         }