Text archives Help

---

Author: knolla
Date: Fri Jun 30 12:22:40 2006
New Revision: 1132

Modified:
   trunk/Model/Primitives/IsosurfaceOctreeVolume.cc
   trunk/Model/Primitives/OctreeVolume.cc
   trunk/Model/Primitives/OctreeVolume.h
Log:
Reverted octree traversal to using octree data. The macro TEST_INDATA in 
OctreeVolume.h should remain off.

Modified: trunk/Model/Primitives/IsosurfaceOctreeVolume.cc
==============================================================================
--- trunk/Model/Primitives/IsosurfaceOctreeVolume.cc    (original)
+++ trunk/Model/Primitives/IsosurfaceOctreeVolume.cc    Fri Jun 30 12:22:40 
2006
@@ -11,7 +11,7 @@
 #include <Core/Math/SSEDefs.h>
 #endif
 
-//#define USE_OCTREE_DATA
+#define USE_OCTREE_DATA
 
 #define MIN4(a,b,c,d) min(min(a,b), min(c,d));
 #define MAX4(a,b,c,d) max(max(a,b), max(c,d));
@@ -114,8 +114,8 @@
 
 void IsosurfaceOctreeVolume::intersect(RenderContext const &context, 
RayPacket &packet) const
 {
-#ifdef MANTA_SSE
-//#if 0
+//#ifdef MANTA_SSE
+#if 0
        packet_intersect_sse(packet);
 #else
     for ( int i = packet.rayBegin; i < packet.rayEnd; i++ )

Modified: trunk/Model/Primitives/OctreeVolume.cc
==============================================================================
--- trunk/Model/Primitives/OctreeVolume.cc      (original)
+++ trunk/Model/Primitives/OctreeVolume.cc      Fri Jun 30 12:22:40 2006
@@ -47,7 +47,7 @@
 
 OctreeVolume::OctreeVolume(char* filebase)
 {
-    isoval = 22;
+    isoval = 90;
     read_file(filebase);
 }
 
@@ -67,7 +67,7 @@
     
     current_timestep = 0;
     
-    isoval = 22;
+    isoval = 90;
     
     //read in the octree data from .oth, .otd files
     {

Modified: trunk/Model/Primitives/OctreeVolume.h
==============================================================================
--- trunk/Model/Primitives/OctreeVolume.h       (original)
+++ trunk/Model/Primitives/OctreeVolume.h       Fri Jun 30 12:22:40 2006
@@ -32,8 +32,8 @@
 #define MAX(a,b) (((a)>(b))?(a):(b))
 #endif
 
-//enable this only when testing octree data and original data side by side
-#define TEST_INDATA
+//enable this ONLY when testing octree data and original data side by side
+//#define TEST_INDATA
 
 //enable dynamic multires via the "stop_depth"
 //#define OCTVOL_DYNAMIC_MULTIRES

---

• [MANTA] r1132 - trunk/Model/Primitives, knolla, 06/30/2006

---

Archive powered by MHonArc 2.6.16.