star-sf

Set of surface and volume scattering functions
git clone git://git.meso-star.fr/star-sf.git
Log | Files | Refs | README | LICENSE

commit 62045347e6ecb9a07dcae03418e93512910a4658
parent b9228843127a8812693c55d6d33e374205961a50
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Thu, 14 Oct 2021 10:01:43 +0200

Merge branch 'release_0.7.2'

Diffstat:
MREADME.md | 13+++++++++----
Mcmake/CMakeLists.txt | 4++--
Msrc/test_ssf_beckmann_distribution.c | 2+-
Msrc/test_ssf_blinn_distribution.c | 2+-
Msrc/test_ssf_bsdf.c | 2+-
Msrc/test_ssf_lambertian_reflection.c | 2+-
Msrc/test_ssf_microfacet_distribution.c | 2+-
Msrc/test_ssf_microfacet_reflection.c | 2+-
Msrc/test_ssf_phase.c | 2+-
Msrc/test_ssf_phase_hg.c | 2+-
Msrc/test_ssf_phase_rayleigh.c | 2+-
Msrc/test_ssf_phase_rdgfa.c | 2+-
Msrc/test_ssf_pillbox_distribution.c | 2+-
Msrc/test_ssf_specular_dielectric_dielectric_reflection.c | 2+-
Msrc/test_ssf_specular_reflection.c | 2+-
Msrc/test_ssf_thin_specular_dielectric.c | 2+-
16 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md @@ -27,15 +27,20 @@ project from the `cmake/CMakeLists.txt` file by appending to the ## Release notes +### Version 0.7.2 + +Sets the required version of Star-SampPling to 0.12. This version fixes +compilation errors with gcc 11 but introduce API breaks. + ### Version 0.7.1 -- Fix the evaluation of the RDG-FA phase function: the incident direction was - reversed. +Fix the evaluation of the RDG-FA phase function: the incident direction was +reversed. ### Version 0.7 -- Add a built-in phase function using the - [RDG-FA](https://doi.org/10.1016/j.jqsrt.2013.08.022) model. +Add a built-in phase function using the +[RDG-FA](https://doi.org/10.1016/j.jqsrt.2013.08.022) model. ### Version 0.6 diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt @@ -26,7 +26,7 @@ set(SSF_SOURCE_DIR ${PROJECT_SOURCE_DIR}/../src) ################################################################################ find_package(RCMake 0.4 REQUIRED) find_package(RSys 0.6 REQUIRED) -find_package(StarSP 0.5 REQUIRED) +find_package(StarSP 0.12 REQUIRED) find_package(RSIMD 0.3) if(RSIMD_FOUND) option(USE_SIMD "Use SIMD instruction sets" ON) @@ -81,7 +81,7 @@ endif() ################################################################################ set(VERSION_MAJOR 0) set(VERSION_MINOR 7) -set(VERSION_PATCH 1) +set(VERSION_PATCH 2) set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) set(SSF_FILES_DOC COPYING README.md) diff --git a/src/test_ssf_beckmann_distribution.c b/src/test_ssf_beckmann_distribution.c @@ -33,7 +33,7 @@ main(int argc, char** argv) mem_init_proxy_allocator(&allocator, &mem_default_allocator); - CHK(ssp_rng_create(&allocator, &ssp_rng_threefry, &rng) == RES_OK); + CHK(ssp_rng_create(&allocator, SSP_RNG_THREEFRY, &rng) == RES_OK); CHK(ssf_microfacet_distribution_create (&allocator, &ssf_beckmann_distribution, &distrib) == RES_OK); diff --git a/src/test_ssf_blinn_distribution.c b/src/test_ssf_blinn_distribution.c @@ -30,7 +30,7 @@ main(int argc, char** argv) (void)argc, (void)argv; mem_init_proxy_allocator(&allocator, &mem_default_allocator); - CHK(ssp_rng_create(&allocator, &ssp_rng_threefry, &rng) == RES_OK); + CHK(ssp_rng_create(&allocator, SSP_RNG_THREEFRY, &rng) == RES_OK); CHK(ssf_microfacet_distribution_create (&allocator, &ssf_blinn_distribution, &distrib) == RES_OK); diff --git a/src/test_ssf_bsdf.c b/src/test_ssf_bsdf.c @@ -123,7 +123,7 @@ main(int argc, char** argv) (void)argc, (void)argv; mem_init_proxy_allocator(&allocator, &mem_default_allocator); - CHK(ssp_rng_create(&allocator, &ssp_rng_threefry, &rng) == RES_OK); + CHK(ssp_rng_create(&allocator, SSP_RNG_THREEFRY, &rng) == RES_OK); type.init = bsdf_init; type.release = bsdf_release; diff --git a/src/test_ssf_lambertian_reflection.c b/src/test_ssf_lambertian_reflection.c @@ -40,7 +40,7 @@ main(int argc, char** argv) (void)argc, (void)argv; mem_init_proxy_allocator(&allocator, &mem_default_allocator); - CHK(ssp_rng_create(&allocator, &ssp_rng_threefry, &rng) == RES_OK); + CHK(ssp_rng_create(&allocator, SSP_RNG_THREEFRY, &rng) == RES_OK); CHK(ssf_bsdf_create(&allocator, &ssf_lambertian_reflection, &brdf) == RES_OK); CHK(ssf_bsdf_create(&allocator, &bsdf_dummy, &dummy) == RES_OK); diff --git a/src/test_ssf_microfacet_distribution.c b/src/test_ssf_microfacet_distribution.c @@ -109,7 +109,7 @@ main(int argc, char** argv) (void)argc, (void)argv; mem_init_proxy_allocator(&allocator, &mem_default_allocator); - CHK(ssp_rng_create(&allocator, &ssp_rng_threefry, &rng) == RES_OK); + CHK(ssp_rng_create(&allocator, SSP_RNG_THREEFRY, &rng) == RES_OK); type.init = ufacet_init; type.release = ufacet_release; diff --git a/src/test_ssf_microfacet_reflection.c b/src/test_ssf_microfacet_reflection.c @@ -38,7 +38,7 @@ main(int argc, char** argv) (void)argc, (void)argv; mem_init_proxy_allocator(&allocator, &mem_default_allocator); - CHK(ssp_rng_create(&allocator, &ssp_rng_threefry, &rng) == RES_OK); + CHK(ssp_rng_create(&allocator, SSP_RNG_THREEFRY, &rng) == RES_OK); CHK(ssf_bsdf_create(&allocator, &ssf_microfacet2_reflection, &bsdf) == RES_OK); CHK(ssf_bsdf_create(&allocator, &bsdf_dummy, &dummy) == RES_OK); CHK(ssf_fresnel_create(&allocator, &ssf_fresnel_no_op, &F) == RES_OK); diff --git a/src/test_ssf_phase.c b/src/test_ssf_phase.c @@ -106,7 +106,7 @@ main(int argc, char** argv) (void)argc, (void)argv; mem_init_proxy_allocator(&allocator, &mem_default_allocator); - CHK(ssp_rng_create(&allocator, &ssp_rng_threefry, &rng) == RES_OK); + CHK(ssp_rng_create(&allocator, SSP_RNG_THREEFRY, &rng) == RES_OK); type.init = phase_init; type.release = phase_release; diff --git a/src/test_ssf_phase_hg.c b/src/test_ssf_phase_hg.c @@ -32,7 +32,7 @@ main(int argc, char** argv) (void)argc, (void)argv; mem_init_proxy_allocator(&allocator, &mem_default_allocator); - CHK(ssp_rng_create(&allocator, &ssp_rng_mt19937_64, &rng) == RES_OK); + CHK(ssp_rng_create(&allocator, SSP_RNG_MT19937_64, &rng) == RES_OK); CHK(ssf_phase_create(&allocator, &ssf_phase_hg, &phase) == RES_OK); CHK(ssf_phase_create(&allocator, &phase_dummy, &dummy) == RES_OK); diff --git a/src/test_ssf_phase_rayleigh.c b/src/test_ssf_phase_rayleigh.c @@ -34,7 +34,7 @@ main(int argc, char** argv) (void)argc, (void)argv; mem_init_proxy_allocator(&allocator, &mem_default_allocator); - CHK(ssp_rng_create(&allocator, &ssp_rng_mt19937_64, &rng) == RES_OK); + CHK(ssp_rng_create(&allocator, SSP_RNG_MT19937_64, &rng) == RES_OK); CHK(ssf_phase_create(&allocator, &ssf_phase_rayleigh, &phase) == RES_OK); diff --git a/src/test_ssf_phase_rdgfa.c b/src/test_ssf_phase_rdgfa.c @@ -63,7 +63,7 @@ main(int argc, char** argv) } mem_init_proxy_allocator(&allocator, &mem_default_allocator); - CHK(ssp_rng_create(&allocator, &ssp_rng_mt19937_64, &rng) == RES_OK); + CHK(ssp_rng_create(&allocator, SSP_RNG_MT19937_64, &rng) == RES_OK); CHK(ssf_phase_create(&allocator, &ssf_phase_rdgfa, &phase) == RES_OK); CHK(ssf_phase_create(&allocator, &phase_dummy, &dummy) == RES_OK); diff --git a/src/test_ssf_pillbox_distribution.c b/src/test_ssf_pillbox_distribution.c @@ -32,7 +32,7 @@ main(int argc, char** argv) (void)argc, (void)argv; mem_init_proxy_allocator(&allocator, &mem_default_allocator); - CHK(ssp_rng_create(&allocator, &ssp_rng_threefry, &rng) == RES_OK); + CHK(ssp_rng_create(&allocator, SSP_RNG_THREEFRY, &rng) == RES_OK); CHK(ssf_microfacet_distribution_create (&allocator, &ssf_pillbox_distribution, &distrib) == RES_OK); diff --git a/src/test_ssf_specular_dielectric_dielectric_reflection.c b/src/test_ssf_specular_dielectric_dielectric_reflection.c @@ -43,7 +43,7 @@ main(int argc, char** argv) (void)argc, (void)argv; mem_init_proxy_allocator(&allocator, &mem_default_allocator); - CHK(ssp_rng_create(&allocator, &ssp_rng_mt19937_64, &rng) == RES_OK); + CHK(ssp_rng_create(&allocator, SSP_RNG_MT19937_64, &rng) == RES_OK); CHK(ssf_bsdf_create(&allocator, &ssf_specular_dielectric_dielectric_interface, &bsdf) == RES_OK); CHK(ssf_bsdf_create(&allocator, &bsdf_dummy, &dummy) == RES_OK); diff --git a/src/test_ssf_specular_reflection.c b/src/test_ssf_specular_reflection.c @@ -36,7 +36,7 @@ main(int argc, char** argv) (void)argc, (void)argv; mem_init_proxy_allocator(&allocator, &mem_default_allocator); - CHK(ssp_rng_create(&allocator, &ssp_rng_threefry, &rng) == RES_OK); + CHK(ssp_rng_create(&allocator, SSP_RNG_THREEFRY, &rng) == RES_OK); CHK(ssf_bsdf_create(&allocator, &ssf_specular_reflection, &brdf) == RES_OK); CHK(ssf_bsdf_create(&allocator, &bsdf_dummy, &dummy) == RES_OK); CHK(ssf_fresnel_create diff --git a/src/test_ssf_thin_specular_dielectric.c b/src/test_ssf_thin_specular_dielectric.c @@ -40,7 +40,7 @@ main(int argc, char** argv) (void)argc, (void)argv; mem_init_proxy_allocator(&allocator, &mem_default_allocator); - CHK(ssp_rng_create(&allocator, &ssp_rng_threefry, &rng) == RES_OK); + CHK(ssp_rng_create(&allocator, SSP_RNG_THREEFRY, &rng) == RES_OK); CHK(ssf_bsdf_create (&allocator, &ssf_thin_specular_dielectric, &bsdf) == RES_OK); CHK(ssf_bsdf_create(&allocator, &bsdf_dummy, &dummy) == RES_OK);