Merge branch 'float_dt' into dev

oxygine/src/oxygine/Clock.cpp

@@ -128,11 +128,35 @@ namespace oxygine
         return (timeMS)_fixedStep;
     }
 
+    float   Clock::doTickF()
+    {
+        if (_counter > 0)
+            return 0;
+
+        if (_srcTime + _fixedStep > _destTime)
+            return 0;
+
+        if (_fixedStep == 0)
+        {
+            float dt = _destTime - _srcTime;
+            _srcTime = _destTime;
+            return dt;
+        }
+
+        _srcTime += _fixedStep;
+        return _fixedStep;
+    }
+
     timeMS Clock::getTime() const
     {
         return (timeMS)_srcTime;
     }
 
+    float Clock::getTimeF() const
+    {
+        return _srcTime;
+    }
+
     int Clock::getPauseCounter() const
     {
         return _counter;

oxygine/src/oxygine/Clock.h

@@ -12,6 +12,7 @@ namespace oxygine
         ~Clock();
 
         timeMS  getTime() const;
+        float   getTimeF() const;
         int     getPauseCounter() const;
         int     getFixedStep() const;
         int     getLastDT() const;
@@ -27,6 +28,7 @@ namespace oxygine
 
         void    update(timeMS globalTime = -1);
         timeMS  doTick();
+        float   doTickF();
 
         std::string dump() const;
 

oxygine/src/oxygine/TouchEvent.h

@@ -26,7 +26,7 @@ namespace oxygine
 
         TouchEvent(eventType type, bool Bubbles = true, const Vector2& locPosition = Vector2(0, 0)) : Event(type, Bubbles), localPosition(locPosition), position(locPosition), mouseButton(MouseButton_Touch), pressure(1.0f), index(1), __clickDispatched(false), wheelDirection(0, 0), __localScale(1.0f) {}
 
-        /**position in local space for Event::currentTarget Actor*/
+        /**position in local space for Event::currentTarget Actor (in space for actor with added EventCallback)*/
         Vector2 localPosition;
         /**position in local space for Event::target actor*/
         Vector2 position;

oxygine/src/oxygine/UpdateState.h

@@ -6,14 +6,20 @@ namespace oxygine
     class UpdateState
     {
     public:
-        UpdateState(): time(0), dt(0), iteration(0) {}
+        UpdateState(): time(0), dt(0), iteration(0), dtf(0){}
 
-        /**local time*/
+        /**local time in  milliseconds*/
         timeMS time;
 
-        /**delta time since last update*/
+        /**local time in  seconds*/
+        float timef;
+
+        /**delta time since last update in milliseconds*/
         timeMS dt;
 
+        /*delta time since last update in seconds*/
+        float dtf;
+
         /**current iteration, used with fixed Clock update */
         int iteration;
     };

oxygine/src/oxygine/actor/Actor.cpp

@@ -1076,15 +1076,17 @@ namespace oxygine
             us.iteration = 0;
             _clock->update();
 
-            timeMS dt = _clock->doTick();
-            while (dt > 0)
+            float dt = _clock->doTickF();
+            while (dt > 0.0f)
             {
-                us.dt = dt;
+                us.dt = (timeMS)dt;
+                us.dtf = dt;
                 us.time = _clock->getTime();
+                us.timef = _clock->getTimeF();
 
                 internalUpdate(us);
 
-                dt = _clock->doTick();
+                dt = _clock->doTickF();
                 us.iteration += 1;
             }
         }

oxygine/src/oxygine/actor/Stage.cpp

@@ -127,14 +127,6 @@ namespace oxygine
         return RectF(-getPosition(), s);
     }
 
-    /*
-    bool Stage::handleEvent(const EventState &es)
-    {
-        bool handled = Actor::handleEvent(es);
-        return handled;
-    }
-    */
-
     void Stage::render(const Color* clearColor, const Rect& viewport, const Matrix& view, const Matrix& proj)
     {
 

oxygine/src/oxygine/dev_tools/TreeInspectorPreview.h

@@ -116,7 +116,6 @@ namespace oxygine
     private:
         void doUpdate(const UpdateState& us) override;
         friend class TreeInspector;
-        //bool _onEvent(const EventState &es);
 
         Vector2 render2cache(spActor item, const Vector2& size,  bool child);
 

oxygine/src/oxygine/oxygine-forwards.h

@@ -82,7 +82,6 @@ namespace oxygine
     DECLARE_SMART(Object, spObject);
     DECLARE_SMART(Polygon, spPolygon);
     DECLARE_SMART(ProgressBar, spProgressBar);
-    DECLARE_SMART(RenderTexture, spRenderTexture);
     DECLARE_SMART(ResAnim, spResAnim);
     DECLARE_SMART(ResBuffer, spResBuffer);
     DECLARE_SMART(ResFont, spResFont);
@@ -107,7 +106,6 @@ namespace oxygine
     class CreateResourceContext;
     class DebugActor;
     class Event;
-    class EventState;
     class Font;
     class IVideoDriver;
     class Image;