Changeset 2198 for GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.h

Timestamp:

03/06/07 17:37:28 (17 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.h (modified) (8 diffs)

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

@@ -35 +35 @@
 class BvhTree;
 class VspTree;
-class ViewCellsContainer;
 class HierarchyManager;
 
@@ -649 +648 @@
         static float EvalAbsCost(const ObjectContainer &objects);
 
-        float EvalProb(const ObjectContainer &objects) const;
-
         void CollectObjects(const AxisAlignedBox3 &box, ObjectContainer &objects);
 
@@ -658 +655 @@
         void CreateUniqueObjectIds();
 
-        PerfTimer mSortTimer;
         PerfTimer mNodeTimer;
         PerfTimer mSubdivTimer;
         PerfTimer mEvalTimer;
         PerfTimer mSplitTimer;
+        PerfTimer mPlaneTimer;
+        PerfTimer mSort2Timer;
+        PerfTimer mCollectTimer;
 
 protected:
@@ -710 +709 @@
         /** Evaluates render cost of the bv induced by these objects
         */
-        float EvalRenderCost(const ObjectContainer &objects) const;
+        float EvalRenderCost(const ObjectContainer &objects);// const;
 
         /** Evaluates tree stats in the BSP tree leafs.
@@ -759 +758 @@
         static void AssociateObjectsWithLeaf(BvhLeaf *leaf);
 
-
+        
         /////////////////////////////
         // Helper functions for local cost heuristics
@@ -834 +833 @@
                                                  ViewCellContainer &viewCells,
                                                  const bool setCounter,
-                                                 const bool onlyUnmailedRays) const;
+                                                 const bool onlyUnmailedRays);// const;
 
         /** Collects view cells which see an object.
@@ -846 +845 @@
                                                  const bool useMailBoxing,
                                                  const bool setCounter,
-                                                 const bool onlyUnmailedRays) const;
+                                                 const bool onlyUnmailedRays);// const;
 
         /** Counts the view cells of this object. note: only
                 counts unmailed objects.
         */
-        int CountViewCells(Intersectable *obj) const;
+        int CountViewCells(Intersectable *obj);// const;
 
         /** Counts the view cells seen by this bvh leaf
         */
-        int CountViewCells(const ObjectContainer &objects) const;
+        int CountViewCells(const ObjectContainer &objects);// const;
+
+#if STORE_VIEWCELLS_WITH_BVH
+
+        int AssociateViewCellsWithObject(Intersectable *obj, const bool useMailBoxing) const;
+
+        void AssociateViewCellsWithObjects(const ObjectContainer &objects) const;
+
+        void ReleaseViewCells(const ObjectContainer &objects);
+
+        int CollectViewCellsFromRays(Intersectable *obj, 
+                                                                 ViewCellContainer &viewCells,
+                                                                 const bool useMailBoxing,
+                                                                 const bool setCounter,
+                                                                 const bool onlyUnmailedRays);
+
+        int CountViewCellsFromRays(Intersectable *obj);
+#endif
 
         /** Evaluates increase in pvs size.
         */
-        int EvalPvsEntriesIncr(BvhSubdivisionCandidate &splitCandidate, const float avgRayContri) const;
+        int EvalPvsEntriesIncr(BvhSubdivisionCandidate &splitCandidate, 
+                                                   const float avgRayContri);// const;
 
         /** Rays will be clipped to the bounding box.
@@ -901 +918 @@
         /** Evaluates volume of view cells that see the objects.
         */
-        float EvalViewCellsVolume(const ObjectContainer &objects) const;
+        float EvalViewCellsVolume(const ObjectContainer &objects);// const;
 
         /** Assigns or newly creates initial list of sorted objects.