Merge branch 'master' into glm

Author: dcwhite

.github/workflows/ccpp.yml

@@ -74,3 +74,20 @@ jobs:
       working-directory: bin/SCIRun
       continue-on-error: true
       run: make test
+
+  linux-build-gui-ospray:
+
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Prepare
+      run: sudo apt-get update && sudo apt-get install mesa-common-dev libgl1-mesa-dev mesa-utils-extra libglapi-mesa ninja-build qt5-qmake qtbase5-dev libqt5opengl5-dev libqt5svg5-dev xorg-dev libglu1-mesa-dev
+
+    - name: Build
+      run: ./build.sh -DQt5_PATH=$(dpkg -L qtbase5-dev) -DUSER_PYTHON_VERSION="3.6.7" -DWITH_OSPRAY:BOOL=ON

.github/workflows/mac.yml

@@ -61,6 +61,61 @@ jobs:
     #     files: |
     #          bin/SCIRun/SCIRun-5.0.beta.*-Darwin.pkg
 
+  mac-build-gui-ospray:
+
+    runs-on: macOS-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - name: Install Qt
+      uses: ouuan/install-qt-action@ouuan
+      with:
+        version: 5.14.2
+        target: desktop
+        host: mac
+        install-deps: true
+
+    - name: Print out Qt directory
+      run: echo $Qt5_DIR; echo $Qt5_Dir
+
+    - name: Prepare
+      run: |
+        ln -s /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/System/Library/Frameworks/Tk.framework/Versions/8.5/Headers/X11/ /usr/local/include/X11
+
+    - name: make
+      run: ./build.sh -DWITH_OSPRAY:BOOL=ON -DUSER_PYTHON_VERSION="3.6.7" -DQt5_PATH="${Qt5_Dir}"
+
+    - name: Package
+      working-directory: bin/SCIRun
+      run: |
+        cmake -DBUILD_BUNDLE:BOOL=ON ../../src
+        make -j3
+        make package
+        chmod +x repair_package.sh
+        ./repair_package.sh
+
+    - name: Upload installer
+      uses: actions/upload-artifact@v2
+      with:
+        name: SCIRunMacOsprayInstaller
+        path: bin/SCIRun/SCIRun-5.0.beta.*-Darwin.pkg
+
+    # - name: Deploy
+    #   id: deploy
+    #   if: github.ref == 'refs/heads/master'
+    #   uses: marvinpinto/action-automatic-releases@latest
+    #   with:
+    #     repo_token: "${{ secrets.GITHUB_TOKEN }}"
+    #     automatic_release_tag: "dev-mac"
+    #     prerelease: true
+    #     title: "Development Build for Mac"
+    #     files: |
+    #          bin/SCIRun/SCIRun-5.0.beta.*-Darwin.pkg
+
   mac-build-headless:
 
     runs-on: macOS-latest

.github/workflows/windows.yml

@@ -47,7 +47,7 @@ jobs:
     - name: Install Qt
       uses: ouuan/install-qt-action@ouuan
       with:
-        version: 5.13.1
+        version: 5.14.2
         target: desktop
         host: windows
         arch: win64_msvc2017_64
@@ -90,15 +90,12 @@ jobs:
     - name: Install Qt
       uses: ouuan/install-qt-action@ouuan
       with:
-        version: 5.13.1
+        version: 5.14.2
         target: desktop
         host: windows
         arch: win64_msvc2017_64
         install-deps: true
 
-    - name: Print out Qt directory
-      run: echo $Env:Qt5_Dir
-
     - name: Configure
       working-directory: bin
       run: |
@@ -130,3 +127,54 @@ jobs:
     #     title: "Development Build for Windows"
     #     files: |
     #          bin/SCIRun/SCIRun-5.0.beta.*-win64.exe
+
+  windows-build-gui-python-ospray:
+    runs-on: windows-latest
+
+    steps:
+
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - name: Install Qt
+      uses: ouuan/install-qt-action@ouuan
+      with:
+        version: 5.14.2
+        target: desktop
+        host: windows
+        arch: win64_msvc2017_64
+        install-deps: true
+
+    - name: Configure
+      working-directory: bin
+      run: |
+        cmake ..\Superbuild -DCMAKE_BUILD_TYPE=Release -G"Visual Studio 16 2019" -Ax64 -DQt5_PATH:PATH="$env:Qt5_Dir" -DWITH_OSPRAY:BOOL=ON
+
+    - name: Compile
+      working-directory: bin
+      shell: cmd
+      run: cmake --build . --config Release -j 3
+
+    - name: Package
+      working-directory: bin/SCIRun
+      shell: cmd
+      run: cmake --build . --config Release --target package
+
+    - name: Upload installer
+      uses: actions/upload-artifact@v2
+      with:
+        name: SCIRunWindowsOsprayInstaller
+        path: bin/SCIRun/SCIRun-5.0.beta.*-win64.exe
+
+    # - name: Deploy
+    #   if: github.ref == 'refs/heads/master'
+    #   uses: marvinpinto/action-automatic-releases@latest
+    #   with:
+    #     repo_token: "${{ secrets.GITHUB_TOKEN }}"
+    #     automatic_release_tag: "dev-windows"
+    #     prerelease: true
+    #     title: "Development Build for Windows"
+    #     files: |
+    #          bin/SCIRun/SCIRun-5.0.beta.*-win64.exe

Superbuild/OsprayExternal.cmake

@@ -25,7 +25,7 @@
 #  DEALINGS IN THE SOFTWARE.
 
 SET_PROPERTY(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
-SET(ospray_GIT_TAG "origin/scirun-build")
+SET(ospray_GIT_TAG "origin/scirun-build-2.4")
 
 # If CMake ever allows overriding the checkout command or adding flags,
 # git checkout -q will silence message about detached head (harmless).

src/Externals/spire/es-render/comp/CommonUniforms.cpp

@@ -26,6 +26,10 @@
 */
 
 
+#ifdef __APPLE__
+#define GL_SILENCE_DEPRECATION
+#endif
+
 #include <gl-shaders/GLShader.hpp>
 
 #include <es-general/util/Math.hpp>

src/Externals/spire/es-render/comp/MatUniform.cpp

@@ -26,6 +26,10 @@
 */
 
 
+#ifdef __APPLE__
+#define GL_SILENCE_DEPRECATION
+#endif
+
 #include <gl-shaders/GLShader.hpp>
 #include <glm/gtc/type_ptr.hpp>           // glm::value_ptr