Set up WITH_OSPRAY build flag

Author: dcwhite

Superbuild/Superbuild.cmake

@@ -74,6 +74,11 @@ OPTION(BUILD_WITH_PYTHON "Build with python support." ON)
 # Configure tetgen
 OPTION(WITH_TETGEN "Build Tetgen." OFF)
 
+
+###########################################
+# Configure ospray -- TODO: convert into real external
+OPTION(WITH_OSPRAY "Build with Ospray support." OFF)
+
 ###########################################
 # Configure data
 OPTION(BUILD_WITH_SCIRUN_DATA "Svn checkout data" OFF)

src/CMakeLists.txt

@@ -364,6 +364,13 @@ IF(WITH_TETGEN)
   ADD_DEFINITIONS(-DWITH_TETGEN)
 ENDIF()
 
+########################################################################
+# Configure ospray module build
+
+IF(WITH_OSPRAY)
+  ADD_DEFINITIONS(-DWITH_OSPRAY)
+ENDIF()
+
 ########################################################################
 # Copy Spire-SCIRun specific assets and shaders
 
@@ -717,7 +724,7 @@ SET_PROPERTY(TARGET Testing_Utils PROPERTY FOLDER "Testing Support")
 SET_PROPERTY(TARGET Testing_ModuleTestBase PROPERTY FOLDER "Testing Support")
 
 IF(BUILD_TESTING)
- 
+
   #SET_PROPERTY(TARGET SCIRunTestData_external   PROPERTY FOLDER "Testing Support")
 
   SET_PROPERTY(TARGET Algorithms_Base_Tests   PROPERTY FOLDER "Core/Algorithms/Tests")

src/Modules/Visualization/CMakeLists.txt

@@ -54,10 +54,6 @@ SCIRUN_ADD_LIBRARY(Modules_Visualization
   ${Modules_Visualization_SRCS}
 )
 
-INCLUDE(${CMAKE_SOURCE_DIR}/CMake/Modules/FindOSPRay.cmake)
-
-INCLUDE_DIRECTORIES(${OSPRAY_INCLUDE_DIRS})
-
 TARGET_LINK_LIBRARIES(Modules_Visualization
   Dataflow_Network
   Core_Datatypes
@@ -67,9 +63,14 @@ TARGET_LINK_LIBRARIES(Modules_Visualization
   Graphics_Glyphs
   Graphics_Datatypes
   ${SCI_FREETYPE_LIBRARY}
-  ${OSPRAY_LIBRARIES}
 )
 
+IF(WITH_OSPRAY)
+  INCLUDE(${CMAKE_SOURCE_DIR}/CMake/Modules/FindOSPRay.cmake)
+  INCLUDE_DIRECTORIES(${OSPRAY_INCLUDE_DIRS})
+  TARGET_LINK_LIBRARIES(Modules_Visualization ${OSPRAY_LIBRARIES})
+ENDIF()
+
 IF(BUILD_SHARED_LIBS)
   ADD_DEFINITIONS(-DBUILD_Modules_Visualization)
 ENDIF(BUILD_SHARED_LIBS)

src/Modules/Visualization/InterfaceWithOspray.cc

@@ -38,7 +38,9 @@ DEALINGS IN THE SOFTWARE.
 
 #include <boost/date_time/posix_time/posix_time.hpp>
 
+#ifdef WITH_OSPRAY
 #include <ospray/ospray.h>
+#endif
 
 using namespace SCIRun;
 using namespace Dataflow::Networks;
@@ -96,6 +98,7 @@ void InterfaceWithOspray::setStateDefaults()
 
 namespace detail
 {
+  #ifdef WITH_OSPRAY
   class OsprayImpl
   {
   public:
@@ -114,7 +117,7 @@ namespace detail
 
       // image size
       osp::vec2i imgSize;
-      imgSize.x = state->getValue(Parameters::ImageWidth).toInt(); 
+      imgSize.x = state->getValue(Parameters::ImageWidth).toInt();
       imgSize.y = state->getValue(Parameters::ImageHeight).toInt();
 
       auto toFloat = [state](const Name& name) { return static_cast<float>(state->getValue(name).toDouble()); };
@@ -203,7 +206,7 @@ namespace detail
       // complete setup of renderer
       ospSet1i(renderer, "aoSamples", 1);
       ospSet3f(renderer, "bgColor", toFloat(Parameters::BackgroundColorR),
-        toFloat(Parameters::BackgroundColorG), 
+        toFloat(Parameters::BackgroundColorG),
         toFloat(Parameters::BackgroundColorB));
       ospSetObject(renderer, "model", world);
       ospSetObject(renderer, "camera", camera);
@@ -233,10 +236,10 @@ namespace detail
       FILE *file = fopen(fileName, "wb");
       fprintf(file, "P6\n%i %i\n255\n", size.x, size.y);
       std::vector<unsigned char> out(3 * size.x);
-      for (int y = 0; y < size.y; y++) 
+      for (int y = 0; y < size.y; y++)
       {
         const unsigned char *in = (const unsigned char *)&pixel[(size.y - 1 - y)*size.x];
-        for (int x = 0; x < size.x; x++) 
+        for (int x = 0; x < size.x; x++)
         {
           out[3 * x + 0] = in[4 * x + 0];
           out[3 * x + 1] = in[4 * x + 1];
@@ -249,6 +252,9 @@ namespace detail
       std::cout << "wrote file " << fileName << std::endl;
     }
   };
+  #else
+  class OsprayImpl {};
+  #endif
 }
 
 InterfaceWithOspray::InterfaceWithOspray() : GeometryGeneratingModule(staticInfo_), impl_(new detail::OsprayImpl)
@@ -260,6 +266,7 @@ InterfaceWithOspray::InterfaceWithOspray() : GeometryGeneratingModule(staticInfo
 
 void InterfaceWithOspray::execute()
 {
+  #ifdef WITH_OSPRAY
   auto field = getRequiredInput(Field);
   auto colorMap = getOptionalInput(ColorMapObject);
 
@@ -275,8 +282,11 @@ void InterfaceWithOspray::execute()
     remark("Saving output to " + filename);
     impl_->writeImage(field, filename, get_state(), colorMap);
     get_state()->setTransientValue(Variables::Filename, filename);
-    
+
     //auto geom = builder_->buildGeometryObject(field, colorMap, *this, this);
     //sendOutput(SceneGraph, geom);
   }
+  #else
+  error("Build SCIRun with WITH_OSPRAY set to true to enable this module.");
+  #endif
 }

src/Modules/Visualization/Tests/CMakeLists.txt

@@ -34,9 +34,14 @@ SET(Modules_Visualization_Tests_SRCS
   ShowFieldTests.cc
   ShowMeshTests.cc
   ShowStringTests.cc
-  OsprayFieldRenderTests.cc
 )
 
+IF(WITH_OSPRAY)
+  SET(Modules_Visualization_Tests_SRCS ${Modules_Visualization_Tests_SRCS}
+    OsprayFieldRenderTests.cc
+  )
+ENDIF()
+
 SCIRUN_ADD_UNIT_TEST(Modules_Visualization_Tests
   ${Modules_Visualization_Tests_SRCS}
 )
@@ -53,5 +58,8 @@ TARGET_LINK_LIBRARIES(Modules_Visualization_Tests
   gtest_main
   gtest
   gmock
-  ${OSPRAY_LIBRARIES}
 )
+
+IF(WITH_OSPRAY)
+  TARGET_LINK_LIBRARIES(Modules_Visualization_Tests ${OSPRAY_LIBRARIES})
+ENDIF()