Changeset 1867 for GTP/trunk/Lib/Vis/Preprocessing/src/RssTree.h

Timestamp:

12/08/06 17:10:14 (18 years ago)

Author:

bittner

Message:

merge, global lines, rss sampling updates

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/RssTree.h (modified) (10 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/RssTree.h

@@ -137 +137 @@
 public:
 
+
   struct RayInfo
   {
@@ -162 +163 @@
         }
 
+        
 #define USE_ORIGIN 1
         
@@ -312 +314 @@
   AxisAlignedBox3 dirBBox;
 
-  
+  // evaluated importance of this node
+  float mImportance;
+
   inline RssTreeNode(RssTreeInterior *p);
 
@@ -328 +332 @@
   }
 
-  
+  float GetImportance() const;
+
         
 };
@@ -339 +344 @@
 {
 public:
-  // plane in local modelling coordinates
+  // plane in world coordinates
   float position;
 
@@ -359 +364 @@
   virtual int GetAccessTime() {
     return lastAccessTime;
+  }
+
+  float GetRelativePosition() const {
+        if (axis < 3)
+          return (position - bbox.Min(axis))/bbox.Size(axis);
+        else
+          return (position - dirBBox.Min(axis-3))/dirBBox.Size(axis-3);
   }
 
@@ -423 +435 @@
         
   bool mValidPvs;
-  float mImportance;
-  
-  HaltonSequence halton;
-
+  
   Beam mBeam;
   
@@ -490 +499 @@
   }
 
-  float GetImportance() const;
   
   float GetSqrRayContribution() const {
@@ -621 +629 @@
   
   
-  
+  Halton<5> halton;
+  
+
   /////////////////////////////
   // Basic properties
@@ -1086 +1096 @@
   PushRoots(stack<RayTraversalData> &st, RssTreeNode::RayInfo &info) const;
 
-
+  void
+  UpdateImportance(
+                                   RssTreeNode *node);
+
+  void
+  GenerateRay(float *params, SimpleRayContainer &rays);
+
+  void
+  GenerateLeafRay(
+                                  float *params,
+                                  SimpleRayContainer &rays,
+                                  const AxisAlignedBox3 &box,
+                                  const AxisAlignedBox3 &dirBBox
+                                  );
+        
 };