Merge branch 'release-2.1.x'

.gitattributes

@@ -0,0 +1 @@
+*.rc	text working-tree-encoding=UTF-16LE-BOM eol=CRLF

.gitlab-ci.yml

@@ -56,12 +56,13 @@ variables:
 .job_template: &test_job_unix
   <<: *test_job
   script:
-    - scripts/tests/run_tests.sh
+    - LD_LIBRARY_PATH="$CI_PROJECT_DIR/build/install/lib:$LD_LIBRARY_PATH" PATH="$CI_PROJECT_DIR/build/install/bin:$PATH" scripts/tests/run_tests.sh "$CI_PROJECT_DIR"
 
 .job_template: &test_job_windows
   <<: *test_job
   script:
-    - scripts\tests\run_tests.ps1
+    - $env:Path += ";$CI_PROJECT_DIR\build\install\bin"
+    - scripts\tests\run_tests.ps1 "$CI_PROJECT_DIR"
 
 
 ### BUILD JOBS ###
@@ -110,6 +111,16 @@ build-ubuntu1804-gcc:
       - build/install
     expire_in: 3 day
 
+build-centos8:
+  <<: *build_job_docker
+  image: ospray/docker-images:centos8
+  script:
+    - scripts/build_gitlab/linux.sh -G Ninja
+  artifacts:
+    paths:
+      - build/install
+    expire_in: 3 day
+
 build-centos7-icc:
   <<: *build_job_docker_modules
   script:
@@ -136,6 +147,14 @@ build-centos7-gcc:
       - build/install
     expire_in: 3 day
 
+build-centos7-mpi:
+  <<: *build_job_docker_modules
+  script:
+    - module load cmake
+    - module load intel
+    - scripts/build_gitlab/linux.sh -DBUILD_OSPRAY_MODULE_MPI=ON
+  allow_failure: true
+
 build-debug:
   <<: *build_job_docker
   script:
@@ -201,14 +220,11 @@ build-scan-kw:
 
 source-protex-scan:
   stage: build
-  image: ospray-protex-centos7
+  image: amd64/openjdk:8
   script:
-    - /tmp/source-scan-protex.sh
-  dependencies:
-  tags:
-    - protex-scan-docker
-  ## Temporarily allow to fail
-  when: manual
+    - scripts/build_gitlab/source-scan-protex.sh
+  dependencies: []
+  tags: [docker]
   allow_failure: true
 
 
@@ -220,19 +236,21 @@ test-centos7-gcc:
   dependencies:
     - build-centos7-gcc
 
+test-centos8:
+  <<: *test_job_unix
+  image: ospray/docker-images:centos8
+  dependencies:
+    - build-centos8
+
 test-ubuntu1804-gcc:
   <<: *test_job_unix
   image: ospray/docker-images:ubuntu18.04
-  script:
-    - LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib64/ scripts/tests/run_tests.sh
   dependencies:
     - build-ubuntu1804-gcc
 
 test-ubuntu1604-gcc:
   <<: *test_job_unix
   image: ospray/docker-images:ubuntu16.04
-  script:
-    - LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib64/ scripts/tests/run_tests.sh
   dependencies:
     - build-ubuntu1604-gcc
 
@@ -286,12 +304,12 @@ generate-ci-baseline:
   <<: *test_job_unix
   image: ospray/docker-images:ubuntu18.04
   script:
-    - scripts/tests/generate_baseline.sh
+    - LD_LIBRARY_PATH="$CI_PROJECT_DIR/build/install/lib:$LD_LIBRARY_PATH" PATH="$CI_PROJECT_DIR/build/install/bin:$PATH" scripts/tests/generate_baseline.sh
   dependencies:
     - build-ubuntu1804-gcc
   artifacts:
     paths:
-      - img
+      - generated_test_images
     expire_in: 3 day
   when: manual
 
@@ -329,7 +347,7 @@ web:
 
 ### RELEASE JOBS ###
 
