From f5f6cf81b44892f9e24ff7f0a578033d0228bf75 Mon Sep 17 00:00:00 2001 From: Fabien Freling Date: Thu, 24 Mar 2022 13:25:40 +0100 Subject: [PATCH] use raygui --- 3rdparty/raylib | 2 +- build.zig | 4 ++-- src/main.zig | 12 +++++++++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/3rdparty/raylib b/3rdparty/raylib index 0851960..ca12ef4 160000 --- a/3rdparty/raylib +++ b/3rdparty/raylib @@ -1 +1 @@ -Subproject commit 0851960397f02a477d80eda2239f90fae14dec64 +Subproject commit ca12ef48e9e9f4eae03b1ca43ec3eb0a78d63dd3 diff --git a/build.zig b/build.zig index 82edbfb..60371b4 100644 --- a/build.zig +++ b/build.zig @@ -14,8 +14,8 @@ pub fn build(b: *std.build.Builder) void { const exe = b.addExecutable("doggo", "src/main.zig"); exe.setTarget(target); - - const ray = raylib.Pkg("./3rdparty/raylib/src").addRaylib(b, exe.target); + + const ray = raylib.addRaylib(b, exe.target); exe.linkLibrary(ray); exe.addIncludeDir("./3rdparty/raylib/src"); diff --git a/src/main.zig b/src/main.zig index 47404c4..b5d8b92 100644 --- a/src/main.zig +++ b/src/main.zig @@ -2,6 +2,10 @@ const std = @import("std"); const ray = @cImport({ @cInclude("raylib.h"); }); +const raygui = @cImport({ + @cDefine("RAYGUI_IMPLEMENTATION", {}); + @cInclude("extras/raygui.h"); +}); pub fn main() anyerror!void { std.log.info("All your codebase are belong to us.", .{}); @@ -9,15 +13,17 @@ pub fn main() anyerror!void { ray.InitWindow(800, 450, "ray [core] example - basic window"); defer ray.CloseWindow(); - while (!ray.WindowShouldClose()) - { + while (!ray.WindowShouldClose()) { ray.BeginDrawing(); defer ray.EndDrawing(); ray.ClearBackground(ray.RAYWHITE); ray.DrawText("Congrats! You created your first window!", 190, 200, 20, ray.LIGHTGRAY); - } + if (raygui.GuiButton(raygui.Rectangle{ .x = 190, .y = 250, .width = 150, .height = 30 }, "Button")) { + std.log.info("Button pressed", .{}); + } + } } test "basic test" {