Merge branch 'release-0.11.x'

.gitlab-ci.yml

@@ -14,35 +14,44 @@ stages:
   - test
   - release
   - scan
+  - test-signing
 
 .centos7:
-  tags: [ build, docker, modules ]
+  tags: [build, docker, modules]
   image: $DOCKER_REGISTRY/centos:7
   before_script:
     - module load python/$PYTHON_VERSION
     - echo $Python3_ROOT
     - ls $Python3_ROOT
 
+.centos7-test:
+  tags: [build, docker, modules]
+  image: $DOCKER_REGISTRY/ospray/docker-images:centos7-mod
+  before_script:
+    - module load python/$PYTHON_VERSION
+    - echo $Python3_ROOT
+    - ls $Python3_ROOT
+
 .ubuntu18.04:
-  tags: [ build, docker, modules ]
+  tags: [build, docker, modules]
   image: $DOCKER_REGISTRY/ubuntu:18.04
   before_script:
     - module load python/$PYTHON_VERSION
     - echo $Python3_ROOT
     - ls $Python3_ROOT
 
 .ubuntu20.04:
-  tags: [ build, docker ]
+  tags: [build, docker]
   image: $DOCKER_REGISTRY/clamav:ubuntu20.04
 
 .macos:
-  tags: [ osx, clang ]
+  tags: [osx, clang]
 
 .macos-sign:
-  tags: [ osx, clang, sign ]
+  tags: [osx, clang, sign]
 
 .windows:
-  tags: [ win, msvc15 ]
+  tags: [win, msvc15]
   before_script:
     - $env:Python3_ROOT = $PYTHON_ROOT_WINDOWS
     - echo $env:Python3_ROOT
@@ -77,12 +86,20 @@ stages:
     name: ospray_studio
     paths:
       - build-macos/package/ospray_studio*
+  only:
+    - master
+    - /^release-.*$/
+    - devel
 
 .windows-release-artifacts:
   artifacts:
     name: ospray_studio
     paths:
       - build-win/package/ospray_studio*
+  only:
+    - master
+    - /^release-.*$/
+    - devel
 
 source-protex-scan:
   stage: scan
@@ -106,7 +123,7 @@ build-centos7:
     - module load intel/2020.1
     - export CC=icc
     - export CXX=icpc
-    - export CXXFLAGS="-static-intel -static-libstdc++ -fPIC -D_GLIBCXX_USE_CXX11_ABI=0"
+    - export CXXFLAGS="-static-intel -fPIC -D_GLIBCXX_USE_CXX11_ABI=0"
     - gitlab/build.sh
 
 build-ubuntu18.04:
@@ -144,7 +161,7 @@ build-windows-msvc15:
 
 build-kw:
   stage: build
-  extends: .ubuntu18.04
+  extends: .centos7
   script:
     - gitlab/build-kw.sh
   artifacts:
@@ -156,15 +173,15 @@ build-kw:
 
 test-run-centos7:
   stage: test
-  extends: .centos7
-  needs: [ build-centos7 ]
+  extends: .centos7-test
+  needs: [build-centos7]
   script:
     - build/install/bin/ospStudio --verify_install
 
 test-run-ubuntu18.04:
   stage: test
   extends: .ubuntu18.04
-  needs: [ build-ubuntu18.04 ]
+  needs: [build-ubuntu18.04]
   script:
     - gitlab/run.sh
   only:
@@ -174,7 +191,7 @@ test-run-ubuntu18.04:
 test-kw:
   stage: scan
   extends: .centos7
-  needs: [ build-kw ]
+  needs: [build-kw]
   script:
     - gitlab/kw-check-issues.sh
   allow_failure: true
@@ -226,7 +243,7 @@ build-windows-icl:
 
 build-kw-dev:
   stage: build
-  extends: .ubuntu18.04
+  extends: .centos7
   script:
     - gitlab/build-kw-dev.sh
   artifacts:
@@ -247,14 +264,15 @@ kw-gen-report:
   needs: [build-kw-dev]
   script:
     - gitlab/kw-gen-report.sh
+    - gitlab/store-files.sh $CI_PROJECT_NAME $CI_PIPELINE_ID klocwork "klocwork/report.log"
   artifacts:
     paths:
       - klocwork/report.log
 
 test-run-ubuntu18.04-dev:
   stage: test
   extends: .ubuntu18.04
-  needs: [ build-ubuntu18.04-dev ]
+  needs: [build-ubuntu18.04-dev]
   script:
     - gitlab/run-dev.sh
 
@@ -272,12 +290,13 @@ release-centos7:
   extends:
     - .centos7
     - .linux-release-artifacts
-  needs: [ test-run-centos7 ]
+  needs: [test-run-centos7]
+  dependencies: []
   script:
     - module load intel/2020.1
     - export CC=icc
     - export CXX=icpc
-    - export CXXFLAGS="-static-intel -static-libstdc++ -fPIC -D_GLIBCXX_USE_CXX11_ABI=0"
+    - export CXXFLAGS="-static-intel -fPIC -D_GLIBCXX_USE_CXX11_ABI=0"
     - gitlab/build.sh package
 
 release-windows:
