From f145d498a6d91e3f5f3dcf921db8b74c98a7dad2 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Sat, 12 Nov 2011 02:25:30 +0200 Subject: [PATCH] Scripting WIP --- data/scripts/default.lua | 17 +- src/content_sao.cpp | 13 ++ src/content_sao.h | 3 + src/environment.cpp | 4 +- src/scriptapi.cpp | 483 ++++++++++++++++++++++++++++----------- src/scriptapi.h | 8 +- src/server.cpp | 3 + 7 files changed, 380 insertions(+), 151 deletions(-) diff --git a/data/scripts/default.lua b/data/scripts/default.lua index 005e9ac15..b6c6b0d89 100644 --- a/data/scripts/default.lua +++ b/data/scripts/default.lua @@ -155,28 +155,21 @@ end -- Called periodically function TNT:on_step(dtime) - print("TNT:on_step()") - --[[self.timer = self.timer + dtime - if self.timer > 4.0 then - self.to_be_deleted = true -- Environment will delete this object at a suitable point of execution - env:explode(self.pos, 3) -- Uh... well, something like that - end]] + --print("TNT:on_step()") end -- Called when object is punched function TNT:on_punch(hitter) print("TNT:on_punch()") - --[[-- If tool is bomb defuser, revert back to being a block - local item = hitter.inventory.get_current() - if item.itemtype == "tool" and item.param == "bomb_defuser" then - env:add_node(self.pos, 3072) - self.to_be_deleted = true - end]] end -- Called when object is right-clicked function TNT:on_rightclick(clicker) print("TNT:on_rightclick()") + pos = self.object:getpos() + print("TNT:on_rightclick(): object position: "..dump(pos)) + pos = {x=pos.x+0.5+1, y=pos.y+0.5, z=pos.z+0.5} + minetest.env:add_node(pos, 0) end print("TNT dump: "..dump(TNT)) diff --git a/src/content_sao.cpp b/src/content_sao.cpp index 3507ec154..567b489d9 100644 --- a/src/content_sao.cpp +++ b/src/content_sao.cpp @@ -1593,4 +1593,17 @@ InventoryItem* LuaEntitySAO::createPickedUpItem() return item; } +u16 LuaEntitySAO::punch(const std::string &toolname, v3f dir, + const std::string &playername) +{ + return 0; +} + +void LuaEntitySAO::rightClick(Player *player) +{ + if(!m_registered) + return; + lua_State *L = m_env->getLua(); + scriptapi_luaentity_rightclick_player(L, m_id, player->getName()); +} diff --git a/src/content_sao.h b/src/content_sao.h index f0eec29b6..115b9ead4 100644 --- a/src/content_sao.h +++ b/src/content_sao.h @@ -212,6 +212,9 @@ public: std::string getClientInitializationData(); std::string getStaticData(); InventoryItem* createPickedUpItem(); + u16 punch(const std::string &toolname, v3f dir, + const std::string &playername); + void rightClick(Player *player); private: std::string m_init_name; std::string m_init_state; diff --git a/src/environment.cpp b/src/environment.cpp index d7a647ac8..ed45cee69 100644 --- a/src/environment.cpp +++ b/src/environment.cpp @@ -1497,10 +1497,10 @@ u16 ServerEnvironment::addActiveObjectRaw(ServerActiveObject *object, <<" statically"<addedToEnvironment(object->getId()); - // Register reference in scripting api - scriptapi_add_object_reference(m_lua, object); return object->getId(); } diff --git a/src/scriptapi.cpp b/src/scriptapi.cpp index fc5364c87..2704f6c43 100644 --- a/src/scriptapi.cpp +++ b/src/scriptapi.cpp @@ -76,6 +76,24 @@ static void realitycheck(lua_State *L) } } +class StackUnroller +{ +private: + lua_State *m_lua; + int m_original_top; +public: + StackUnroller(lua_State *L): + m_lua(L), + m_original_top(-1) + { + m_original_top = lua_gettop(m_lua); // store stack height + } + ~StackUnroller() + { + lua_settop(m_lua, m_original_top); // restore stack height + } +}; + // Register new object prototype // register_entity(name, prototype) static int l_register_entity(lua_State *L) @@ -145,6 +163,131 @@ static const struct luaL_Reg minetest_entity_m [] = { {NULL, NULL} }; +/* + Reference objects +*/ +#define method(class, name) {#name, class::l_##name} + +class EnvRef +{ +private: + ServerEnvironment *m_env; + + static const char className[]; + static const luaL_reg methods[]; + + static EnvRef *checkobject(lua_State *L, int narg) + { + luaL_checktype(L, narg, LUA_TUSERDATA); + void *ud = luaL_checkudata(L, narg, className); + if(!ud) luaL_typerror(L, narg, className); + return *(EnvRef**)ud; // unbox pointer + } + + // Exported functions + + // EnvRef:add_node(pos, content) + // pos = {x=num, y=num, z=num} + // content = number + static int l_add_node(lua_State *L) + { + infostream<<"EnvRef::l_add_node()"<m_env; + if(env == NULL) return 0; + // pos + v3s16 pos; + lua_pushvalue(L, 2); // Push pos + luaL_checktype(L, -1, LUA_TTABLE); + lua_getfield(L, -1, "x"); + pos.X = lua_tonumber(L, -1); + lua_pop(L, 1); + lua_getfield(L, -1, "y"); + pos.Y = lua_tonumber(L, -1); + lua_pop(L, 1); + lua_getfield(L, -1, "z"); + pos.Z = lua_tonumber(L, -1); + lua_pop(L, 1); + lua_pop(L, 1); // Pop pos + // content + u16 content = 0; + lua_pushvalue(L, 3); // Push content + content = lua_tonumber(L, -1); + lua_pop(L, 1); // Pop content + // Do it + env->getMap().addNodeWithEvent(pos, MapNode(content)); + return 0; + } + + static int gc_object(lua_State *L) { + EnvRef *o = *(EnvRef **)(lua_touserdata(L, 1)); + delete o; + return 0; + } + +public: + EnvRef(ServerEnvironment *env): + m_env(env) + { + infostream<<"EnvRef created"<m_object; + if(co == NULL) return 0; + infostream<<"ObjectRef::l_getpos(): id="<getId()<getBasePosition() / BS; + lua_newtable(L); + lua_pushnumber(L, pos.X); + lua_setfield(L, -2, "x"); + lua_pushnumber(L, pos.Y); + lua_setfield(L, -2, "y"); + lua_pushnumber(L, pos.Z); + lua_setfield(L, -2, "z"); + return 1; + } + static int gc_object(lua_State *L) { //ObjectRef *o = checkobject(L, 1); ObjectRef *o = *(ObjectRef **)(lua_touserdata(L, 1)); @@ -185,15 +345,16 @@ public: ObjectRef(ServerActiveObject *object): m_object(object) { - infostream<<"ObjectRef created for id="<getId()<m_object; - if(co == NULL) - return; o->m_object = NULL; } @@ -244,16 +402,17 @@ public: //lua_register(L, className, create_object); } }; - const char ObjectRef::className[] = "ObjectRef"; - -#define method(class, name) {#name, class::l_##name} - const luaL_reg ObjectRef::methods[] = { method(ObjectRef, remove), + method(ObjectRef, getpos), {0,0} }; +/* + Main export function +*/ + void scriptapi_export(lua_State *L, Server *server) { realitycheck(L); @@ -285,8 +444,8 @@ void scriptapi_export(lua_State *L, Server *server) + DIR_DELIM + "base.lua").c_str());*/ // Create entity reference metatable - luaL_newmetatable(L, "minetest.entity_reference"); - lua_pop(L, 1); + //luaL_newmetatable(L, "minetest.entity_reference"); + //lua_pop(L, 1); // Create entity prototype luaL_newmetatable(L, "minetest.entity"); @@ -297,10 +456,33 @@ void scriptapi_export(lua_State *L, Server *server) luaL_register(L, NULL, minetest_entity_m); // Put other stuff in metatable - // Entity C reference + // Environment C reference + EnvRef::Register(L); + + // Object C reference ObjectRef::Register(L); } +void scriptapi_add_environment(lua_State *L, ServerEnvironment *env) +{ + realitycheck(L); + assert(lua_checkstack(L, 20)); + infostream<<"scriptapi_add_environment"<getId()); // Push id - lua_gettable(L, objectstable); - // Object is at stack top - lua_pop(L, 1); // pop object*/ - - // Set luaentities[id] = nil - lua_pushnumber(L, id); // Push id - lua_pushnil(L); - lua_settable(L, objectstable); - - lua_pop(L, 2); // pop luaentities, minetest -} - -void scriptapi_luaentity_step(lua_State *L, u16 id, float dtime) -{ - realitycheck(L); - assert(lua_checkstack(L, 20)); - infostream<<"scriptapi_luaentity_step: id="< class Server; +class ServerEnvironment; class ServerActiveObject; typedef struct lua_State lua_State; void scriptapi_export(lua_State *L, Server *server); - +void scriptapi_add_environment(lua_State *L, ServerEnvironment *env); + void scriptapi_add_object_reference(lua_State *L, ServerActiveObject *cobj); void scriptapi_rm_object_reference(lua_State *L, ServerActiveObject *cobj); void scriptapi_luaentity_add(lua_State *L, u16 id, const char *name, const char *init_state); void scriptapi_luaentity_rm(lua_State *L, u16 id); -void scriptapi_luaentity_step(lua_State *L, u16 id, float dtime); std::string scriptapi_luaentity_get_state(lua_State *L, u16 id); +void scriptapi_luaentity_step(lua_State *L, u16 id, float dtime); +void scriptapi_luaentity_rightclick_player(lua_State *L, u16 id, + const char *playername); #endif diff --git a/src/server.cpp b/src/server.cpp index 82671bf89..88ac6fd70 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -1001,6 +1001,9 @@ Server::Server( // Initialize Environment m_env = new ServerEnvironment(new ServerMap(mapsavedir), m_lua); + + // Give environment reference to scripting api + scriptapi_add_environment(m_lua, m_env); // Register us to receive map edit events m_env->getMap().addEventReceiver(this);