WIP: Upgrade ZBGFX, ZNFDE, ZFlecs, ZGUI, FontAwesome => Lucide

Author: OndraVoves

.github/workflows/docs.yaml

@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       # - name: Pull LFS
       #   run: git lfs pull --include "docs/**/*"
@@ -106,7 +106,7 @@ jobs:
     needs: [build, test, deploy]
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Cleanup
         run: |

.github/workflows/test.yaml

@@ -28,9 +28,12 @@ jobs:
     timeout-minutes: 1
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
+
       - name: Install Zig
         uses: mlugg/setup-zig@v2
+        with:
+          cache-size-limit: 4096
 
       - name: Lint
         run: zig fmt --check . --exclude externals/
@@ -52,7 +55,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - if: runner.os == 'Linux'
         name: Prepare linux
@@ -68,17 +71,19 @@ jobs:
 
       - name: Install Zig
         uses: mlugg/setup-zig@v2
+        with:
+          cache-size-limit: 4096
 
       - name: Init repo
         shell: bash
         run: zig build init
 
       - name: Build
         shell: bash
-        run: zig build -Doptimize=Debug -Dwith_shaderc=false
+        run: zig build -Doptimize=Debug
 
       - name: Upload build
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: ${{matrix.os}}-bin
           path: zig-out/
@@ -106,10 +111,9 @@ jobs:
         shell: bash
         run: zig-out/bin/cetech1_test
 
-      # FIXME: Windows
-      - if: runner.os != 'Windows'
-        name: Test UI headless
+      - name: Test UI headless
         run: zig-out/bin/cetech1_studio --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

.gitignore

@@ -27,6 +27,9 @@
 project.xcworkspace/
 xcuserdata/
 
+# Kevelop
+*.kdev4
+
 kcov-output/
 
 imgui.ini
@@ -36,6 +39,7 @@ _static.zig
 # VSCode
 .vscode/launch.json
 .vscode/settings.json
+.vscode/tasks.json
 
 # Idea
 .idea/
@@ -51,4 +55,4 @@ result.xml
 *.tracy
 NodeEditor.json
 
-*.zst
+*.zst

.ide.zon

