Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2843


Ignore:
Timestamp:
Mar 25, 2009, 4:34:40 PM (16 years ago)
Author:
rgrieder
Message:

Exported TimeFactorListener to separate file in the tools folder.

Location:
code/branches/gui/src/orxonox
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed

  • code/branches/gui/src/orxonox/gamestates/GSRoot.cc

    r2817 r2843  
    3535#include "core/CoreIncludes.h"
    3636#include "core/ConsoleCommand.h"
     37#include "tools/TimeFactorListener.h"
    3738#include "tools/Timer.h"
    3839#include "objects/Tickable.h"
    … …  
    171172        }
    172173    }
    173 
    174     ////////////////////////
    175     // TimeFactorListener //
    176     ////////////////////////
    177     float TimeFactorListener::timefactor_s = 1.0f;
    178 
    179     TimeFactorListener::TimeFactorListener()
    180     {
    181         RegisterRootObject(TimeFactorListener);
    182     }
    183174}

  • code/branches/gui/src/orxonox/gamestates/GSRoot.h

    r2817 r2843  
    6868        ConsoleCommand*       ccPause_;
    6969    };
    70 
    71     class _OrxonoxExport TimeFactorListener : virtual public OrxonoxClass
    72     {
    73         friend class GSRoot;
    74 
    75         public:
    76             TimeFactorListener();
    77             virtual ~TimeFactorListener() {}
    78 
    79         protected:
    80             virtual void changedTimeFactor(float factor_new, float factor_old) {}
    81             inline float getTimeFactor() const
    82                 { return TimeFactorListener::timefactor_s; }
    83 
    84         private:
    85             static float timefactor_s;
    86     };
    8770}
    8871

  • code/branches/gui/src/orxonox/objects/worldentities/Backlight.h

    r2710 r2843  
    3232#include "OrxonoxPrereqs.h"
    3333#include "FadingBillboard.h"
    34 #include "gamestates/GSRoot.h"
     34#include "tools/TimeFactorListener.h"
    3535
    3636namespace orxonox

  • code/branches/gui/src/orxonox/tools/CMakeLists.txt

    r2710 r2843  
    55  Shader.cc
    66  TextureGenerator.cc
     7  TimeFactorListener.cc
    78  Timer.cc
    89  WindowEventListener.cc

  • code/branches/gui/src/orxonox/tools/ParticleInterface.h

    r2662 r2843  
    3737#include "core/OrxonoxClass.h"
    3838#include "util/Math.h"
    39 #include "gamestates/GSRoot.h"
     39#include "tools/TimeFactorListener.h"
    4040
    4141#define getAllEmitters() \

  • code/branches/gui/src/orxonox/tools/Timer.h

    r2662 r2843  
    6464#include "core/Executor.h"
    6565#include "core/OrxonoxClass.h"
    66 #include "gamestates/GSRoot.h"
     66#include "tools/TimeFactorListener.h"
    6767
    6868namespace orxonox
Note: See TracChangeset for help on using the changeset viewer.