make lua work again

Author: nicoabie

build.zig.zon

@@ -15,11 +15,6 @@
             .url = "git+https://github.com/natecraddock/ziglua#891945ef9c2bffcd06050c4836d414428ed7d95a",
             .hash = "zlua-0.1.0-hGRpC2rgBACFhBjc9s9dGN37ZaTu7rNVZZqduwitv4O7",
         },
-        // // needed because Lua is a lazy dependency inside of ziglua
-        // .lua54 = .{
-        //     .url = "https://www.lua.org/ftp/lua-5.4.6.tar.gz",
-        //     .hash = "1220f93ada1fa077ab096bf88a5b159ad421dbf6a478edec78ddb186d0c21d3476d9",
-        // },
         .sokol = .{
             .url = "git+https://github.com/floooh/sokol-zig.git#d8c1205a4dd9ad28da411f998102ce520cdef6bc",
             .hash = "sokol-0.1.0-pb1HK5mGLABB7_Vt66xb8nbn8sJN_ULvd4v0wg8WypJ_",

src/framework/api/assets.zig

@@ -1,6 +1,6 @@
 const std = @import("std");
 const math = std.math;
-const ziglua = @import("ziglua");
+const zlua = @import("zlua");
 const debug = @import("../debug.zig");
 const images = @import("../images.zig");
 const graphics = @import("../platform/graphics.zig");

src/framework/api/display.zig

@@ -1,17 +1,15 @@
 const std = @import("std");
 const fmt = @import("fmt");
-const ziglua = @import("ziglua");
+const zlua = @import("zlua");
 const debug = @import("../debug.zig");
 
 var enable_debug_logging = false;
 
-pub var test_me: bool = true;
-
 pub fn set_resolution(res_x: i32, res_y: i32) void {
     // var scale_x: f32 = 1.0;
     // var scale_y: f32 = 1.0;
 
-    debug.log("set resolution: {d}x{d}", .{res_x, res_y});
+    debug.log("set resolution: {d}x{d}", .{ res_x, res_y });
     // _ = sdl.SDL_RenderGetScale(zigsdl.getRenderer(), &scale_x, &scale_y);
 
     // res_x *= @intFromFloat(scale_x);
@@ -39,5 +37,5 @@ pub fn set_resolution(res_x: i32, res_y: i32) void {
 // }
 
 pub fn set_size(one: i32, two: i32) void {
-    debug.log("Set size: {d}x{d}", .{one, two});
+    debug.log("Set size: {d}x{d}", .{ one, two });
 }

src/framework/api/draw.zig

@@ -1,5 +1,5 @@
 const std = @import("std");
-const ziglua = @import("ziglua");
+const zlua = @import("zlua");
 const app = @import("../app.zig");
 const papp = @import("../platform/app.zig");
 const debug = @import("../debug.zig");

src/framework/api/graphics.zig

@@ -1,6 +1,6 @@
 const std = @import("std");
 const math = @import("../math.zig");
-const ziglua = @import("ziglua");
+const zlua = @import("zlua");
 const papp = @import("../platform/app.zig");
 const debug = @import("../debug.zig");
 const colors = @import("../colors.zig");

src/framework/api/keyboard.zig

@@ -1,8 +1,8 @@
 const std = @import("std");
 const debug = @import("../debug.zig");
-const ziglua = @import("ziglua");
+const zlua = @import("zlua");
 const input = @import("../platform/input.zig");
 
 pub fn key(key_idx: usize) bool {
-   return input.isKeyPressed(@enumFromInt(key_idx));
+    return input.isKeyPressed(@enumFromInt(key_idx));
 }

src/framework/api/mouse.zig

@@ -1,10 +1,10 @@
 const std = @import("std");
-const ziglua = @import("ziglua");
+const zlua = @import("zlua");
 const input = @import("../platform/input.zig");
 const Tuple = std.meta.Tuple;
 
 // Get Mouse Position
-pub fn position() Tuple(&.{f32, f32}) {
+pub fn position() Tuple(&.{ f32, f32 }) {
     const mouse_pos = input.getMousePosition();
     return .{ mouse_pos.x, mouse_pos.y };
 }

src/framework/api/text.zig

@@ -1,6 +1,6 @@
 const std = @import("std");
 const math = std.math;
-const ziglua = @import("ziglua");
+const zlua = @import("zlua");
 const app = @import("../app.zig");
 const colors = @import("../colors.zig");
 const images = @import("../images.zig");

src/framework/scripting/lua.zig

@@ -82,7 +82,7 @@ pub fn runLine(lua_string: [:0]const u8) !void {
     };
 }
 
-pub fn openModule(comptime name: [:0]const u8, comptime open_func: zlua.ZigFn) void {
+pub fn openModule(comptime name: [:0]const u8, comptime open_func: anytype) void {
     lua.requireF(name, zlua.wrap(open_func), true);
     debug.log("Lua: registered module '{s}'", .{name});
 }

src/framework/scripting/manager.zig

@@ -16,15 +16,14 @@ pub fn init() !void {
     // Start lua
     try lua_util.init();
 
-    // TODO fix this
     // Bind all the libraries using some meta programming magic at compile time
-    // try bindZigLibrary("assets", @import("../api/assets.zig"));
-    // try bindZigLibrary("display", @import("../api/display.zig"));
-    // try bindZigLibrary("draw", @import("../api/draw.zig"));
-    // try bindZigLibrary("text", @import("../api/text.zig"));
-    // try bindZigLibrary("graphics", @import("../api/graphics.zig"));
-    // try bindZigLibrary("input.mouse", @import("../api/mouse.zig"));
-    // try bindZigLibrary("input.keyboard", @import("../api/keyboard.zig"));
+    try bindZigLibrary("assets", @import("../api/assets.zig"));
+    try bindZigLibrary("display", @import("../api/display.zig"));
+    try bindZigLibrary("draw", @import("../api/draw.zig"));
+    try bindZigLibrary("text", @import("../api/text.zig"));
+    try bindZigLibrary("graphics", @import("../api/graphics.zig"));
+    try bindZigLibrary("input.mouse", @import("../api/mouse.zig"));
+    try bindZigLibrary("input.keyboard", @import("../api/keyboard.zig"));
 }
 
 pub fn deinit() void {
@@ -45,10 +44,8 @@ fn isModuleFunction(comptime name: [:0]const u8, comptime in_type: anytype) bool
 
 fn findLibraryFunctions(comptime module: anytype) []const ScriptFn {
     comptime {
-        const info = @typeInfo(module);
         // Get all the public declarations in this module
-        const decls = info.@"struct".decls;
-        @compileLog(@typeName(@TypeOf(module)));
+        const decls = @typeInfo(module).@"struct".decls;
         // filter out only the public functions
         var gen_fields: []const std.builtin.Type.Declaration = &[_]std.builtin.Type.Declaration{};
         for (decls) |d| {