Improve glass

[oweals/minetest.git] / src / environment.h

diff --git a/src/environment.h b/src/environment.h
index b4f2a64caeb465ee5614b5a89452b44f17a3fe26..a8213ea6de8fadf02b32260efcb47d6fa3b74b40 100644 (file)
--- a/src/environment.h
+++ b/src/environment.h
@@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        - The map
        - Players
        - Other objects
-       - The current time in the game (actually it only contains the brightness)
+       - The current time in the game
        - etc.
 */
 
@@ -36,6 +36,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "map.h"
 #include <ostream>
 #include "utility.h"
+#include "activeobject.h"
+
+class Server;
+class ActiveBlockModifier;
+class ServerActiveObject;
+typedef struct lua_State lua_State;
+class ITextureSource;
+class IGameDef;
 
 class Environment
 {
@@ -118,34 +126,29 @@ private:
        This is not thread-safe. Server uses an environment mutex.
 */
 
-#include "serverobject.h"
-
-class Server;
-class ActiveBlockModifier;
-
 class ServerEnvironment : public Environment
 {
 public:
-       ServerEnvironment(ServerMap *map, Server *server);
+       ServerEnvironment(ServerMap *map, lua_State *L, IGameDef *gamedef);
        ~ServerEnvironment();
 
        Map & getMap()
-       {
-               return *m_map;
-       }
+               { return *m_map; }
 
        ServerMap & getServerMap()
-       {
-               return *m_map;
-       }
+               { return *m_map; }
+
+       lua_State* getLua()
+               { return m_lua; }
+
+       IGameDef *getGameDef()
+               { return m_gamedef; }
 
-       Server * getServer()
+       float getSendRecommendedInterval()
        {
-               return m_server;
+               return 0.10;
        }
 
-       void step(f32 dtime);
-       
        /*
                Save players
        */
@@ -159,7 +162,7 @@ public:
        void loadMeta(const std::string &savedir);
 
        /*
-               ActiveObjects
+               External ActiveObject interface
                -------------------------------------------
        */
 
@@ -175,6 +178,14 @@ public:
        */
        u16 addActiveObject(ServerActiveObject *object);
        
+       /*
+               Add an active object as a static object to the corresponding
+               MapBlock.
+               Caller allocates memory, ServerEnvironment frees memory.
+               Return value: true if succeeded, false if failed.
+       */
+       bool addActiveObjectAsStatic(ServerActiveObject *object);
+       
        /*
                Find out what new objects have been added to
                inside a radius around a position
@@ -198,13 +209,45 @@ public:
        ActiveObjectMessage getActiveObjectMessage();
 
        /*
-               ActiveBlockModifiers
+               Activate objects and dynamically modify for the dtime determined
+               from timestamp and additional_dtime
+       */
+       void activateBlock(MapBlock *block, u32 additional_dtime=0);
+
+       /*
+               ActiveBlockModifiers (TODO)
                -------------------------------------------
+               NOTE: Not used currently (TODO: Use or remove)
        */
 
        void addActiveBlockModifier(ActiveBlockModifier *abm);
 
+       /* Other stuff */
+       
+       // Clear all objects, loading and going through every MapBlock
+       void clearAllObjects();
+       
+       void step(f32 dtime);
+       
 private:
+
+       /*
+               Internal ActiveObject interface
+               -------------------------------------------
+       */
+
+       /*
+               Add an active object to the environment.
+
+               Called by addActiveObject.
+
+               Object may be deleted by environment immediately.
+               If id of object is 0, assigns a free id to it.
+               Returns the id of the object.
+               Returns 0 if not added and thus deleted.
+       */
+       u16 addActiveObjectRaw(ServerActiveObject *object, bool set_changed);
+       
        /*
                Remove all objects that satisfy (m_removed && m_known_by_count==0)
        */
@@ -232,8 +275,10 @@ private:
        
        // The map
        ServerMap *m_map;
-       // Pointer to server (which is handling this environment)
-       Server *m_server;
+       // Lua state
+       lua_State *m_lua;
+       // Game definition
+       IGameDef *m_gamedef;
        // Active object list
        core::map<u16, ServerActiveObject*> m_active_objects;
        // Outgoing network message buffer for active objects
@@ -259,6 +304,8 @@ private:
 
        These are fed into ServerEnvironment at initialization time;
        ServerEnvironment handles deleting them.
+
+       NOTE: Not used currently (TODO: Use or remove)
 */
 
 class ActiveBlockModifier
@@ -310,7 +357,8 @@ struct ClientEnvEvent
 class ClientEnvironment : public Environment
 {
 public:
-       ClientEnvironment(ClientMap *map, scene::ISceneManager *smgr);
+       ClientEnvironment(ClientMap *map, scene::ISceneManager *smgr,
+                       ITextureSource *texturesource, IGameDef *gamedef);
        ~ClientEnvironment();
 
        Map & getMap()
@@ -327,7 +375,8 @@ public:
 
        virtual void addPlayer(Player *player);
        LocalPlayer * getLocalPlayer();
-
+       
+       // Slightly deprecated
        void updateMeshes(v3s16 blockpos);
        void expireMeshes(bool only_daynight_diffed);
 
@@ -339,8 +388,8 @@ public:
 
                if(getDayNightRatio() != old_dr)
                {
-                       dout_client<<DTIME<<"ClientEnvironment: DayNightRatio changed"
-                                       <<" -> expiring meshes"<<std::endl;
+                       /*infostream<<"ClientEnvironment: DayNightRatio changed"
+                                       <<" -> expiring meshes"<<std::endl;*/
                        expireMeshes(true);
                }
        }
@@ -386,8 +435,12 @@ public:
 private:
        ClientMap *m_map;
        scene::ISceneManager *m_smgr;
+       ITextureSource *m_texturesource;
+       IGameDef *m_gamedef;
        core::map<u16, ClientActiveObject*> m_active_objects;
        Queue<ClientEnvEvent> m_client_event_queue;
+       IntervalLimiter m_active_object_light_update_interval;
+       IntervalLimiter m_lava_hurt_interval;
 };
 
 #endif