Text archives Help

---

Author: thiago
Date: Thu Jan 31 17:27:59 2008
New Revision: 2027

Modified:
   trunk/StandAlone/CMakeLists.txt
Log:
fixed bug in how arguments were being passed. Now it should actually run the 
scenes.

Modified: trunk/StandAlone/CMakeLists.txt
==============================================================================
--- trunk/StandAlone/CMakeLists.txt     (original)
+++ trunk/StandAlone/CMakeLists.txt     Thu Jan 31 17:27:59 2008
@@ -9,23 +9,17 @@
 
   SET (bunny_sci_model 
/usr/sci/data/Geometry/Stanford_Sculptures/bun_zipper.ply)
   IF( EXISTS "${bunny_sci_model}" )
+       SET(IMAGE_TRAVERSER_ARG -imagetraverser "tiled(-square)")
+       SET(CAMERA_ARG -camera "pinhole( -eye -0.0308032 0.257053 -0.0461074 
-lookat -0.0396542 0.111762 -0.0132095 -up -0.072059 0.224437 0.971821 -hfov 
60 -vfov 60 -normalizeRays -createCornerRays )")
+       MACRO(ADD_BUNNY_TEST acceleration_structure)
+         ADD_TEST(Bunny_${acceleration_structure}_NP2 
${CMAKE_BINARY_DIR}/bin/manta -np 2 -scene 
"${CMAKE_BINARY_DIR}/lib/libscene_triangleSceneViewer${CMAKE_SHARED_LIBRARY_SUFFIX}(-${acceleration_structure}
 -model ${bunny_sci_model} -triangleType Wald_tri)" ${IMAGE_TRAVERSER_ARG} 
${CAMERA_ARG} -nodisplaybench-dart 200 20)
+       ENDMACRO(ADD_BUNNY_TEST)
 
-       SET (AccelerationStructure "-DynBVH")
-       SET (Bunny_command "-scene 
\"${CMAKE_BINARY_DIR}/lib/libscene_triangleSceneViewer${CMAKE_SHARED_LIBRARY_SUFFIX}\(${AccelerationStructure}
 -model ${bunny_sci_model} -triangleType Wald_tri\)\" -imagetraverser \"tiled 
\(-square\)\" -camera \"pinhole\( -eye -0.0308032 0.257053 -0.0461074 -lookat 
-0.0396542 0.111762 -0.0132095 -up -0.072059 0.224437 0.971821 -hfov 60 -vfov 
60 -normalizeRays -createCornerRays \)\"" )
-       ADD_TEST(Bunny_DynBVH_NP2 ${CMAKE_BINARY_DIR}/bin/manta -np 2 
${Bunny_command} -nodisplaybench-dart 200 20)
-
-       SET (AccelerationStructure "-KDTree")
-       SET (Bunny_command "-scene 
\"${CMAKE_BINARY_DIR}/lib/libscene_triangleSceneViewer${CMAKE_SHARED_LIBRARY_SUFFIX}\(${AccelerationStructure}
 -model ${bunny_sci_model} -triangleType Wald_tri\)\" -imagetraverser \"tiled 
\(-square\)\" -camera \"pinhole\( -eye -0.0308032 0.257053 -0.0461074 -lookat 
-0.0396542 0.111762 -0.0132095 -up -0.072059 0.224437 0.971821 -hfov 60 -vfov 
60 -normalizeRays -createCornerRays \)\"" )
-       ADD_TEST(Bunny_KDTree_NP2 ${CMAKE_BINARY_DIR}/bin/manta -np 2 
${Bunny_command} -nodisplaybench-dart 200 20)
-
-       SET (AccelerationStructure "-CGT")
-       SET (Bunny_command "-scene 
\"${CMAKE_BINARY_DIR}/lib/libscene_triangleSceneViewer${CMAKE_SHARED_LIBRARY_SUFFIX}\(${AccelerationStructure}
 -model ${bunny_sci_model} -triangleType Wald_tri\)\" -imagetraverser \"tiled 
\(-square\)\" -camera \"pinhole\( -eye -0.0308032 0.257053 -0.0461074 -lookat 
-0.0396542 0.111762 -0.0132095 -up -0.072059 0.224437 0.971821 -hfov 60 -vfov 
60 -normalizeRays -createCornerRays \)\"" )
-       #CGT can't handle shadows right now, so we must disable it.
-       ADD_TEST(Bunny_CGT_NP2 ${CMAKE_BINARY_DIR}/bin/manta -np 2 
${Bunny_command} -shadows noshadows -nodisplaybench-dart 200 20)
+       ADD_BUNNY_TEST("DynBVH")
+       ADD_BUNNY_TEST("KDTree")
+       ADD_BUNNY_TEST("CGT")
   ENDIF( EXISTS "${bunny_sci_model}" )
-
 ENDIF(BUILD_TESTING)
-
          
 SET (BUILD_OCTVOL_BUILD 0 CACHE BOOL "Include .v3c1 tools")
 IF (BUILD_OCTVOL_BUILD) 

---

• [Manta] r2027 - trunk/StandAlone, thiago, 01/31/2008

---

Archive powered by MHonArc 2.6.16.