Merge branch 'release-0.9.0'

.gitlab-ci.yml

@@ -3,11 +3,11 @@
 
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
-  OSPRAY_VER: "2.7.1"
-  RKCOMMON_VER: "1.7.0"
-  PYTHON_VERSION: "3.7.10"
-  PYTHON_ROOT_MACOS: "/NAS/packages/apps/python/$PYTHON_VERSION/macos"
-  PYTHON_ROOT_WINDOWS: "N:/packages/apps/python/3.7.9/windows" ## python-3.7.10 currently not installed for windows
+  OSPRAY_VER: "2.8.0"
+  RKCOMMON_VER: "1.8.0"
+  PYTHON_VERSION: "3.9.7"
+  # PYTHON_ROOT_MACOS: "/NAS/packages/apps/python/$PYTHON_VERSION/macos"
+  PYTHON_ROOT_WINDOWS: "N:/packages/apps/python/$PYTHON_VERSION/windows"
 
 stages:
   - build
@@ -17,40 +17,29 @@ stages:
 
 .centos7:
   tags: [ build, docker, modules ]
-  image: $DOCKER_REGISTRY/general:centos7-devel
+  image: $DOCKER_REGISTRY/centos:7
   before_script:
     - module load python/$PYTHON_VERSION
     - echo $Python3_ROOT
     - ls $Python3_ROOT
 
 .ubuntu18.04:
   tags: [ build, docker, modules ]
-  image: $DOCKER_REGISTRY/ospray/docker-images:ubuntu18.04-mod
+  image: $DOCKER_REGISTRY/ubuntu:18.04
   before_script:
-    - apt install -y xorg-dev
-  # image: $DOCKER_REGISTRY/general:ubuntu18.04-devel
-  # before_script:
-  #   - module load python/$PYTHON_VERSION
-  #   - echo $Python3_ROOT
-  #   - ls $Python3_ROOT
+    - module load python/$PYTHON_VERSION
+    - echo $Python3_ROOT
+    - ls $Python3_ROOT
 
 .ubuntu20.04:
   tags: [ build, docker ]
   image: $DOCKER_REGISTRY/clamav:ubuntu20.04
 
 .macos:
   tags: [ osx, clang ]
-  before_script:
-    - export Python3_ROOT=$PYTHON_ROOT_MACOS
-    - echo $Python3_ROOT
-    - ls $Python3_ROOT
 
 .macos-sign:
   tags: [ osx, clang, sign ]
-  before_script:
-    - export Python3_ROOT=$PYTHON_ROOT_MACOS
-    - echo $Python3_ROOT
-    - ls $Python3_ROOT
 
 .windows:
   tags: [ win, msvc15 ]
@@ -114,9 +103,6 @@ build-centos7:
     - .centos7
     - .linux-build-artifacts
   script:
-    - source $SPACK_SETUP_ENV
-    - module load cmake/3.15.2
-    - module load gcc/5.4.0
     - module load intel/2020.1
     - export CC=icc
     - export CXX=icpc
@@ -274,9 +260,6 @@ release-centos7:
     - .linux-release-artifacts
   needs: [ test-run-centos7 ]
   script:
-    - source $SPACK_SETUP_ENV
-    - module load cmake/3.15.2
-    - module load gcc/5.4.0
     - module load intel/2020.1
     - export CC=icc
     - export CXX=icpc
@@ -304,6 +287,7 @@ release-macos:
     - master
     - /^release-.*$/
     - devel
+    - web
 
 scan-bdba-bin:
   stage: scan

CHANGELOG.md

@@ -1,6 +1,30 @@
 Version History
 ---------------
 
+### Changes in OSPRay Studio v0.9.0
+
+-   Compatible with OSPRay release v2.8.0
+
+- Features and Improvements
+  - Added initial EULUMDAT photometric light support to SpotLight
+  - Enabled alternate camera selection in glTF scenes
+  - Added ability for python scripts to define transfer functions and load Studio plugins
+  - Enabled .sg scene files can now contain an HDRI light
+  - Much improved command line parsing in all modes
+  - Added support for several new KHR_materials extentions
+    (`KHR_materials_volume`, `KHR_materials_specular`, `KHR_materials_ior`)
+    and  `KHR_texture_transform`
+  - Improved UI controls for adjusting model transforms
+<br>
+
+- Bug Fixes:
+  - Fixed high-DPI display issues
+  - Fixed bug causing model textures to be flipped if loading HDRI first
+  - Fixed crash when selecting non-default cameras in glTF scenes
+  - Fixed bug with macOS ARM build.
+  - Fixed `KHR_lights_punctual` light direction bug
+
+
 ### Changes in OSPRay Studio v0.8.1
 
 -   Compatible with OSPRay release v2.7.1
@@ -26,14 +50,15 @@ Version History
     -   Updated external 3rd party dependencies bringing in features and bug fixes
     -   Modified OBJ importer to parse and use quads and triangles
     -   Improved Arcball camera navigation with up-vector lock
+<br>
 
 -   Bug Fixes
     -   Fixed materials after clearing scene
     -   Fixed materials for PointCloudData (PCD)
     -   Can no longer create a zero-dimension framebuffer
     -   Fixed instancing node-naming to allow for for many identical instances
     -   Fixed crash if optional glTF punctual light color was omitted