@@ -1,4 +1,8 @@
 .{
+    .tasks = .{
+        .{ .name = "Build", .type = "shell", .command = "zig", .args = .{"build"} },
+    },
+
     .launchers = .{
         .{ .name = "Unit tests", .program = .{ .path = "zig-out/bin/cetech1_test" }, .args = .{} },
         .{ .name = "No asset root", .args = .{} },

build.zig

@@ -2,6 +2,7 @@ const std = @import("std");
 const builtin = @import("builtin");
 
 pub const generate_ide = @import("src/tools/generate_ide.zig");
+const zbgfx = @import("zbgfx");
 
 const min_zig_version = std.SemanticVersion.parse("0.15.1") catch @panic("Where is .zigversion?");
 const cetech1_version = std.SemanticVersion.parse(@embedFile(".version")) catch @panic("Where is .version?");
@@ -131,6 +132,8 @@ pub fn createKernelExe(
     ignored_modules: ?[]const []const u8,
     ignored_modules_prefix: ?[]const []const u8,
 ) !*std.Build.Step.Compile {
+    const use_lld = !target.result.os.tag.isDarwin();
+
     const exe = b.addExecutable(.{
         .name = bin_name,
         .version = versionn,
@@ -140,6 +143,7 @@ pub fn createKernelExe(
             .optimize = optimize,
         }),
         .use_llvm = true,
+        .use_lld = use_lld,
     });
     exe.root_module.link_libc = true;
     exe.root_module.addImport("kernel", cetech1_kernel);
@@ -172,7 +176,7 @@ pub fn createStudioExe(
     return try createKernelExe(
         b,
         base_bin_name ++ "_studio",
-        "studio",
+        "run-studio",
         "Run studio",
         root_source,
         cetech1_kernel,
@@ -246,7 +250,7 @@ pub fn build(b: *std.Build) !void {
         .nfd_portal = b.option(bool, "nfd_portal", "build NFD with xdg-desktop-portal instead of GTK. ( Linux, nice for steamdeck;) )") orelse true,
 
         // ZGUI
-        .with_freetype = b.option(bool, "with_freetype", "build coreui with freetype support") orelse false,
+        .with_freetype = b.option(bool, "with_freetype", "build coreui with freetype support") orelse true,
 
         // BGFX
         .with_shaderc = b.option(bool, "with_shaderc", "build with shaderc support") orelse true,
@@ -264,6 +268,8 @@ pub fn build(b: *std.Build) !void {
     }
     const options_module = options_step.createModule();
 
+    const use_lld = !target.result.os.tag.isDarwin();
+
     //
     // Extrnals
     //
@@ -343,7 +349,8 @@ pub fn build(b: *std.Build) !void {
     );
 
     // ZBGFX
-    const zbgfx = b.dependency(
+    // TODO: Remove
+    const zbgfx_dep = b.dependency(
         "zbgfx",
         .{
             .target = target,
@@ -384,7 +391,6 @@ pub fn build(b: *std.Build) !void {
             .target = b.graph.host,
         }),
     });
-    b.installArtifact(generate_ide_tool);
 
     // Modules
     const ModulesSet = std.StringArrayHashMapUnmanaged(void);
@@ -418,6 +424,7 @@ pub fn build(b: *std.Build) !void {
     // TODO: Problem with debugdraw in dll on windows.
     if (target.result.os.tag == .windows) {
         try static_modules.put(b.allocator, "gpu_bgfx", {});
+        try static_modules.put(b.allocator, "physics_jolt", {});
     }
 
     // Dynamic modules.
@@ -475,7 +482,6 @@ pub fn build(b: *std.Build) !void {
     const gen_ide_step = b.step("gen-ide", "init/update IDE configs");
     {
         const ide = b.option(generate_ide.EditorType, "ide", "IDE for gen-ide command") orelse .VSCode;
-        const no_zls = b.option(bool, "no_zls", "Dont write zls path with gen-ide command") orelse false;
 
         const gen_ide = b.addRunArtifact(generate_ide_tool);
 
@@ -493,10 +499,6 @@ pub fn build(b: *std.Build) !void {
         gen_ide.addArg("--config");
         gen_ide.addDirectoryArg(b.path(".ide.zon"));
 
-        if (no_zls) {
-            gen_ide.addArg("--no-zls");
-        }
-
         gen_ide_step.dependOn(&gen_ide.step);
     }
 
@@ -520,7 +522,8 @@ pub fn build(b: *std.Build) !void {
     });
 
     if (options.with_shaderc) {
-        b.installArtifact(zbgfx.artifact("shaderc"));
+        const shaderc_install = try zbgfx.build_step.installShaderc(b, zbgfx_dep);
+        b.getInstallStep().dependOn(shaderc_install);
     }
 
     //
@@ -570,14 +573,14 @@ pub fn build(b: *std.Build) !void {
             .name = "gamecontrollerdb",
             .module = b.createModule(.{ .root_source_file = b.path("externals/shared/lib/SDL_GameControllerDB/gamecontrollerdb.txt") }),
         },
-        .{
-            .name = "fa-solid-900",
-            .module = b.createModule(.{ .root_source_file = b.path("externals/shared/fonts/fa-solid-900.ttf") }),
-        },
         .{
             .name = "Roboto-Medium",
             .module = b.createModule(.{ .root_source_file = b.path("externals/shared/fonts/Roboto-Medium.ttf") }),
         },
+        .{
+            .name = "lucide",
+            .module = b.createModule(.{ .root_source_file = b.path("externals/shared/fonts/lucide.ttf") }),
+        },
     };
 
     //
@@ -655,6 +658,7 @@ pub fn build(b: *std.Build) !void {
             .imports = &imports,
         }),
         .use_llvm = true,
+        .use_lld = use_lld,
     });
     useSystemSDK(b, target, tests);
     b.installArtifact(tests);

build.zig.zon

@@ -106,8 +106,8 @@
 
         // zig-gamedev
         .system_sdk = .{
-            .url = "https://github.com/zig-gamedev/system_sdk/archive/c0dbf11cdc17da5904ea8a17eadc54dee26567ec.tar.gz",
-            .hash = "system_sdk-0.3.0-dev-alwUNnYaaAJAtIdE2fg4NQfDqEKs7QCXy_qYukAOBfmF",
+            .url = "https://github.com/zig-gamedev/system_sdk/archive/777e76828f05d5d223df47a4c0de95ae4efde884.tar.gz",
+            .hash = "system_sdk-0.3.0-dev-alwUNqAaaALJ5VoZImZo3n6prezBnQnrpziun3ZeZwcp",
             .lazy = true,
         },
         .zglfw = .{ .path = "externals/shared/lib/zglfw" },

docs/topics/about.md

@@ -34,7 +34,8 @@ posts.
 
 ## Credits/Licenses For Fonts Included In Repository
 
-Some fonts files are available in the `src/embed/fonts/` folder:
+Some fonts files are available in the `externals/shared/fonts/` folder:
 
 - **[Roboto-Medium.ttf](https://fonts.google.com/specimen/Roboto)** - Apache License 2.0
-- **[fa-regular-400.ttf](https://fontawesome.com)** - SIL OFL 1.1 License
+- **[lucide.ttf](https://lucide.dev/)** - ISC License
+

docs/topics/getting-started.md

@@ -46,21 +46,18 @@ Get ZIG `0.15.1`.
     </tab>
 </tabs>
 
-## VSCode
-
-> Repository contain recommended extension.
+## NVim
 
-> add `-Dno_zls` to disable zls path change (For example if you are install zls via vscode plugin).
-> {style="note"}
+> This generate `vscode/{launch.json,tasks.json,settings.json}`
+> that can read pluggins in NVim (ex.: overseer, nvim-dap, ..)
 
 1. Create vscode configs.
     <code-block lang="bash">
         # This generate vscode launch.json with predefined cases
         # create or update settings.json
         # and set zls path to locally builded
         zig build gen-ide -Dide=VSCode
-    </code-block>
-2. Install extension `ziglang.vscode-zig` (or install all recommended)
+    </code-block> 
 
 ## Idea
 
@@ -73,6 +70,19 @@ Need [zigbrains](https://plugins.jetbrains.com/plugin/22456-zigbrains)
         zig build gen-ide -Dide=IDEA
     </code-block>
 
+## VSCode
+
+> Repository contain recommended extension.
+
+1. Create vscode configs.
+    <code-block lang="bash">
+        # This generate vscode launch.json with predefined cases
+        # create or update settings.json
+        # and set zls path to locally builded
+        zig build gen-ide -Dide=VSCode
+    </code-block>
+2. Install extension `ziglang.vscode-zig` (or install all recommended)
+
 ## Build
 
 <tabs>
@@ -132,27 +142,6 @@ Need [zigbrains](https://plugins.jetbrains.com/plugin/22456-zigbrains)
 | `--test-ui-speed`        | `fast`, `normal`,  `cinematic`                        | `fast`          | UI test speed.                              |
 | `--test-ui-junit`        | `str`                                                 | `null`          | UI test JUnit result filename.              |
 
-## ZLS
-
-CETech provide ZLS as submodule, but you must build it.
-
-<tabs>
-    <tab title="MacOS/Linux">
-        <code-block lang="bash">
-            git submodule update --init externals/shared/repo/zls
-            cd externals/shared/repo/zls
-            zig build -Doptimize=ReleaseFast
-        </code-block>
-    </tab>
-    <tab title="Windows">
-        <code-block lang="bash">
-            git submodule update --init externals/shared/repo/zls
-            cd externals/shared/repo/zls
-            zig.exe build -Doptimize=ReleaseFast
-        </code-block>
-    </tab>
-</tabs>
-
 ## Tracy profiler
 
 CETech1 has builtin support for tracy profiler and provide Tracy as submodule, but you must build it first.