Changeset 2063 for GTP/trunk/Lib/Vis/Preprocessing/src

Timestamp:

01/28/07 23:41:59 (18 years ago)

Author:

mattausch

Message:

warning: the mutation contains bugs now as internal
ray casting support is not implemented

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Mutation.cpp (modified) (5 diffs)
• Preprocessor.vcproj (modified) (1 diff)
• RayCaster.h (modified) (1 diff)
• ViewCellsParser.cpp (modified) (1 diff)
• VssPreprocessor.cpp (modified) (1 diff)
• VssPreprocessor.h (modified) (1 diff)

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

@@ -336 +336 @@
                                                                                                   )
 {
+#ifdef GTP_INTERNAL
+
   // first reconstruct the termination point
   Vector3 oldDir = Normalize(oldRay.GetDir());
@@ -368 +370 @@
   float left = 0.0f;
   float right = 1.0f;
+
   // cast rays to find silhouette ray
   for (int j=0; j < mSilhouetteSearchSteps; j++) {
@@ -442 +445 @@
   }
 
-
+#else
+cerr << "warning: reverse mutation not supported!" << endl;
+#endif
   
   return true;
@@ -460 +465 @@
                                                                                                                                 )
 {
+#ifdef GTP_INTERNAL
+
   const int packetSize = 4;
   static int hit_triangles[packetSize];
@@ -516 +523 @@
   //  cout<<i<<endl;
   return shifts[i];
+
+#else
+        cerr << "warning: shiluette mutation not supported" << endl;
+        return Vector3(0, 0, 0);
+#endif
+  
 }
 

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

@@ -320 +320 @@
                                 OptimizeForProcessor="3"
                                 OptimizeForWindowsApplication="TRUE"
-                                AdditionalIncludeDirectories="..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost;..\MultiLevelRayTracing;"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include";"$(QTDIR)\include\QtOpenGl";"$(CG_INC_PATH)""
+                                AdditionalIncludeDirectories="..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost;..\MultiLevelRayTracing;"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include";"$(QTDIR)\include\QtOpenGl";"$(CG_INC_PATH)";Timer"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_QT;ATI"
                                 ExceptionHandling="TRUE"

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

@@ -54 +54 @@
                                                 const bool pruneInvalidRays = true) = 0;
 
-        virtual void CastRays16(
-                                                         SimpleRayContainer &rays,
-                                                         VssRayContainer &vssRays,
-                                                         const AxisAlignedBox3 &sbox,
-                                                         const bool castDoubleRay,
-                                                         const bool pruneInvalidRays = true) = 0;
+        virtual void CastRays16(SimpleRayContainer &rays,
+                                                        VssRayContainer &vssRays,
+                                                        const AxisAlignedBox3 &sbox,
+                                                        const bool castDoubleRay,
+                                                        const bool pruneInvalidRays = true) = 0;
 
-
-  virtual void
-  SortRays(SimpleRayContainer &rays);
+        /*virtual void CastRaysEye4(SimpleRayContainer &rays,
+                                                          VssRayContainer &vssRays,
+                                                          const AxisAlignedBox3 &sbox,
+                                                          const bool castDoubleRay,
+                                                          const bool pruneInvalidRays = true) = 0;
+*/
+        virtual void
+        SortRays(SimpleRayContainer &rays);
 
 

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

@@ -64 +64 @@
 static SAXParser::ValSchemes    valScheme       = SAXParser::Val_Auto;
 
-#define PVS_HACK 1
+#define PVS_HACK 0
 
 inline static bool ilt(Intersectable *obj1, Intersectable *obj2)

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

@@ -624 +624 @@
 }
 
-}
+
+void VssPreprocessor::DeterminePvsObjects(VssRayContainer &rays)
+{
+        mViewCellsManager->DeterminePvsObjects(rays, true);
+}
+
+
+}

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

@@ -89 +89 @@
   void TestBeamCasting(VssTree *tre, ViewCellsManager *vm, const ObjectContainer &objects);
 
+  void DeterminePvsObjects(VssRayContainer &rays);
+
   bool mTestBeamSampling;