diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a2f6b48ac..07891ab77 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,6 +1,10 @@ name: 🛠️ Build All on: [push, workflow_dispatch] +concurrency: + group: ${{ github.ref }} + cancel-in-progress: ${{ github.ref != 'refs/heads/main' }} + jobs: build: name: ${{ matrix.name }} @@ -10,47 +14,54 @@ jobs: matrix: include: - identifier: linux-debug - name: Linux Debug + name: 🐧 Linux Debug runner: ubuntu-20.04 target: template_debug platform: linux arch: x86_64 + - identifier: linux-release - name: Linux Release + name: 🐧 Linux Release runner: ubuntu-20.04 target: template_release platform: linux arch: x86_64 + - identifier: windows-debug - name: Windows Debug + name: 🪟 Windows Debug runner: ubuntu-20.04 target: template_debug platform: windows arch: x86_64 + - identifier: windows-release - name: Windows Release + name: 🪟 Windows Release runner: ubuntu-20.04 target: template_release platform: windows arch: x86_64 + - identifier: macos-debug - name: macOS Debug + name: 🍎 macOS Debug runner: macos-latest target: template_debug platform: macos + - identifier: macos-release - name: macOS Release + name: 🍎 macOS Release runner: macos-latest target: template_release platform: macos + - identifier: android-debug - name: Android Debug + name: 🤖 Android Debug runner: ubuntu-20.04 target: template_debug platform: android arch: arm64 + - identifier: android-release - name: Android Release + name: 🤖 Android Release runner: ubuntu-20.04 target: template_release platform: android @@ -58,7 +69,7 @@ jobs: steps: - name: Checkout Terrain3D - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: recursive @@ -66,10 +77,6 @@ jobs: if: startsWith(matrix.identifier, 'windows-') uses: ./.github/actions/windows-deps - - name: Setup Android Dependencies - if: startsWith(matrix.identifier, 'android-') - uses: ./.github/actions/android-deps - - name: Setup Base Dependencies uses: ./.github/actions/base-deps @@ -83,7 +90,6 @@ jobs: shell: sh env: SCONS_CACHE: "${{ github.workspace }}/.scons-cache/" - SCONS_CACHE_LIMIT: 7168 run: | scons target='${{ matrix.target }}' platform='${{ matrix.platform }}' arch='${{ matrix.arch }}' debug_symbols=no -j2 diff --git a/README.md b/README.md index ef5f1dcac..26af462e1 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Terrain3D -A high performance, editable terrain system for Godot 4, written in C++. +A high performance, editable terrain system for Godot 4. ## Features * Written in C++ as a GDExtension plugin, which works with official engine builds @@ -10,7 +10,7 @@ A high performance, editable terrain system for Godot 4, written in C++. * Up to 16k x 16k in 1k regions (imagine multiple islands without paying for 16k^2 vram) * Up to 10 Levels of Detail (LODs) * Up to 32 texture sets using albedo, normal, roughness, height -* Sculpting, texture painting, texture detiling, painting colors and wetness, undo/redo +* Sculpting, holes, texture painting, texture detiling, painting colors and wetness * Supports importing heightmaps from [HTerrain](https://github.com/Zylann/godot_heightmap_plugin/), WorldMachine, Unity, Unreal and any tool that can export a heightmap (raw/r16/exr/+). See [importing](https://github.com/TokisanGames/Terrain3D/wiki/Importing-&-Exporting-Data) See the [Wiki](https://github.com/TokisanGames/Terrain3D/wiki) for project status, design, and usage. diff --git a/Terrain3D.vcxproj b/Terrain3D.vcxproj index af85e123d..a5e0751bd 100644 --- a/Terrain3D.vcxproj +++ b/Terrain3D.vcxproj @@ -177,12 +177,19 @@ + + + + + + + diff --git a/Terrain3D.vcxproj.filters b/Terrain3D.vcxproj.filters index ccb14ccb8..f569675f6 100644 --- a/Terrain3D.vcxproj.filters +++ b/Terrain3D.vcxproj.filters @@ -139,8 +139,22 @@ 1. Project Files + + 1. Project Files + + + 1. Project Files + + + 1. Project Files + 1. Project Files + + + 1. Project Files + + \ No newline at end of file