Skip to content

Commit

Permalink
Latest updates from develop branch (#93)
Browse files Browse the repository at this point in the history
* putting hdrbatch into HDRView bundle

* allowing folders to be dropped onto the app icon

* adding zap gremlins filter

* fixing build issue. adding Clarberg's equal area spherical mapping

* bug fixes and improvements to hdrbatch parsing

* improving zap gremlins filter

* restructuring to hunt down windows build error

* fixing average and variance calculations

* bump map to normal map conversion filter

* fix nanogui flicker on mac. irradiance convolution and bump -> normal map filters

* updating deprecated CI dependencies

* Update release.yml

* updating CIs

* adding missing IlmBase::Iex dependency
  • Loading branch information
wkjarosz authored Dec 24, 2022
1 parent 73a9722 commit 99dfaeb
Show file tree
Hide file tree
Showing 21 changed files with 1,077 additions and 621 deletions.
537 changes: 229 additions & 308 deletions .cmake-format.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .github/workflows/ci-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
${{github.workspace}}/build/hdrbatch --help
- name: Archive build artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: linux-build-artifacts
path: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
create-dmg --window-size 500 300 --icon-size 96 --volname "HDRView Installer" --app-drop-link 360 105 --icon HDRView.app 130 105 $RESULT ${{github.workspace}}/build-metal/HDRView.app
- name: Archive build artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: HDRView (Metal).dmg
path: |
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
create-dmg --window-size 500 300 --icon-size 96 --volname "HDRView Installer" --app-drop-link 360 105 --icon HDRView.app 130 105 $RESULT ${{github.workspace}}/build-opengl/HDRView.app
- name: Archive build artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: HDRView (OpenGL).dmg
path: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ jobs:
submodules: recursive

- name: Fetch newer Windows SDK
uses: fbactions/setup-winsdk@v1
uses: fbactions/setup-winsdk@v1.3.0
with:
winsdk-build-version: 19041

- name: Get WSL
uses: Vampire/setup-wsl@v1
uses: Vampire/setup-wsl@v1.3.2

- name: Setup MSBuild.exe
uses: microsoft/setup-msbuild@v1.0.2
uses: microsoft/setup-msbuild@v1.1

- name: Configure CMake
run: |
Expand All @@ -47,7 +47,7 @@ jobs:
${{github.workspace}}/build/${{env.BUILD_TYPE}}/hdrbatch.exe --help
- name: Archive build artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: HDRView
path: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,15 @@ jobs:
submodules: recursive

- name: Fetch newer Windows SDK
uses: fbactions/setup-winsdk@v1
uses: fbactions/setup-winsdk@v1.3.0
with:
winsdk-build-version: 19041

- name: Get WSL
uses: Vampire/setup-wsl@v1
uses: Vampire/setup-wsl@v1.3.2

- name: Setup MSBuild.exe
uses: microsoft/setup-msbuild@v1.0.2
uses: microsoft/setup-msbuild@v1.1

- name: Configure CMake
run: |
Expand Down
Loading

0 comments on commit 99dfaeb

Please sign in to comment.