Filter, AssetInput, Modal, Create menu, Tags, Multi-select, D&D, Obje…

…ct Buffer

.ci/build.sh

@@ -4,20 +4,17 @@ set -x
 set -e
 
 ZIG_ARCH=$1
-TARGET_ZIG_ARCH=$2
-OPTIMIZE=$3
+OPTIMIZE=$2
 
-./bin/zig/lfs_pull.sh ${ZIG_ARCH}
+./zig/lfs_pull.sh ${ZIG_ARCH}
 ./lfs_pull.sh
 
-mkdir -p build/${OPTIMIZE}
-
 function build() {
     WITH_TRACY=$1
-    bin/zig/zig_${ZIG_ARCH} build -Dtarget=${TARGET_ZIG_ARCH} -Doptimize=${OPTIMIZE} -Dwith-tracy=${WITH_TRACY} -Dwith-nfd=false --verbose
-    mv zig-out build/${OPTIMIZE}/${TARGET_ZIG_ARCH}
+    WITH_NFD=$2
+    zig/bin/${ZIG_ARCH}/zig build --verbose -Doptimize=${OPTIMIZE} -Dwith-tracy=${WITH_TRACY} -Dwith-nfd=${WITH_NFD}
 }
 
-build false
+build false true
 
-ls -Rhan build/
+ls -Rhan zig-out/

.ci/gen-docs.sh

@@ -5,10 +5,10 @@ set -e
 
 ZIG_ARCH=$1
 
-./bin/zig/lfs_pull.sh ${ZIG_ARCH}
+./zig/lfs_pull.sh ${ZIG_ARCH}
 
 function build() {
-    bin/zig/zig_${ZIG_ARCH} build docs
+    zig/${ZIG_ARCH}/zig build docs
 }
 
 build x86_64-linux

.ci/init_zig.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -x
+set -e
+
+ZIG_ARCH=$1
+OPTIMIZE=$2
+
+./zig/lfs_pull.sh ${ZIG_ARCH}
+./lfs_pull.sh

.ci/xbuild.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -x
+set -e
+
+ZIG_ARCH=$1
+TARGET_ZIG_ARCH=$2
+OPTIMIZE=$3
+
+./zig/lfs_pull.sh ${ZIG_ARCH}
+./lfs_pull.sh
+
+mkdir -p build/${OPTIMIZE}
+
+function build() {
+    WITH_TRACY=$1
+    zig/bin/${ZIG_ARCH}/zig build -Dtarget=${TARGET_ZIG_ARCH} -Doptimize=${OPTIMIZE} -Dwith-tracy=${WITH_TRACY} -Dwith-nfd=false --verbose
+    mv zig-out build/${OPTIMIZE}/${TARGET_ZIG_ARCH}
+}
+
+build false
+
+ls -Rhan build/

.ci/x86_64-linux-test.sh → .ci/xx86_64-linux-test.sh

@@ -11,4 +11,4 @@ chmod -R 777 zig-out/
 ls -Rhan zig-out/
 
 zig-out/bin/cetech1_test 
-zig-out/bin/cetech1 --headless --max-kernel-tick 5
+#zig-out/bin/cetech1 --headless --max-kernel-tick 5

.ci/x86_64-windows-test.ps1 → .ci/xx86_64-windows-test.ps1

@@ -15,5 +15,5 @@ Move-Item -Path ./build/$optimize/x86_64-windows -Destination ./zig-out
 zig-out/bin/cetech1_test.exe
 CheckLastExitCode
 
-zig-out/bin/cetech1.exe --headless --max-kernel-tick 5
-CheckLastExitCode
+#zig-out/bin/cetech1.exe --headless --max-kernel-tick 5
+#CheckLastExitCode

.gitattributes

@@ -1,4 +1,4 @@
-bin/zig/zig_* filter=lfs diff=lfs merge=lfs -texts
+#bin/zig/zig_* filter=lfs diff=lfs merge=lfs -texts
 
 *.zig text eol=lf
 

.github/workflows/ci.yaml

@@ -1,9 +1,9 @@
-name: "Build & Test"
+name: "XCompile Build & Test"
 
 on:
   pull_request:
   push:
-    branches: ["main"]
+    #branches: ["main"]
     paths:
       - "bin/**"
       - "src/**"
@@ -26,11 +26,11 @@ jobs:
         with:
           submodules: true
 
-      - name: Prepare
-        run: sudo apt-get install libgtk-3-dev
+      # - name: Prepare
+      #   run: sudo apt-get update && sudo apt-get install libgtk-3-dev
 
-      - name: Build x86_64-linux Debug
-        run: .ci/build.sh x86_64-linux x86_64-linux Debug
+      # - name: Build x86_64-linux Debug
+      #   run: .ci/build.sh x86_64-linux x86_64-linux-gnu Debug
       - name: Build x86_64-macos Debug
         run: .ci/build.sh x86_64-linux x86_64-macos Debug
       - name: Build x86_64-windows Debug
@@ -73,8 +73,8 @@ jobs:
       - name: Test
         run: sh .ci/x86_64-macos-test.sh Debug
 
-  # TODO: i dont know why but i see files, persmision looks ok
-  #       but cant run because file not found... WTF
+  #  TODO: i dont know why but i see files, persmision looks ok
+  #        but cant run because file not found... WTF
   # test-x86_64-linux:
   #   name: Test x86_64-linux Debug
   #   runs-on: ubuntu-latest
