ImGUI Test Engine, new zig-gamedev, cleanup

cyberegoorg · Mar 27, 2024 · 3f9d5f6 · 3f9d5f6
1 parent 063e5fd
commit 3f9d5f6
Show file tree

Hide file tree

Showing 230 changed files with 14,802 additions and 6,459 deletions.
diff --git a/.ci/build.sh b/.ci/build.sh
@@ -6,13 +6,13 @@ set -e
 ZIG_ARCH=$1
 OPTIMIZE=$2
 
-./zig/lfs_pull.sh ${ZIG_ARCH}
+#./zig/get_zig.sh ${ZIG_ARCH}
 ./lfs_pull.sh
 
 function build() {
     WITH_TRACY=$1
     WITH_NFD=$2
-    zig/bin/${ZIG_ARCH}/zig build --verbose -Doptimize=${OPTIMIZE} -Dwith-tracy=${WITH_TRACY} -Dwith-nfd=${WITH_NFD}
+    zig/bin/${ZIG_ARCH}/zig build -Doptimize=${OPTIMIZE} -Dwith-tracy=${WITH_TRACY} -Dwith-nfd=${WITH_NFD}
 }
 
 build false true

diff --git a/.ci/gen-docs.sh b/.ci/gen-docs.sh
@@ -5,7 +5,7 @@ set -e
 
 ZIG_ARCH=$1
 
