Changeset 2575 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.cpp

Timestamp:

01/03/08 15:53:44 (17 years ago)

Author:

bittner

Message:

big merge: preparation for havran ray caster, check if everything works

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.cpp (modified) (9 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.cpp

@@ -3 +3 @@
 #include <stack>
 
-
+#include "Material.h"
 #include "ViewCell.h"
 #include "Mesh.h"
@@ -14 +14 @@
 #include "Exporter.h"
 #include "BvHierarchy.h"
+
+#ifdef PERFTIMER  
 #include "Timer/PerfTimer.h"
-
+#endif
 
 namespace GtpVisibilityPreprocessor {
@@ -23 +25 @@
 #define TYPE_LEAF -3
 
+#ifdef PERFTIMER  
 static PerfTimer sPvsTimer;
 static PerfTimer sSearchTimer;
-
-
+#endif
 
 static inline bool ilt(Intersectable *obj1, Intersectable *obj2)
@@ -45 +47 @@
 
 typedef priority_queue<ViewCell *, vector<ViewCell *>, 
-                                           myless<vector<ViewCell *>::value_type> > TraversalQueue;
-
-int ViewCell::sMailId = 10000;//2147483647;
-int ViewCell::sReservedMailboxes = 1;
+                       myless<vector<ViewCell *>::value_type> > TraversalQueue;
+
+int Intersectable::sMailId = 10000;//2147483647;
+int Intersectable::sReservedMailboxes = 1;
 
 float MergeCandidate::sRenderCostWeight = 0;
@@ -55 +57 @@
 // pvs penalty can be different from pvs size
 inline static float EvalPvsPenalty(const float pvs, 
-                                                                   const float lower, 
-                                                                   const float upper)
+                                   const float lower, 
+                                   const float upper)
 {
         // clamp to minmax values
@@ -2686 +2688 @@
         Intersectable *obj;
 
+#ifdef PERFTIMER  
         sPvsTimer.Entry();
-
+#endif
         int pvsSize;
         stream.read(reinterpret_cast<char *>(&pvsSize), sizeof(int));
@@ -2703 +2706 @@
         }
 
+#ifdef PERFTIMER
         sPvsTimer.Exit();
+#endif  
 
         return leaf;
@@ -2738 +2743 @@
         queue<ViewCell *> tStack;
 
+#ifdef PERFTIMER  
         sPvsTimer.Start();
-
+#endif
+        
         mPvsIds = new int[pvsObjects.size()];
 
@@ -2774 +2781 @@
         }
 
+#ifdef PERFTIMER  
         Debug << "needed " << sPvsTimer.TotalTime() << " secs for pvs loading" << endl;
-
+#endif
+        
         delete mPvsIds;