From 3c372a30248930a1dea987f0e89d2ed7983e6346 Mon Sep 17 00:00:00 2001 From: mid <> Date: Sat, 13 Sep 2025 12:02:15 +0300 Subject: [PATCH] Map to newest k3 --- src/luaapi.c | 8 ++++++-- src/main.c | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/luaapi.c b/src/luaapi.c index 03466a2..e0d00ed 100644 --- a/src/luaapi.c +++ b/src/luaapi.c @@ -1935,7 +1935,7 @@ static int dagame_draw(lua_State *L) { rect.y -= rect.h / 2; } - k3FontDraw(font, lua_tonumber(L, -2) + rect.x, lua_tonumber(L, -1) + rect.y, lua_tonumber(L, -4), lua_tostring(L, -3), -1, (vec4) {lua_tonumber(L, -8), lua_tonumber(L, -7), lua_tonumber(L, -6), lua_tonumber(L, -5)}); + k3FontDraw(font, lua_tonumber(L, -2) + rect.x, lua_tonumber(L, -1) + rect.y, lua_tonumber(L, -4), lua_tostring(L, -3), -1, 0, (vec4) {lua_tonumber(L, -8), lua_tonumber(L, -7), lua_tonumber(L, -6), lua_tonumber(L, -5)}); lua_pop(L, 9); } @@ -2147,6 +2147,8 @@ static int dagame_k3menuitem_on(lua_State *L) { evcode = k3M_EVENT_MEASURE; } else if(!strcmp(lua_tostring(L, 2), "arrange")) { evcode = k3M_EVENT_ARRANGE; + } else if(!strcmp(lua_tostring(L, 2), "post_arrange")) { + evcode = k3M_EVENT_POST_ARRANGE; } else if(!strcmp(lua_tostring(L, 2), "all")) { evcode = k3M_EVENT_ALL; } @@ -2740,7 +2742,9 @@ static int os_time(lua_State *L) { } static int dagame_particle_system(lua_State *L) { - struct k3CPUQuadParticles *qp = calloc(1, sizeof(*qp)); + struct k3CPUQuadParticles *qp = _mm_malloc(sizeof(*qp), 16); + memset(qp, 0, sizeof(*qp)); + qp->capacity = lua_tointeger(L, 1); qp->origin[0] = 0; diff --git a/src/main.c b/src/main.c index c6794bd..2662c28 100644 --- a/src/main.c +++ b/src/main.c @@ -283,7 +283,9 @@ static int eng_init() { k3SetLogCallback(k4k3LogCallback); - k3Init(); + k3Init( + !k4_get_arg("tc") || strtol(k4_get_arg("tc"), NULL, 0) != 0, + !k4_get_arg("mipmap") || strtol(k4_get_arg("mipmap"), NULL, 0) != 0); k3BatchInit();