-./zig/lfs_pull.sh ${ZIG_ARCH}
+./zig/get_zig.sh ${ZIG_ARCH}
 
 function build() {
     zig/${ZIG_ARCH}/zig build docs

diff --git a/.ci/init_zig.sh b/.ci/init_zig.sh
@@ -6,5 +6,5 @@ set -e
 ZIG_ARCH=$1
 OPTIMIZE=$2
 
-./zig/lfs_pull.sh ${ZIG_ARCH}
-./lfs_pull.sh
+./zig/get_zig.sh ${ZIG_ARCH}
+#./lfs_pull.sh
diff --git a/.ci/xbuild.sh b/.ci/xbuild.sh
@@ -7,7 +7,7 @@ ZIG_ARCH=$1
 TARGET_ZIG_ARCH=$2
 OPTIMIZE=$3
 
-./zig/lfs_pull.sh ${ZIG_ARCH}
+./zig/get_zig.sh ${ZIG_ARCH}
 ./lfs_pull.sh
 
 mkdir -p build/${OPTIMIZE}

diff --git a/.github/workflows/ci.yaml → .ci/xbuild.yaml b/.github/workflows/ci.yaml → .ci/xbuild.yaml
@@ -63,7 +63,7 @@ jobs:
         with:
           sparse-checkout: |
             .ci/x86_64-macos-test.sh
-            tests/
+            fixtures/
       - name: Download build
         uses: actions/cache@v3
         with:
@@ -86,7 +86,7 @@ jobs:
   #       with:
   #         sparse-checkout: |
   #           .ci/x86_64-macos-linux.sh
-  #           tests/
+  #           fixtures/
   #     - name: Download build
   #       uses: actions/cache@v3
   #       with:
@@ -108,7 +108,7 @@ jobs:
         with:
           sparse-checkout: |
             .ci/x86_64-windows-test.ps1
-            tests/
+            fixtures/
       - name: Download build
         uses: actions/cache@v3
         with:

diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -1,4 +1,4 @@
-name: Build and publish docs
+name: Docs
 
 on:
   push:
@@ -17,7 +17,7 @@ permissions:
 env:
   INSTANCE: Writerside/cetech1
   ARTIFACT: webHelpCETECH12-all.zip
-  DOCKER_VERSION: 233.14389
+  DOCKER_VERSION: 233.14938
 
 jobs:
   build:
@@ -30,6 +30,9 @@ jobs:
       - name: Pull LFS
         run: git lfs pull --include "Writerside/**/*"
 
+      # - name: Install d2
+      #   run: curl -fsSL https://d2lang.com/install.sh | sh -s --
+
       - name: Build Writerside docs using Docker
         uses: JetBrains/writerside-github-action@v4
         with:

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -1,4 +1,7 @@
-name: "Build & Test"
+name: Test
+
+permissions:
+  checks: write
 
 on:
   pull_request:
@@ -9,6 +12,7 @@ on:
       - "include/**"
       - "externals/**"
       - "build.zig"
+      - "build.zig.zon"
 
 concurrency:
   group: ${{ github.head_ref || github.run_id }}-${{ github.actor }}
@@ -18,14 +22,28 @@ jobs:
   validation:
     name: Validation
     runs-on: ubuntu-latest
-    timeout-minutes: 5
+    timeout-minutes: 1
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           submodules: true
-      - name: Prepare
+
+      - name: Read .zig-version
+        id: zigversion
+        uses: juliangruber/read-file-action@v1
+        with:
+          path: ./.zigversion
+      - name: Cache zig binary
+        id: cache-zig
+        uses: actions/cache@v4
+        with:
+          path: zig/bin/x86_64-linux/zig
+          key: ${{ runner.arch }}-${{ runner.os }}-zig-${{ steps.zigversion.outputs.content }}
+      - name: Init zig
+        if: steps.cache-zig.outputs.cache-hit != 'true'
         run: .ci/init_zig.sh x86_64-linux
+
       - name: Lint
         run: zig/bin/x86_64-linux/zig fmt --check . --exclude externals/
 
@@ -41,7 +59,22 @@ jobs:
           submodules: true
 
       - name: Prepare
-        run: sudo apt-get update && sudo apt-get install libgtk-3-dev kcov
+        run: sudo apt-get update && sudo apt-get install kcov libdbus-1-dev
+
+      - name: Read .zig-version
+        id: zigversion
+        uses: juliangruber/read-file-action@v1
+        with:
+          path: ./.zigversion
+      - name: Cache zig binary
+        id: cache-zig
+        uses: actions/cache@v4
+        with:
+          path: zig/bin/x86_64-linux/zig
+          key: ${{ runner.arch }}-${{ runner.os }}-zig-${{ steps.zigversion.outputs.content }}
+      - name: Init zig
+        if: steps.cache-zig.outputs.cache-hit != 'true'
+        run: .ci/init_zig.sh x86_64-linux
 
       - name: Build
         run: .ci/build.sh x86_64-linux Debug
@@ -54,7 +87,7 @@ jobs:
           overwrite: true
           retention-days: 1
 
-      - name: Run test
+      - name: Test unit
         run: kcov --include-pattern=cetech1/src/ kcov-output zig-out/bin/cetech1_test
 
       - name: Upload code coverage report to Codecov
@@ -65,12 +98,25 @@ jobs:
           slug: cyberegoorg/cetech1
           fail_ci_if_error: true
           verbose: true
+          flags: unittests
 
       - name: Test headless standalone
         run: zig-out/bin/cetech1 --headless --max-kernel-tick 5
 
       - name: Test headless standalone with asset root
-        run: zig-out/bin/cetech1 --headless --max-kernel-tick 5 --asset-root tests/test_asset/
+        run: zig-out/bin/cetech1 --headless --max-kernel-tick 5 --asset-root fixtures/test_asset/
+
+      # TODO: make linux work in CI
+      # - name: Test UI headless 
+      #   run: zig-out/bin/cetech1 --headless --test-ui --test-ui-junit ./result.xml
+      #
+      # - name: Publish Test Report
+      #   uses: mikepenz/action-junit-report@v4
+      #   if: success() || failure() # always run even if the previous step fails
+      #   with:
+      #     report_paths: "./result.xml"
+      #     fail_on_failure: true
+      #     detailed_summary: true
 
   x86-64-macos:
     needs: ["validation"]
@@ -88,6 +134,21 @@ jobs:
           brew update
           brew install kcov
 
+      - name: Read .zig-version
+        id: zigversion
+        uses: juliangruber/read-file-action@v1
+        with:
+          path: ./.zigversion
+      - name: Cache zig binary
+        id: cache-zig
+        uses: actions/cache@v4
+        with:
+          path: zig/bin/x86_64-macos/zig
+          key: ${{ runner.arch }}-${{ runner.os }}-zig-${{ steps.zigversion.outputs.content }}
+      - name: Init zig
+        if: steps.cache-zig.outputs.cache-hit != 'true'
+        run: .ci/init_zig.sh x86_64-macos
+
       - name: Build
         run: .ci/build.sh x86_64-macos Debug
 
@@ -99,14 +160,27 @@ jobs:
           overwrite: true
           retention-days: 1
 
-      - name: Run test
+      - name: Test unit
         run: zig-out/bin/cetech1_test
+        #run: kcov --include-pattern=cetech1/src/ kcov-output zig-out/bin/cetech1_test
 
       - name: Test headless standalone
         run: zig-out/bin/cetech1 --headless --max-kernel-tick 5
 
       - name: Test headless standalone with asset root
-        run: zig-out/bin/cetech1 --headless --max-kernel-tick 5 --asset-root tests/test_asset/
+        run: zig-out/bin/cetech1 --headless --max-kernel-tick 5 --asset-root fixtures/test_asset/
+
+      - name: Test UI headless 
+        run: zig-out/bin/cetech1 --headless --test-ui --test-ui-junit ./result.xml
+
+      - name: Publish Test Report
+        uses: mikepenz/action-junit-report@v4
+        if: success() || failure() # always run even if the previous step fails
+        with:
+          report_paths: "./result.xml"
+          fail_on_failure: true
+          detailed_summary: true
+          require_tests: true
 
   x86-64-windows:
     needs: ["validation"]
@@ -119,6 +193,22 @@ jobs:
         with:
           submodules: true
 
+      - name: Read .zig-version
+        id: zigversion
+        uses: juliangruber/read-file-action@v1
+        with:
+          path: ./.zigversion
+      - name: Cache zig binary
+        id: cache-zig
+        uses: actions/cache@v4
+        with:
+          path: zig/bin/x86_64-windows/zig.exe
+          key: ${{ runner.arch }}-${{ runner.os }}-zig-${{ steps.zigversion.outputs.content }}
+      - name: Init zig
+        if: steps.cache-zig.outputs.cache-hit != 'true'
+        shell: bash
+        run: .ci/init_zig.sh x86_64-windows
+
       - name: Build
         shell: bash
         run: .ci/build.sh x86_64-windows Debug
@@ -138,11 +228,27 @@ jobs:
           maximum-size: 16GB
           disk-root: "C:"
 
-      - name: Run test
-        run: zig-out/bin/cetech1_test.exe
+      - name: Test unit
+        shell: bash
+        run: zig-out/bin/cetech1_test
 
       - name: Test headless standalone
-        run: zig-out/bin/cetech1.exe --headless --max-kernel-tick 5
+        shell: bash
+        run: zig-out/bin/cetech1 --headless --max-kernel-tick 5
 
       - name: Test headless standalone with asset root
-        run: zig-out/bin/cetech1.exe --headless --max-kernel-tick 5 --asset-root tests/test_asset/
+        shell: bash
+        run: zig-out/bin/cetech1 --headless --max-kernel-tick 5 --asset-root fixtures/test_asset/
+
+      - name: Test UI headless 
+        shell: bash
+        run: zig-out/bin/cetech1 --headless --test-ui
+
+      # TODO: error on save
+      # - name: Publish Test Report
+      #   uses: mikepenz/action-junit-report@v4
+      #   if: success() || failure() # always run even if the previous step fails
+      #   with:
+      #     report_paths: "./result.xml"
+      #     fail_on_failure: true
+      #     detailed_summary: true
diff --git a/.gitignore b/.gitignore
@@ -25,9 +25,15 @@ zig-out
 kcov-output/
 
 imgui.ini
+!**/default/imgui.ini
+
+_static.zig
 
 # temp folder for tests
-/tests/tmp
+/fixtures/tmp
 
 # folder for generated tmp data, cache and debug purpose files
 .ct_temp
+
+result.xml
+*.tracy
diff --git a/.gitmodules b/.gitmodules
@@ -10,12 +10,12 @@
 [submodule "externals/shared/tools/zls"]
 	path = externals/shared/tools/zls
 	url = https://github.com/zigtools/zls.git
-[submodule "zig"]
-	path = zig
-	url = https://github.com/cyberegoorg/cetech1-zig.git
 [submodule "externals/shared/lib/mach-gamemode"]
 	path = externals/shared/lib/mach-gamemode
 	url = https://github.com/hexops/mach-gamemode.git
 [submodule "externals/shared/lib/SDL_GameControllerDB"]
 	path = externals/shared/lib/SDL_GameControllerDB
 	url = https://github.com/mdqinc/SDL_GameControllerDB.git
+[submodule "zig"]
+	path = zig
+	url = https://github.com/cyberegoorg/cetech1-zig.git
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -3,7 +3,6 @@
         "ziglang.vscode-zig", // ZIG support. 
         "vadimcn.vscode-lldb", // Debugging support.
         "Gruntfuggly.todo-tree", // Todo viewer.
-        "tintinweb.graphviz-interactive-preview", // DOT preview (asset_graph, etc...)
-        "bierner.markdown-mermaid", // mermaid preview
+        "kdheepak.d2-markdown-preview" // D2 preview
     ]
 }