Improve glass

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

diff --git a/src/environment.h b/src/environment.h
index d93caac3bd49d6b49f6de90e10405627cf13fb9a..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.
 */
 
@@ -41,6 +41,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 class Server;
 class ActiveBlockModifier;
 class ServerActiveObject;
+typedef struct lua_State lua_State;
+class ITextureSource;
+class IGameDef;
 
 class Environment
 {
@@ -126,26 +129,26 @@ private:
 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; }
 
-       Server * getServer()
+       IGameDef *getGameDef()
+               { return m_gamedef; }
+
+       float getSendRecommendedInterval()
        {
-               return m_server;
+               return 0.10;
        }
 
-       void step(f32 dtime);
-       
        /*
                Save players
        */
@@ -214,10 +217,18 @@ public:
        /*
                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:
 
        /*
@@ -264,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
@@ -291,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
@@ -342,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()
@@ -359,7 +375,8 @@ public:
 
        virtual void addPlayer(Player *player);
        LocalPlayer * getLocalPlayer();
-
+       
+       // Slightly deprecated
        void updateMeshes(v3s16 blockpos);
        void expireMeshes(bool only_daynight_diffed);
 
@@ -371,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);
                }
        }
@@ -418,6 +435,8 @@ 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;