-    -   Fixed crash if isosuface geometry is used as clipping geometry when no other
+    -   Fixed crash if isosurface geometry is used as clipping geometry when no other
         geometries are in the scene
 
 ### Changes in OSPRay Studio v0.7.0

CMakeLists.txt

@@ -3,7 +3,7 @@
 
 cmake_minimum_required(VERSION 3.15)
 
-project(ospray_studio VERSION 0.8.1 LANGUAGES CXX)
+project(ospray_studio VERSION 0.9.0 LANGUAGES CXX)
 
 include(GNUInstallDirs)
 include(ProcessorCount)

README.md

@@ -1,9 +1,10 @@
 # OSPRay Studio
 
-This is release v0.8.1 of Intel® OSPRay Studio. It is released under the
+This is release v0.9.0 of Intel® OSPRay Studio. It is released under the
 Apache 2.0 license.
 
-Visit http://www.ospray.org/ospray_studio for more information.
+Visit [**OSPRay Studio**](http://www.ospray.org/ospray_studio)
+(http://www.ospray.org/ospray_studio) for more information.
 
 See [what's
 new](https://github.com/ospray/ospray_studio/blob/master/CHANGELOG.md)
@@ -12,10 +13,9 @@ in this release.
 ## Overview
 
 Intel OSPRay Studio is an open source and interactive visualization and
-ray tracing application that leverages [Intel
-OSPRay](https://www.ospray.org) as its core rendering engine. It can be
-used to load complex scenes requiring high fidelity rendering or very
-large scenes requiring supercomputing resources.
+ray tracing application that leverages [Intel OSPRay](https://www.ospray.org)
+as its core rendering engine. It can be used to load complex scenes requiring
+high fidelity rendering or very large scenes requiring supercomputing resources.
 
 The main control structure is a *scene graph* which allows users to
 create an abstract scene in a *directed acyclical graph* manner. Scenes
@@ -30,27 +30,26 @@ OSPRay Studio has the following required and optional dependencies.
 ### Required dependencies
 
 -   [CMake](https://www.cmake.org) (v3.15+) and any C++14 compiler
--   Intel [OSPRay](https://www.github.com/ospray/ospray) (v2.7.1) and
+-   Intel [OSPRay](https://www.github.com/ospray/ospray) (v2.8.0) and
     its dependencies - OSPRay Studio builds on top of OSPRay.
     Instructions on building OSPRay are provided
-    [here](http://www.ospray.org/downloads.html#building-and-finding-ospray)
-    -   Intel [Open VKL](https://www.github.com/openvkl/openvkl) (v1.0.1)
+    [here](http://www.ospray.org/downloads.html#building-and-finding-ospray).
+    -   Intel [Open VKL](https://www.github.com/openvkl/openvkl) (v1.0.1 or newer)
     -   Intel [Embree](https://www.github.com/embree/embree) (v3.13.1 or newer)
     -   Intel oneAPI Rendering Toolkit common library
-        [rkcommon](https://www.github.com/ospray/rkcommon) (v1.7.0)
-    -   Intel [Threading Building
-        Blocks](https://www.threadingbuildingblocks.org/)
--   OpenGL and [GLFW](https://www.glfw.org/) (v3.x) - for the windowing
-    environment
+        [rkcommon](https://www.github.com/ospray/rkcommon) (v1.8.0)
+    -   Intel [Threading Building Blocks](https://www.threadingbuildingblocks.org/)
+-   OpenGL and [GLFW](https://www.glfw.org) (v3.3.4) - for the windowing environment
 
 ### Optional Dependencies
 
--   Intel [Open Image Denoise](https://openimagedenoise.github.io/) - (v1.2.3 or
+-   Intel [Open Image Denoise](https://openimagedenoise.github.io) - (v1.2.3 or
     newer) for denoising frames. To use with OSPRay Studio, OSPRay must be built
-    with `-DBUILD_OIDN=ON` in CMake
--   [OpenImageIO]() and [OpenEXR]() - to support images in a variety of
-    file formats. Set `OPENIMAGEIO_ROOT` and `OPENEXR_ROOT` to the
-    respective install directories to use these libraries
+    with `-DBUILD_OIDN=ON` in CMake.
+-   [OpenImageIO](http://openimageio.org/) and [OpenEXR](https://www.openexr.com/)
+    to support images in a variety of file formats.  Set `OPENIMAGEIO_ROOT`
+    and `OPENEXR_ROOT` to the respective install directories to use these libraries.
+-   [Python] (3.9.7) (https://python.org) for python bindings
 
 ### Building on Linux and macOS
 
@@ -66,6 +65,9 @@ OSPRay Studio has the following required and optional dependencies.
     export rkcommon_DIR = ${RKCOMMON_INSTALL_LOCATION}
     ```
 
+    Alternatively, [CMAKE_PREFIX_PATH](https://cmake.org/cmake/help/latest/variable/CMAKE_PREFIX_PATH.html)
+    can be set to find the OSPRay install and other dependencies.
+
 -   Clone OSPRay Studio
 
     ``` bash