build system enhancements

[chaz/yoink] / src / moof / timer.hh

diff --git a/src/moof/timer.hh b/src/moof/timer.hh
index 9f3e9846096d7e09600a053ea929c66e7af91d19..f9545eb4f4149810cbf78bc7b605f3948c24c17f 100644 (file)
--- a/src/moof/timer.hh
+++ b/src/moof/timer.hh
@@ -296,11 +296,10 @@ class game_time : public timer_source
 {
 public:
 
 {
 public:
 

-       game_time(scalar timestep) :
-               timestep_(timestep),
+       game_time(scalar timestep = SCALAR(1.0)) :

                scale_(timestep)
        {
                scale_(timestep)
        {

-               reset();
+               reset(timestep);

        }
 
        scalar ticks() const
        }
 
        scalar ticks() const


@@ -313,6 +312,11 @@ public:
                reference_ = SCALAR(0.0);
                ticks_ = 0;
        }
                reference_ = SCALAR(0.0);
                ticks_ = 0;
        }

+       void reset(scalar timestep)
+       {
+               reset();
+               timestep_ = timestep;
+       }

 
        void scale(scalar factor)
        {
 
        void scale(scalar factor)
        {