voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-05 19:11:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

update entity.spawn(...): now returns an Entity instead of id

Browse source
This commit is contained in:
MihailRis 2024-06-29 21:10:23 +03:00
parent fc3994446a
commit d22948f45c
4 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
res/content/base/scripts/drop.lua
View file

@ -4,4 +4,5 @@ end
function on_grounded()
entity.transform:set_rot(mat4.rotate({0, 1, 0}, math.random()*360))
entity:despawn()
end

8
res/content/base/scripts/hud.lua
View file

@ -6,11 +6,11 @@ function on_hud_open()
local pid = hud.get_player()
local pvel = {player.get_vel(pid)}
local ppos = vec3.add({player.get_pos(pid)}, {0, 0.7, 0})
local eid = entity.spawn("base:drop", ppos)
local throw_force = vec3.mul(player.get_dir(pid), DROP_FORCE)
__rigidbody.set_vel(eid, vec3.add(throw_force, vec3.add(pvel, DROP_INIT_VEL)))
__transform.set_rot(eid,
mat4.rotate(mat4.rotate(mat4.rotate({0, 1, 0}, math.random() * 360),
local drop = entity.spawn("base:drop", ppos)
drop.rigidbody:set_vel(vec3.add(throw_force, vec3.add(pvel, DROP_INIT_VEL)))
drop.transform:set_rot(mat4.rotate(mat4.rotate(mat4.rotate({0, 1, 0}, math.random() * 360),
{1, 0, 0}, math.random() * 360), {0, 0, 1}, math.random() * 360))
end)
end

4
src/logic/scripting/lua/libentity.cpp
View file

@ -31,8 +31,8 @@ static int l_spawn(lua::State* L) {
auto defname = lua::tostring(L, 1);
auto& def = content->entities.require(defname);
auto pos = lua::tovec3(L, 2);
auto id = level->entities->spawn(def, pos);
return lua::pushinteger(L, id);
level->entities->spawn(def, pos);
return 1;
}
static int l_despawn(lua::State* L) {

1
src/logic/scripting/scripting.cpp
View file

@ -271,6 +271,7 @@ scriptenv scripting::on_entity_spawn(const EntityDef& def, entityid_t eid, entit
lua::pushenv(L, *entityenv);
funcsset.on_grounded = lua::hasfield(L, "on_grounded");
funcsset.on_despawn = lua::hasfield(L, "on_despawn");
lua::pop(L, 2);
return entityenv;
}