adrien/raylib-zig
1
0
Fork 0
mirror of https://github.com/Not-Nik/raylib-zig.git synced 2025-09-08 19:47:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use packed struct for ConfigFlags (#93)

Browse Source
This commit is contained in:
Not-Nik 2024-05-31 20:22:57 +02:00
parent 98ced86523
commit 6ff9f0a45b
No known key found for this signature in database
GPG Key ID: E95F679E3CDD9784
5 changed files with 110 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
examples/core/window_flags.zig
View File

@ -62,74 +62,74 @@ pub fn main() anyerror!void {
if (rl.isKeyPressed(.key_f)) rl.toggleFullscreen(); // Modifies window size when scaling! if (rl.isKeyPressed(.key_f)) rl.toggleFullscreen(); // Modifies window size when scaling!
if (rl.isKeyPressed(.key_r)) { if (rl.isKeyPressed(.key_r)) {
if (rl.isWindowState(@intFromEnum(rl.ConfigFlags.flag_window_resizable))) { if (rl.isWindowState(rl.ConfigFlags { .window_resizable = true })) {
rl.clearWindowState(.flag_window_resizable); rl.clearWindowState(rl.ConfigFlags { .window_resizable = true });
} else { } else {
rl.setWindowState(.flag_window_resizable); rl.setWindowState(rl.ConfigFlags { .window_resizable = true });
} }
} }
if (rl.isKeyPressed(.key_d)) { if (rl.isKeyPressed(.key_d)) {
if (rl.isWindowState(@intFromEnum(rl.ConfigFlags.flag_window_undecorated))) { if (rl.isWindowState(rl.ConfigFlags { .window_undecorated = true })) {
rl.clearWindowState(.flag_window_undecorated); rl.clearWindowState(rl.ConfigFlags { .window_undecorated = true });
} else { } else {
rl.setWindowState(.flag_window_undecorated); rl.setWindowState(rl.ConfigFlags { .window_undecorated = true });
} }
} }
if (rl.isKeyPressed(.key_h)) { if (rl.isKeyPressed(.key_h)) {
if (!rl.isWindowState(@intFromEnum(rl.ConfigFlags.flag_window_hidden))) { if (!rl.isWindowState(rl.ConfigFlags { .window_hidden = true })) {
rl.setWindowState(.flag_window_hidden); rl.setWindowState(rl.ConfigFlags { .window_hidden = true });
} }
frames_counter = 0; frames_counter = 0;
} }
if (rl.isWindowState(@intFromEnum(rl.ConfigFlags.flag_window_hidden))) { if (rl.isWindowState(rl.ConfigFlags { .window_hidden = true })) {
frames_counter += 1; frames_counter += 1;
if (frames_counter >= 240) rl.clearWindowState(.flag_window_hidden); // Show window after 3 seconds if (frames_counter >= 240) rl.clearWindowState(rl.ConfigFlags { .window_hidden = true }); // Show window after 3 seconds
} }
if (rl.isKeyPressed(.key_n)) { if (rl.isKeyPressed(.key_n)) {
if (!rl.isWindowState(@intFromEnum(rl.ConfigFlags.flag_window_minimized))) { if (!rl.isWindowState(rl.ConfigFlags { .window_minimized = true })) {
rl.minimizeWindow(); rl.minimizeWindow();
} }
frames_counter = 0; frames_counter = 0;
} }
if (rl.isWindowState(@intFromEnum(rl.ConfigFlags.flag_window_minimized))) { if (rl.isWindowState(rl.ConfigFlags { .window_minimized = true })) {
frames_counter += 1; frames_counter += 1;
if (frames_counter >= 240) rl.restoreWindow(); // Restore window after 3 seconds if (frames_counter >= 240) rl.restoreWindow(); // Restore window after 3 seconds
} }
if (rl.isKeyPressed(.key_m)) { if (rl.isKeyPressed(.key_m)) {
// NOTE: Requires `flag_window_resizable` enabled! // NOTE: Requires `flag_window_resizable` enabled!
if (rl.isWindowState(@intFromEnum(rl.ConfigFlags.flag_window_maximized))) { if (rl.isWindowState(rl.ConfigFlags { .window_maximized = true })) {
rl.restoreWindow(); rl.restoreWindow();
} else rl.maximizeWindow(); } else rl.maximizeWindow();
} }
if (rl.isKeyPressed(.key_u)) { if (rl.isKeyPressed(.key_u)) {
if (rl.isWindowState(@intFromEnum(rl.ConfigFlags.flag_window_unfocused))) { if (rl.isWindowState(rl.ConfigFlags { .window_unfocused = true })) {
rl.clearWindowState(.flag_window_unfocused); rl.clearWindowState(rl.ConfigFlags { .window_unfocused = true });
} else rl.setWindowState(.flag_window_unfocused); } else rl.setWindowState(rl.ConfigFlags { .window_unfocused = true });
} }
if (rl.isKeyPressed(.key_t)) { if (rl.isKeyPressed(.key_t)) {
if (rl.isWindowState(@intFromEnum(rl.ConfigFlags.flag_window_topmost))) { if (rl.isWindowState(rl.ConfigFlags { .window_topmost = true })) {
rl.clearWindowState(.flag_window_topmost); rl.clearWindowState(rl.ConfigFlags { .window_topmost = true });
} else rl.setWindowState(.flag_window_topmost); } else rl.setWindowState(rl.ConfigFlags { .window_topmost = true });
} }
if (rl.isKeyPressed(.key_a)) { if (rl.isKeyPressed(.key_a)) {
if (rl.isWindowState(@intFromEnum(rl.ConfigFlags.flag_window_always_run))) { if (rl.isWindowState(rl.ConfigFlags { .window_always_run = true })) {
rl.clearWindowState(.flag_window_always_run); rl.clearWindowState(rl.ConfigFlags { .window_always_run = true });
} else rl.setWindowState(.flag_window_always_run); } else rl.setWindowState(rl.ConfigFlags { .window_always_run = true });
} }
if (rl.isKeyPressed(.key_v)) { if (rl.isKeyPressed(.key_v)) {
if (rl.isWindowState(@intFromEnum(rl.ConfigFlags.flag_vsync_hint))) { if (rl.isWindowState(rl.ConfigFlags { .vsync_hint = true })) {
rl.clearWindowState(.flag_vsync_hint); rl.clearWindowState(rl.ConfigFlags { .vsync_hint = true });
} else rl.setWindowState(.flag_vsync_hint); } else rl.setWindowState(rl.ConfigFlags { .vsync_hint = true });
} }
// Bouncing ball logic // Bouncing ball logic
@ -149,7 +149,7 @@ pub fn main() anyerror!void {
rl.beginDrawing(); rl.beginDrawing();
defer rl.endDrawing(); defer rl.endDrawing();
if (rl.isWindowState(@intFromEnum(rl.ConfigFlags.flag_window_transparent))) { if (rl.isWindowState(rl.ConfigFlags { .window_transparent = true })) {
rl.clearBackground(rl.Color.blank); rl.clearBackground(rl.Color.blank);
} else rl.clearBackground(rl.Color.ray_white); } else rl.clearBackground(rl.Color.ray_white);
@ -182,7 +182,7 @@ pub fn main() anyerror!void {
); );
rl.drawText( rl.drawText(
rl.textFormat("[F] flag_fullscreen_mode: %d", .{ rl.textFormat("[F] flag_fullscreen_mode: %d", .{
@as(i32, @intFromBool(rl.isWindowState(@intFromEnum(rl.ConfigFlags.flag_fullscreen_mode)))), @as(i32, @intFromBool(rl.isWindowState(rl.ConfigFlags { .fullscreen_mode = true }))),
}), }),
10, 10,
80, 80,
@ -191,7 +191,7 @@ pub fn main() anyerror!void {
); );
rl.drawText( rl.drawText(
rl.textFormat("[R] flag_window_resizable: %d", .{ rl.textFormat("[R] flag_window_resizable: %d", .{
@as(i32, @intFromBool(rl.isWindowState(@intFromEnum(rl.ConfigFlags.flag_window_resizable)))), @as(i32, @intFromBool(rl.isWindowState(rl.ConfigFlags { .window_resizable = true }))),
}), }),
10, 10,
100, 100,
@ -200,7 +200,7 @@ pub fn main() anyerror!void {
); );
rl.drawText( rl.drawText(
rl.textFormat("[D] flag_window_undecorated: %d", .{ rl.textFormat("[D] flag_window_undecorated: %d", .{
@as(i32, @intFromBool(rl.isWindowState(@intFromEnum(rl.ConfigFlags.flag_window_undecorated)))), @as(i32, @intFromBool(rl.isWindowState(rl.ConfigFlags { .window_undecorated = true }))),
}), }),
10, 10,
120, 120,
@ -209,7 +209,7 @@ pub fn main() anyerror!void {
); );
rl.drawText( rl.drawText(
rl.textFormat("[H] flag_window_hidden: %d", .{ rl.textFormat("[H] flag_window_hidden: %d", .{
@as(i32, @intFromBool(rl.isWindowState(@intFromEnum(rl.ConfigFlags.flag_window_hidden)))), @as(i32, @intFromBool(rl.isWindowState(rl.ConfigFlags { .window_hidden = true }))),
}), }),
10, 10,
140, 140,
@ -218,7 +218,7 @@ pub fn main() anyerror!void {
); );
rl.drawText( rl.drawText(
rl.textFormat("[N] flag_window_minimized: %d", .{ rl.textFormat("[N] flag_window_minimized: %d", .{
@as(i32, @intFromBool(rl.isWindowState(@intFromEnum(rl.ConfigFlags.flag_window_minimized)))), @as(i32, @intFromBool(rl.isWindowState(rl.ConfigFlags { .window_minimized = true }))),
}), }),
10, 10,
160, 160,
@ -227,7 +227,7 @@ pub fn main() anyerror!void {
); );
rl.drawText( rl.drawText(
rl.textFormat("[M] flag_window_maximized: %d", .{ rl.textFormat("[M] flag_window_maximized: %d", .{
@as(i32, @intFromBool(rl.isWindowState(@intFromEnum(rl.ConfigFlags.flag_window_maximized)))), @as(i32, @intFromBool(rl.isWindowState(rl.ConfigFlags { .window_maximized = true }))),
}), }),
10, 10,
180, 180,
@ -236,7 +236,7 @@ pub fn main() anyerror!void {
); );
rl.drawText( rl.drawText(
rl.textFormat("[U] flag_window_unfocused: %d", .{ rl.textFormat("[U] flag_window_unfocused: %d", .{
@as(i32, @intFromBool(rl.isWindowState(@intFromEnum(rl.ConfigFlags.flag_window_unfocused)))), @as(i32, @intFromBool(rl.isWindowState(rl.ConfigFlags { .window_unfocused = true }))),
}), }),
10, 10,
200, 200,
@ -245,7 +245,7 @@ pub fn main() anyerror!void {
); );
rl.drawText( rl.drawText(
rl.textFormat("[T] flag_window_topmost: %d", .{ rl.textFormat("[T] flag_window_topmost: %d", .{
@as(i32, @intFromBool(rl.isWindowState(@intFromEnum(rl.ConfigFlags.flag_window_topmost)))), @as(i32, @intFromBool(rl.isWindowState(rl.ConfigFlags { .window_topmost = true }))),
}), }),
10, 10,
220, 220,
@ -254,7 +254,7 @@ pub fn main() anyerror!void {
); );
rl.drawText( rl.drawText(
rl.textFormat("[A] flag_window_always_run: %d", .{ rl.textFormat("[A] flag_window_always_run: %d", .{
@as(i32, @intFromBool(rl.isWindowState(@intFromEnum(rl.ConfigFlags.flag_window_always_run)))), @as(i32, @intFromBool(rl.isWindowState(rl.ConfigFlags { .window_always_run = true }))),
}), }),
10, 10,
240, 240,
@ -263,7 +263,7 @@ pub fn main() anyerror!void {
); );
rl.drawText( rl.drawText(
rl.textFormat("[V] flag_vsync_hint: %d", .{ rl.textFormat("[V] flag_vsync_hint: %d", .{
@as(i32, @intFromBool(rl.isWindowState(@intFromEnum(rl.ConfigFlags.flag_vsync_hint)))), @as(i32, @intFromBool(rl.isWindowState(rl.ConfigFlags { .vsync_hint = true }))),
}), }),
10, 10,
260, 260,
@ -280,7 +280,7 @@ pub fn main() anyerror!void {
); );
rl.drawText( rl.drawText(
rl.textFormat("flag_window_highdpi: %d", .{ rl.textFormat("flag_window_highdpi: %d", .{
@as(i32, @intFromBool(rl.isWindowState(@intFromEnum(rl.ConfigFlags.flag_window_highdpi)))), @as(i32, @intFromBool(rl.isWindowState(rl.ConfigFlags { .window_highdpi = true }))),
}), }),
10, 10,
320, 320,
@ -289,7 +289,7 @@ pub fn main() anyerror!void {
); );
rl.drawText( rl.drawText(
rl.textFormat("flag_window_transparent: %d", .{ rl.textFormat("flag_window_transparent: %d", .{
@as(i32, @intFromBool(rl.isWindowState(@intFromEnum(rl.ConfigFlags.flag_window_transparent)))), @as(i32, @intFromBool(rl.isWindowState(rl.ConfigFlags { .window_transparent = true }))),
}), }),
10, 10,
340, 340,
@ -298,7 +298,7 @@ pub fn main() anyerror!void {
); );
rl.drawText( rl.drawText(
rl.textFormat("flag_msaa_4x_hint: %d", .{ rl.textFormat("flag_msaa_4x_hint: %d", .{
@as(i32, @intFromBool(rl.isWindowState(@intFromEnum(rl.ConfigFlags.flag_msaa_4x_hint)))), @as(i32, @intFromBool(rl.isWindowState(rl.ConfigFlags { .msaa_4x_hint = true }))),
}), }),
10, 10,
360, 360,

4
lib/generate_functions.py
View File

@ -165,9 +165,9 @@ def fix_enums(arg_name, arg_type, func_name):
arg_type = "BlendMode" arg_type = "BlendMode"
elif arg_name == "gesture": elif arg_name == "gesture":
arg_type = "Gesture" arg_type = "Gesture"
elif arg_name == "flags": elif arg_name == "flags" or arg_name == "flag":
if func_name in [ if func_name in [
"SetWindowState", "ClearWindowState", "SetConfigFlags" "SetWindowState", "ClearWindowState", "SetConfigFlags", "IsWindowState"
]: ]:
arg_type = "ConfigFlags" arg_type = "ConfigFlags"
elif func_name == "SetGesturesEnabled": elif func_name == "SetGesturesEnabled":

51
lib/preludes/raylib-prelude.zig
View File

@ -805,24 +805,39 @@ pub const AutomationEventList = extern struct {
events: [*c]AutomationEvent events: [*c]AutomationEvent
}; };
pub const ConfigFlags = enum(c_int) { pub const ConfigFlags = packed struct {
flag_fullscreen_mode = 2, __reserved: bool = false,
flag_window_resizable = 4, fullscreen_mode: bool = false,
flag_window_undecorated = 8, window_resizable: bool = false,
flag_window_transparent = 16, window_undecorated: bool = false,
flag_msaa_4x_hint = 32, window_transparent: bool = false,
flag_vsync_hint = 64, msaa_4x_hint: bool = false,
flag_window_hidden = 128, vsync_hint: bool = false,
flag_window_always_run = 256, window_hidden: bool = false,
flag_window_minimized = 512, window_always_run: bool = false,
flag_window_maximized = 1024, window_minimized: bool = false,
flag_window_unfocused = 2048, window_maximized: bool = false,
flag_window_topmost = 4096, window_unfocused: bool = false,
flag_window_highdpi = 8192, window_topmost: bool = false,
flag_window_mouse_passthrough = 16384, window_highdpi: bool = false,
flag_borderless_windowed_mode = 32768, window_mouse_passthrough: bool = false,
flag_interlaced_hint = 65536, borderless_windowed_mode: bool = false,
_, interlaced_hint: bool = false,
__reserved2: bool = false,
__reserved3: bool = false,
__reserved4: bool = false,
__reserved5: bool = false,
__reserved6: bool = false,
__reserved7: bool = false,
__reserved8: bool = false,
__reserved9: bool = false,
__reserved10: bool = false,
__reserved11: bool = false,
__reserved12: bool = false,
__reserved13: bool = false,
__reserved14: bool = false,
__reserved15: bool = false,
__reserved16: bool = false,
}; };
pub const TraceLogLevel = enum(c_int) { pub const TraceLogLevel = enum(c_int) {

2
lib/raylib-ext.zig
View File

@ -12,7 +12,7 @@ pub extern "c" fn IsWindowMinimized() bool;
pub extern "c" fn IsWindowMaximized() bool; pub extern "c" fn IsWindowMaximized() bool;
pub extern "c" fn IsWindowFocused() bool; pub extern "c" fn IsWindowFocused() bool;
pub extern "c" fn IsWindowResized() bool; pub extern "c" fn IsWindowResized() bool;
pub extern "c" fn IsWindowState(flag: c_uint) bool; pub extern "c" fn IsWindowState(flag: rl.ConfigFlags) bool;
pub extern "c" fn SetWindowState(flags: rl.ConfigFlags) void; pub extern "c" fn SetWindowState(flags: rl.ConfigFlags) void;
pub extern "c" fn ClearWindowState(flags: rl.ConfigFlags) void; pub extern "c" fn ClearWindowState(flags: rl.ConfigFlags) void;
pub extern "c" fn ToggleFullscreen() void; pub extern "c" fn ToggleFullscreen() void;

55
lib/raylib.zig
View File

@ -805,24 +805,39 @@ pub const AutomationEventList = extern struct {
events: [*c]AutomationEvent events: [*c]AutomationEvent
}; };
pub const ConfigFlags = enum(c_int) { pub const ConfigFlags = packed struct {
flag_fullscreen_mode = 2, __reserved: bool = false,
flag_window_resizable = 4, fullscreen_mode: bool = false,
flag_window_undecorated = 8, window_resizable: bool = false,
flag_window_transparent = 16, window_undecorated: bool = false,
flag_msaa_4x_hint = 32, window_transparent: bool = false,
flag_vsync_hint = 64, msaa_4x_hint: bool = false,
flag_window_hidden = 128, vsync_hint: bool = false,
flag_window_always_run = 256, window_hidden: bool = false,
flag_window_minimized = 512, window_always_run: bool = false,
flag_window_maximized = 1024, window_minimized: bool = false,
flag_window_unfocused = 2048, window_maximized: bool = false,
flag_window_topmost = 4096, window_unfocused: bool = false,
flag_window_highdpi = 8192, window_topmost: bool = false,
flag_window_mouse_passthrough = 16384, window_highdpi: bool = false,
flag_borderless_windowed_mode = 32768, window_mouse_passthrough: bool = false,
flag_interlaced_hint = 65536, borderless_windowed_mode: bool = false,
_, interlaced_hint: bool = false,
__reserved2: bool = false,
__reserved3: bool = false,
__reserved4: bool = false,
__reserved5: bool = false,
__reserved6: bool = false,
__reserved7: bool = false,
__reserved8: bool = false,
__reserved9: bool = false,
__reserved10: bool = false,
__reserved11: bool = false,
__reserved12: bool = false,
__reserved13: bool = false,
__reserved14: bool = false,
__reserved15: bool = false,
__reserved16: bool = false,
}; };
pub const TraceLogLevel = enum(c_int) { pub const TraceLogLevel = enum(c_int) {
@ -1500,8 +1515,8 @@ pub fn isWindowResized() bool {
return cdef.IsWindowResized(); return cdef.IsWindowResized();
} }
pub fn isWindowState(flag: u32) bool { pub fn isWindowState(flag: ConfigFlags) bool {
return cdef.IsWindowState(@as(c_uint, flag)); return cdef.IsWindowState(flag);
} }
pub fn setWindowState(flags: ConfigFlags) void { pub fn setWindowState(flags: ConfigFlags) void {