Scripting WIP

diff --git a/data/scripts/default.lua b/data/scripts/default.lua
index 7d3242837895c8c28e1a4cddab392ff8c55109e0..46d9fbf6cb30f5a6e9573bcfeaed7f8b6b7f575a 100644 (file)
--- 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 (file)
index 0000000..8ba2fca
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 (file)
index 0000000..d9a2bc4
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 (file)
index 0000000..a84ffc9
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 1f4f6fbe83d0d1da8781bca5cec6bfde99c214cd..e007c5f377b68f018293131295fbdf15ae880d65 100644 (file)
--- 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"<<std::endl;
+               m_spritenode = new scene::MyBillboardSceneNode(
+                               smgr->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"<<std::endl;
+               video::SColor c(255,255,255,255);
+               video::S3DVertex vertices[24] =
+               {
+                       // Up
+                       video::S3DVertex(-0.5,+0.5,-0.5, 0,1,0, c, 0,1),
+                       video::S3DVertex(-0.5,+0.5,+0.5, 0,1,0, c, 0,0),
+                       video::S3DVertex(+0.5,+0.5,+0.5, 0,1,0, c, 1,0),
+                       video::S3DVertex(+0.5,+0.5,-0.5, 0,1,0, c, 1,1),
+                       // Down
+                       video::S3DVertex(-0.5,-0.5,-0.5, 0,-1,0, c, 0,0),
+                       video::S3DVertex(+0.5,-0.5,-0.5, 0,-1,0, c, 1,0),
+                       video::S3DVertex(+0.5,-0.5,+0.5, 0,-1,0, c, 1,1),
+                       video::S3DVertex(-0.5,-0.5,+0.5, 0,-1,0, c, 0,1),
+                       // Right
+                       video::S3DVertex(+0.5,-0.5,-0.5, 1,0,0, c, 0,1),
+                       video::S3DVertex(+0.5,+0.5,-0.5, 1,0,0, c, 0,0),
+                       video::S3DVertex(+0.5,+0.5,+0.5, 1,0,0, c, 1,0),
+                       video::S3DVertex(+0.5,-0.5,+0.5, 1,0,0, c, 1,1),
+                       // Left
+                       video::S3DVertex(-0.5,-0.5,-0.5, -1,0,0, c, 1,1),
+                       video::S3DVertex(-0.5,-0.5,+0.5, -1,0,0, c, 0,1),
+                       video::S3DVertex(-0.5,+0.5,+0.5, -1,0,0, c, 0,0),
+                       video::S3DVertex(-0.5,+0.5,-0.5, -1,0,0, c, 1,0),
+                       // Back
+                       video::S3DVertex(-0.5,-0.5,+0.5, 0,0,1, c, 1,1),
+                       video::S3DVertex(+0.5,-0.5,+0.5, 0,0,1, c, 0,1),
+                       video::S3DVertex(+0.5,+0.5,+0.5, 0,0,1, c, 0,0),
+                       video::S3DVertex(-0.5,+0.5,+0.5, 0,0,1, c, 1,0),
+                       // Front
+                       video::S3DVertex(-0.5,-0.5,-0.5, 0,0,-1, c, 0,1),
+                       video::S3DVertex(-0.5,+0.5,-0.5, 0,0,-1, c, 0,0),
+                       video::S3DVertex(+0.5,+0.5,-0.5, 0,0,-1, c, 1,0),
+                       video::S3DVertex(+0.5,-0.5,-0.5, 0,0,-1, c, 1,1),
+               };
+               
+               for(u32 i=0; i<24; ++i){
+                       vertices[i].Pos *= BS;
+               }
+
+               u16 indices[6] = {0,1,2,2,3,0};
+
+               scene::SMesh* mesh = new scene::SMesh();
+               for (u32 i=0; i<6; ++i)
+               {
+                       scene::IMeshBuffer* buf = new scene::SMeshBuffer();
+                       buf->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(): \""<<m_prop->visual
+                               <<"\" not supported"<<std::endl;
        }
+       updateNodePos();
 }
 
 void LuaEntityCAO::removeFromScene()
