Text archives Help

---

Author: thiago
Date: Tue Aug 14 21:58:27 2007
New Revision: 1635

Removed:
   trunk/Model/Groups/Build_Approx_cc.cc
   trunk/Model/Groups/Build_Approx_cc.h
   trunk/Model/Groups/Build_OnLogn_cc.cc
   trunk/Model/Groups/Build_OnLogn_cc.h
   trunk/Model/Groups/KDTreeDyn.cc
   trunk/Model/Groups/KDTreeDyn.h
   trunk/Model/Groups/Load_OBJ_KDTreeDyn.cc
   trunk/Model/Groups/Load_OBJ_KDTreeDyn.h
   trunk/Model/Groups/TriangleIW.cc
   trunk/Model/Groups/TriangleIW.h
   trunk/scenes/objviewer.cc
Modified:
   trunk/CMake/ConfigCompilerFlags.cmake
   trunk/Model/Groups/CMakeLists.txt
   trunk/StandAlone/manta.cc
   trunk/scenes/0.cc
   trunk/scenes/CMakeLists.txt
Log:
scenes/objviewer.cc: removed this since it didn't seem to add anything
new that triangleSceneViewer didn't already offer.

-Removed a bunch of kdtree related code that I don't think anyone
 used. Not even sure if it even worked.

scenes/0.cc: noticed this does a sphereflake and I wanted to see how
it would do with an acceleration structure. It now uses a DynBVH
instead of the antiquated GriddedGroup. This can be further improved
to use other AccelerationStructures if someone is so inclined.

CMake/ConfigCompilerFlags.cmake:
-intel compiler in release mode did not have -DNDEBUG set!
-removed the disabling of intel compiler warnings for macs since
there is a bug somewhere (cmake?) that is passing those warnings to
libtool and causing it to die. Would be nice to fix this!


Modified: trunk/CMake/ConfigCompilerFlags.cmake
==============================================================================
--- trunk/CMake/ConfigCompilerFlags.cmake       (original)
+++ trunk/CMake/ConfigCompilerFlags.cmake       Tue Aug 14 21:58:27 2007
@@ -57,10 +57,17 @@
 # Set the default warning levels for each compiler
 
 ####################
-SET(WARNING_FLAGS "-Wall -wd193,383,424,981,1419,1572") #-Wcheck may also 
work
-# Solomon also uses these warning flags -wd1188,1476,1505
+IF (APPLE_X86)
+  #Something is broken on macs using icc where disabling warnings breaks
+  #the compile. Hopefully this can be fixed!!
+  SET(WARNING_FLAGS "-Wall")
+ELSE (APPLE_X86)
+  SET(WARNING_FLAGS "-Wall -wd193,383,424,981,1419,1572") #-Wcheck may also 
work
+  # Solomon also uses these warning flags -wd1188,1476,1505
+ENDIF(APPLE_X86)
+
 SET(DEBUG_FLAGS "-O0 -g -restrict")
-SET(RELEASE_FLAGS "-O3 -g -restrict")
+SET(RELEASE_FLAGS "-O3 -DNDEBUG -g -restrict")
 IF   (USING_ICC)
   APPEND_TO_STRING(C_FLAGS         ${WARNING_FLAGS})
   APPEND_TO_STRING(C_FLAGS_DEBUG   ${DEBUG_FLAGS})

