commit b4e2464b1d662278b7ac939699986c4626375d79 parent 14e645c99da364a68e01c89a1dcf45318db4a432 Author: Vincent Forest <vincent.forest@meso-star.com> Date: Mon, 10 Feb 2020 16:19:31 +0100 Merge branch 'release_0.7.1' into develop Diffstat:
45 files changed, 52 insertions(+), 45 deletions(-)
diff --git a/README.md b/README.md @@ -119,6 +119,13 @@ with `<STAR3D_INSTALL_DIR>` the install directory of Star-3D and ## Release notes +### Version 0.7.1 + +- Fix an invalid memory read at the setup of the scene view when the + `S3D_TRACE` flag was set. The Embree backend assumes that the last vertex + position is at least 16 bytes length while its size was only of 12 bytes + (i.e. 3 single-precision floating-point values). + ### Version 0.7 - Add the `s3d_scene_view_closest_point` function. This function retrieves the @@ -200,7 +207,7 @@ with `<STAR3D_INSTALL_DIR>` the install directory of Star-3D and ## License -Copyright (C) 2015-2019 |Méso|Star> (<contact@meso-star.com>). Star-3D is +Copyright (C) 2015-2020 |Méso|Star> (<contact@meso-star.com>). Star-3D is released under the CeCILLv2.1 license. You are welcome to redistribute it under certain conditions; refer to the COPYING files for details. diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt @@ -58,7 +58,7 @@ endif() ################################################################################ set(VERSION_MAJOR 0) set(VERSION_MINOR 7) -set(VERSION_PATCH 0) +set(VERSION_PATCH 1) set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) set(S3D_FILES_SRC diff --git a/src/s3d.h b/src/s3d.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/s3d_backend.h b/src/s3d_backend.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/s3d_buffer.h b/src/s3d_buffer.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/s3d_c.h b/src/s3d_c.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/s3d_device.c b/src/s3d_device.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/s3d_device_c.h b/src/s3d_device_c.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/s3d_geometry.c b/src/s3d_geometry.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/s3d_geometry.h b/src/s3d_geometry.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/s3d_instance.c b/src/s3d_instance.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/s3d_instance.h b/src/s3d_instance.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/s3d_mesh.c b/src/s3d_mesh.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/s3d_mesh.h b/src/s3d_mesh.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/s3d_primitive.c b/src/s3d_primitive.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/s3d_scene.c b/src/s3d_scene.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/s3d_scene_c.h b/src/s3d_scene_c.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/s3d_scene_view.c b/src/s3d_scene_view.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/s3d_scene_view_c.h b/src/s3d_scene_view_c.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/s3d_scene_view_closest_point.c b/src/s3d_scene_view_closest_point.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/s3d_scene_view_trace_ray.c b/src/s3d_scene_view_trace_ray.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/s3d_shape.c b/src/s3d_shape.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/s3d_shape_c.h b/src/s3d_shape_c.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/s3d_sphere.c b/src/s3d_sphere.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/s3d_sphere.h b/src/s3d_sphere.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/test_s3d_accel_struct_conf.c b/src/test_s3d_accel_struct_conf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/test_s3d_camera.h b/src/test_s3d_camera.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/test_s3d_cbox.h b/src/test_s3d_cbox.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/test_s3d_closest_point.c b/src/test_s3d_closest_point.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/test_s3d_device.c b/src/test_s3d_device.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/test_s3d_primitive.c b/src/test_s3d_primitive.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/test_s3d_sample_sphere.c b/src/test_s3d_sample_sphere.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/test_s3d_sampler.c b/src/test_s3d_sampler.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/test_s3d_scene.c b/src/test_s3d_scene.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/test_s3d_scene_view.c b/src/test_s3d_scene_view.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/test_s3d_scene_view_aabb.c b/src/test_s3d_scene_view_aabb.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/test_s3d_seams.c b/src/test_s3d_seams.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/test_s3d_shape.c b/src/test_s3d_shape.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/test_s3d_sphere.c b/src/test_s3d_sphere.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/test_s3d_sphere_box.c b/src/test_s3d_sphere_box.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/test_s3d_sphere_instance.c b/src/test_s3d_sphere_instance.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/test_s3d_trace_ray.c b/src/test_s3d_trace_ray.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/test_s3d_trace_ray_instance.c b/src/test_s3d_trace_ray_instance.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/test_s3d_trace_ray_sphere.c b/src/test_s3d_trace_ray_sphere.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly diff --git a/src/test_s3d_utils.h b/src/test_s3d_utils.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2019 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2015-2020 |Meso|Star> (contact@meso-star.com) * * This software is a computer program whose purpose is to describe a * virtual 3D environment that can be ray-traced and sampled both robustly