Changeset 1287 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsParser.cpp

Timestamp:

08/27/06 23:39:50 (18 years ago)

Author:

mattausch

Message:

implemented bv hierarchy

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsParser.cpp (modified) (20 diffs)

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

@@ -159 +159 @@
         if (mObjectSpaceHierarchyType == OSP)
         {
+                // for a spatial subdivision, it is not necessary to store
+                // the objects with the leaves, they can be classified now
                 mHierarchyManager->mOspTree->InsertObjects(
                         mHierarchyManager->mOspTree->mRoot, *mObjects);
         }
+        else
+                cout << "here209" << endl;
+
 }
 
@@ -279 +284 @@
 
 
-void ViewCellsParseHandlers::StartHierarchy(AttributeList&  attributes)
-{
-        int len = attributes.getLength();
-  
-        for (int i = 0; i < len; ++ i) 
-        {
-                string attrName(StrX(attributes.getName(i)).LocalForm());
-                
-                if (attrName == "name") 
-                {
-                        StrX attrValue(attributes.getValue(i));
-                        
-                        const char *ptr = attrValue.LocalForm();
-                        
-                        // the view cells manager is created here
-                        //CreateViewCellsManager(ptr);
-                }
-        }
-}
-
-
 void ViewCellsParseHandlers::StartBspElement(string element,
                                                                                          AttributeList& attributes)
@@ -437 +421 @@
                 // create new view cells hierarchy
                 mViewCellsTree = new ViewCellsTree();
-        }
-
-        // decides about the view cells manager type
-        if (element == "Hierarchy")
-        {
-                cout << "parsing view cells manager type" << endl;
-                StartHierarchy(attributes);
         }
 
@@ -688 +665 @@
                 const char *ptr = attrValue.LocalForm();
 
-
                 if (attrName == "id")
                 {
@@ -711 +687 @@
 void ViewCellsParseHandlers::StartBspLeaf(AttributeList& attributes)
 {
-        BspLeaf * leaf = 
-                new BspLeaf(dynamic_cast<BspInterior *>(mCurrentBspNode), NULL);
+        BspLeaf * leaf;
 
         if (mCurrentBspNode) // replace front or (if not NULL) back child
         {
-                dynamic_cast<BspInterior *>(mCurrentBspNode)->ReplaceChildLink(NULL, leaf);
+                BspInterior *interior = dynamic_cast<BspInterior *>(mCurrentBspNode);
+
+                leaf = new BspLeaf(interior);
+                interior->ReplaceChildLink(NULL, leaf);
         }
         else
         {
+                leaf = new BspLeaf();
                 mVspBspTree->mRoot = leaf;
         }
@@ -797 +776 @@
         if (mCurrentBspNode) // replace NULL child of parent with current node
         {
-                BspInterior *current = dynamic_cast<BspInterior *>(mCurrentBspNode);
-
-                current->ReplaceChildLink(NULL, interior);
-                interior->SetParent(current);
+                BspInterior *parent = dynamic_cast<BspInterior *>(mCurrentBspNode);
+
+                parent->ReplaceChildLink(NULL, interior);
+                interior->SetParent(parent);
         }
         else
@@ -856 +835 @@
 void ViewCellsParseHandlers::CreateViewSpaceHierarchy()
 {
-        ViewCellContainer::iterator it, it_end = mViewCells.end();
-        cout << "\n====================" << endl << endl;
-        for (it = mViewCells.begin(); it != it_end; ++ it)
-        {
-                cout << (*it)->GetId() << " ";
-        }
-cout << endl;
         if (mViewSpaceHierarchyType == BSP)
         {
@@ -936 +908 @@
                 }
         }
-        cout << "************************" << endl;
-        it_end = mViewCells.end();
-        for (it = mViewCells.begin(); it != it_end; ++ it)
-        {
-                cout << (*it)->GetId() << " ";
-        }
-        cout << endl;
-        cout << "\nview space box: " << mViewSpaceBox << endl;
+        //cout << "\nview space box: " << mViewSpaceBox << endl;
 }
 
@@ -992 +957 @@
 void ViewCellsParseHandlers::StartVspLeaf(AttributeList& attributes)
 {
-        VspLeaf * leaf = 
-                new VspLeaf(dynamic_cast<VspInterior *>(mCurrentVspNode), NULL);
-
+        VspLeaf * leaf;
+                
         if (mCurrentVspNode) // replace front or (if not NULL) back child
         {
-                dynamic_cast<VspInterior *>(mCurrentVspNode)->ReplaceChildLink(NULL, leaf);
+                VspInterior *interior = dynamic_cast<VspInterior *>(mCurrentVspNode);
+                leaf = new VspLeaf(interior);
+                interior->ReplaceChildLink(NULL, leaf);
         }
         else
         {
+                leaf = new VspLeaf();
                 mVspTree->mRoot = leaf;
         }
@@ -1029 +996 @@
                 dummyVc.SetId(viewCellId);
 
-                cout << "\nsearching view cell with id " << viewCellId << endl;
+                //cout << "\nsearching view cell with id " << viewCellId << endl;
 
                 ViewCellContainer::iterator vit =
@@ -1087 +1054 @@
                 AxisAlignedBox3 frontBox, backBox;
 
-                parent->GetBoundingBox().Split(parent->GetPlane().mAxis, parent->GetPlane().mPosition, frontBox, backBox);
+                parent->GetBoundingBox().Split(
+                        parent->GetPlane().mAxis, 
+                        parent->GetPlane().mPosition, 
+                        frontBox, 
+                        backBox);
+
                 if (parent->GetFront() == interior)
                         interior->SetBoundingBox(frontBox);
@@ -1134 +1106 @@
 
                 parent->mBox.Split(parent->mAxis, parent->mPosition, frontBox, backBox);
+
                 if (parent->mFront == interior)
                         interior->mBox = frontBox;
@@ -1180 +1153 @@
                 if (attrName == "min") 
                 {
-                        sscanf(ptr, "%f %f %f", &minBox);
+                        sscanf(ptr, "%f %f %f", &minBox.x, &minBox.y, &minBox.z);
                 }
                 if (attrName == "max") 
                 {
-                        sscanf(ptr, "%f %f %f", &maxBox);
+                        sscanf(ptr, "%f %f %f", &maxBox.x, &maxBox.y, &maxBox.z);
                 }
                 if (attrName == "objects")
@@ -1192 +1165 @@
         }
 
-        BvhLeaf * leaf = 
-                new BvhLeaf(AxisAlignedBox3(minBox, maxBox), 
-                                        dynamic_cast<BvhInterior *>(mCurrentBvhNode), (int)objects.size());
+        AxisAlignedBox3 box = AxisAlignedBox3(minBox, maxBox);
+
+        BvhLeaf *leaf;
+
+        if (mCurrentBvhNode) // replace front or (if not NULL) back child
+        {
+                BvhInterior *interior = dynamic_cast<BvhInterior *>(mCurrentBvhNode);
+                leaf = new BvhLeaf(box, interior, (int)objects.size());
+                interior->ReplaceChildLink(NULL, leaf);
+        }
+        else
+        {
+                leaf = new BvhLeaf(box, NULL, (int)objects.size());
+                mHierarchyManager->mBvHierarchy->mRoot = leaf;
+        }
 
         leaf->mObjects = objects;
-
-        if (mCurrentBvhNode) // replace front or (if not NULL) back child
-        {
-                dynamic_cast<BvhInterior *>(mCurrentBvhNode)->ReplaceChildLink(NULL, leaf);
-        }
-        else
-        {
-                mHierarchyManager->mBvHierarchy->mRoot = leaf;
-        }
 }
 