Modified: trunk/Model/Groups/CMakeLists.txt
==============================================================================
--- trunk/Model/Groups/CMakeLists.txt   (original)
+++ trunk/Model/Groups/CMakeLists.txt   Tue Aug 14 21:58:27 2007
@@ -8,12 +8,6 @@
   
 
 SET (Manta_Groups_SRCS
-     Groups/Build_Approx_cc.h
-     Groups/Build_Approx_cc.cc
-     Groups/Build_OnLogn_cc.h
-     Groups/Build_OnLogn_cc.cc
-     Groups/Load_OBJ_KDTreeDyn.h
-     Groups/Load_OBJ_KDTreeDyn.cc
      Groups/BVH.cc
      Groups/BVH.h
      Groups/DynBVH.h
@@ -24,8 +18,6 @@
      Groups/Group.h
      Groups/KDTree.cc
      Groups/KDTree.h
-     Groups/KDTreeDyn.cc
-     Groups/KDTreeDyn.h
      Groups/KDTreeLoader.cc
      Groups/KDTreeLoader.h
      Groups/KDTreeLoaderIW.cc
@@ -38,8 +30,6 @@
      Groups/RealisticBvh.h
      Groups/TransparentKDTree.cc
      Groups/TransparentKDTree.h
-     Groups/TriangleIW.cc
-     Groups/TriangleIW.h
      Groups/VolumeGrid.h
      Groups/ObjGroup.h
      Groups/ObjGroup.cc

Modified: trunk/StandAlone/manta.cc
==============================================================================

Modified: trunk/scenes/0.cc
==============================================================================
--- trunk/scenes/0.cc   (original)
+++ trunk/scenes/0.cc   Tue Aug 14 21:58:27 2007
@@ -9,7 +9,7 @@
 #include <Model/AmbientLights/ArcAmbient.h>
 #include <Model/Backgrounds/LinearBackground.h>
 #include <Model/Groups/Group.h>
-#include <Model/Groups/GriddedGroup.h>
+#include <Model/Groups/DynBVH.h>
 #include <Model/Lights/PointLight.h>
 #include <Model/Materials/Lambertian.h>
 #include <Model/Materials/MetalMaterial.h>
@@ -106,7 +106,6 @@
   Material* matl0=new Lambertian(Color(RGBColor(.4,.4,.4)));
   create_objs(group, Vector(0,0,.5), BV_RADIUS/2.0, Vector(0,0,1),
                 size, objset, matl0);
-  world->add(group);
 
   Vector diag1(1,1,0);
   diag1.normalize();
@@ -138,7 +137,8 @@
 {
   int scenesize=2;
   double light_radius=0.8;
-  Group* group = 0;
+  Group* group = new Group;
+  AccelerationStructure *as = NULL;
 
   Factory factory( context.manta_interface );
 
@@ -150,13 +150,8 @@
     } else if(arg == "-light"){
       if(!getDoubleArg(i, args, light_radius))
         throw IllegalArgument("scene 0 -light", i, args);
-    } else if(arg == "-group"){
-      string s;
-      if(!getStringArg(i, args, s))
-        throw IllegalArgument("scene 0 -group", i, args);
-      group = factory.makeGroup(s);
-      if ( group == 0 )
-        throw IllegalArgument("scene 0 -group", i, args);
+    } else if(arg == "-DynBVH"){
+      as = new DynBVH;
     } else {
       cerr << "Valid options for scene 0:\n";
       cerr << " -size n     - Sets depth of sphereflake\n";
@@ -166,12 +161,19 @@
     }
   }
 
-  if(!group)
-    group = new Group();
   Group* world = new Group();
 
   NOT_FINISHED("scene 0");
   make_obj(world, group, scenesize);
+
+  if(as) {
+    world->add(as);
+    as->rebuild(group);
+  }
+  else 
+    world->add(group);
+
+  
 #if 0
   double ambient_scale=1.0;
   Color bgcolor(RGB(0.1, 0.2, 0.45));

Modified: trunk/scenes/CMakeLists.txt
==============================================================================
--- trunk/scenes/CMakeLists.txt (original)
+++ trunk/scenes/CMakeLists.txt Tue Aug 14 21:58:27 2007
@@ -61,12 +61,6 @@
    TARGET_LINK_LIBRARIES(scene_gridisovol ${MANTA_SCENE_LINK})
 ENDIF(SCENE_GRIDISOVOL)
 
-SET(SCENE_OBJVIEWER 0 CACHE BOOL "Wavefront Obj file viewer.")
-IF(SCENE_OBJVIEWER)
-   ADD_LIBRARY(scene_objviewer objviewer.cc)
-   TARGET_LINK_LIBRARIES(scene_objviewer ${MANTA_SCENE_LINK})
-ENDIF(SCENE_OBJVIEWER)
-
 SET(SCENE_IWVIEWER 0 CACHE BOOL "IW file viewer.")
 IF(SCENE_IWVIEWER)
    ADD_LIBRARY(scene_iwviewer iwviewer.cc)

---

• [Manta] r1635 - in trunk: CMake Model/Groups StandAlone scenes, thiago, 08/14/2007

---

Archive powered by MHonArc 2.6.16.