Changeset 7172 for code/trunk

Timestamp:

Aug 17, 2010, 8:25:21 PM (14 years ago)

Author:

landauf

Message:

removed network as dependency of tools. these libraries can build in parallel again now.
moved network synchronization of setTimeFactor from TimeFactorListener to GSRoot (GSRoot inherits from TimeFactorListener now)

Location:

code/trunk/src

Files:

• libraries/tools/CMakeLists.txt (modified) (1 diff)
• libraries/tools/interfaces/TimeFactorListener.h (modified) (1 diff)
• libraries/tools/interfaces/ToolsInterfaceCompilation.cc (modified) (3 diffs)
• orxonox/gamestates/GSRoot.cc (modified) (3 diffs)
• orxonox/gamestates/GSRoot.h (modified) (2 diffs)

code/trunk/src/libraries/tools/CMakeLists.txt

@@ -22 +22 @@
   LINK_LIBRARIES
     core
-    network
   SOURCE_FILES ${TOOLS_SRC_FILES}
 )

code/trunk/src/libraries/tools/interfaces/TimeFactorListener.h

@@ -41 +41 @@
             virtual ~TimeFactorListener() {}
 
-            static void setTimeFactor( float factor );
-            static void setTimeFactorInternal( float factor );
-            static inline float getTimeFactor(){ return TimeFactorListener::timefactor_s; }
+            static void setTimeFactor(float factor);
+            static inline float getTimeFactor()
+                { return TimeFactorListener::timefactor_s; }
 
         protected:

code/trunk/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc

@@ -38 +38 @@
 #include "core/CoreIncludes.h"
 #include "core/GameMode.h"
-#include "network/NetworkFunction.h"
 
 namespace orxonox
@@ -45 +44 @@
     // TimeFactorListener
     //----------------------------
-    registerStaticNetworkFunction( &TimeFactorListener::setTimeFactorInternal );
-
     float TimeFactorListener::timefactor_s = 1.0f;
 
@@ -54 +51 @@
     }
 
-    /*static*/ void TimeFactorListener::setTimeFactor( float factor )
+    /*static*/ void TimeFactorListener::setTimeFactor(float factor)
     {
-        if ( !GameMode::isStandalone() )
-            callStaticNetworkFunction( &TimeFactorListener::setTimeFactorInternal, CLIENTID_UNKNOWN, factor );
-        TimeFactorListener::setTimeFactorInternal(factor);
-    }
+        if (factor == TimeFactorListener::timefactor_s)
+            return;
 
-    /*static*/ void TimeFactorListener::setTimeFactorInternal( float factor )
-    {
         float oldFactor = TimeFactorListener::timefactor_s;
         TimeFactorListener::timefactor_s = factor;

code/trunk/src/orxonox/gamestates/GSRoot.cc

@@ -36 +36 @@
 #include "network/NetworkFunction.h"
 #include "tools/Timer.h"
-#include "tools/interfaces/TimeFactorListener.h"
 #include "tools/interfaces/Tickable.h"
 
@@ -43 +42 @@
     DeclareGameState(GSRoot, "root", false, false);
     SetConsoleCommandShortcut(GSRoot, printObjects);
+
+    registerStaticNetworkFunction(&TimeFactorListener::setTimeFactor);
 
     GSRoot::GSRoot(const GameStateInfo& info)
@@ -153 +154 @@
     }
 
-    float GSRoot::getTimeFactor()
+    void GSRoot::changedTimeFactor(float factor_new, float factor_old)
     {
-        return TimeFactorListener::getTimeFactor();
+        if (!GameMode::isStandalone())
+            callStaticNetworkFunction(&TimeFactorListener::setTimeFactor, CLIENTID_UNKNOWN, factor_new);
     }
 }

code/trunk/src/orxonox/gamestates/GSRoot.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 #include "core/GameState.h"
+#include "tools/interfaces/TimeFactorListener.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport GSRoot : public GameState
+    class _OrxonoxExport GSRoot : public GameState, public TimeFactorListener
     {
     public:
@@ -51 +52 @@
         void setTimeFactor(float factor);
         void pause();
-        float getTimeFactor();
+
+    protected:
+        virtual void changedTimeFactor(float factor_new, float factor_old);
 
     private: