Changeset 1867 for GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp

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/Preprocessor.cpp (modified) (4 diffs)

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

@@ -30 +30 @@
 namespace GtpVisibilityPreprocessor {
 
-const static bool ADDITIONAL_GEOMETRY_HACK = false;
-
-
+  const static bool ADDITIONAL_GEOMETRY_HACK = false;
+
+  Preprocessor *preprocessor = NULL;
+  
 // HACK: Artificially modify scene to watch rendercost changes
 static void AddGeometry(SceneGraph *scene)
@@ -443 +444 @@
         Environment::GetSingleton()->GetIntValue("Preprocessor.rayCastMethod", rayCastMethod);
         vector<FaceParentInfo> *fi = 
-                ((rayCastMethod == RayCaster::INTEL_RAYCASTER) && mLoadMeshes) ?
-                &mFaceParents : NULL;
-
+          ((rayCastMethod == RayCaster::INTEL_RAYCASTER) && mLoadMeshes) ?
+          &mFaceParents : NULL;
+        
         if (files == 1) 
-        {
+          {
                 if (strstr(filename.c_str(), ".x3d"))
-                {
+                  {
                         parser = new X3dParser;
                         
@@ -984 +985 @@
 int
 Preprocessor::GenerateRays(const int number,
-                                                                                                         const SamplingStrategy &strategy,
-                                                                                                         SimpleRayContainer &rays)
-{
-        return strategy.GenerateSamples(number, rays);
+                                                   SamplingStrategy &strategy,
+                                                   SimpleRayContainer &rays)
+{
+  return strategy.GenerateSamples(number, rays);
 }
 
@@ -1096 +1097 @@
         if (rayCastMethod == 0)
         {
+                cout << "ray cast method: internal" << endl;
                 mRayCaster = new InternalRayCaster(*this, mKdTree);
-                cout << "ray cast method: internal" << endl;
         }
         else
         {
 #ifdef GTP_INTERNAL
-                mRayCaster = new IntelRayCaster(*this, externKdTree);
-                cout << "ray cast method: intel" << endl;
+          cout << "ray cast method: intel" << endl;
+          mRayCaster = new IntelRayCaster(*this, externKdTree);
 #endif
         }
-
+        
         return true;
 }