-release-linux-icc:
+release-linux:
   <<: *release_job
   image: ospray/docker-images:centos7-mod
   script:

CHANGELOG.md

@@ -1,27 +1,65 @@
 Version History
 ---------------
 
+### Changes in v2.1.0:
+
+-   New clipping geometries feature that allows clipping any scene
+    (geometry and volumes); all OSPRay geometry types can by used as
+    clipping geometry
+    -   Inverted clipping is supported via new `invertNormals` parameter
+        of `GeometricModel`
+    -   Currently there is a fixed upper limit (64) of how many clipping
+        geometries can be nested
+    -   When clipping with curves geometry (any basis except linear)
+        some rendering artifacts may appear
+-   New plane geometry defined via plane equation and optional bounding
+    box
+-   Sun-sky light based on physical model of Hošek-Wilkie
+-   Support for photometric lights (e.g. IES or EULUMDAT)
+-   Add new `ospGetTaskDuration` API call to query execution time of
+    asynchronous tasks
+-   Support for 16bit (unsigned short) textures
+-   Add static `cpp::Device::current` method as a C++ wrapper equivalent
+    to `ospGetCurrentDevice`
+-   Generalized `cpp::Device` parameter setting to match other handle
+    types
+-   Passing `NULL` to `ospRelease` is not reported as error anymore
+-   Fix computation of strides for `OSPData`
+-   Fix transparency in `scivis` renderer
+-   Add missing C++ wrapper for `ospGetVariance`
+-   Proper demonstration of `ospGetVariance` in `ospTutorialAsync`
+-   Fix handling of `--osp:device-params` to process and set all passed
+    arguments first before committing the device, to ensure it is
+    committed in a valid state.
+-   Object factory functions are now registered during module
+    initialization via the appropriate `registerType` function
+-   Fix issue with OSPRay ignoring tasking system thread count settings
+-   Fix issue where OSPRay always loaded the ISPC module, even if not
+    required
+-   OSPRay now requires minimum Open VKL v0.9.0
+
 ### Changes in v2.0.1:
 
--   Fix bug where Embree user-defined geometries were not indexed correctly
-    in the scene, which now requires Embree v3.8.0+
--   Fix crash when the path tracer encounters geometric models that do not
-    have a material
--   Fix crash when some path tracer materials generated NULL bsdfs
+-   Fix bug where Embree user-defined geometries were not indexed
+    correctly in the scene, which now requires Embree v3.8.0+
+-   Fix crash when the path tracer encounters geometric models that do
+    not have a material
+-   Fix crash when some path tracer materials generated `NULL` bsdfs
 -   Fix bug where `ospGetBounds` returned incorrect values
 -   Fix missing symbol in denoiser module
 -   Fix missing symbol exports on Windows for all OSPRay built modules
 -   Add the option to specify a single color for geometric models
--   The `scivis` renderer now respects the opacity component of `color` on
-    geometric models
--   Fix various inconsistent handling of frame buffer alpha between renderers
+-   The `scivis` renderer now respects the opacity component of `color`
+    on geometric models
+-   Fix various inconsistent handling of frame buffer alpha between
+    renderers
 -   `ospGetCurrentDevice` now increments the ref count of the returned
-    `OSPDevice` handle, so applications will need to release the handle when
-    finished by using `ospDeviceRelease` accordingly
+    `OSPDevice` handle, so applications will need to release the handle
+    when finished by using `ospDeviceRelease` accordingly
 -   Added denoiser to `ospExamples` app
 -   Added `module_mpi` to superbuild (disabled by default)
--   The superbuild now will emit a CMake error when using any 32-bit CMake
-    generator, as 32-bit builds are not supported
+-   The superbuild now will emit a CMake error when using any 32-bit
+    CMake generator, as 32-bit builds are not supported
 
 ### Changes in v2.0.0:
 

LICENSE.txt

@@ -174,60 +174,3 @@
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
 
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
--------------------------------------------------------------------------------
-
-Copyright 2008, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.