Changeset 2629 for GTP/trunk/Lib/Vis/Preprocessing/src/HavranRayCaster.cpp

Timestamp:

01/23/08 00:21:50 (16 years ago)

Author:

bittner

Message:

commit after merge with vlastimil

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/HavranRayCaster.cpp (modified) (3 diffs)

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

@@ -26 +26 @@
 #define DEBUG_RAYCAST 0
 
-// This macro should be undefined when testing ray tracing
-// by casting rays from file or using camera
-#define _PROCESS_RAY
-
 namespace GtpVisibilityPreprocessor {
 
-
-
-#ifdef USE_HAVRAN_RAYCASTER 
 #ifdef _USE_HAVRAN_SSE
-  
 // static rays
-RayPacket2x2
+GALIGN16 RayPacket2x2
 HavranRayCaster::raypack;
 #endif // _USE_HAVRAN_SSE
-#endif // USE_HAVRAN_RAYCASTER
+
   
 HavranRayCaster::HavranRayCaster(const Preprocessor &preprocessor):
@@ -70 +62 @@
 
   if (!ImportBinTree(kdfile, objlist)) {
-        cout << "\nKd-tree for Havran ray caster imported."<<endl<<flush;
-  } else {
-        CTimer timer;
-        cout << "\nBuilding up kd-tree for Havran ray caster ..."<<endl<<flush;
-        
-        timer.Start();
-        mKtbtree->BuildUp(objlist);
-        timer.Stop();
-        cout << "\nBuilding up kd-tree is finished, user time = "
-                 << timer.UserTime() << " real time = " << timer.RealTime() <<
-          endl <<flush;
-        ExportBinTree(kdfile);
+        cout << "\nKd-tree for Havran ray caster imported."<<endl<<flush;
+  }
+  else {
+    CTimer timer;
+    cout << "\nBuilding up kd-tree for Havran ray caster ..."<<endl<<flush;
+    
+    timer.Start();
+    mKtbtree->BuildUp(objlist);
+    timer.Stop();
+    cout << "\nBuilding up kd-tree is finished, user time = "
+         << timer.UserTime() << " real time = " << timer.RealTime()
+         << endl;
+    ExportBinTree(kdfile);
   }
 #endif
@@ -513 +506 @@
 #endif // USE_HAVRAN_RAYCASTER 
 }
+
+
+
+  
 #endif // _USE_HAVRAN_SSE
 
 
-    /*
-  virtual void HavranRayCaster::AddDynamicObjecs(const ObjectContainer &objects, const Matrix4x4 &m);
-  virtual void UpdateDynamicObjects(const Matrix4x4 &m);
-  virtual void DeleteDynamicObjects);
-*/
 } // the namespace