Changeset 2726 for GTP/trunk/Lib/Vis/Preprocessing/src/GvsPreprocessor.h

Timestamp:

05/30/08 02:37:07 (16 years ago)

Author:

mattausch

Message:

worked on gvs efficiency

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/GvsPreprocessor.h (modified) (6 diffs)

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

@@ -39 +39 @@
                 mGvsRuns = 0;
 
+                mRandomSamples = 0;
+                mGvsSamples = 0;
                 mTotalPvs = 0;
                 mViewCells = 0;
@@ -54 +56 @@
 public:
 
+        int mRandomSamples;
+        int mGvsSamples;
         int mPass;
         int mTotalSamples;
@@ -141 +145 @@
                 b) if triangle was found reverse sampling
         */
-        bool HandleRay(VssRay *ray);
+        inline bool HandleRay(VssRay *ray);
 
         /** The adaptive border sampling step. It aims to find neighbouring 
@@ -157 +161 @@
                                                         const VssRay &oldRay);
 
+        bool ReverseSampling2(const VssRay &currentRay,
+                          const Triangle3 &hitTriangle,
+                                                  const VssRay &oldRay,
+                                                  VssRayContainer &reverseRays);
+
         /** Returns true if we sampled a closer triangle than with the previous ray. 
                 Does reverse sampling if gap found.
@@ -167 +176 @@
                 with respect to the previous ray.
         */
-        void EnqueueRays(VssRayContainer &samples, VssRayContainer &invalidSamples);
+        void EnqueueRays(VssRayContainer &samples);
 
         /** Hepler function for adaptive border sampling. It finds 
@@ -239 +248 @@
         */
         void UpdateStatsForVisualization(KdIntersectable *kdInt);
+        
+        void CompileViewCellsFromPointList();
+
+        void ComputeStats();
+
+        int ConvertObjectPvs();
         /** Keep count of new objects for stats. Returns number of new pvs entries.
         */
-        int CountObject(Intersectable *triObj);
-
-        void CompileViewCellsFromPointList();
-
-        bool AddTriangleObject(Intersectable *triObj);
-
-        void ComputeStats();
-
-        int ConvertObjectPvs();
+        inline int CountObject(Intersectable *triObj);
+
+        inline bool AddTriangleObject(Intersectable *triObj);
+
+        inline void AddKdNodeToPvs(const Vector3 &termination);