From 4b084dffad163ef5ac67e738c87dba554a10daa8 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Wed, 3 Jul 2024 19:21:05 +0300
Subject: [PATCH] add aabb drop models support

---
 res/content/base/scripts/components/drop.lua | 32 ++++++++++++++------
 src/logic/scripting/lua/libblock.cpp         | 18 ++++++++++-
 2 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/res/content/base/scripts/components/drop.lua b/res/content/base/scripts/components/drop.lua
index fe67ad70..e6466b2a 100644
--- a/res/content/base/scripts/components/drop.lua
+++ b/res/content/base/scripts/components/drop.lua
@@ -6,20 +6,25 @@ inair = true
 ready = false
 
 local dropitem = ARGS.item
+local scale = {1, 1, 1}
+local rotation = mat4.rotate({
+    math.random(), math.random(), math.random()
+}, 360)
 
 do -- setup visuals
-    local rotation = mat4.rotate({0, 1, 0}, math.random() * 360)
-    mat4.rotate(rotation, {1, 0, 0}, math.random() * 360, rotation)
-    mat4.rotate(rotation, {0, 0, 1}, math.random() * 360, rotation)
-    rig:set_matrix(0, rotation)
+    local matrix = mat4.idt()
     local icon = item.icon(dropitem.id)
     if icon:find("^block%-previews%:") then
         local bid = block.index(icon:sub(16))
-        if block.get_model(bid) == "X" then
+        local model = block.get_model(bid)
+        if model == "X" then
             entity:set_rig("drop-item")
             body:set_size(vec3.mul(body:get_size(), {1.0, 0.3, 1.0}))
             rig:set_texture("$0", icon)
         else
+            if model == "aabb" then
+                scale = block.get_hitbox(bid, 0)[2]
+            end
             local textures = block.get_textures(bid)
             for i,t in ipairs(textures) do
                 rig:set_texture("$"..tostring(i-1), "blocks:"..textures[i])
@@ -30,10 +35,15 @@ do -- setup visuals
         body:set_size(vec3.mul(body:get_size(), {1.0, 0.3, 1.0}))
         rig:set_texture("$0", icon)
     end
+    mat4.mul(matrix, rotation, matrix)
+    mat4.scale(matrix, scale, matrix)
+    rig:set_matrix(0, matrix)
 end
 
 function on_grounded(force)
-    rig:set_matrix(0, mat4.rotate({0, 1, 0}, math.random()*360))
+    local matrix = mat4.rotate({0, 1, 0}, math.random()*360)
+    mat4.scale(matrix, scale, matrix)
+    rig:set_matrix(0, matrix)
     inair = false
     ready = true
 end
@@ -53,9 +63,13 @@ end
 function on_update()
     if inair then
         local dt = time.delta();
-        local matrix = rig:get_matrix(0)
-        mat4.rotate(matrix, {0, 1, 0}, 240*dt, matrix)
-        mat4.rotate(matrix, {0, 0, 1}, 240*dt, matrix)
+
+        mat4.rotate(rotation, {0, 1, 0}, 240*dt, rotation)
+        mat4.rotate(rotation, {0, 0, 1}, 240*dt, rotation)
+        
+        local matrix = mat4.idt()
+        mat4.mul(matrix, rotation, matrix)
+        mat4.scale(matrix, scale, matrix)
         rig:set_matrix(0, matrix)
     end
 end
diff --git a/src/logic/scripting/lua/libblock.cpp b/src/logic/scripting/lua/libblock.cpp
index 5e70ba65..1527babb 100644
--- a/src/logic/scripting/lua/libblock.cpp
+++ b/src/logic/scripting/lua/libblock.cpp
@@ -280,8 +280,23 @@ static int l_get_model(lua::State* L) {
             case BlockModel::custom: return lua::pushstring(L, "custom");
             case BlockModel::none: return lua::pushstring(L, "none");
         }
-        return 0;
     }
+    return 0;
+}
+
+static int l_get_hitbox(lua::State* L) {
+    if (auto def = require_block(L)) {
+        auto& hitbox = def->rt.hitboxes[0].at(lua::tointeger(L, 2));
+        lua::createtable(L, 2, 0);
+        
+        lua::pushvec3_arr(L, hitbox.min());
+        lua::rawseti(L, 1);
+
+        lua::pushvec3_arr(L, hitbox.size());
+        lua::rawseti(L, 2);
+        return 1;
+    }
+    return 0;
 }
 
 const luaL_Reg blocklib [] = {
@@ -309,5 +324,6 @@ const luaL_Reg blocklib [] = {
     {"seek_origin", lua::wrap<l_seek_origin>},
     {"get_textures", lua::wrap<l_get_textures>},
     {"get_model", lua::wrap<l_get_model>},
+    {"get_hitbox", lua::wrap<l_get_hitbox>},
     {NULL, NULL}
 };