star-2d

commit 0121707f40e64b2ca509ed9184147e1929f212b2
parent 91d441423f681bd30d98924c15a63f82b75aaa9c
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Wed, 18 Apr 2018 16:14:34 +0200

Merge branch 'release_0.1.1'

Diffstat:
M
README.md
 | 
7
+++++++
M
cmake/CMakeLists.txt
 | 
2
+-
M
src/s2d.h
 | 
2
+-
M
src/s2d_primitive.c
 | 
2
+-
M
src/s2d_scene_view.c
 | 
2
+-

5 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
@@ -92,6 +92,13 @@ instance, on a GNU/Linux system:
 with `<STAR2D_INSTALL_DIR>` the install directory of Star-2D and
 `<MY_PROJECT_DIR>` the location of the `CMakeLists.txt` file.
 
+## Release notes
+
+### Version 0.1.1
+
+- Fix the `s2d_primitive_get_function`. The function failed when the submitted
+  parametric coordinate was equal to 1
+
 ### Version 0.1
 
 - Implement the `s2d_scene_view` API; it replaces the
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -53,7 +53,7 @@ rcmake_append_runtime_dirs(_runtime_dirs RSys Embree)
 ################################################################################
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 1)
-set(VERSION_PATCH 0)
+set(VERSION_PATCH 1)
 set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 
 set(S2D_FILES_SRC
diff --git a/src/s2d.h b/src/s2d.h
@@ -278,7 +278,7 @@ s2d_scene_view_trace_ray
 S2D_API res_T
 s2d_scene_view_trace_ray_3d
   (struct s2d_scene_view* scnview,
-   const float origin[3],
+   const float origin[2],
    const float dir[3],
    const float range[2],
    void* ray_data,
diff --git a/src/s2d_primitive.c b/src/s2d_primitive.c
@@ -61,7 +61,7 @@ s2d_primitive_get_attrib
   }
 
   /* Unnormalized barycentric coordinates */
-  if(s < 0.f || s >= 1.f) {
+  if(s < 0.f || s > 1.f) {
     res = RES_BAD_ARG;
     goto error;
   }
diff --git a/src/s2d_scene_view.c b/src/s2d_scene_view.c
@@ -813,7 +813,7 @@ s2d_scene_view_trace_ray
 res_T
 s2d_scene_view_trace_ray_3d
   (struct s2d_scene_view* scnview,
-   const float org[3],
+   const float org[2],
    const float dir[3],
    const float range[2],
    void* ray_data,