Merge branch 'release-2.4.x' into master

.gitlab-ci.yml

@@ -491,6 +491,51 @@ av:
     paths:
       - build_release/ospray-*
 
+test-release-linux:
+  <<: *test_job
+  <<: *release_job
+  stage: scan3
+  image: $DOCKER_REGISTRY/ospray/docker-images:centos7 
+  needs: [release-linux]
+  script:
+    - tar xzf build_release/*.gz
+    - PATH="$CI_PROJECT_DIR/`ls -d1 ospray-*/bin`:$PATH" scripts/tests/run_tests.sh "$CI_PROJECT_DIR"
+
+test-release-osx:
+  <<: *test_job
+  <<: *release_job
+  stage: scan3
+  tags: [osx]
+  needs: [release-osx-clang]
+  script:
+    - unzip build_release/*.zip
+    - PATH="$CI_PROJECT_DIR/`ls -d1 ospray-*/bin`:$PATH" scripts/tests/run_tests.sh "$CI_PROJECT_DIR"
+    - $SIGN_FILE_MAC -t $CI_PROJECT_DIR/ospray-*/bin/* $CI_PROJECT_DIR/ospray-*/lib/*.dylib $CI_PROJECT_DIR/build_release/*.pkg
+
+test-release-windows-zip:
+  <<: *test_job
+  <<: *release_job
+  stage: scan3
+  tags: [win]
+  needs: [release-windows]
+  script:
+    - Expand-Archive build_release/*.zip -DestinationPath .
+    - $env:Path += ";" + (Get-ChildItem $CI_PROJECT_DIR\ospray-*\bin | Select-Object -Expand FullName)
+    - scripts\tests\run_tests.ps1 "$CI_PROJECT_DIR"
+    - ;& $env:SIGN_FILE_WINDOWS -t (Get-ChildItem $CI_PROJECT_DIR\ospray-*\bin\* | Select-Object -Expand FullName)
+
+test-release-windows-msi:
+  <<: *test_job
+  <<: *release_job
+  stage: scan3
+  tags: [win]
+  needs: [release-windows]
+  script:
+    - msiexec.exe /a (Get-ChildItem build_release/*.msi | Select-Object -Expand FullName) /qn TARGETDIR=$CI_PROJECT_DIR
+    - $env:Path += ";$CI_PROJECT_DIR\Intel\OSPRay v2\bin"
+    - scripts\tests\run_tests.ps1 "$CI_PROJECT_DIR"
+    - ;& $env:SIGN_FILE_WINDOWS -t $CI_PROJECT_DIR/build_release/*.msi (Get-ChildItem  "$CI_PROJECT_DIR\Intel\OSPRay v2\bin\*" | Select-Object -Expand FullName)
+
 
 ### Mirror ###
 

CHANGELOG.md

@@ -1,6 +1,32 @@
 Version History
 ---------------
 
+### Changes in v2.4.0:
+
+-   The pathtracer optionally allows for alpha blending even if the
+    background is seen through refractive objects like glass, by
+    enabling `backgroundRefraction`
+-   OSPRay now requires minimum Open VKL v0.11.0 to bring the following
+    improvements: 
+    -   Improved rendering performance of VDB volumes
+    -   Added support for configurable iterator depth via the
+        `maxIteratorDepth` parameters for unstructured and particle
+        volumes, improved performance
+    -   Added support for filter modes for structured volumes (regular
+        and spherical)
+-   Expose parameter `horizonExtension` of Sun-sky light, which extends
+    the sky dome by stretching the horizon over the lower hemisphere
+-   Optimize handling of geometry lights by the pathtracer
+-   The optional `denoiser` image operation now respects frame
+    cancellation, requiring Intel® Open Image Denoise with minimum
+    version 1.2.3
+-   Fixed normals of (transformed) isosurfaces
+-   Robust calculation of normals of `boxes` geometry
+-   Clipping geometry is now working correctly with `map_maxDepth`
+    renderer parameter
+-   Using materials in a renderer with a mismatched `renderer_type` no
+    longer causes crashes while rendering
+
 ### Changes in v2.3.0:
 
 -   Re-add SciVis renderer features (the previous version is still
@@ -21,11 +47,11 @@ Version History
     understand rkcommon and glm short vector types
     -   For rkcommon, include `ospray/ospray_cpp/ext/rkcommon.h`
     -   For glm, include `ospray/ospray_cpp/ext/glm.h`
-    -   Note in debug builds some compilers will not optimize out type trait
-        definitions. This will require users to manually instantiate the glm
-        definitions in one translation unit within the application using
-        `#define OSPRAY_GLM_DEFINITIONS` before including `ext/glm.h`: see
-        `ospTutorialGLM` as an example
+    -   Note in debug builds some compilers will not optimize out type
+        trait definitions. This will require users to manually
+        instantiate the glm definitions in one translation unit within
+        the application using `#define OSPRAY_GLM_DEFINITIONS` before
+        including `ext/glm.h`: see `ospTutorialGLM` as an example
 -   Changed parameters to `volume` texture: it now directly accepts the
     `volume` and the `transferFunction`
 -   Fixed many memory leaks
@@ -160,7 +186,7 @@ Version History
         function parameters instead of setting some as renderer params
     -   `ospRenderFrame` is now asynchronous, where the task is managed
         through a returned `OSPFuture` handle
-    -   The heirarchy of objets in a scene are now more granular to
+    -   The hierarchy of objects in a scene are now more granular to
         aid in scene construction flexibility and reduce potential
         object duplication
     -   Type-specific parameter setting functions have been consolidated
@@ -225,13 +251,13 @@ Version History
     instead
 -   Triangle mesh and Quad mesh are superseded by the `mesh` geometry
 -   Applications need to use the various error reporting methods to
-    check wether the creation (via `ospNew...`) of objects failed; a
+    check whether the creation (via `ospNew...`) of objects failed; a
     returned `NULL` is not a special handle anymore to signify an error
 -   Changed module init methods to facilitate version checking:
     `extern "C" OSPError ospray_module_init_<name>(int16_t versionMajor, int16_t versionMinor, int16_t versionPatch)`
 -   The `map_backplate` texture is supported in all renderers and does
     not hide lights in infinity (like the HDRI light) anymore;
-    explicitely make lights in`visible` if this is needed
+    explicitly make lights in`visible` if this is needed
 -   Changed the computation of variance for adaptive accumulation to be
     independent of `TILE_SIZE`, thus `varianceThreshold` needs to be
     adapted if using a different `TILE_SIZE` than default 64

CMakeLists.txt

@@ -1,4 +1,4 @@
-## Copyright 2009-2019 Intel Corporation
+## Copyright 2009-2020 Intel Corporation
 ## SPDX-License-Identifier: Apache-2.0
 
 cmake_minimum_required(VERSION 3.1)
@@ -55,19 +55,13 @@ endif()
 add_subdirectory(ospray)
 
 ## OSPRay sample apps ##
-if (OSPRAY_ENABLE_APPS)
-  add_subdirectory(apps)
-endif()
+add_subdirectory(apps)
 
 ## Modules ##
-if (OSPRAY_ENABLE_MODULES)
-  add_subdirectory(modules)
-endif()
+add_subdirectory(modules)
 
-## Testing ##
-if (OSPRAY_APPS_TESTING)
-  add_subdirectory(test_image_data)
-endif()
+## Regression test images target ##
+add_subdirectory(test_image_data)
 
 ## Clang-format target ##
 if (OSPRAY_ENABLE_TARGET_CLANGFORMAT)