diff --git a/lib/preludes/raylib-zig-math-ext-prelude.zig b/lib/preludes/raylib-zig-math-ext-prelude.zig index 0003276..2f06d97 100644 --- a/lib/preludes/raylib-zig-math-ext-prelude.zig +++ b/lib/preludes/raylib-zig-math-ext-prelude.zig @@ -1,4 +1,4 @@ // raylib-zig (c) Nikolas Wipper 2023 -const rl = @import("raylib-zig"); +const rl = @import("raylib-zig.zig"); const rlm = @import("raylib-zig-math.zig"); diff --git a/lib/preludes/raylib-zig-math-prelude.zig b/lib/preludes/raylib-zig-math-prelude.zig index d16aea1..479425f 100644 --- a/lib/preludes/raylib-zig-math-prelude.zig +++ b/lib/preludes/raylib-zig-math-prelude.zig @@ -1,6 +1,6 @@ // raylib-zig (c) Nikolas Wipper 2023 -const rl = @import("raylib-zig"); +const rl = @import("raylib-zig.zig"); const cdef = @import("raylib-zig-math-ext.zig"); const std = @import("std"); diff --git a/lib/preludes/raylib-zig-prelude.zig b/lib/preludes/raylib-zig-prelude.zig index 4be7ac3..01827d0 100755 --- a/lib/preludes/raylib-zig-prelude.zig +++ b/lib/preludes/raylib-zig-prelude.zig @@ -1,6 +1,7 @@ // raylib-zig (c) Nikolas Wipper 2023 const rl = @This(); +const rlm = @import("raylib-zig-math.zig"); const std = @import("std"); pub const RaylibError = error{GenericError}; @@ -22,6 +23,8 @@ pub const Vector3 = extern struct { pub fn init(x: f32, y: f32, z: f32) Vector3 { return Vector3{ .x = x, .y = y, .z = z }; } + pub const add = rlm.vector2Add; + pub const sub = rlm.vector2Subtract; }; pub const Vector4 = extern struct { diff --git a/lib/raylib-zig-math-ext.zig b/lib/raylib-zig-math-ext.zig index dd32a1d..fa9667e 100644 --- a/lib/raylib-zig-math-ext.zig +++ b/lib/raylib-zig-math-ext.zig @@ -1,6 +1,6 @@ // raylib-zig (c) Nikolas Wipper 2023 -const rl = @import("raylib-zig"); +const rl = @import("raylib-zig.zig"); const rlm = @import("raylib-zig-math.zig"); pub extern "c" fn Clamp(value: f32, min: f32, max: f32) f32; diff --git a/lib/raylib-zig-math.zig b/lib/raylib-zig-math.zig index 4d74e3b..bf62945 100755 --- a/lib/raylib-zig-math.zig +++ b/lib/raylib-zig-math.zig @@ -1,6 +1,6 @@ // raylib-zig (c) Nikolas Wipper 2023 -const rl = @import("raylib-zig"); +const rl = @import("raylib-zig.zig"); const cdef = @import("raylib-zig-math-ext.zig"); const std = @import("std"); diff --git a/lib/raylib-zig.zig b/lib/raylib-zig.zig index e5a093a..ae6c71a 100644 --- a/lib/raylib-zig.zig +++ b/lib/raylib-zig.zig @@ -1,6 +1,7 @@ // raylib-zig (c) Nikolas Wipper 2023 const rl = @This(); +const rlm = @import("raylib-zig-math.zig"); const std = @import("std"); pub const RaylibError = error{GenericError}; @@ -22,6 +23,8 @@ pub const Vector3 = extern struct { pub fn init(x: f32, y: f32, z: f32) Vector3 { return Vector3{ .x = x, .y = y, .z = z }; } + pub const add = rlm.vector2Add; + pub const sub = rlm.vector2Subtract; }; pub const Vector4 = extern struct { @@ -1388,11 +1391,11 @@ pub fn loadMusicStreamFromMemory(fileType: [:0]const u8, data: []const u8) Music } pub fn drawLineStrip(points: []const Vector2, color: Color) void { - cdef.DrawLineStrip(@as([*c]Vector2, @ptrCast(@constCast(points))), @as(c_int, @intCast(points.len)), color); + cdef.DrawLineStrip(@as([*c]Vector2, @ptrCast(points)), @as(c_int, @intCast(points.len)), color); } pub fn drawTriangleFan(points: []const Vector2, color: Color) void { - cdef.DrawTriangleFan(@as([*c]Vector2, @ptrCast(@constCast(points))), @as(c_int, @intCast(points.len)), color); + cdef.DrawTriangleFan(@as([*c]Vector2, @ptrCast(points)), @as(c_int, @intCast(points.len)), color); } pub fn drawTriangleStrip(points: []const Vector2, color: Color) void { @@ -1400,7 +1403,7 @@ pub fn drawTriangleStrip(points: []const Vector2, color: Color) void { } pub fn checkCollisionPointPoly(point: Vector2, points: []const Vector2) bool { - return cdef.CheckCollisionPointPoly(point, @as([*c]Vector2, @ptrCast(@constCast(points))), @as(c_int, @intCast(points.len))); + return cdef.CheckCollisionPointPoly(point, @as([*c]Vector2, @ptrCast(points)), @as(c_int, @intCast(points.len))); } pub fn loadFontEx(fileName: [:0]const u8, fontSize: i32, fontChars: []i32) Font {