@@ -1326,9 +1431,11 @@ void LuaEntityCAO::updateLight(u8 light_at_pos)
        video::SColor color(255,li,li,li);
        if(m_meshnode){
                setMeshVerticesColor(m_meshnode->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: "<<m_prop->dump()<<std::endl;
+
+       m_selection_box = m_prop->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 b053274f15984ef16d4a87eb866cc7a7dac8bf29..0abeb0ef047e30675d235f44c72ea96d16681d51 100644 (file)
--- 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 103b4cc8eb6785ba2bd6df87ab38265299d10a2f..1d72392324bad3d3b21427569275011556576807 100644 (file)
--- 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 e75e967c28dc4fee98e6e89646f965f4191b14d7..d3e8fa12cbbb2dab21ae226686fa3d22eca7694c 100644 (file)
--- 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)
                                                <<PP(obj->m_static_block)<<std::endl;
                        }
                }
+
+               bool shall_be_written = (!stays_in_same_block || data_changed);
                
                // Delete old static object
                if(obj->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 5d4a6e4089e09f967025e637c36ae5dcfe18960d..45646a69a40791b73e683ad319e917baa5f21954 100644 (file)
--- 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 6ce20123651bf0f8cd587d6cb967c47a9ea26500..26cfce1c2e6735bad6281b88ecd68aa550a12a92 100644 (file)
--- a/src/luaentity_common.cpp
+++ b/src/luaentity_common.cpp
@@ -40,9 +40,8 @@ std::string LuaEntityProperties::dump()
        os<<", collisionbox="<<PP(collisionbox.MinEdge)<<","<<PP(collisionbox.MaxEdge);
        os<<", visual="<<visual;
        os<<", textures=[";
-       for(core::list<std::string>::Iterator i = textures.begin();
-                       i != textures.end(); i++){
-               os<<"\""<<(*i)<<"\" ";
+       for(u32 i=0; i<textures.size(); i++){
+               os<<"\""<<textures[i]<<"\" ";
        }
        os<<"]";
        return os.str();
@@ -57,9 +56,8 @@ void LuaEntityProperties::serialize(std::ostream &os)
        writeV3F1000(os, collisionbox.MaxEdge);
        os<<serializeString(visual);
        writeU16(os, textures.size());
-       for(core::list<std::string>::Iterator i = textures.begin();
-                       i != textures.end(); i++){
-               os<<serializeString(*i);
+       for(u32 i=0; i<textures.size(); i++){
+               os<<serializeString(textures[i]);
        }
 }
 
@@ -74,8 +72,8 @@ void LuaEntityProperties::deSerialize(std::istream &is)
        collisionbox.MaxEdge = readV3F1000(is);
        visual = deSerializeString(is);
        textures.clear();
-       int texture_count = readU16(is);
-       for(int i=0; i<texture_count; i++){
+       u32 texture_count = readU16(is);
+       for(u32 i=0; i<texture_count; i++){
                textures.push_back(deSerializeString(is));
        }
 }

diff --git a/src/luaentity_common.h b/src/luaentity_common.h
index 379249d3fec70289dc8141164f9ae14cc8ad4ee3..6e5f11385ffe59012d7c0282c8df0163c2db1f44 100644 (file)
--- a/src/luaentity_common.h
+++ b/src/luaentity_common.h
@@ -26,11 +26,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 struct LuaEntityProperties
 {
+       // Values are BS=1
        bool physical;
        float weight;
        core::aabbox3d<f32> collisionbox;
        std::string visual;
-       core::list<std::string> textures;
+       core::array<std::string> textures;
 
        LuaEntityProperties();
        std::string dump();

diff --git a/src/scriptapi.cpp b/src/scriptapi.cpp
index 428810117b8931aef24880b8a29ec3b5722e7555..f8875c0e36d53e41eb149477d6fa126499013c3b 100644 (file)
--- 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 88ac6fd704dbd4c46f1fb3421ec973f59213ceb8..fd9703bd56d0a509633101fcdcc6e26da4e38ecf 100644 (file)
--- 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 cd98ba0aa3e232197c6e5596def37b1aede5a1f4..6d616c75e60b66a8a5d7a22f240a8d24e1ba10cc 100644 (file)
--- 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.