Changeset 516 for trunk/VUT/GtpVisibilityPreprocessor/src/RssTree.h

Timestamp:

01/11/06 15:50:37 (19 years ago)

Author:

bittner

Message:

per object rss tree support - changes in glrenderer.cpp so tha it compiles; unix2dos on glrenderer.*

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/RssTree.h (modified) (11 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/RssTree.h

@@ -300 +300 @@
   //
   /////////////////////////////////
+
+
+  // the bbox of the node
+  AxisAlignedBox3 bbox;
+  
+  // the bbox of the node
+  AxisAlignedBox3 dirBBox;
+
   
   inline RssTreeNode(RssTreeInterior *p);
@@ -333 +341 @@
   RssTreeNode *back, *front;
 
-  // the bbox of the node
-  AxisAlignedBox3 bbox;
-  
-  // the bbox of the node
-  AxisAlignedBox3 dirBBox;
 
   // data for caching
@@ -611 +614 @@
   /////////////////////////////
   // The core pointer
-  RssTreeNode *root;
+  vector<RssTreeNode *> mRoots;
+  
+  
   
   /////////////////////////////
@@ -618 +623 @@
   // total number of nodes of the tree
   int nodes;
+
   // axis aligned bounding box of the scene
   AxisAlignedBox3 bbox;
@@ -625 +631 @@
 
   // forced bounding box for from viewcell visibility
-  AxisAlignedBox3 *mForcedBoundingBox;
+  //  AxisAlignedBox3 *mForcedBoundingBox;
 
   /////////////////////////////
@@ -652 +658 @@
   float termMaxRayContribution;
 
-        
   // randomized construction
   bool randomize;
+
+  // use a root per object in the tree
+  bool mPerObjectTree;
   
   // type of the splitting to use fo rthe tree construction
@@ -711 +719 @@
   virtual void
   Construct(
-                        VssRayContainer &rays,
-                        AxisAlignedBox3 *forcedBoundingBox = NULL
+                        ObjectContainer &objects,
+                        VssRayContainer &rays
+                        //                      AxisAlignedBox3 *forcedBoundingBox = NULL
                         );
         
@@ -849 +858 @@
   
   AxisAlignedBox3 GetBBox(const RssTreeNode *node) const {
-    if (node->parent == NULL)
-      return bbox;
-
-    if (!node->IsLeaf())
-      return ((RssTreeInterior *)node)->bbox;
-
-    if (node->parent->axis >= 3)
-      return node->parent->bbox;
+        return node->bbox;
+
+//     if (node->parent == NULL)
+//       return bbox;
+
+//     if (!node->IsLeaf())
+//       return ((RssTreeInterior *)node)->bbox;
+
+//     if (node->parent->axis >= 3)
+//       return node->parent->bbox;
       
-    AxisAlignedBox3 box(node->parent->bbox);
-    if (node->parent->front == node)
-      box.SetMin(node->parent->axis, node->parent->position);
-    else
-      box.SetMax(node->parent->axis, node->parent->position);
-    return box;
+//     AxisAlignedBox3 box(node->parent->bbox);
+//     if (node->parent->front == node)
+//       box.SetMin(node->parent->axis, node->parent->position);
+//     else
+//       box.SetMax(node->parent->axis, node->parent->position);
+//     return box;
   }
 
@@ -869 +880 @@
 
   AxisAlignedBox3 GetDirBBox(const RssTreeNode *node) const {
-
-    if (node->parent == NULL)
-      return dirBBox;
+        return node->dirBBox;
+//     if (node->parent == NULL)
+//       return dirBBox;
     
-    if (!node->IsLeaf() )
-      return ((RssTreeInterior *)node)->dirBBox;
-
-    if (node->parent->axis < 3)
-      return node->parent->dirBBox;
+//     if (!node->IsLeaf() )
+//       return ((RssTreeInterior *)node)->dirBBox;
+
+//     if (node->parent->axis < 3)
+//       return node->parent->dirBBox;
     
-    AxisAlignedBox3 dBBox(node->parent->dirBBox);
-
-    if (node->parent->front == node)
-      dBBox.SetMin(node->parent->axis - 3, node->parent->position);
-    else
-      dBBox.SetMax(node->parent->axis - 3, node->parent->position);
-    return dBBox;
+//     AxisAlignedBox3 dBBox(node->parent->dirBBox);
+
+//     if (node->parent->front == node)
+//       dBBox.SetMin(node->parent->axis - 3, node->parent->position);
+//     else
+//       dBBox.SetMax(node->parent->axis - 3, node->parent->position);
+//     return dBBox;
   }
   
@@ -978 +989 @@
                   );
 
-  RssTreeNode *GetRoot() const { return root; }
+  RssTreeNode *GetRoot(Intersectable *object = NULL) const;
 
   bool
@@ -1053 +1064 @@
                                          vector<RssTreeLeaf::SilhouetteRays> &rays
                                          );
-  
+
+  void
+  PushRoots(priority_queue<TraversalData> &stack) const;
+
+  void
+  PushRoots(stack<RssTreeNode *> &st) const;
+
+  void
+  PushRoots(stack<RayTraversalData> &st, RssTreeNode::RayInfo &info) const;
+
+
 };