stardis

commit 2ca3be4513fdd04c500236760d9f609eb33ee9ef
parent 9a5052f9134043e62f9711c1172211150f2d029e
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Wed, 23 Jun 2021 09:52:29 +0200

Update Star-3D to version 0.8

Fix API break on filter function.

Diffstat:
M
cmake/CMakeLists.txt
 | 
2
+-
M
src/stardis-compute.c
 | 
7
+++----

2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -71,7 +71,7 @@ configure_file(${SDIS_SOURCE_DIR}/stardis-version.h.in
 find_package(RCMake 0.4 REQUIRED)
 find_package(RSys 0.11 REQUIRED)
 find_package(StarGeom3D 0.1 REQUIRED)
-find_package(Star3D 0.7.3 REQUIRED)
+find_package(Star3D 0.8 REQUIRED)
 find_package(StarEnc3D 0.4.2 REQUIRED)
 find_package(Stardis 0.11 REQUIRED)
 find_package(StarSTL 0.3 REQUIRED)
diff --git a/src/stardis-compute.c b/src/stardis-compute.c
@@ -41,8 +41,6 @@
 /*******************************************************************************
  * Local Functions
  ******************************************************************************/
-
-
 struct filter_ctx {
   const struct stardis* stardis;
   unsigned prim;
@@ -85,7 +83,8 @@ static int
 hit_filter
   (const struct s3d_hit* hit,
    const float ray_org[3],
-   const float* invalid_, /* In closest_point queries ray_dir is not informed */
+   const float ray_dir[3],
+   const float ray_range[2],
    void* ray_data,
    void* filter_data)
 {
@@ -97,7 +96,7 @@ hit_filter
   unsigned descr[SG3D_PROP_TYPES_COUNT__];
   const struct stardis* stardis;
 
-  (void)ray_org; (void)invalid_; (void)filter_data;
+  (void)ray_org; (void)ray_dir; (void)ray_range; (void)filter_data;
   ASSERT(hit && filter_ctx);
   ASSERT(hit->uv[0] == CLAMP(hit->uv[0], 0, 1));
   ASSERT(hit->uv[1] == CLAMP(hit->uv[1], 0, 1));