@@ -117,7 +117,7 @@ jobs:
           fail-on-cache-miss: true
           enableCrossOsArchive: true
       - name: configure Pagefile
-        uses: al-cheb/configure-pagefile-action@v1.2
+        uses: al-cheb/configure-pagefile-action@v1.4
         with:
           minimum-size: 8GB
           maximum-size: 16GB
@@ -140,7 +140,7 @@ jobs:
       - test-x86_64-windows
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Cleanup
         run: |

.github/workflows/docs.yaml

@@ -17,15 +17,15 @@ permissions:
 env:
   INSTANCE: Writerside/cetech1
   ARTIFACT: webHelpCETECH12-all.zip
-  DOCKER_VERSION: 232.10165.1
+  DOCKER_VERSION: 233.14389
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Build Writerside docs using Docker
         uses: JetBrains/writerside-github-action@v4
@@ -102,7 +102,7 @@ jobs:
     needs: [build, test, deploy]
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Cleanup
         run: |

.github/workflows/test.yaml

@@ -0,0 +1,148 @@
+name: "Build & Test"
+
+on:
+  pull_request:
+  push:
+    #branches: ["main"]
+    paths:
+      - "src/**"
+      - "include/**"
+      - "externals/**"
+      - "build.zig"
+
+concurrency:
+  group: ${{ github.head_ref || github.run_id }}-${{ github.actor }}
+  cancel-in-progress: true
+
+jobs:
+  validation:
+    name: Validation
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: Prepare
+        run: .ci/init_zig.sh x86_64-linux
+      - name: Lint
+        run: zig/bin/x86_64-linux/zig fmt --check . --exclude externals/
+
+  x86-64-linux:
+    needs: ["validation"]
+    name: x86-64 Linux
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Prepare
+        run: sudo apt-get update && sudo apt-get install libgtk-3-dev kcov
+
+      - name: Build
+        run: .ci/build.sh x86_64-linux Debug
+
+      - name: Upload build
+        uses: actions/upload-artifact@v4
+        with:
+          name: x86-64-linux-bin
+          path: zig-out/
+          overwrite: true
+          retention-days: 1
+
+      - name: Run test
+        run: kcov --include-pattern=cetech1/src/ kcov-output zig-out/bin/cetech1_test
+
+      - name: Upload code coverage report to Codecov
+        uses: codecov/codecov-action@v4
+        with:
+          directory: kcov-output
+          token: ${{ secrets.CODECOV_TOKEN }}
+          slug: cyberegoorg/cetech1
+          fail_ci_if_error: true
+          verbose: true
+
+      - 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/
+
+  x86-64-macos:
+    needs: ["validation"]
+    name: x86-64 Macos
+    runs-on: macos-latest
+    timeout-minutes: 10
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Prepare
+        run: |
+          brew update
+          brew install kcov
+
+      - name: Build
+        run: .ci/build.sh x86_64-macos Debug
+
+      - name: Upload build
+        uses: actions/upload-artifact@v4
+        with:
+          name: x86-64-macos-bin
+          path: zig-out/
+          overwrite: true
+          retention-days: 1
+
+      - name: Run test
+        run: 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/
+
+  x86-64-windows:
+    needs: ["validation"]
+    name: x86-64 Windows
+    runs-on: windows-latest
+    timeout-minutes: 10
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Build
+        shell: bash
+        run: .ci/build.sh x86_64-windows Debug
+
+      - name: Upload build
+        uses: actions/upload-artifact@v4
+        with:
+          name: x86-64-windows-bin
+          path: zig-out/
+          overwrite: true
+          retention-days: 1
+
+      - name: configure Pagefile
+        uses: al-cheb/[email protected]
+        with:
+          minimum-size: 8GB
+          maximum-size: 16GB
+          disk-root: "C:"
+
+      - name: Run test with kcov
+        run: zig-out/bin/cetech1_test.exe
+
+      - name: Test headless standalone
+        run: zig-out/bin/cetech1.exe --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/

.gitmodules

@@ -1,12 +1,21 @@
-[submodule "bin/zig"]
-	path = bin/zig
-	url = https://github.com/cyberegoorg/cetech1-zig.git
 [submodule "externals/shared/lib/zig-gamedev"]
 	path = externals/shared/lib/zig-gamedev
 	url = https://github.com/OndraVoves/zig-gamedev.git
 [submodule "externals/shared/lib/zig-uuid"]
 	path = externals/shared/lib/zig-uuid
 	url = https://github.com/tensorush/zig-uuid.git
-[submodule "externals/shared/lib/nfd-zig"]
-	path = externals/shared/lib/nfd-zig
-	url = https://github.com/fabioarnold/nfd-zig.git
+[submodule "externals/shared/lib/zf"]
+	path = externals/shared/lib/zf
+	url = https://github.com/natecraddock/zf.git
+[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

.lldbinit-template

@@ -1,3 +1,3 @@
-command script import <CHANGE_ME_TO_REPODIR>/bin/zig/tools/lldb_pretty_printers.py
+command script import <CHANGE_ME_TO_REPODIR>/zig/tools/lldb_pretty_printers.py
 type category enable zig
 type category enable zig.std

.space.kts

@@ -0,0 +1,8 @@
+job("Hello world") {
+    git {
+        // Do not download large files
+        env["GIT_LFS_SKIP_SMUDGE"] = "1"
+    }
+
+    container(displayName = "Say hello", image = "hello-world")
+}