Replace all embree 3 occurences

ViennaTools · Mar 1, 2024 · 7be6208 · 7be6208
1 parent 82baea0
commit 7be6208
Show file tree

Hide file tree

Showing 17 changed files with 37 additions and 22 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,11 +22,11 @@ option(VIENNARAY_BUILD_TESTS "Build tests" OFF)
 
 include("cmake/openmp.cmake")
 
-find_package(embree 4 QUIET)
+set(VIENNARAY_EMBREE_VERSION 4)
+find_package(embree ${VIENNARAY_EMBREE_VERSION} QUIET)
 set(VIENNARAY_SYSTEM_EMBREE ${embree_FOUND})
 if (VIENNARAY_SYSTEM_EMBREE)
   message(STATUS "[ViennaRay] Found embree 4 system installation")
-  set(VIENNARAY_EMBREE_VERSION 4)
 else(VIENNARAY_SYSTEM_EMBREE)
   # look for embree 3
   find_package(embree 3 QUIET)
@@ -98,11 +98,18 @@ if (NOT VIENNARAY_SYSTEM_EMBREE)
     OPTIONS "TBB_TEST OFF" "TBB_STRICT OFF")
 endif()
 
-CPMFindPackage(
-  NAME embree
-  VERSION ${VIENNARAY_EMBREE_VERSION}
-  GIT_REPOSITORY "https://github.com/embree/embree"
-  OPTIONS "EMBREE_TUTORIALS OFF")
+if (VIENNARAY_EMBREE_VERSION EQUAL 3)
+  CPMFindPackage(
+    NAME embree
+    VERSION ${VIENNARAY_EMBREE_VERSION})
+else(VIENNARAY_EMBREE_VERSION)
+  CPMFindPackage(
+    NAME embree
+    VERSION ${VIENNARAY_EMBREE_VERSION}
+    GIT_TAG v4.3.1
+    GIT_REPOSITORY "https://github.com/embree/embree"
+    OPTIONS "EMBREE_TUTORIALS OFF")
+endif()
 
 find_package(OpenMP REQUIRED)
 target_link_libraries(${PROJECT_NAME} INTERFACE OpenMP::OpenMP_CXX embree)

diff --git a/README.md b/README.md
@@ -48,6 +48,7 @@ git clone https://github.com/ViennaTools/ViennaRay.git
 cd ViennaRay
 
 cmake -B build -DCMAKE_INSTALL_PREFIX=/path/to/your/custom/install/
+cmake --build build
 cmake --install build
 ```
 

diff --git a/include/viennaray/rayGeometry.hpp b/include/viennaray/rayGeometry.hpp
@@ -1,7 +1,6 @@
 #ifndef RAY_GEOMETRY_HPP
 #define RAY_GEOMETRY_HPP
 
-#include <embree3/rtcore.h>
 #include <rayMetaGeometry.hpp>
 #include <rayUtil.hpp>
 

diff --git a/include/viennaray/rayMetaGeometry.hpp b/include/viennaray/rayMetaGeometry.hpp
@@ -1,7 +1,11 @@
 #ifndef RAY_METAGEOMETRY_HPP
 #define RAY_METAGEOMETRY_HPP
 
+#if VIENNARAY_EMBREE_VERSION < 4
 #include <embree3/rtcore.h>
+#else
+#include <embree4/rtcore.h>
+#endif
 #include <rayUtil.hpp>
 
 template <typename NumericType, int D> class rayMetaGeometry {

diff --git a/include/viennaray/raySource.hpp b/include/viennaray/raySource.hpp
@@ -1,7 +1,11 @@
 #ifndef RAY_SOURCE_HPP
 #define RAY_SOURCE_HPP
 
+#if VIENNARAY_EMBREE_VERSION < 4
 #include <embree3/rtcore.h>
+#else
+#include <embree4/rtcore.h>
+#endif
 #include <rayPreCompileMacros.hpp>
 #include <rayRNG.hpp>
 #include <rayUtil.hpp>

diff --git a/include/viennaray/rayTrace.hpp b/include/viennaray/rayTrace.hpp
@@ -1,7 +1,6 @@
 #ifndef RAY_TRACE_HPP
 #define RAY_TRACE_HPP
 
-#include <embree3/rtcore.h>
 #include <rayBoundary.hpp>
 #include <rayGeometry.hpp>
 #include <rayHitCounter.hpp>

diff --git a/include/viennaray/rayTraceKernel.hpp b/include/viennaray/rayTraceKernel.hpp
@@ -115,7 +115,7 @@ template <typename NumericType, int D> class rayTraceKernel {
       // probabilistic weight
       const NumericType initialRayWeight = 1.;
 
-#ifdef VIENNARAY_EMBREE_VERSION < 4
+#if VIENNARAY_EMBREE_VERSION < 4
       auto rtcContext = RTCIntersectContext{};
       rtcInitIntersectContext(&rtcContext);
 #endif
@@ -152,7 +152,7 @@ template <typename NumericType, int D> class rayTraceKernel {
           // source
 
           // Run the intersection
-#ifdef VIENNARAY_EMBREE_VERSION < 4
+#if VIENNARAY_EMBREE_VERSION < 4
           rtcIntersect1(rtcScene, &rtcContext, &rayHit);
 #else
           rtcIntersect1(rtcScene, &rayHit);

diff --git a/include/viennaray/rayUtil.hpp b/include/viennaray/rayUtil.hpp
@@ -40,8 +40,8 @@ namespace rayInternal {
 constexpr double PI = 3.14159265358979323846;
 
 template <int D>
-constexpr double DiskFactor =
-    0.5 * (D == 3 ? 1.7320508 : 1.41421356237) * (1 + 1e-5);
+constexpr double DiskFactor = 0.5 * (D == 3 ? 1.7320508 : 1.41421356237) *
+                              (1 + 1e-5);
 
 /* ------------- Vector operation functions ------------- */
 template <typename NumericType>

diff --git a/tests/boundaryHit/boundaryHit.cpp b/tests/boundaryHit/boundaryHit.cpp
@@ -1,4 +1,3 @@
-#include <embree3/rtcore.h>
 #include <rayBoundary.hpp>
 #include <rayGeometry.hpp>
 #include <rayTestAsserts.hpp>

diff --git a/tests/boundaryHit2D/boundaryHit2D.cpp b/tests/boundaryHit2D/boundaryHit2D.cpp
@@ -1,4 +1,3 @@
-#include <embree3/rtcore.h>
 #include <rayBoundary.hpp>
 #include <rayGeometry.hpp>
 #include <rayTestAsserts.hpp>

diff --git a/tests/buildBoundary/buildBoundary.cpp b/tests/buildBoundary/buildBoundary.cpp
@@ -1,4 +1,3 @@
-#include <embree3/rtcore.h>
 #include <rayTestAsserts.hpp>
 #include <rayTrace.hpp>
 

diff --git a/tests/buildBoundary2D/buildBoundary2D.cpp b/tests/buildBoundary2D/buildBoundary2D.cpp
@@ -1,4 +1,3 @@
-#include <embree3/rtcore.h>
 #include <rayTestAsserts.hpp>
 #include <rayTrace.hpp>
 

diff --git a/tests/createGeometry/createGeometry.cpp b/tests/createGeometry/createGeometry.cpp
@@ -1,4 +1,3 @@
-#include <embree3/rtcore.h>
 #include <rayGeometry.hpp>
 #include <rayTestAsserts.hpp>
 

diff --git a/tests/createRay/createRay.cpp b/tests/createRay/createRay.cpp
@@ -1,4 +1,3 @@
-#include <embree3/rtcore.h>
 #include <rayGeometry.hpp>
 #include <rayRNG.hpp>
 #include <raySourceGrid.hpp>

diff --git a/tests/intersectionTest/intersectionTest.cpp b/tests/intersectionTest/intersectionTest.cpp
@@ -1,4 +1,3 @@
-#include <embree3/rtcore.h>
 #include <rayBoundary.hpp>
 #include <rayGeometry.hpp>
 #include <rayTestAsserts.hpp>
@@ -51,8 +50,10 @@ int main() {
   auto geometryID = rtcAttachGeometry(rtcscene, rtcgeometry);
   rtcJoinCommitScene(rtcscene);
 
+#if VIENNARAY_EMBREE_VERSION < 4
   auto rtccontext = RTCIntersectContext{};
   rtcInitIntersectContext(&rtccontext);
+#endif
   RAYTEST_ASSERT(rtcGetDeviceError(rtcDevice) == RTC_ERROR_NONE)
 
   {
@@ -79,7 +80,11 @@ int main() {
     rayhit.hit.instID[0] = RTC_INVALID_GEOMETRY_ID;
     rayhit.hit.geomID = RTC_INVALID_GEOMETRY_ID;
 
+#if VIENNARAY_EMBREE_VERSION < 4
     rtcIntersect1(rtcscene, &rtccontext, &rayhit);
+#else
+    rtcIntersect1(rtcscene, &rayhit);
+#endif
 
     RAYTEST_ASSERT(rayhit.hit.geomID == geometryID)
     RAYTEST_ASSERT(rayhit.hit.primID == 840)
@@ -110,7 +115,11 @@ int main() {
     rayhit.hit.instID[0] = RTC_INVALID_GEOMETRY_ID;
     rayhit.hit.geomID = RTC_INVALID_GEOMETRY_ID;
 
+#if VIENNARAY_EMBREE_VERSION < 4
     rtcIntersect1(rtcscene, &rtccontext, &rayhit);
+#else
+    rtcIntersect1(rtcscene, &rayhit);
+#endif
 
     RAYTEST_ASSERT(rayhit.hit.geomID == boundaryID)
     RAYTEST_ASSERT(rayhit.hit.primID == 7)

diff --git a/tests/pointNeighborhood/pointNeighborhood.cpp b/tests/pointNeighborhood/pointNeighborhood.cpp
@@ -1,4 +1,3 @@
-#include <embree3/rtcore.h>
 #include <rayGeometry.hpp>
 #include <rayTestAsserts.hpp>
 #include <rayUtil.hpp>

diff --git a/tests/pointNeighborhood2D/pointNeighborhood2D.cpp b/tests/pointNeighborhood2D/pointNeighborhood2D.cpp
@@ -1,4 +1,3 @@
-#include <embree3/rtcore.h>
 #include <rayGeometry.hpp>
 #include <rayTestAsserts.hpp>