Server should use the same eye position as the client

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

diff --git a/src/environment.h b/src/environment.h
index ac290f932cac31be4bbec9ec7be14e57a3ac3298..b6767858ad5c49100a188e501e7c7bea05cc68a5 100644 (file)
--- a/src/environment.h
+++ b/src/environment.h
@@ -36,6 +36,11 @@ 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;
 
 class Environment
 {
@@ -112,35 +117,12 @@ public:
 private:
 };
 
-/*
-       Active block modifier interface
-*/
-
-class ServerEnvironment;
-
-class ActiveBlockModifier
-{
-public:
-       ActiveBlockModifier(){};
-       virtual ~ActiveBlockModifier(){};
-       
-       virtual u32 getTriggerContentCount(){ return 1;}
-       virtual u8 getTriggerContent(u32 i) = 0;
-       virtual float getActiveInterval() = 0;
-       virtual u32 getActiveChance() = 0;
-       virtual void triggerEvent(ServerEnvironment *env, v3s16 p) = 0;
-};
-
 /*
        The server-side environment.
 
        This is not thread-safe. Server uses an environment mutex.
 */
 
-#include "serverobject.h"
-
-class Server;
-
 class ServerEnvironment : public Environment
 {
 public:
@@ -177,7 +159,8 @@ public:
        void loadMeta(const std::string &savedir);
 
        /*
-               ActiveObjects
+               External ActiveObject interface
+               -------------------------------------------
        */
 
        ServerActiveObject* getActiveObject(u16 id);
@@ -214,7 +197,38 @@ public:
        */
        ActiveObjectMessage getActiveObjectMessage();
 
+       /*
+               Activate objects and dynamically modify for the dtime determined
+               from timestamp and additional_dtime
+       */
+       void activateBlock(MapBlock *block, u32 additional_dtime=0);
+
+       /*
+               ActiveBlockModifiers (TODO)
+               -------------------------------------------
+       */
+
+       void addActiveBlockModifier(ActiveBlockModifier *abm);
+
 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)
        */
@@ -256,6 +270,7 @@ private:
        ActiveBlockList m_active_blocks;
        IntervalLimiter m_active_blocks_management_interval;
        IntervalLimiter m_active_blocks_test_interval;
+       IntervalLimiter m_active_blocks_nodemetadata_interval;
        // Time from the beginning of the game in seconds.
        // Incremented in step().
        u32 m_game_time;
@@ -263,6 +278,29 @@ private:
        float m_game_time_fraction_counter;
 };
 
+/*
+       Active block modifier interface.
+
+       These are fed into ServerEnvironment at initialization time;
+       ServerEnvironment handles deleting them.
+*/
+
+class ActiveBlockModifier
+{
+public:
+       ActiveBlockModifier(){};
+       virtual ~ActiveBlockModifier(){};
+
+       //virtual core::list<u8> update(ServerEnvironment *env) = 0;
+       virtual u32 getTriggerContentCount(){ return 1;}
+       virtual u8 getTriggerContent(u32 i) = 0;
+       virtual float getActiveInterval() = 0;
+       // chance of (1 / return value), 0 is disallowed
+       virtual u32 getActiveChance() = 0;
+       // This is called usually at interval for 1/chance of the nodes
+       virtual void triggerEvent(ServerEnvironment *env, v3s16 p) = 0;
+};
+
 #ifndef SERVER
 
 #include "clientobject.h"
@@ -368,12 +406,16 @@ public:
        
        // Get event from queue. CEE_NONE is returned if queue is empty.
        ClientEnvEvent getClientEvent();
+
+       // Post effects
+       void drawPostFx(video::IVideoDriver* driver, v3f camera_pos);
        
 private:
        ClientMap *m_map;
        scene::ISceneManager *m_smgr;
        core::map<u16, ClientActiveObject*> m_active_objects;
        Queue<ClientEnvEvent> m_client_event_queue;
+       IntervalLimiter m_active_object_light_update_interval;
 };
 
 #endif