From 9600e2108a5b0ac84f143e366310e49945a0fd63 Mon Sep 17 00:00:00 2001 From: Not-Nik Date: Sun, 14 Apr 2024 22:20:30 +0200 Subject: [PATCH] Rename library files --- build.zig | 12 ++++++------ lib/generate_functions.py | 16 ++++++++-------- ...ig-ext-prelude.zig => raylib-ext-prelude.zig} | 2 +- ...raylib-zig-prelude.zig => raylib-prelude.zig} | 2 +- ...h-ext-prelude.zig => raymath-ext-prelude.zig} | 2 +- ...-zig-math-prelude.zig => raymath-prelude.zig} | 2 +- lib/{raylib-zig-ext.zig => raylib-ext.zig} | 2 +- lib/{raylib-zig.zig => raylib.zig} | 2 +- lib/{raylib-zig-math-ext.zig => raymath-ext.zig} | 2 +- lib/{raylib-zig-math.zig => raymath.zig} | 2 +- 10 files changed, 22 insertions(+), 22 deletions(-) rename lib/preludes/{raylib-zig-ext-prelude.zig => raylib-ext-prelude.zig} (50%) rename lib/preludes/{raylib-zig-prelude.zig => raylib-prelude.zig} (99%) rename lib/preludes/{raylib-zig-math-ext-prelude.zig => raymath-ext-prelude.zig} (62%) rename lib/preludes/{raylib-zig-math-prelude.zig => raymath-prelude.zig} (89%) rename lib/{raylib-zig-ext.zig => raylib-ext.zig} (99%) rename lib/{raylib-zig.zig => raylib.zig} (99%) rename lib/{raylib-zig-math-ext.zig => raymath-ext.zig} (99%) rename lib/{raylib-zig-math.zig => raymath.zig} (99%) mode change 100755 => 100644 diff --git a/build.zig b/build.zig index 8c54d63..41a4c06 100755 --- a/build.zig +++ b/build.zig @@ -84,21 +84,21 @@ pub fn getModule(b: *std.Build, comptime rl_path: []const u8) *std.Build.Module if (b.modules.contains("raylib")) { return b.modules.get("raylib").?; } - return b.addModule("raylib", .{ .source_file = .{ .path = rl_path ++ "/lib/raylib-zig.zig" } }); + return b.addModule("raylib", .{ .source_file = .{ .path = rl_path ++ "/lib/raylib.zig" } }); } fn getModuleInternal(b: *std.Build) *std.Build.Module { if (b.modules.contains("raylib")) { return b.modules.get("raylib").?; } - return b.addModule("raylib", .{ .source_file = .{ .path = "lib/raylib-zig.zig" } }); + return b.addModule("raylib", .{ .source_file = .{ .path = "lib/raylib.zig" } }); } pub const math = struct { pub fn getModule(b: *std.Build, comptime rl_path: []const u8) *std.Build.Module { const raylib = rl.getModule(b, rl_path); return b.addModule("raylib-math", .{ - .source_file = .{ .path = rl_path ++ "/lib/raylib-zig-math.zig" }, + .source_file = .{ .path = rl_path ++ "/lib/raymath.zig" }, .dependencies = &.{.{ .name = "raylib-zig", .module = raylib }}, }); } @@ -106,7 +106,7 @@ pub const math = struct { fn getModuleInternal(b: *std.Build) *std.Build.Module { const raylib = rl.getModuleInternal(b); return b.addModule("raylib-math", .{ - .source_file = .{ .path = "lib/raylib-zig-math.zig" }, + .source_file = .{ .path = "lib/raymath.zig" }, .dependencies = &.{.{ .name = "raylib-zig", .module = raylib }}, }); } @@ -214,13 +214,13 @@ pub fn build(b: *std.Build) !void { const rlgl = rl.gl.getModuleInternal(b); const raylib_test = b.addTest(.{ - .root_source_file = .{ .path = "lib/raylib-zig.zig" }, + .root_source_file = .{ .path = "lib/raylib.zig" }, .target = target, .optimize = optimize, }); const raylib_math_test = b.addTest(.{ - .root_source_file = .{ .path = "lib/raylib-zig-math.zig" }, + .root_source_file = .{ .path = "lib/raymath.zig" }, .target = target, .optimize = optimize, }); diff --git a/lib/generate_functions.py b/lib/generate_functions.py index 0fd888b..9d1729f 100644 --- a/lib/generate_functions.py +++ b/lib/generate_functions.py @@ -331,19 +331,19 @@ def parse_header(header_name: str, output_file: str, ext_file: str, prefix: str, if __name__ == "__main__": parse_header( "raylib.h", - "raylib-zig.zig", - "raylib-zig-ext.zig", + "raylib.zig", + "raylib-ext.zig", "RLAPI ", - "preludes/raylib-zig-prelude.zig", - "preludes/raylib-zig-ext-prelude.zig" + "preludes/raylib-prelude.zig", + "preludes/raylib-ext-prelude.zig" ) parse_header( "raymath.h", - "raylib-zig-math.zig", - "raylib-zig-math-ext.zig", + "raymath.zig", + "raymath-ext.zig", "RMAPI ", - "preludes/raylib-zig-math-prelude.zig", - "preludes/raylib-zig-math-ext-prelude.zig" + "preludes/raymath-prelude.zig", + "preludes/raymath-ext-prelude.zig" ) parse_header( "rlgl.h", diff --git a/lib/preludes/raylib-zig-ext-prelude.zig b/lib/preludes/raylib-ext-prelude.zig similarity index 50% rename from lib/preludes/raylib-zig-ext-prelude.zig rename to lib/preludes/raylib-ext-prelude.zig index 333df26..115f2bd 100644 --- a/lib/preludes/raylib-zig-ext-prelude.zig +++ b/lib/preludes/raylib-ext-prelude.zig @@ -1,3 +1,3 @@ // raylib-zig (c) Nikolas Wipper 2023 -const rl = @import("raylib-zig.zig"); +const rl = @import("raylib.zig"); diff --git a/lib/preludes/raylib-zig-prelude.zig b/lib/preludes/raylib-prelude.zig similarity index 99% rename from lib/preludes/raylib-zig-prelude.zig rename to lib/preludes/raylib-prelude.zig index cf07fc2..81e27bb 100755 --- a/lib/preludes/raylib-zig-prelude.zig +++ b/lib/preludes/raylib-prelude.zig @@ -1189,7 +1189,7 @@ pub const MATERIAL_MAP_SPECULAR = MaterialMapIndex.material_map_metalness; pub const SHADER_LOC_MAP_DIFFUSE = ShaderLocationIndex.shader_loc_map_albedo; pub const SHADER_LOC_MAP_SPECULAR = ShaderLocationIndex.shader_loc_map_metalness; -const cdef = @import("raylib-zig-ext.zig"); +const cdef = @import("raylib-ext.zig"); pub fn setWindowIcons(images: []Image) void { cdef.SetWindowIcons(@as([*c]Image, @ptrCast(images)), @as(c_int, @intCast(images.len))); diff --git a/lib/preludes/raylib-zig-math-ext-prelude.zig b/lib/preludes/raymath-ext-prelude.zig similarity index 62% rename from lib/preludes/raylib-zig-math-ext-prelude.zig rename to lib/preludes/raymath-ext-prelude.zig index 0003276..9c8799d 100644 --- a/lib/preludes/raylib-zig-math-ext-prelude.zig +++ b/lib/preludes/raymath-ext-prelude.zig @@ -1,4 +1,4 @@ // raylib-zig (c) Nikolas Wipper 2023 const rl = @import("raylib-zig"); -const rlm = @import("raylib-zig-math.zig"); +const rlm = @import("raymath.zig"); diff --git a/lib/preludes/raylib-zig-math-prelude.zig b/lib/preludes/raymath-prelude.zig similarity index 89% rename from lib/preludes/raylib-zig-math-prelude.zig rename to lib/preludes/raymath-prelude.zig index b8b5b56..94f6b18 100644 --- a/lib/preludes/raylib-zig-math-prelude.zig +++ b/lib/preludes/raymath-prelude.zig @@ -1,7 +1,7 @@ // raylib-zig (c) Nikolas Wipper 2023 const rl = @import("raylib-zig"); -const cdef = @import("raylib-zig-math-ext.zig"); +const cdef = @import("raymath-ext.zig"); const std = @import("std"); test { diff --git a/lib/raylib-zig-ext.zig b/lib/raylib-ext.zig similarity index 99% rename from lib/raylib-zig-ext.zig rename to lib/raylib-ext.zig index 897ec34..24d2460 100644 --- a/lib/raylib-zig-ext.zig +++ b/lib/raylib-ext.zig @@ -1,6 +1,6 @@ // raylib-zig (c) Nikolas Wipper 2023 -const rl = @import("raylib-zig.zig"); +const rl = @import("raylib.zig"); pub extern "c" fn InitWindow(width: c_int, height: c_int, title: [*c]const u8) void; pub extern "c" fn CloseWindow() void; diff --git a/lib/raylib-zig.zig b/lib/raylib.zig similarity index 99% rename from lib/raylib-zig.zig rename to lib/raylib.zig index 5c99d20..7b5eb53 100644 --- a/lib/raylib-zig.zig +++ b/lib/raylib.zig @@ -1189,7 +1189,7 @@ pub const MATERIAL_MAP_SPECULAR = MaterialMapIndex.material_map_metalness; pub const SHADER_LOC_MAP_DIFFUSE = ShaderLocationIndex.shader_loc_map_albedo; pub const SHADER_LOC_MAP_SPECULAR = ShaderLocationIndex.shader_loc_map_metalness; -const cdef = @import("raylib-zig-ext.zig"); +const cdef = @import("raylib-ext.zig"); pub fn setWindowIcons(images: []Image) void { cdef.SetWindowIcons(@as([*c]Image, @ptrCast(images)), @as(c_int, @intCast(images.len))); diff --git a/lib/raylib-zig-math-ext.zig b/lib/raymath-ext.zig similarity index 99% rename from lib/raylib-zig-math-ext.zig rename to lib/raymath-ext.zig index dd32a1d..7abffcb 100644 --- a/lib/raylib-zig-math-ext.zig +++ b/lib/raymath-ext.zig @@ -1,7 +1,7 @@ // raylib-zig (c) Nikolas Wipper 2023 const rl = @import("raylib-zig"); -const rlm = @import("raylib-zig-math.zig"); +const rlm = @import("raymath.zig"); pub extern "c" fn Clamp(value: f32, min: f32, max: f32) f32; pub extern "c" fn Lerp(start: f32, end: f32, amount: f32) f32; diff --git a/lib/raylib-zig-math.zig b/lib/raymath.zig old mode 100755 new mode 100644 similarity index 99% rename from lib/raylib-zig-math.zig rename to lib/raymath.zig index c759b89..b3f19ac --- a/lib/raylib-zig-math.zig +++ b/lib/raymath.zig @@ -1,7 +1,7 @@ // raylib-zig (c) Nikolas Wipper 2023 const rl = @import("raylib-zig"); -const cdef = @import("raylib-zig-math-ext.zig"); +const cdef = @import("raymath-ext.zig"); const std = @import("std"); test {