Changeset 590 for trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsParser.cpp

Timestamp:

02/04/06 21:36:40 (18 years ago)

Author:

mattausch

Message:

implemented some code for merge history loading

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsParser.cpp (modified) (10 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsParser.cpp

@@ -28 +28 @@
 #include "VspBspTree.h"
 #include "ViewCellBsp.h"
+#include "VspKdTree.h"
 #include "ViewCellsManager.h"
 
@@ -98 +99 @@
 {
         // go one up in the tree
-        if (mCurrentNode->GetParent())
+        if (mCurrentBspNode->GetParent())
         {       cout << "]";
-                mCurrentNode = mCurrentNode->GetParent();
+                mCurrentBspNode = mCurrentBspNode->GetParent();
         }
 }
@@ -213 +214 @@
         vector<int> objIndices;
   
-        ViewCell *viewCell = mViewCellsManager->GenerateViewCell();
+//hack!!
+        
+        ViewCell *viewCell = new ViewCellInterior();//mViewCellsManager->GenerateViewCell();
+        viewCell->mIsActive = true;
+
         mViewCells.push_back(viewCell);
-
+        
         for (int i = 0; i < len; ++ i) 
         {
@@ -316 +321 @@
 {
         BspLeaf * leaf = 
-                new BspLeaf(dynamic_cast<BspInterior *>(mCurrentNode), NULL);
-
-        if (mCurrentNode) // replace front or (if not NULL) back child
-        {
-                dynamic_cast<BspInterior *>(mCurrentNode)->ReplaceChildLink(NULL, leaf);
+                new BspLeaf(dynamic_cast<BspInterior *>(mCurrentBspNode), NULL);
+
+        if (mCurrentBspNode) // replace front or (if not NULL) back child
+        {
+                dynamic_cast<BspInterior *>(mCurrentBspNode)->ReplaceChildLink(NULL, leaf);
         }
         else
@@ -353 +358 @@
         }
 
+        
         if (viewCellId >= 0) // valid view cell
         {
                 // TODO: get view cell with specified id
-                BspViewCell dummyVc;
+                ViewCellInterior dummyVc;
                 dummyVc.SetId(viewCellId);
 
@@ -362 +368 @@
                         lower_bound(mViewCells.begin(), mViewCells.end(), &dummyVc, vlt);
                         
-                BspViewCell *viewCell = dynamic_cast<BspViewCell *>(*vit);
+                ViewCellInterior *viewCell = dynamic_cast<ViewCellInterior *>(*vit);
+
+                // giant hack!!
+                BspViewCell *l = dynamic_cast<BspViewCell *>(mViewCellsManager->GenerateViewCell());
+                viewCell->SetupChildLink(l);
 
                 if (viewCell->GetId() == viewCellId)
                 {
-                        leaf->SetViewCell(viewCell);
+                        leaf->SetViewCell(l);
+                        l->mLeaf = leaf;
                 }
                 else
@@ -405 +416 @@
         BspInterior* interior = new BspInterior(plane);
         
-        if (mCurrentNode) // replace NULL child of parent with current node
-        {
-                BspInterior *current = dynamic_cast<BspInterior *>(mCurrentNode);
+        if (mCurrentBspNode) // replace NULL child of parent with current node
+        {
+                BspInterior *current = dynamic_cast<BspInterior *>(mCurrentBspNode);
 
                 current->ReplaceChildLink(NULL, interior);
@@ -424 +435 @@
         }
 
-        mCurrentNode = interior;
+        mCurrentBspNode = interior;
 }
 
@@ -436 +447 @@
 
                 mBspTree = new BspTree();
-                mCurrentNode = mBspTree->GetRoot();
+                mBspTree->mBox = mViewSpaceBox;
+                mCurrentBspNode = mBspTree->GetRoot();
 
                 mViewCellsManager = new BspViewCellsManager(mBspTree);
@@ -445 +457 @@
 
                 mVspBspTree = new VspBspTree();
-                mCurrentNode = mVspBspTree->GetRoot();
+                mCurrentBspNode = mVspBspTree->GetRoot();
 
                 mViewCellsManager = new VspBspViewCellsManager(mVspBspTree);
 
+                mVspBspTree->mBox = mViewSpaceBox;
                 Debug << "creating vsp bsp view cells manager" << endl;
         }
-        /*else if (strcmp(name, "vspKdTree") == 0)
-        {
-                mVspKdTree = new VspKdTree();           
-        
-                mViewCellsManager = VspKdViewCellsManager(mVspKdTree);
-        }*/
+        else if (strcmp(name, "vspKdTree") == 0)
+        {
+                // TODO
+                mVspKdTree = new VspKdTree();   
+                mViewCellsManager = new VspKdViewCellsManager(mVspKdTree);
+        }
         else
         {