@@ -1219 +1195 @@
         {
                 const int index = strtol(ptr, &endptr, 10);
-
                 if (ptr == endptr) break;
 
                 objIndices.push_back(index);
-
                 ptr = endptr;
         }
@@ -1239 +1213 @@
 
                 ObjectContainer::iterator oit =
-                        lower_bound(mObjects->begin(), mObjects->end(), (Intersectable *)&dummyInst, ilt);      
+                        lower_bound(mObjects->begin(), 
+                                                mObjects->end(), 
+                                                (Intersectable *)&dummyInst, 
+                                                ilt);   
                                                         
                 if ((oit != mObjects->end()) && ((*oit)->GetId() == objId))
@@ -1260 +1237 @@
         for (int i = 0; i < len; ++ i) 
         {
+                cout << "here5" << endl;
                 string attrName(StrX(attributes.getName(i)).LocalForm());
                 StrX attrValue(attributes.getValue(i));
@@ -1265 +1243 @@
 
                 if (attrName == "min") 
-                {
-                        sscanf(ptr, "%f %f %f", &minBox);
+                {cout << "here6" << endl;
+                        sscanf(ptr, "%f %f %f", &minBox.x, &minBox.y, &minBox.z);
                 }
                 if (attrName == "max") 
-                {
-                        sscanf(ptr, "%f %f %f", &maxBox);
+                {cout << "here7" << endl;
+                        sscanf(ptr, "%f %f %f", &maxBox.x, &maxBox.y, &maxBox.z);
                 }
         }
@@ -1278 +1256 @@
         if (mCurrentBvhNode) // replace NULL child of parent with current node
         {
+                cout << "here8" << endl;
                 BvhInterior *parent = dynamic_cast<BvhInterior *>(mCurrentBvhNode);
                 parent->ReplaceChildLink(NULL, interior);
@@ -1283 +1262 @@
         }
         else
-        {
-                mBvHierarchy->mRoot = interior;
-        }
-
+        {cout << "here18" << endl;
+                mHierarchyManager->mBvHierarchy->mRoot = interior;
+        }
+cout << "here28" << endl;
         mCurrentBvhNode = interior;
 }