From: Perttu Ahola Date: Sat, 12 Nov 2011 13:14:24 +0000 (+0200) Subject: Scripting WIP X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=75a0ca6bd67aa9ca87668bc27d36399b5028c2b1;p=zefram%2Fminetest%2Fminetest_engine.git Scripting WIP --- diff --git a/data/scripts/default.lua b/data/scripts/default.lua index 7d324283..46d9fbf6 100644 --- a/data/scripts/default.lua +++ b/data/scripts/default.lua @@ -146,6 +146,8 @@ local TNT = { collisionbox = {-0.5,-0.5,-0.5, 0.5,0.5,0.5}, visual = "cube", textures = {"tnt_top.png","tnt_bottom.png","tnt_side.png","tnt_side.png","tnt_side.png","tnt_side.png"}, + --visual = "single_sprite", + --textures = {"mese.png^[forcesingle"}, -- Initial value for our timer timer = 0, -- List names of state variables, for serializing object state diff --git a/data/textures/tnt_bottom.png b/data/textures/tnt_bottom.png new file mode 100644 index 00000000..8ba2fca0 Binary files /dev/null and b/data/textures/tnt_bottom.png differ diff --git a/data/textures/tnt_side.png b/data/textures/tnt_side.png new file mode 100644 index 00000000..d9a2bc4e Binary files /dev/null and b/data/textures/tnt_side.png differ diff --git a/data/textures/tnt_top.png b/data/textures/tnt_top.png new file mode 100644 index 00000000..a84ffc9a Binary files /dev/null and b/data/textures/tnt_top.png differ diff --git a/src/content_cao.cpp b/src/content_cao.cpp index 1f4f6fbe..e007c5f3 100644 --- a/src/content_cao.cpp +++ b/src/content_cao.cpp @@ -1275,7 +1275,7 @@ LuaEntityCAO proto_LuaEntityCAO; LuaEntityCAO::LuaEntityCAO(): ClientActiveObject(0), - m_selection_box(-BS/3.,0.0,-BS/3., BS/3.,BS*2./3.,BS/3.), + m_selection_box(-BS/3.,-BS/3.,-BS/3., BS/3.,BS/3.,BS/3.), m_meshnode(NULL), m_spritenode(NULL), m_position(v3f(0,10*BS,0)), @@ -1303,9 +1303,114 @@ void LuaEntityCAO::addToScene(scene::ISceneManager *smgr) //video::IVideoDriver* driver = smgr->getVideoDriver(); if(m_prop->visual == "single_sprite"){ + infostream<<"LuaEntityCAO::addToScene(): single_sprite"<getRootSceneNode(), smgr, -1, v3f(0,0,0), v2f(1,1)); + std::string texturestring = "unknown_block.png"; + if(m_prop->textures.size() >= 1) + texturestring = m_prop->textures[0]; + m_spritenode->setMaterialTexture(0, + g_texturesource->getTextureRaw(texturestring)); + m_spritenode->setMaterialFlag(video::EMF_LIGHTING, false); + m_spritenode->setMaterialFlag(video::EMF_BILINEAR_FILTER, false); + m_spritenode->setMaterialType(video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF); + m_spritenode->setMaterialFlag(video::EMF_FOG_ENABLE, true); + m_spritenode->setColor(video::SColor(255,0,0,0)); + m_spritenode->setVisible(false); /* Set visible when brightness is known */ + m_spritenode->setSize(v2f(1,1)*1.0*BS); + { + const float txs = 1.0 / 1; + const float tys = 1.0 / 1; + m_spritenode->setTCoords(0, v2f(txs*1, tys*1)); + m_spritenode->setTCoords(1, v2f(txs*1, tys*0)); + m_spritenode->setTCoords(2, v2f(txs*0, tys*0)); + m_spritenode->setTCoords(3, v2f(txs*0, tys*1)); + } } else if(m_prop->visual == "cube"){ + infostream<<"LuaEntityCAO::addToScene(): cube"<append(vertices + 4 * i, 4, indices, 6); + buf->recalculateBoundingBox(); + mesh->addMeshBuffer(buf); + buf->drop(); + } + mesh->recalculateBoundingBox(); + + m_meshnode = smgr->addMeshSceneNode(mesh, NULL); + + m_meshnode->setMesh(mesh); + m_meshnode->setScale(v3f(1)); + for (u32 i = 0; i < 6; ++i) + { + std::string texturestring = "unknown_block.png"; + if(m_prop->textures.size() > i) + texturestring = m_prop->textures[i]; + AtlasPointer ap = g_texturesource->getTexture(texturestring); + + // Get the tile texture and atlas transformation + video::ITexture* atlas = ap.atlas; + v2f pos = ap.pos; + v2f size = ap.size; + + // Set material flags and texture + video::SMaterial& material = m_meshnode->getMaterial(i); + material.setFlag(video::EMF_LIGHTING, false); + material.setFlag(video::EMF_BILINEAR_FILTER, false); + material.setTexture(0, atlas); + material.getTextureMatrix(0).setTextureTranslate(pos.X, pos.Y); + material.getTextureMatrix(0).setTextureScale(size.X, size.Y); + } + // Will be shown when we know the brightness + m_meshnode->setVisible(false); } else { + infostream<<"LuaEntityCAO::addToScene(): \""<visual + <<"\" not supported"<getMesh(), color); + m_meshnode->setVisible(true); } if(m_spritenode){ m_spritenode->setColor(color); + m_spritenode->setVisible(true); } } @@ -1350,6 +1457,7 @@ void LuaEntityCAO::updateNodePos() void LuaEntityCAO::step(float dtime, ClientEnvironment *env) { pos_translator.translate(dtime); + updateNodePos(); } void LuaEntityCAO::processMessage(const std::string &data) @@ -1398,6 +1506,10 @@ void LuaEntityCAO::initialize(const std::string &data) m_prop->deSerialize(prop_is); infostream<<"m_prop: "<dump()<collisionbox; + m_selection_box.MinEdge *= BS; + m_selection_box.MaxEdge *= BS; pos_translator.init(m_position); diff --git a/src/content_sao.cpp b/src/content_sao.cpp index b053274f..0abeb0ef 100644 --- a/src/content_sao.cpp +++ b/src/content_sao.cpp @@ -1656,6 +1656,11 @@ void LuaEntitySAO::moveTo(v3f pos, bool continuous) sendPosition(true, true); } +float LuaEntitySAO::getMinimumSavedMovement() +{ + return 0.1 * BS; +} + void LuaEntitySAO::sendPosition(bool do_interpolate, bool is_movement_end) { m_last_sent_move_precision = m_base_position.getDistanceFrom( diff --git a/src/content_sao.h b/src/content_sao.h index 103b4cc8..1d723923 100644 --- a/src/content_sao.h +++ b/src/content_sao.h @@ -52,6 +52,8 @@ public: InventoryItem* createInventoryItem(); InventoryItem* createPickedUpItem(){return createInventoryItem();} void rightClick(Player *player); + + float getMinimumSavedMovement(){ return 0.1*BS; } private: std::string m_inventorystring; v3f m_speed_f; @@ -218,6 +220,7 @@ public: void setPos(v3f pos); void moveTo(v3f pos, bool continuous); + float getMinimumSavedMovement(); private: void sendPosition(bool do_interpolate, bool is_movement_end); diff --git a/src/environment.cpp b/src/environment.cpp index e75e967c..d3e8fa12 100644 --- a/src/environment.cpp +++ b/src/environment.cpp @@ -1749,8 +1749,10 @@ void ServerEnvironment::deactivateFarObjects(bool force_delete) if(n){ StaticObject static_old = n->getValue(); + float save_movem = obj->getMinimumSavedMovement(); + if(static_old.data == staticdata_new && - (static_old.pos - objectpos).getLength() < 2*BS) + (static_old.pos - objectpos).getLength() < save_movem) data_changed = false; } else { errorstream<<"ServerEnvironment::deactivateFarObjects(): " @@ -1759,6 +1761,8 @@ void ServerEnvironment::deactivateFarObjects(bool force_delete) <m_static_block)<m_static_exists) @@ -1769,7 +1773,7 @@ void ServerEnvironment::deactivateFarObjects(bool force_delete) block->m_static_objects.remove(id); obj->m_static_exists = false; // Only mark block as modified if data changed considerably - if(!stays_in_same_block || data_changed) + if(shall_be_written) block->raiseModified(MOD_STATE_WRITE_NEEDED); } } @@ -1794,7 +1798,7 @@ void ServerEnvironment::deactivateFarObjects(bool force_delete) block->m_static_objects.insert(new_id, s_obj); // Only mark block as modified if data changed considerably - if(!stays_in_same_block || data_changed) + if(shall_be_written) block->raiseModified(MOD_STATE_WRITE_NEEDED); obj->m_static_exists = true; diff --git a/src/inventory.cpp b/src/inventory.cpp index 5d4a6e40..45646a69 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -135,6 +135,10 @@ ServerActiveObject* InventoryItem::createSAO(ServerEnvironment *env, u16 id, v3f /* Create an ItemSAO */ + pos.Y -= BS*0.25; // let it drop a bit + // Randomize a bit + pos.X += BS*0.2*(float)myrand_range(-1000,1000)/1000.0; + pos.Z += BS*0.2*(float)myrand_range(-1000,1000)/1000.0; // Create object ServerActiveObject *obj = new ItemSAO(env, pos, getItemString()); return obj; diff --git a/src/luaentity_common.cpp b/src/luaentity_common.cpp index 6ce20123..26cfce1c 100644 --- a/src/luaentity_common.cpp +++ b/src/luaentity_common.cpp @@ -40,9 +40,8 @@ std::string LuaEntityProperties::dump() os<<", collisionbox="<::Iterator i = textures.begin(); - i != textures.end(); i++){ - os<<"\""<<(*i)<<"\" "; + for(u32 i=0; i::Iterator i = textures.begin(); - i != textures.end(); i++){ - os< collisionbox; std::string visual; - core::list textures; + core::array textures; LuaEntityProperties(); std::string dump(); diff --git a/src/scriptapi.cpp b/src/scriptapi.cpp index 42881011..f8875c0e 100644 --- a/src/scriptapi.cpp +++ b/src/scriptapi.cpp @@ -791,6 +791,7 @@ void scriptapi_luaentity_get_properties(lua_State *L, u16 id, } } lua_pop(L, 1); + } void scriptapi_luaentity_step(lua_State *L, u16 id, float dtime) diff --git a/src/server.cpp b/src/server.cpp index 88ac6fd7..fd9703bd 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -2853,10 +2853,10 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id) // Calculate a position for it v3f pos = intToFloat(p_over, BS); //pos.Y -= BS*0.45; - pos.Y -= BS*0.25; // let it drop a bit + /*pos.Y -= BS*0.25; // let it drop a bit // Randomize a bit pos.X += BS*0.2*(float)myrand_range(-1000,1000)/1000.0; - pos.Z += BS*0.2*(float)myrand_range(-1000,1000)/1000.0; + pos.Z += BS*0.2*(float)myrand_range(-1000,1000)/1000.0;*/ /* Create the object diff --git a/src/serverobject.h b/src/serverobject.h index cd98ba0a..6d616c75 100644 --- a/src/serverobject.h +++ b/src/serverobject.h @@ -76,6 +76,9 @@ public: // continuous: if true, object does not stop immediately at pos virtual void moveTo(v3f pos, bool continuous) { setBasePosition(pos); } + // If object has moved less than this and data has not changed, + // saving to disk may be omitted + virtual float getMinimumSavedMovement(){ return 2.0*BS; } /* Step object in time.