Merge pull request #8 from Macbull/development

ospExamples.exe working properly

Author: vnarwal95

RenderingToolkit/Tutorial/apps/common/CMakeLists.txt

@@ -7,4 +7,4 @@
 #   return()
 # endif()
 
-add_all_subdirectories_except("arcball_camera")
+add_all_subdirectories_except("")

RenderingToolkit/Tutorial/apps/common/arcball_camera/ArcballCamera.cpp

@@ -6,7 +6,12 @@ include(GenerateExportHeader)
 add_library(ospray_testing STATIC
   ${OSPRAY_RESOURCE}
 
-  ospray_testing.cpp
+  builders/ospray_testing.h
+
+  builders/ospray_testing.inl
+  builders/builder.h
+  builders/Noise.h
+  builders/ospray_testing.cpp
 
   builders/Boxes.cpp
   builders/Interpolation.cpp
@@ -35,25 +40,24 @@ add_library(ospray_testing STATIC
   builders/test_pt_metal_roughness.cpp
   builders/test_pt_metallic_flakes.cpp
   builders/test_pt_obj.cpp
+
 )
 
 generate_export_header(ospray_testing)
 
 target_link_libraries(ospray_testing
 PUBLIC
+  ospray
+PRIVATE
   raw_to_amr
 )
 
 target_include_directories(ospray_testing
-  PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/ospray/ospray_testing>
+PUBLIC  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>/builders
 )
-
 ## Install library/headers ##
 
-# ospray_install_library(ospray_testing apps)
+# ospray_install_library(ospray_testing "")
 
 install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ospray

RenderingToolkit/Tutorial/apps/common/arcball_camera/ArcballCamera.h

@@ -13,7 +13,7 @@
 #include <functional>
 #include <map>
 
-#include "ospray_testing_export.h"
+#include "ospray_testing.h"
 
 namespace ospray {
 namespace testing {

RenderingToolkit/Tutorial/apps/common/arcball_camera/CMakeLists.txt

@@ -6,8 +6,6 @@
 #include "ospray/ospray_cpp.h"
 #include "ospray/ospray_cpp/ext/rkcommon.h"
 
-#include "ospray_testing_export.h"
-
 namespace ospray {
 namespace testing {
 
@@ -16,25 +14,25 @@ using namespace rkcommon::math;
 
 using SceneBuilderHandle = void *;
 
-OSPRAY_TESTING_EXPORT
+// OSPRAY_TESTING_EXPORT
 SceneBuilderHandle newBuilder(const std::string &type);
 
 template <typename T>
 void setParam(SceneBuilderHandle b, const std::string &type, const T &val);
 
-OSPRAY_TESTING_EXPORT
+// OSPRAY_TESTING_EXPORT
 cpp::Group buildGroup(SceneBuilderHandle b);
 
-OSPRAY_TESTING_EXPORT
+// OSPRAY_TESTING_EXPORT
 cpp::World buildWorld(SceneBuilderHandle b);
 
-OSPRAY_TESTING_EXPORT
+// OSPRAY_TESTING_EXPORT
 void commit(SceneBuilderHandle b);
 
-OSPRAY_TESTING_EXPORT
+// OSPRAY_TESTING_EXPORT
 void release(SceneBuilderHandle b);
 
 } // namespace testing
 } // namespace ospray
 
-#include "detail/ospray_testing.inl"
+#include "ospray_testing.inl"

RenderingToolkit/Tutorial/apps/common/ospray_testing/CMakeLists.txt

@@ -1,7 +1,7 @@
 // Copyright 2009 Intel Corporation
 // SPDX-License-Identifier: Apache-2.0
 
-#include "../builders/Builder.h"
+#include "Builder.h"
 
 namespace ospray {
 namespace testing {

RenderingToolkit/Tutorial/apps/common/ospray_testing/builders/Builder.h

@@ -0,0 +1,113 @@
+// Copyright 2009 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+
+#include "Builder.h"
+#include "ospray_testing.h"
+#include "rkcommon/utility/multidim_index_sequence.h"
+
+using namespace rkcommon::math;
+
+namespace ospray {
+namespace testing {
+
+struct Boxes : public detail::Builder
+{
+  Boxes(bool lights = false) : useLights(lights) {}
+  ~Boxes() override = default;
+
+  void commit() override;
+
+  cpp::Group buildGroup() const override;
+  cpp::World buildWorld() const override;
+
+
+ private:
+  vec3i dimensions{4};
+  bool useLights{false};
+};
+
+// Inlined definitions ////////////////////////////////////////////////////
+
+void Boxes::commit()
+{
+  Builder::commit();
+
+  dimensions = getParam<vec3i>("dimensions", vec3i(4));
+
+  addPlane = false;
+}
+
+cpp::Group Boxes::buildGroup() const
+{
+  cpp::Geometry boxGeometry("box");
+
+  index_sequence_3D numBoxes(dimensions);
+
+  std::vector<box3f> boxes;
+  std::vector<vec4f> color;
+
+  auto dim = reduce_max(dimensions);
+
+  for (auto i : numBoxes) {
+    auto i_f = static_cast<vec3f>(i);
+
+    auto lower = i_f * 5.f;
+    auto upper = lower + (0.75f * 5.f);
+    boxes.emplace_back(lower, upper);
+
+    auto box_color = (0.8f * i_f / dim) + 0.2f;
+    color.emplace_back(box_color.x, box_color.y, box_color.z, 1.f);
+  }
+
+  boxGeometry.setParam("box", cpp::CopiedData(boxes));
+  boxGeometry.commit();
+
+  cpp::GeometricModel model(boxGeometry);
+
+  model.setParam("color", cpp::CopiedData(color));
+
+  if (rendererType == "pathtracer" || rendererType == "scivis"
+      || rendererType == "ao") {
+    cpp::Material material(rendererType, "obj");
+    if (rendererType == "pathtracer" || rendererType == "scivis") {
+      material.setParam("ks", vec3f(0.3f));
+      material.setParam("ns", 10.f);
+    }
+    material.commit();
+    model.setParam("material", material);
+  }
+
+  model.commit();
+
+  cpp::Group group;
+
+  group.setParam("geometry", cpp::CopiedData(model));
+  group.commit();
+
+  return group;
+}
+
+cpp::World Boxes::buildWorld() const
+{
+  auto world = Builder::buildWorld();
+  if (!useLights)
+    return world;
+  cpp::Light light("distant");
+  light.setParam("color", vec3f(0.78f, 0.551f, 0.483f));
+  light.setParam("intensity", 3.14f);
+  light.setParam("direction", vec3f(-0.8f, -0.6f, 0.3f));
+  light.commit();
+  cpp::Light ambient("ambient");
+  ambient.setParam("intensity", 0.35f);
+  ambient.setParam("visible", false);
+  ambient.commit();
+  std::vector<cpp::Light> lights{light, ambient};
+  world.setParam("light", cpp::CopiedData(lights));
+  return world;
+}
+
+OSP_REGISTER_TESTING_BUILDER(Boxes, boxes);
+OSP_REGISTER_TESTING_BUILDER(Boxes(true), boxes_lit);
+
+} // namespace testing
+} // namespace ospray