diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b45fb17c..2bf14014 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -46,9 +46,13 @@ jobs: run: | cd examples/sdl dub build --compiler=${{ env.DC }} + cd ../renderer + dub - name: '[Windows] Build' if: runner.os == 'Windows' run: | cd examples/sdl dub build --compiler=${{ env.DC }} + cd ..\renderer + dub diff --git a/.gitignore b/.gitignore index 93b0ba2b..8fe6e110 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ nanogui-test-* /.vscode/ /examples/arsd/example-sdl /sizeindex +/examples/renderer/renderer diff --git a/auxil/dub.sdl b/auxil/dub.sdl index 778c0f94..16718ee3 100644 --- a/auxil/dub.sdl +++ b/auxil/dub.sdl @@ -1,10 +1,10 @@ name "auxil" description "A minimal D application." authors "drug007" -copyright "Copyright © 2020, drug007" +copyright "Copyright © 2020-2022, drug007" license "BSL" targetType "library" -dependency "taggedalgebraic" version="~>0.11.9" +dependency "taggedalgebraic" version="~>0.11.22" dependency "automem" version="~>0.6.1" dependency "nogc" version="~>0.5.0" diff --git a/dub.sdl b/dub.sdl index 0e5bf4b2..fdd17475 100644 --- a/dub.sdl +++ b/dub.sdl @@ -2,8 +2,8 @@ name "nanogui" description "Port of nanogui to dlang." license "BSD-like" authors "drug007" -copyright "Copyright © 2018-2020, drug007" -dependency "arsd-official:nanovega" version="~>9.3.2" +copyright "Copyright © 2018-2022, drug007" +dependency "arsd-official:nanovega" version="~>10.8.2" dependency "gfm:math" version="~>8.0.6" dependency "gfm7:opengl" version="~>1.1.2" dependency "gfm7:sdl2" version="~>1.1.2" diff --git a/examples/renderer/complexCase.html b/examples/renderer/complexCase.html index c4628104..5095a136 100644 --- a/examples/renderer/complexCase.html +++ b/examples/renderer/complexCase.html @@ -1,2 +1,2 @@ \ No newline at end of file +]]> \ No newline at end of file diff --git a/examples/renderer/complexCase.svg b/examples/renderer/complexCase.svg index 73ddb2bb..1725f521 100644 --- a/examples/renderer/complexCase.svg +++ b/examples/renderer/complexCase.svg @@ -1,2 +1,2 @@ \ No newline at end of file +]]> \ No newline at end of file diff --git a/examples/renderer/dub.sdl b/examples/renderer/dub.sdl index 2eef3fed..d75e7b30 100644 --- a/examples/renderer/dub.sdl +++ b/examples/renderer/dub.sdl @@ -1,10 +1,10 @@ -name "treeview" +name "renderer" description "Example of TreeView using" authors "drug007" -copyright "Copyright © 2019-2020, drug007" +copyright "Copyright © 2019-2022, drug007" license "BSL" dependency "nanogui" path="../.." -dependency "arsd-official:nanovega" version="5.3.7" -dependency "taggedalgebraic" version="~>0.10.13" +dependency "arsd-official:nanovega" version="10.8.2" +dependency "taggedalgebraic" version="~>0.11.22" dependency "printed" version="~>0.0.12" diff --git a/examples/renderer/dub.selections.json b/examples/renderer/dub.selections.json index 1ab717a9..2c86c77d 100644 --- a/examples/renderer/dub.selections.json +++ b/examples/renderer/dub.selections.json @@ -1,19 +1,26 @@ { "fileVersion": 1, "versions": { - "arsd-official": "5.3.7", + "arsd-official": "10.8.2", + "automem": "0.6.7", + "auxil": {"path":"../../auxil"}, + "bindbc-loader": "0.3.2", + "bindbc-opengl": "0.15.0", + "bindbc-sdl": "0.19.2", "binrange": "1.0.3", - "derelict-gl3": "2.0.0-beta.8", - "derelict-sdl2": "3.1.0-alpha.4", - "derelict-util": "3.0.0-beta.2", - "dplug": "8.4.15", - "gfm": "7.0.8", - "intel-intrinsics": "1.1.3", + "dplug": "9.3.4", + "gfm": "8.0.6", + "gfm7": "1.1.2", + "intel-intrinsics": "1.10.2", "isfreedesktop": "0.1.1", + "localimport": "1.3.0", "nanogui": {"path":"../.."}, - "printed": "0.0.12", - "standardpaths": "0.8.1", - "taggedalgebraic": "0.10.13", + "nogc": "0.5.1", + "printed": "0.0.14", + "standardpaths": "0.8.2", + "taggedalgebraic": "0.11.22", + "test_allocator": "0.3.3", + "unit-threaded": "0.10.8", "xdgpaths": "0.2.5" } } diff --git a/examples/renderer/itemInColumn.html b/examples/renderer/itemInColumn.html index 415e7a59..e06fea0d 100644 --- a/examples/renderer/itemInColumn.html +++ b/examples/renderer/itemInColumn.html @@ -1,2 +1,2 @@ \ No newline at end of file +]]> \ No newline at end of file diff --git a/examples/renderer/itemInColumn.svg b/examples/renderer/itemInColumn.svg index bcefeb3b..b62650d8 100644 --- a/examples/renderer/itemInColumn.svg +++ b/examples/renderer/itemInColumn.svg @@ -1,2 +1,2 @@ \ No newline at end of file +]]> \ No newline at end of file diff --git a/examples/renderer/itemInRow.html b/examples/renderer/itemInRow.html index 047984b3..77f5ce98 100644 --- a/examples/renderer/itemInRow.html +++ b/examples/renderer/itemInRow.html @@ -1,2 +1,2 @@ \ No newline at end of file +]]> \ No newline at end of file diff --git a/examples/renderer/itemInRow.svg b/examples/renderer/itemInRow.svg index 87e9c8b0..7b86910f 100644 --- a/examples/renderer/itemInRow.svg +++ b/examples/renderer/itemInRow.svg @@ -1,2 +1,2 @@ \ No newline at end of file +]]> \ No newline at end of file diff --git a/examples/sdl/dub.sdl b/examples/sdl/dub.sdl index d0883871..b0201c1e 100644 --- a/examples/sdl/dub.sdl +++ b/examples/sdl/dub.sdl @@ -1,12 +1,12 @@ name "nanogui-sdl" description "Example of nanogui using sdl backend" authors "drug" -copyright "Copyright © 2018-2020, drug" +copyright "Copyright © 2018-2022, drug" license "BSL" targetType "executable" targetName "example-sdl" dependency "nanogui" path="../.." -dependency "resusage" version="~>0.2.8" -dependency "taggedalgebraic" version="0.11.9" +dependency "resusage" version="~>0.3.2" +dependency "taggedalgebraic" version="0.11.22" diff --git a/examples/sdl/dub.selections.json b/examples/sdl/dub.selections.json index 6856105a..94a3c7c7 100644 --- a/examples/sdl/dub.selections.json +++ b/examples/sdl/dub.selections.json @@ -1,7 +1,7 @@ { "fileVersion": 1, "versions": { - "arsd-official": "9.3.2", + "arsd-official": "10.8.2", "automem": "0.6.7", "auxil": {"path":"../../auxil"}, "bindbc-loader": "0.3.2", @@ -9,12 +9,12 @@ "bindbc-sdl": "0.19.2", "gfm": "8.0.6", "gfm7": "1.1.2", - "intel-intrinsics": "1.6.2", + "intel-intrinsics": "1.10.2", "localimport": "1.3.0", "nanogui": {"path":"../.."}, "nogc": "0.5.1", - "resusage": "0.2.8", - "taggedalgebraic": "0.11.9", + "resusage": "0.3.2", + "taggedalgebraic": "0.11.22", "test_allocator": "0.3.3", "unit-threaded": "0.10.8" }