@@ -288,6 +307,29 @@ release-windows:
   dependencies: []
   script:
     - gitlab\win.ps1 package
+    - ;& $env:SIGN_FILE_WINDOWS $CI_PROJECT_DIR/build-win/package/ospray_studio*.msi
+
+test-release-windows-zip:
+  stage: test-signing
+  extends:
+    - .windows
+    - .windows-release-artifacts
+  needs: [release-windows]
+  script:
+    - Expand-Archive $CI_PROJECT_DIR/build-win/package/*.zip -DestinationPath .
+    - ;& $env:SIGN_FILE_WINDOWS -t (Get-ChildItem $CI_PROJECT_DIR\ospray_studio-*\bin\* | Select-Object -Expand FullName)
+
+test-release-windows-msi:
+  stage: test-signing
+  extends:
+    - .windows
+    - .windows-release-artifacts
+  needs: [release-windows]
+  script:
+    # XXX VERY IMPORTANT!!! msiexec returns immediately.  Adding the pipe to Out-Null the simplest way to wait for completion
+    # XXX VERY IMPORTANT!!! never try to extract/install to the same TARGETDIR that the .msi file resides.  It fails in a very opaque way. 
+    - msiexec.exe /a (Get-ChildItem $CI_PROJECT_DIR/build-win/package/*.msi | Select-Object -Expand FullName) /qn TARGETDIR=$CI_PROJECT_DIR | Out-Null
+    - ;& $env:SIGN_FILE_WINDOWS -t $CI_PROJECT_DIR/build-win/package/*.msi (Get-ChildItem "$CI_PROJECT_DIR\Intel\OSPRay Studio v0\bin\*" | Select-Object -Expand FullName)
 
 release-macos:
   stage: release
@@ -296,12 +338,17 @@ release-macos:
     - .macos-release-artifacts
   dependencies: []
   script:
-   - gitlab/macos.sh package
-  only:
-    - master
-    - /^release-.*$/
-    - devel
-    - web
+    - gitlab/macos.sh package
+
+test-release-macos:
+  stage: test-signing
+  extends:
+    - .macos-sign
+    - .macos-release-artifacts
+  needs: [release-macos]
+  script:
+    - unzip $CI_PROJECT_DIR/build-macos/package/*.zip
+    - $SIGN_FILE_MAC -t $CI_PROJECT_DIR/ospray_studio-*/bin/* $CI_PROJECT_DIR/ospray_studio-*/lib/*.dylib $CI_PROJECT_DIR/build-macos/package/*.pkg
 
 scan-bdba-bin:
   stage: scan

CHANGELOG.md

@@ -1,6 +1,47 @@
 Version History
 ---------------
 
+### Changes in OSPRay Studio v0.11.0
+
+-   Compatible with OSPRay release v2.10.0
+
+- Note! The background color now defaults to black.  It is left to the user to
+  set a background color through either the UI or command-line arg `--bgColor
+  <rgba>`.  This was done to prevent confusion when background color is blended
+  with an HDRI light.
+
+- Features and Improvements
+  - UI
+    - Improved transform SearchWidget to correctly handle volumes and allow 
+    - Fix animation start time and allow playback without UI showing using
+      `<spacebar> hotkey` to toggle playback
+  - Camera
+    - Improved scene camera support with ability to switch between multiple
+      cameras without overwriting the preloaded camera positions
+  - Batch
+    - Add ability to export SceneGraph file in batch mode, including scene
+      camera information
+    - Benchmarking is enabled by default with the same command line options as
+      batch-mode.  `ospStudio benchmark batch [options]`
+  - Importer
+    - Added `INTEL_lights_sunsky` vendor extension to glTF importer
+    - Added support for glTF `KHR_materials_emissive_strength`
+    - Added VolumentricModel `densityScale` and `anisotropy` parameters
+    - VDB volumes use contiguous data layouts, which can provide improved
+      performance
+
+<br>
+
+- Bug Fixes:
+  - Fixed crash caused by deleted node not being completely removed from lists
+  - Fixed rare crash when default material loaded from .sg is not OBJ
+  - Improved geometry and volume visibility toggle, which would occasionally get confused
+  - Fixed crash in FileBrowser widget if selecting a non-existent directory path
+  - Fixed glTF skinning on models that weren't handled correctly, normalize all weights.
+  - Correctly set material opacity to `baseColorfactor` alpha for glTF material
+    `alphaMode BLEND`
+  - Fixed unusual case where glTF textures could use the same texture
+
 ### Changes in OSPRay Studio v0.10.0
 
 -   Compatible with OSPRay release v2.9.0
@@ -10,22 +51,22 @@ Version History
     - Improved color picker widget so that color value are consistent whether
       viewing frame as sRGB or linear.
     - Added widget to change file selection on HDRI textures and photometric lights
-    - Added renderer setting to set and adjust OSPRay's shadowCatcherPlane
+    - Added renderer setting to set and adjust OSPRay's `shadowCatcherPlane`
   - Light
     - Add support for new OSPRay `cylinder` light-type
     - Photometric intensity distribution now supported on point, quad, and spot
       light types.
     - Lights in glTF scene are now instanced and can be used with motion blur
   - Camera
-    - Custom support for "panoramic" camera type in glTF files
+    - Custom support for `panoramic` camera type in glTF files
     - All glTF cameras are instanced to allow for motion blur
   - Batch
-    - Improved batch rendering flexibility with params for cameraType, bgColor,
-      frameStep and denoiser.
-    - Added final frame denoising to batch mode - only final accumulation is
+    - Improved batch rendering flexibility with params for `cameraType`,
+      `bgColor`, `frameStep` and `denoiser`.
+    - Added final frame denoising to batch mode -- only final accumulation is
       denoised.
   - Added glTF support for OSPRay's new multi-segment deformation motion blur
-  - Added python bindings for affine3f and affine3f::translate
+  - Added python bindings for `affine3f` and `affine3f::translate`
   - Added tasking/scheduling system.  Currently used to greatly improve loading
     of raw volumes.  Will be expanded to other asynchronous operations.
 
@@ -34,7 +75,7 @@ Version History
 - Bug Fixes:
   - Fixed lights editor interaction with group lights loaded in a glTF file.  UI
     now allows correct editing/removal of existing lights and addition new lights
-  - Added full path name and extension to importer and texture cache entried to
+  - Added full path name and extension to importer and texture cache entries to
     prevent collision with similar files.
   - Better handling of failed texture load across glTF and OBJ materials, as well
     as HDRI, background texture, and material editor.
@@ -124,7 +165,7 @@ Version History
 
 -   Expose support for OSPRay / Open VKL Particle Volume primitives
 
--   Add PCD (Point Cloud Data) file importer - ascii and binary formats
+-   Add PCD (Point Cloud Data) file importer -- ascii and binary formats
 
 -   Transfer function and isosurface enhancements provide more control over volume visualizations
 
@@ -146,7 +187,7 @@ Version History
 -   glTF loader improvements:
     Animation and skinning of triangle meshes
     KHR_lights_punctual support for glTF Lights and experimental environmental lights
-    Initial glTF KHR_materials_* extensions and KHR_texture_transform support.
+    Initial glTF `KHR_materials_*` extensions and `KHR_texture_transform` support.
     Add support for glTF POINTS primitive for point clouds
     Support GLTF scene cameras
     Added rich image generation containing GeomIDs and InstanceIDs, exported as additional exr layers

CMakeLists.txt

@@ -1,9 +1,9 @@
-## Copyright 2009-2021 Intel Corporation
+## Copyright 2009 Intel Corporation
 ## SPDX-License-Identifier: Apache-2.0
 
 cmake_minimum_required(VERSION 3.15)
 
-project(ospray_studio VERSION 0.10.0 LANGUAGES CXX)
+project(ospray_studio VERSION 0.11.0 LANGUAGES CXX)
 
 include(GNUInstallDirs)
 include(ProcessorCount)
@@ -67,7 +67,7 @@ find_package(OpenGL 2 REQUIRED)
 include(glfw)
 include(ospray)
 
-option(USE_BENCHMARK "Build benchmarking support into ospStudio" OFF)
+option(USE_BENCHMARK "Build benchmarking support into ospStudio" ON)
 
 if(USE_BENCHMARK)
   include(benchmark)

FEATURES.md

@@ -9,12 +9,14 @@ OBJ/MTL importer:
 -   native triangle mesh and quad mesh primitives
 -   basic OBJ materials, with extension for any OSPRay material via "type" keyword
 -   texture and "texture transformations" supported on all OSPRay texturable material parameters via "map_" parameter prefix
--   support for UDIM texture tiles with common "*1001*" filenaming convension
+-   support for UDIM texture tiles with common "*1001*" filenaming convention
 
 glTF importer:
 
 -   mesh and points primitives, vanilla materials, animation (including camera), skinning
--   KHR_lights_punctual: "directional", "point", "spot"; custom extension for OSPRay "sunSky" and "hdri" light types
+-   KHR_lights_punctual: "directional", "point", "spot"; custom extension for OSPRay's "hdri" light type
+-   INTEL_lights_sunsky
+-   KHR_materials_emissive_strength: "intensity"
 -   KHR_materials_pbrSpecularGlossiness: "diffuseFactor", "diffuseTexture", "specularFactor", "glossinessFactor"
 -   KHR_materials_clearcoat: "clearcoatFactor", "clearcoatRoughnessFactor", "clearcoatTexture", "clearcoatRoughnessTexture", "clearcoatNormalTexture"
 -   KHR_materials_transmission: "transmissionFactor", "transmissionTexture"
@@ -30,7 +32,7 @@ glTF importer:
 -   EXT_cameras_sensor, respecting
     -   "imageSensor": "pixels", "pixelSize"
     -   "lens": "focalLength", "apertureRadius", "focusDistance", "centerPointShift"
--   support for UDIM texture tiles with common "*1001*" filenaming convension
+-   support for UDIM texture tiles with common "*1001*" filenaming convention
 
 PCD importer: