star-4v_s

commit 7ef01bce5f504e2232c3630b6688849755e9015b
parent ff0cfcc54b7e81adf3b410c69ad638898bcf046c
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Tue, 22 Jun 2021 14:28:42 +0200

Handle updates introduced by Star-3D 0.8

Diffstat:
M
cmake/CMakeLists.txt
 | 
2
+-
M
src/s4vs_realization.c
 | 
3
++-
M
src/s4vs_realization.h
 | 
1
+

3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -36,7 +36,7 @@ set(S4VS_SOURCE_DIR ${PROJECT_SOURCE_DIR}/../src/)
 ################################################################################
 find_package(RCMake 0.3 REQUIRED)
 find_package(RSys 0.6 REQUIRED)
-find_package(Star3D 0.4.1 REQUIRED)
+find_package(Star3D 0.8 REQUIRED)
 find_package(Star3DAW 0.1.3 REQUIRED)
 find_package(StarSP 0.7 REQUIRED)
 find_package(StarMC 0.4 REQUIRED)
diff --git a/src/s4vs_realization.c b/src/s4vs_realization.c
@@ -42,13 +42,14 @@ s4vs_discard_self_hit
   (const struct s3d_hit* hit,
    const float ray_org[3],
    const float ray_dir[3],
+   const float ray_range[2],
    void* ray_data,
    void* filter_data)
 {
   const struct s3d_primitive* prim_from = ray_data;
 
   /* Avoid unused variable warn */
-  (void)ray_org, (void)ray_dir, (void)filter_data;
+  (void)ray_org, (void)ray_dir, (void)ray_range, (void)filter_data;
   return prim_from ? S3D_PRIMITIVE_EQ(prim_from, &hit->prim) : 0;
 }
 
diff --git a/src/s4vs_realization.h b/src/s4vs_realization.h
@@ -46,6 +46,7 @@ s4vs_discard_self_hit
   (const struct s3d_hit* hit,
    const float ray_org[3],
    const float ray_dir[3],
+   const float ray_range[2],
    void* ray_data,
    void* filter_data);