Changeset 569 for trunk/VUT/GtpVisibilityPreprocessor/src/RssTree.cpp

Timestamp:

01/23/06 15:58:00 (18 years ago)

Author:

bittner

Message:

viewcell validy setting functions extended

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/RssTree.cpp (modified) (7 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/RssTree.cpp

@@ -336 +336 @@
           GetRoot(objects[i])->bbox = objects[i]->GetBox();
         }
-
         stat.nodes = i;
+        stat.leaves = i;
   } else {
         mRoots.resize(1);
@@ -347 +347 @@
         mRoots[0] = leaf;
         stat.nodes = 1;
+        stat.leaves = 1;
   }
 
@@ -356 +357 @@
           
           // first construct a leaf that will get subdivide
-          RssTreeLeaf *leaf = (RssTreeLeaf *) GetRoot(info.GetObject());
+          RssTreeLeaf *leaf = (RssTreeLeaf *) GetRoot(info.GetSourceObject());
 
           leaf->AddRay(info);
@@ -1094 +1095 @@
   
   stat.nodes+=2;
+  stat.leaves += 1;
   stat.splits[axis]++;
 
@@ -1410 +1412 @@
   stack<RayTraversalData> tstack;
 
-  RssTreeNode *root = GetRoot(info.GetObject());
+  RssTreeNode *root = GetRoot(info.GetSourceObject());
   tstack.push(RayTraversalData(root, info));
   
@@ -1550 +1552 @@
 
   stat.nodes -= collapsedNodes - 1;
+  stat.leaves -= collapsedNodes/2 - 1;
   stat.rayRefs -= totalRayCount - rayCount;
   
@@ -2771 +2774 @@
 {
   if (mPerObjectTree && object) {
-        int id = object->GetId();
-        if (id >= mRoots.size())
+        int id = object->GetId()-1;
+        if (id < 0 || id >= mRoots.size()) {
+          Debug<<"Error: object Id out of range, Id="<<id<<" roots.size()="<<mRoots.size()<<
+                endl<<flush;
           id = mRoots.size()-1; // $$ last tree is used by all unsigned objects
+        }
         return mRoots[id];
   } else