Text archives Help

---

Author: knolla
Date: Thu Aug  2 15:23:59 2007
New Revision: 1604

Modified:
   trunk/Model/Primitives/CMakeLists.txt
   trunk/Model/Primitives/IsosurfaceOctreeVolume.cc
   trunk/scenes/octisovol.cc
Log:
fixed OctreeVolume which had the MANTA_SSE flag using the crappy useless 
attempt at a SSE traverser (with a lot of warnings). Also fixed octisovol 
build.

Modified: trunk/Model/Primitives/CMakeLists.txt
==============================================================================
--- trunk/Model/Primitives/CMakeLists.txt       (original)
+++ trunk/Model/Primitives/CMakeLists.txt       Thu Aug  2 15:23:59 2007
@@ -22,6 +22,8 @@
      Primitives/OctreeVolume.h
      Primitives/IsosurfaceGridVolume.cc
      Primitives/IsosurfaceGridVolume.h
+     Primitives/IsosurfaceOctreeVolume.cc
+     Primitives/IsosurfaceOctreeVolume.h
      Primitives/Parallelogram.cc
      Primitives/Parallelogram.h
      Primitives/ParticleBVH.cc
@@ -51,11 +53,11 @@
 )
 
 # IsosurfaceOctreeVolume appears broken in icc 9.1
-IF(INTEL_COMPILER_VERSION LESS 9.1)
-  SET(Manta_Primitives_SRCS
-      ${Manta_Primitives_SRCS}
-      Primitives/IsosurfaceOctreeVolume.cc
-      Primitives/IsosurfaceOctreeVolume.h
-     )
-ENDIF(INTEL_COMPILER_VERSION LESS 9.1)
+#IF(INTEL_COMPILER_VERSION LESS 9.1)
+#  SET(Manta_Primitives_SRCS
+#      ${Manta_Primitives_SRCS}
+#      Primitives/IsosurfaceOctreeVolume.cc
+#      Primitives/IsosurfaceOctreeVolume.h
+#     )
+#ENDIF(INTEL_COMPILER_VERSION LESS 9.1)
 

Modified: trunk/Model/Primitives/IsosurfaceOctreeVolume.cc
==============================================================================
--- trunk/Model/Primitives/IsosurfaceOctreeVolume.cc    (original)
+++ trunk/Model/Primitives/IsosurfaceOctreeVolume.cc    Thu Aug  2 15:23:59 
2007
@@ -747,7 +747,11 @@
 /*
        Begin packet intersection code, for SSE packets only.
 */
-#ifdef MANTA_SSE
+
+//AARONBAD - This SSE octree traverser turned out to be very slow. Not 
recommended.
+#if 0
+
+//#ifdef MANTA_SSE
 
 void IsosurfaceOctreeVolume::packet_intersect_sse(RayPacket& rays) const
 {
@@ -824,7 +828,6 @@
     if (first > last)
         return;
         
-    char axis_order[3];
     Vector direction = rays.getDirection(first<<2);
     Vector dir2 = direction * direction;
     if (dir2[0] > dir2[1] && dir2[0] > dir2[2])

Modified: trunk/scenes/octisovol.cc
==============================================================================
--- trunk/scenes/octisovol.cc   (original)
+++ trunk/scenes/octisovol.cc   Thu Aug  2 15:23:59 2007
@@ -51,7 +51,7 @@
   double isovalue = 100;
 
   // Parse args.i
-  for (int i=0;i<args.size();++i) {
+  for (int i=0;i<(int)args.size();++i) {
     if (args[i] == "-file") {
       if (!getStringArg(i, args, filename))
         throw IllegalArgument("octisovol -file <filename>", i, args);

---

• [MANTA] r1604 - in trunk: Model/Primitives scenes, knolla, 08/02/2007

---

Archive powered by MHonArc 2.6.16.