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

Timestamp:

08/18/06 19:28:12 (18 years ago)

Author:

mattausch

Message:

added intel ray tracing

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp (modified) (7 diffs)

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

@@ -14 +14 @@
 #include "SamplingStrategy.h"
 #include "VspOspTree.h"
-
+#include "ObjParser.h"
+#include "ArchModeler2MLRT.hxx"
 
 
@@ -93 +94 @@
         scene->mRoot->UpdateBox();
         }
-        
-        // plane separating view space regions
+                
         if (1)
         {
+                // plane separating view space regions
                 const Vector3 scale(1.0f, 0.0, 0);
 
@@ -133 +134 @@
         Environment::GetSingleton()->GetBoolValue("Preprocessor.detectEmptyViewSpace", mDetectEmptyViewSpace);
         Environment::GetSingleton()->GetBoolValue("Preprocessor.exportVisibility", mExportVisibility );
+        Environment::GetSingleton()->GetIntValue("Preprocessor.rayCastMethod", mRayCastMethod);
 
         char buffer[256];
@@ -220 +222 @@
                   if (strstr(filename.c_str(), ".ply") || strstr(filename.c_str(), ".plb"))
                         parser = new PlyParser;
-                  else
-                        parser = new UnigraphicsParser;
+                  else if (strstr(filename.c_str(), ".obj"))
+                          parser = new ObjParser;
+                  else 
+                          parser = new UnigraphicsParser;
 
                 cout<<filename<<endl;
-                result = parser->ParseFile(filename, &mSceneGraph->mRoot, mLoadPolygonsAsMeshes);
+
+                if (mRayCastMethod == Preprocessor::INTEL_RAYCASTER)
+                        result = parser->ParseFile(filename, &mSceneGraph->mRoot, mLoadPolygonsAsMeshes, &mFaceParents);
+                else
+                        result = parser->ParseFile(filename, &mSceneGraph->mRoot, mLoadPolygonsAsMeshes);
 
                 delete parser;
@@ -234 +242 @@
                         if (strstr(filenames[i].c_str(), ".x3d"))
                                 parser = new X3dParser;
-                        else
+                        else 
                                 parser = new UnigraphicsParser;
-                        
+                                                
                         SceneGraphNode *node;
                         if (parser->ParseFile(filenames[i], &node)) {
@@ -736 +744 @@
                 return NULL;
         }
+
         // should never come here
         return NULL;
@@ -741 +750 @@
 
 
-}
+bool Preprocessor::InitRayCast(const string externKdTree)
+{
+        switch (mRayCastMethod) // use intel ray tracing
+        {
+        case INTEL_RAYCASTER:
+                return mlrtaLoadAS(externKdTree.c_str());
+        case INTERNAL_RAYCASTER:
+        default:
+                break;
+        }
+
+        return true;
+}
+
+}