Merge branch 'ox-move' of github.com:oxygine/oxygine-framework into ox-move

.gitignore

@@ -66,3 +66,4 @@ build
 *.VC.VC.opendb
 oxygine/SDL/win32/oxygine.vcxproj.user
 *.iml
+**/.vs/

examples/Demo/data/xmls/res.xml

@@ -10,7 +10,7 @@
 
 		<image file="palette.png"/>		
 		<image file="snow.png"/>
-		<image file="edges.png"/>
+		<image file="edges.png" trim="false" extend="true"/>
 		
 		<image file="flower.png"/>
 		

oxygine/src/oxygine/AnimationFrame.cpp

@@ -1,5 +1,6 @@
 #include "AnimationFrame.h"
 #include "res/ResAnim.h"
+
 namespace oxygine
 {
     void AnimationFrame::init(ResAnim* rs, const Diffuse& df, const RectF& srcRect, const RectF& destRect, const Vector2& frame_size)

oxygine/src/oxygine/AnimationFrame.h

@@ -1,8 +1,8 @@
 #pragma once
 #include "oxygine-include.h"
-#include "math/Rect.h"
-#include "core/Texture.h"
 #include "core/NativeTexture.h"
+#include "core/Texture.h"
+#include "math/Rect.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/AsyncTask.cpp

@@ -1,6 +1,7 @@
 #include "AsyncTask.h"
 #include "core/oxygine.h"
 #include <typeinfo>
+
 namespace oxygine
 {
 #define LOGD(...)  (log::messageln("at: %s (%d) %s",    getName().c_str(), getObjectID(), __VA_ARGS__))

oxygine/src/oxygine/AsyncTask.h

@@ -1,9 +1,10 @@
 #pragma once
 #include "oxygine-include.h"
-#include "core/ThreadDispatcher.h"
-#include "EventDispatcher.h"
 #include "Event.h"
+#include "EventDispatcher.h"
+#include "core/ThreadDispatcher.h"
 #include "core/oxygine.h"
+
 #ifdef ERROR
 #undef ERROR
 #endif

oxygine/src/oxygine/Draggable.cpp

@@ -1,7 +1,7 @@
 #include "Draggable.h"
-#include "math/AffineTransform.h"
 #include "actor/Actor.h"
 #include "actor/Stage.h"
+#include "math/AffineTransform.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/Event.h

@@ -1,8 +1,9 @@
 #pragma once
 #include "oxygine-include.h"
-#include "closure/closure.h"
-#include "Input.h"
 #include "EventDispatcher.h"
+#include "Input.h"
+#include "closure/closure.h"
+
 #undef OUT
 
 namespace oxygine

oxygine/src/oxygine/EventDispatcher.cpp

@@ -1,5 +1,6 @@
 #include "EventDispatcher.h"
 #include "Event.h"
+
 #ifdef __MINGW32__
 #include <malloc.h>
 #endif

oxygine/src/oxygine/EventDispatcher.h

@@ -1,8 +1,8 @@
 #pragma once
 #include "oxygine-include.h"
-#include <list>
-#include "core/Object.h"
 #include "closure/closure.h"
+#include "core/Object.h"
+#include <list>
 
 namespace oxygine
 {

oxygine/src/oxygine/Font.h

@@ -2,6 +2,7 @@
 #include "oxygine-include.h"
 #include "core/Object.h"
 #include "math/Rect.h"
+
 #ifdef __S3E__
 #include <set>
 #else
@@ -38,7 +39,7 @@ namespace oxygine
     {
         std::size_t operator()(const glyph& k) const
         {
-            return std::hash<int>()(k.ch + k.opt);
+            return std::hash<size_t>()(k.ch + k.opt);
         }
     };
 
@@ -81,4 +82,4 @@ namespace oxygine
         int _size;
         int _baselineDistance;
     };
-}
+}

oxygine/src/oxygine/HttpRequestTask.cpp

@@ -84,6 +84,16 @@ namespace oxygine
         _setCacheEnabled(enabled);
     }
 
+    spObject HttpRequestTask::getObject() const
+    {
+        return _object;
+    }
+
+    void HttpRequestTask::setObject(spObject obj)
+    {
+        _object = obj;
+    }
+
     void HttpRequestTask::setSuccessOnAnyResponseCode(bool any)
     {
         _responseCodeChecker = any ? _defaultCheckerAny : _defaultChecker200;

oxygine/src/oxygine/HttpRequestTask.h

@@ -1,9 +1,9 @@
 #pragma once
 #include "oxygine-include.h"
 #include "AsyncTask.h"
-#include <vector>
-#include <string>
 #include "core/file.h"
+#include <string>
+#include <vector>
 
 namespace oxygine
 {
@@ -48,6 +48,7 @@ namespace oxygine
         const std::string&                  getUrl() const;
         size_t                              getReceivedSize() const;
         size_t                              getExpectedSize() const;
+        spObject                            getObject() const;
 
         /**swap version of getResponse if you want to modify result buffer inplace*/
         void getResponseSwap(std::vector<unsigned char>&);
@@ -59,7 +60,7 @@ namespace oxygine
         void setUrl(const std::string& url);
         void setFileName(const std::string& name, bool continueDownload = false);
         void setCacheEnabled(bool enabled);
-
+        void setObject(spObject obj);
 
         void setResponseCodeChecker(const responseCodeChecker& f) {_responseCodeChecker = f;}
         /**by default only response code == 200 is succeded, other codes are dispatching Event::ERROR*/
@@ -111,6 +112,8 @@ namespace oxygine
         size_t _expectedContentSize;
         size_t _receivedContentSize;
 
+        spObject _object;
+
         bool _continueDownload;
 
         typedef std::vector< std::pair<std::string, std::string> >  headers;

oxygine/src/oxygine/Image.cpp

@@ -1,8 +1,8 @@
 #include "Image.h"
-#include "math/Rect.h"
 #include "core/ImageDataOperations.h"
 #include "core/file.h"
 #include "core/log.h"
+#include "math/Rect.h"
 #include "utils/ImageUtils.h"
 #include <stdint.h>
 

oxygine/src/oxygine/Input.h

@@ -1,8 +1,8 @@
 #pragma once
 #include "oxygine-include.h"
 #include "EventDispatcher.h"
-#include "closure/closure.h"
 #include "PointerState.h"
+#include "closure/closure.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/InputText.cpp

@@ -1,9 +1,10 @@
 #include "InputText.h"
+#include "actor/ColorRectSprite.h"
 #include "actor/TextField.h"
-#include "utils/stringUtils.h"
 #include "core/oxygine.h"
-#include "actor/ColorRectSprite.h"
 #include "res/ResFont.h"
+#include "utils/stringUtils.h"
+
 #ifndef __S3E__
 #include "SDL_keyboard.h"
 #include "SDL_events.h"
@@ -117,7 +118,7 @@ namespace oxygine
     void InputText::updateText()
     {
         _textActor->setText(_txt);
-        float x = _textActor->getTextRect().getRight();
+        float x = static_cast<float>(_textActor->getTextRect().getRight());
         _cursor->setX(x);
 
 

oxygine/src/oxygine/InputText.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "oxygine-include.h"
-#include "EventDispatcher.h"
 #include "Event.h"
+#include "EventDispatcher.h"
 #include <string>
 
 #ifndef __S3E__

oxygine/src/oxygine/MaskedRenderer.cpp

@@ -1,7 +1,7 @@
 #include "MaskedRenderer.h"
-#include "core/VertexDeclaration.h"
-#include "core/UberShaderProgram.h"
 #include "RenderState.h"
+#include "core/UberShaderProgram.h"
+#include "core/VertexDeclaration.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/MaterialCache.cpp

@@ -1,6 +1,7 @@
 #include "MaterialCache.h"
-#include "core/oxygine.h"
 #include "MaterialX.h"
+#include "core/oxygine.h"
+
 namespace oxygine
 {
     MaterialX* MaterialCache::clone_(const MaterialX& other)

oxygine/src/oxygine/MaterialCache.h

@@ -1,10 +1,10 @@
 #pragma once
 #include "oxygine-include.h"
-#include "core/ref_counter.h"
-#include "core/intrusive_ptr.h"
 #include "core/Mutex.h"
-#include <vector>
+#include "core/intrusive_ptr.h"
+#include "core/ref_counter.h"
 #include <unordered_map>
+#include <vector>
 
 namespace oxygine
 {

oxygine/src/oxygine/MaterialX.cpp

@@ -1,8 +1,8 @@
 #include "MaterialX.h"
+#include "MaterialCache.h"
+#include "STDRenderer.h"
 #include "core/UberShaderProgram.h"
 #include "core/oxygine.h"
-#include "STDRenderer.h"
-#include "MaterialCache.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/MaterialX.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "oxygine-include.h"
-#include "core/ref_counter.h"
 #include "core/Renderer.h"
+#include "core/ref_counter.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/PointerState.cpp

@@ -1,5 +1,6 @@
 #include "PointerState.h"
 #include "actor/Actor.h"
+
 namespace oxygine
 {
     PointerState::PointerState(): _index(1)

oxygine/src/oxygine/PostProcess.cpp

@@ -1,13 +1,13 @@
 #include "PostProcess.h"
-#include "actor/Actor.h"
-#include "core/gl/VertexDeclarationGL.h"
-#include "core/gl/ShaderProgramGL.h"
-#include "core/oxygine.h"
 #include "RenderState.h"
 #include "STDMaterial.h"
+#include "actor/Actor.h"
+#include "core/ZipFileSystem.h"
 #include "core/file.h"
+#include "core/gl/ShaderProgramGL.h"
+#include "core/gl/VertexDeclarationGL.h"
+#include "core/oxygine.h"
 #include "core/system_data.h"
-#include "core/ZipFileSystem.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/PostProcess.h

@@ -1,9 +1,9 @@
 #pragma once
 #include "oxygine-include.h"
-#include "math/Rect.h"
+#include "Material.h"
 #include "core/NativeTexture.h"
 #include "core/Renderer.h"
-#include "Material.h"
+#include "math/Rect.h"
 #include "tween/Tween.h"
 
 namespace oxygine

oxygine/src/oxygine/RenderState.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "oxygine-include.h"
-#include "core/Renderer.h"
 #include "STDMaterial.h"
+#include "core/Renderer.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/STDMaterial.cpp

@@ -1,18 +1,18 @@
 #include "STDMaterial.h"
-#include "VisualStyle.h"
-#include "actor/Sprite.h"
-#include "actor/TextField.h"
-#include "text_utils/Node.h"
-#include "actor/ColorRectSprite.h"
+#include "MaskedRenderer.h"
 #include "RenderState.h"
 #include "STDRenderer.h"
-#include "MaskedRenderer.h"
-#include "actor/MaskedSprite.h"
+#include "VisualStyle.h"
 #include "actor/ClipRectActor.h"
+#include "actor/ColorRectSprite.h"
+#include "actor/MaskedSprite.h"
+#include "actor/Sprite.h"
+#include "actor/TextField.h"
+#include "core/NativeTexture.h"
+#include "core/UberShaderProgram.h"
 #include "core/oxygine.h"
 #include "res/ResFont.h"
-#include "core/UberShaderProgram.h"
-#include "core/NativeTexture.h"
+#include "text_utils/Node.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/STDMaterial.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "oxygine-include.h"
-#include "STDRenderer.h"
 #include "Material.h"
+#include "STDRenderer.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/STDRenderer.cpp

@@ -1,22 +1,17 @@
 #include "STDRenderer.h"
+#include "AnimationFrame.h"
+#include "Image.h"
+#include "RenderState.h"
+#include "STDMaterial.h"
+#include "VisualStyle.h"
+#include "core/ImageDataOperations.h"
 #include "core/UberShaderProgram.h"
 #include "core/VertexDeclaration.h"
-#include "STDMaterial.h"
-#include "Image.h"
-#include "core/file.h"
 #include "core/ZipFileSystem.h"
+#include "core/file.h"
+#include "core/gl/VideoDriverGLES20.h"
 #include "core/system_data.h"
 #include "math/Rect.h"
-#include "Image.h"
-#include "core/ImageDataOperations.h"
-#include "AnimationFrame.h"
-#include "core/VertexDeclaration.h"
-#include "core/gl/VideoDriverGLES20.h"
-
-#include "core/UberShaderProgram.h"
-
-#include "RenderState.h"
-#include "VisualStyle.h"
 
 //#define EXP_SORT
 
@@ -52,7 +47,8 @@ namespace oxygine
         resetTextures();
 
         _blend = blend_disabled;
-        _driver->setState(IVideoDriver::STATE_BLEND, 0);
+        if (_driver)
+            _driver->setState(IVideoDriver::STATE_BLEND, 0);
         _program = 0;
     }
 
@@ -73,7 +69,7 @@ namespace oxygine
             oxglActiveTexture(GL_TEXTURE0 + sampler);
             glGetIntegerv(GL_TEXTURE_BINDING_2D, &whichID);
 
-            OX_ASSERT(_textures[sampler]->getHandle() == (nativeTextureHandle)whichID);
+            OX_ASSERT(_textures[sampler]->getHandle() == (nativeTextureHandle)(size_t)whichID);
         }
 #endif
 

oxygine/src/oxygine/STDRenderer.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "oxygine-include.h"
-#include "core/Renderer.h"
 #include "MaterialX.h"
+#include "core/Renderer.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/Serialize.cpp

@@ -1,13 +1,13 @@
 #include "Serialize.h"
-#include "actor/Sprite.h"
-#include "actor/TextField.h"
-#include "actor/ColorRectSprite.h"
+#include "actor/Box9Sprite.h"
 #include "actor/ClipRectActor.h"
+#include "actor/ColorRectSprite.h"
+#include "actor/MaskedSprite.h"
+#include "actor/Polygon.h"
 #include "actor/ProgressBar.h"
 #include "actor/SlidingActor.h"
-#include "actor/Polygon.h"
-#include "actor/MaskedSprite.h"
-#include "actor/Box9Sprite.h"
+#include "actor/Sprite.h"
+#include "actor/TextField.h"
 #include "actor/WebImage.h"
 
 namespace oxygine

oxygine/src/oxygine/ThreadLoader.cpp

@@ -1,9 +1,9 @@
 #include "ThreadLoader.h"
 #include "Event.h"
-#include "res/Resources.h"
-#include "res/Resource.h"
-#include "core/oxygine.h"
 #include "actor/Stage.h"
+#include "core/oxygine.h"
+#include "res/Resource.h"
+#include "res/Resources.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/ThreadLoader.h

@@ -1,10 +1,10 @@
 #pragma once
 #include "oxygine-include.h"
+#include "Event.h"
 #include "EventDispatcher.h"
 #include "pthread.h"
 #include "core/ThreadDispatcher.h"
 #include <functional>
-#include "Event.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/TouchEvent.h

@@ -1,6 +1,7 @@
 #pragma once
 #include "oxygine-include.h"
 #include "Event.h"
+
 #undef OUT
 namespace oxygine
 {

oxygine/src/oxygine/VisualStyle.cpp

@@ -1,10 +1,10 @@
 #include "VisualStyle.h"
-#include "actor/Actor.h"
-#include <sstream>
+#include "MaterialCache.h"
 #include "RenderState.h"
 #include "Serialize.h"
+#include "actor/Actor.h"
 #include "utils/stringUtils.h"
-#include "MaterialCache.h"
+#include <sstream>
 
 namespace oxygine
 {

oxygine/src/oxygine/VisualStyle.h

@@ -1,7 +1,8 @@
 #pragma once
 #include "oxygine-include.h"
-#include "actor/Actor.h"
 #include "MaterialX.h"
+#include "actor/Actor.h"
+
 namespace oxygine
 {
     class VisualStyle

oxygine/src/oxygine/actor/Actor.cpp

@@ -1,12 +1,13 @@
 #include "Actor.h"
-#include "../core/Texture.h"
-#include "../res/ResAnim.h"
 #include "Stage.h"
 #include "../Clock.h"
-#include "../tween/Tween.h"
+#include "../core/Texture.h"
 #include "../math/AffineTransform.h"
+#include "../res/ResAnim.h"
+#include "../tween/Tween.h"
 #include <sstream>
 #include <typeinfo>
+
 #define _USE_MATH_DEFINES
 #include <math.h>
 #include "../utils/stringUtils.h"
@@ -143,15 +144,18 @@ namespace oxygine
 
     void Actor::calcBounds2(RectF& bounds, const Transform& transform) const
     {
-        const Actor* c = getFirstChild().get();
-        while (c)
+        if (!(_flags & flag_boundsNoChildren))
         {
-            if (c->getVisible())
+            const Actor* c = getFirstChild().get();
+            while (c)
             {
-                Transform tr = c->getTransform() * transform;
-                c->calcBounds2(bounds, tr);
+                if (c->getVisible())
+                {
+                    Transform tr = c->getTransform() * transform;
+                    c->calcBounds2(bounds, tr);
+                }
+                c = c->getNextSibling().get();
             }
-            c = c->getNextSibling().get();
         }
 
         RectF rect;
@@ -1420,16 +1424,21 @@ namespace oxygine
 
 
 
-    spTween setTimeout(timeMS dur, const EventCallback& cb, spActor root)
+    spTween setTimeout(timeMS dur, const EventCallback& cb, Actor* root)
     {
         if (!root)
-            root = getStage();
+            root = getStage().get();
         dur = std::max(dur, 1);
         spTween t = root->addTween(TweenDummy(), dur);
         t->setDoneCallback(cb);
         return t;
     }
 
+    spTween setTimeout(timeMS dur, const EventCallback& cb, spActor root)
+    {
+        return setTimeout(dur, cb, root.get());
+    }
+
     Transform getGlobalTransform2(spActor child, Actor* parent)
     {
         Transform t;

oxygine/src/oxygine/actor/Actor.h

@@ -1,15 +1,15 @@
 #pragma once
 #include "../oxygine-include.h"
-#include "../oxygine-forwards.h"
+#include "../EventDispatcher.h"
+#include "../Serializable.h"
+#include "../TouchEvent.h"
 #include "../core/Object.h"
 #include "../core/Renderer.h"
-#include "../math/Rect.h"
 #include "../math/AffineTransform.h"
-#include "../utils/intrusive_list.h"
-#include "../Serializable.h"
-#include "../EventDispatcher.h"
-#include "../TouchEvent.h"
+#include "../math/Rect.h"
+#include "../oxygine-forwards.h"
 #include "../tween/Tween.h"
+#include "../utils/intrusive_list.h"
 
 namespace oxygine
 {
@@ -345,7 +345,8 @@ namespace oxygine
             flag_touchChildrenEnabled   = 1 << 5,
             flag_cull                   = 1 << 6,
             flag_fastTransform          = 1 << 7,
-            flag_reserved               = 1 << 8,
+            flag_boundsNoChildren       = 1 << 8,
+            flag_reserved               = 1 << 9,
             flag_last                   = flag_reserved
         };
 
@@ -386,6 +387,7 @@ namespace oxygine
 
 
     /*Runs callback in time ms.Stage used as default actor*/
+    spTween setTimeout(timeMS dur, const EventCallback& cb, Actor* root);
     spTween setTimeout(timeMS dur, const EventCallback& cb, spActor root = 0);
 
     Vector2 convert_local2stage(spActor child, const Vector2& pos, spActor root = 0);

oxygine/src/oxygine/actor/Box9Sprite.cpp

@@ -1,14 +1,13 @@
 #include "Box9Sprite.h"
-#include "../res/ResAnim.h"
-#include "../math/ScalarMath.h"
+#include "DebugActor.h"
 #include "../RenderState.h"
-#include "../Serialize.h"
-#include <sstream>
+#include "../STDMaterial.h"
 #include "../STDRenderer.h"
-#include "DebugActor.h"
+#include "../Serialize.h"
+#include "../math/ScalarMath.h"
 #include "../res/ResAnim.h"
 #include "../res/Resources.h"
-#include "../STDMaterial.h"
+#include <sstream>
 
 namespace oxygine
 {

oxygine/src/oxygine/actor/Box9Sprite.h

@@ -1,6 +1,7 @@
 #pragma once
 #include "../oxygine-include.h"
 #include "Sprite.h"
+
 namespace oxygine
 {
     DECLARE_SMART(Box9Sprite, spBox9Sprite);

oxygine/src/oxygine/actor/Button.cpp

@@ -1,6 +1,6 @@
 #include "Button.h"
-#include "Stage.h"
 #include "DebugActor.h"
+#include "Stage.h"
 #include "../res/ResAnim.h"
 #include "../res/Resources.h"
 

oxygine/src/oxygine/actor/Button.h

@@ -1,6 +1,7 @@
 #pragma once
 #include "../oxygine-include.h"
 #include "Sprite.h"
+
 namespace oxygine
 {
     DECLARE_SMART(Button, spButton);

oxygine/src/oxygine/actor/ClipRectActor.cpp

@@ -1,10 +1,10 @@
 #include "ClipRectActor.h"
 #include "Stage.h"
-#include "../core/log.h"
-#include "../core/oxygine.h"
+#include "../Material.h"
 #include "../RenderState.h"
 #include "../Serialize.h"
-#include "../Material.h"
+#include "../core/log.h"
+#include "../core/oxygine.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/actor/ColorRectSprite.cpp

@@ -1,9 +1,9 @@
 #include "ColorRectSprite.h"
-#include "../RenderState.h"
 #include "../Material.h"
+#include "../MaterialCache.h"
+#include "../RenderState.h"
 #include "../Serialize.h"
 #include "../utils/stringUtils.h"
-#include "../MaterialCache.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/actor/DebugActor.cpp

@@ -1,37 +1,30 @@
-#include <sstream>
-#include "../core/oxygine.h"
-
-#include "../res/ResAnim.h"
-#include "../res/ResFont.h"
-#include "../res/Resources.h"
-
-#include "../utils/stringUtils.h"
-#include "../core/NativeTexture.h"
-#include "../core/ZipFileSystem.h"
-#include "../core/system_data.h"
-#include "../STDRenderer.h"
-#include "../MaterialCache.h"
-
-#include "../dev_tools/DeveloperMenu.h"
-#include "../dev_tools/TreeInspector.h"
-#include "../dev_tools/TexturesInspector.h"
-
-#include "../STDRenderer.h"
 #include "DebugActor.h"
+#include "Button.h"
+#include "ColorRectSprite.h"
+#include "MaskedSprite.h"
 #include "Stage.h"
 #include "TextField.h"
-#include "ColorRectSprite.h"
-#include "Button.h"
 #include "../Event.h"
+#include "../MaterialCache.h"
 #include "../RenderState.h"
-#include "../initActor.h"
-#include "MaskedSprite.h"
 #include "../STDMaterial.h"
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <iomanip>
+#include "../STDRenderer.h"
+#include "../core/NativeTexture.h"
+#include "../core/ZipFileSystem.h"
 #include "../core/oxygine.h"
+#include "../core/system_data.h"
+#include "../dev_tools/DeveloperMenu.h"
+#include "../dev_tools/TexturesInspector.h"
+#include "../dev_tools/TreeInspector.h"
+#include "../initActor.h"
+#include "../res/ResAnim.h"
+#include "../res/ResFont.h"
+#include "../res/Resources.h"
+#include "../utils/stringUtils.h"
+#include <iomanip>
+#include <sstream>
+#include <stdarg.h>
+#include <stdio.h>
 
 #ifdef __S3E__
 #include "../s3eMemory.h"
@@ -349,7 +342,7 @@ namespace oxygine
         s << "update=" << aligned(getStage()->_statUpdate, 2) << "ms ";
         s << "render=" << aligned(vstats.duration, 2) << "ms ";
         s << "textures=" << aligned(NativeTexture::created, 2) << " ";
-        s << "mats=" << aligned(mc().getTotalMaterials(), 2) << " ";
+        s << "mats=" << aligned((int)mc().getTotalMaterials(), 2) << " ";
 
 #ifdef __APPLE__
         size_t mem;
@@ -492,12 +485,18 @@ namespace oxygine
     {
         TouchEvent* te = safeCast<TouchEvent*>(ev);
         spActor actor = safeSpCast<Actor>(ev->target);
+
+        Transform tr = actor->computeGlobalTransform();
+        //Vector2 lt = actor->local2stage();
+        //Vector2 rb = actor->local2stage(actor->getSize());
+
         spColorRectSprite cr = new ColorRectSprite;
         cr->setTouchEnabled(false);
         cr->setColor(Color(rand() % 255, rand() % 255, rand() % 255, 0));
         cr->setSize(actor->getSize());
         cr->addTween(ColorRectSprite::TweenColor(Color(Color::White, 200)), 700, 1, true, 0, Tween::ease_inCubic)->detachWhenDone();
-        actor->addChild(cr);
+        cr->setTransform(tr);
+        getStage()->addChild(cr);
         std::string dmp = actor->dump(0);
         log::messageln(">>>>>>>>>>>>>>>>>>>>\ntouched actor '%s' local pos: (%.0f,%.0f), pos: (%.0f,%.0f)\n%s",
                        actor->getName().c_str(),
@@ -512,4 +511,4 @@ namespace oxygine
             actor = actor->getParent();
         }
     }
-}
+}

oxygine/src/oxygine/actor/DebugActor.h

@@ -2,7 +2,6 @@
 #include "../oxygine-include.h"
 #include "Actor.h"
 
-
 namespace oxygine
 {
     DECLARE_SMART(DebugActor, spDebugActor);

oxygine/src/oxygine/actor/MaskedSprite.cpp

@@ -1,8 +1,8 @@
 #include "MaskedSprite.h"
-#include "../RenderState.h"
 #include "../MaskedRenderer.h"
-#include "../Serialize.h"
 #include "../Material.h"
+#include "../RenderState.h"
+#include "../Serialize.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/actor/Polygon.cpp

@@ -1,12 +1,13 @@
 #include "Polygon.h"
-#include "../Serialize.h"
+#include "../Material.h"
 #include "../RenderState.h"
+#include "../STDMaterial.h"
+#include "../STDRenderer.h"
+#include "../Serialize.h"
+#include "../core/UberShaderProgram.h"
 #include "../core/VertexDeclaration.h"
 #include <sstream>
-#include "../core/UberShaderProgram.h"
-#include "../STDRenderer.h"
-#include "../Material.h"
-#include "../STDMaterial.h"
+
 namespace oxygine
 {
     Polygon::Polygon() : _verticesSize(0), _verticesData(0), _own(false), _vdecl(0)

oxygine/src/oxygine/actor/ProgressBar.cpp

@@ -1,10 +1,10 @@
 #include "ProgressBar.h"
-#include "../RenderState.h"
-#include <sstream>
-#include "../Serialize.h"
 #include "../Material.h"
-#include "../STDRenderer.h"
+#include "../RenderState.h"
 #include "../STDMaterial.h"
+#include "../STDRenderer.h"
+#include "../Serialize.h"
+#include <sstream>
 
 namespace oxygine
 {

oxygine/src/oxygine/actor/SlidingActor.cpp

@@ -1,11 +1,11 @@
 #include "SlidingActor.h"
 #include "ClipRectActor.h"
+#include "Stage.h"
 #include "../PointerState.h"
+#include "../Serialize.h"
 #include "../UpdateState.h"
-//#include "../Draggable.h"
 #include "../initActor.h"
-#include "../Serialize.h"
-#include "Stage.h"
+//#include "../Draggable.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/actor/SlidingActor.h

@@ -1,9 +1,9 @@
 #pragma once
 #include "../oxygine-include.h"
 #include "Actor.h"
-#include "../math/Vector2.h"
-#include "../Draggable.h"
 #include "ClipRectActor.h"
+#include "../Draggable.h"
+#include "../math/Vector2.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/actor/Sprite.cpp

@@ -1,13 +1,13 @@
-#include <sstream>
 #include "Sprite.h"
-#include "../res/ResAnim.h"
-#include "../RenderState.h"
-#include "../utils/stringUtils.h"
 #include "Stage.h"
-#include "../Serialize.h"
 #include "../Material.h"
-#include "../core/UberShaderProgram.h"
 #include "../MaterialCache.h"
+#include "../RenderState.h"
+#include "../Serialize.h"
+#include "../core/UberShaderProgram.h"
+#include "../res/ResAnim.h"
+#include "../utils/stringUtils.h"
+#include <sstream>
 
 namespace oxygine
 {

oxygine/src/oxygine/actor/Sprite.h

@@ -1,11 +1,11 @@
 #pragma once
 #include "../oxygine-include.h"
-#include "../core/Texture.h"
-#include "../math/Rect.h"
-#include "../res/ResAnim.h"
 #include "Actor.h"
 #include "../AnimationFrame.h"
 #include "../VisualStyle.h"
+#include "../core/Texture.h"
+#include "../math/Rect.h"
+#include "../res/ResAnim.h"
 #include "../tween/TweenAnim.h"
 
 namespace oxygine

oxygine/src/oxygine/actor/Stage.cpp

@@ -1,10 +1,10 @@
 #include "Stage.h"
+#include "../Clock.h"
+#include "../RenderState.h"
+#include "../STDMaterial.h"
 #include "../core/oxygine.h"
 #include "../math/Rect.h"
-#include "../RenderState.h"
-#include "../Clock.h"
 #include <sstream>
-#include "../STDMaterial.h"
 
 #ifdef OXYGINE_SDL
 #include "SDL.h"

oxygine/src/oxygine/actor/Stage.h

@@ -2,7 +2,6 @@
 #include "../oxygine-include.h"
 #include "Actor.h"
 
-
 namespace oxygine
 {
     DECLARE_SMART(Stage, spStage);

oxygine/src/oxygine/actor/TextField.cpp

@@ -1,19 +1,15 @@
-#include <sstream>
-
-
 #include "TextField.h"
-#include "../Font.h"
 #include "DebugActor.h"
-#include "../res/Resources.h"
+#include "../Font.h"
+#include "../Material.h"
 #include "../RenderState.h"
-
-#include "../utils/stringUtils.h"
+#include "../Serialize.h"
 #include "../core/gl/VideoDriverGLES20.h"
-#include "../text_utils/TextBuilder.h"
+#include "../res/Resources.h"
 #include "../text_utils/Node.h"
-#include "../Serialize.h"
-
-#include "../Material.h"
+#include "../text_utils/TextBuilder.h"
+#include "../utils/stringUtils.h"
+#include <sstream>
 
 namespace oxygine
 {

oxygine/src/oxygine/actor/WebImage.cpp

@@ -1,9 +1,9 @@
 #include "WebImage.h"
-#include "../res/ResAnim.h"
-#include "../Image.h"
-#include "../HttpRequestTask.h"
 #include "Sprite.h"
+#include "../HttpRequestTask.h"
+#include "../Image.h"
 #include "../Serialize.h"
+#include "../res/ResAnim.h"
 #include <vector>
 
 namespace oxygine

oxygine/src/oxygine/actor/WebImage.h

@@ -1,8 +1,8 @@
 #pragma once
 #include "../oxygine-include.h"
 #include "Actor.h"
-#include "../res/ResAnim.h"
 #include "../HttpRequestTask.h"
+#include "../res/ResAnim.h"
 #include <string>
 
 namespace oxygine

oxygine/src/oxygine/core/FileSystem.cpp

@@ -1,8 +1,8 @@
 #include "FileSystem.h"
+#include "file.h"
 #include "../utils/stringUtils.h"
-#include <string.h>
 #include <algorithm>
-#include "file.h"
+#include <string.h>
 
 namespace oxygine
 {

oxygine/src/oxygine/core/ImageData.cpp

@@ -1,5 +1,6 @@
 #include "ImageData.h"
 #include "../utils/stringUtils.h"
+
 namespace oxygine
 {
     int getBytesPerPixel(TextureFormat tf)

oxygine/src/oxygine/core/ImageData.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "../oxygine-include.h"
-#include "../math/Rect.h"
 #include "pixel.h"
+#include "../math/Rect.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/core/Mutex.cpp

@@ -2,7 +2,6 @@
 #include "ox_debug.h"
 #include "pthread.h"
 
-
 namespace oxygine
 {
     Mutex::Mutex(bool recursive)

oxygine/src/oxygine/core/NativeTexture.cpp

@@ -1,8 +1,8 @@
 #include "NativeTexture.h"
-#include "../Image.h"
 #include "ImageDataOperations.h"
 #include "file.h"
 #include "log.h"
+#include "../Image.h"
 #include <stdio.h>
 
 namespace oxygine

oxygine/src/oxygine/core/NativeTexture.h

@@ -1,9 +1,9 @@
 #pragma once
 #include "../oxygine-include.h"
-#include "../closure/closure.h"
 #include "Restorable.h"
-#include "ox_debug.h"
 #include "Texture.h"
+#include "ox_debug.h"
+#include "../closure/closure.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/core/Object.cpp

@@ -1,12 +1,12 @@
 #include "Object.h"
-#include <typeinfo>
-#include <stdio.h>
-#include "log.h"
 #include "Mutex.h"
+#include "log.h"
 #include "../utils/stringUtils.h"
-#include <string.h>
-#include <algorithm>
 #include "../winnie_alloc/winnie_alloc.h"
+#include <algorithm>
+#include <stdio.h>
+#include <string.h>
+#include <typeinfo>
 
 namespace oxygine
 {

oxygine/src/oxygine/core/Renderer.cpp

@@ -1,17 +1,15 @@
 #include "Renderer.h"
-#include "../math/Rect.h"
-#include "../Image.h"
 #include "ImageDataOperations.h"
-#include "../AnimationFrame.h"
+#include "UberShaderProgram.h"
 #include "VertexDeclaration.h"
-#include "gl/VideoDriverGLES20.h"
-
 #include "ZipFileSystem.h"
 #include "system_data.h"
-#include "UberShaderProgram.h"
-
+#include "../AnimationFrame.h"
+#include "../Image.h"
 #include "../RenderState.h"
 #include "../VisualStyle.h"
+#include "../math/Rect.h"
+#include "gl/VideoDriverGLES20.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/core/Renderer.h

@@ -1,12 +1,11 @@
 #pragma once
 #include "../oxygine-include.h"
-#include <vector>
-
-#include "../math/Color.h"
-#include "../math/Rect.h"
-#include "../math/AffineTransform.h"
 #include "NativeTexture.h"
 #include "VideoDriver.h"
+#include "../math/AffineTransform.h"
+#include "../math/Color.h"
+#include "../math/Rect.h"
+#include <vector>
 
 #if OXYGINE_NO_SUBPIXEL_RENDERING
 #define SNAP_PIXEL(arg) floor(arg)

oxygine/src/oxygine/core/STDFileSystem.cpp

@@ -1,9 +1,9 @@
-#include <string>
 #include "STDFileSystem.h"
-#include "log.h"
-#include "../utils/stringUtils.h"
 #include "Object.h"
 #include "file.h"
+#include "log.h"
+#include "../utils/stringUtils.h"
+#include <string>
 
 #ifndef _WIN32
 #include <dirent.h>

oxygine/src/oxygine/core/STDFileSystem.h

@@ -1,6 +1,7 @@
 #pragma once
 #include "../oxygine-include.h"
 #include "FileSystem.h"
+
 namespace oxygine
 {
     namespace file

oxygine/src/oxygine/core/Texture.h

@@ -1,10 +1,10 @@
 #pragma once
 #include "../oxygine-include.h"
-#include "ref_counter.h"
+#include "ImageData.h"
 #include "Object.h"
-#include <vector>
+#include "ref_counter.h"
 #include "../math/Rect.h"
-#include "ImageData.h"
+#include <vector>
 
 namespace oxygine
 {

oxygine/src/oxygine/core/ThreadDispatcher.cpp

@@ -1,7 +1,7 @@
 #include "ThreadDispatcher.h"
+#include "Mutex.h"
 #include "log.h"
 #include "pthread.h"
-#include "Mutex.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/core/ThreadDispatcher.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "../oxygine-include.h"
-#include <vector>
 #include <functional>
+#include <vector>
 
 #if defined(_WIN32) && !defined(__MINGW32__)
 typedef struct pthread_mutex_t_* pthread_mutex_t;

oxygine/src/oxygine/core/ThreadMessages.h

@@ -1,2 +1,3 @@
 #pragma once
-#include "ThreadDispatcher.h"
+#include "ThreadDispatcher.h"
+

oxygine/src/oxygine/core/UberShaderProgram.cpp

@@ -1,8 +1,8 @@
 #include "UberShaderProgram.h"
+#include "NativeTexture.h"
 #include "vertex.h"
-#include "gl/VideoDriverGLES20.h"
 #include "gl/ShaderProgramGL.h"
-#include "NativeTexture.h"
+#include "gl/VideoDriverGLES20.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/core/UberShaderProgram.h

@@ -1,7 +1,7 @@
 #pragma once
-#include <vector>
-#include "Restorable.h"
 #include "Object.h"
+#include "Restorable.h"
+#include <vector>
 
 namespace oxygine
 {

oxygine/src/oxygine/core/VertexDeclaration.h

@@ -1,6 +1,7 @@
 #pragma once
 #include "../oxygine-include.h"
 #include "vertex.h"
+
 namespace oxygine
 {
     class VertexDeclaration

oxygine/src/oxygine/core/VideoDriver.cpp

@@ -1,8 +1,7 @@
 #include "VideoDriver.h"
 #include "NativeTexture.h"
-#include "../math/Color.h"
 #include "ShaderProgram.h"
-
+#include "../math/Color.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/core/VideoDriver.h

@@ -2,9 +2,9 @@
 #include "../oxygine-include.h"
 #include "ref_counter.h"
 #include "vertex.h"
+#include "../math/Matrix.h"
 #include "../math/Rect.h"
 #include "../math/Vector4.h"
-#include "../math/Matrix.h"
 #include <vector>
 
 namespace oxygine

oxygine/src/oxygine/core/ZipFileSystem.cpp

@@ -1,11 +1,11 @@
-#include <string.h>
-#include <map>
-#include "../minizip/ioapi_mem.h"
-#include "../core/ZipFileSystem.h"
+#include "ZipFileSystem.h"
 #include "../core/Object.h"
+#include "../minizip/ioapi_mem.h"
 #include "../utils/stringUtils.h"
-#include <algorithm>
 //#include "../utils/utils.h"
+#include <algorithm>
+#include <map>
+#include <string.h>
 
 #ifdef __S3E__
 #include "s3eFile.h"

oxygine/src/oxygine/core/ZipFileSystem.h

@@ -1,11 +1,11 @@
 #pragma once
 #include "../oxygine-include.h"
-#include <vector>
 #include "FileSystem.h"
-#include "../minizip/unzip.h"
-#include "../core/file.h"
 #include "../core/Mutex.h"
+#include "../core/file.h"
+#include "../minizip/unzip.h"
 #include <unordered_map>
+#include <vector>
 
 namespace oxygine
 {

oxygine/src/oxygine/core/android/HttpRequestJavaTask.h

@@ -7,9 +7,9 @@
 //
 #pragma once
 #include "../../oxygine-include.h"
-#include "../../HttpRequestTask.h"
-#include "jniUtils.h"
 #include "jniHelper.h"
+#include "jniUtils.h"
+#include "../../HttpRequestTask.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/core/android/jniHelper.cpp

@@ -1,5 +1,4 @@
 #include "jniHelper.h"
-
 extern "C"
 {
     JNIEnv* Android_JNI_GetEnv(void);
@@ -44,7 +43,9 @@ namespace oxygine
 
         for (size_t i = 0; i < src.size(); ++i)
         {
+            env->PushLocalFrame(1);
             env->SetObjectArrayElement(res, i, env->NewStringUTF(src[i].c_str()));
+            env->PopLocalFrame(0);
         }
 
         return res;

oxygine/src/oxygine/core/android/jniHelper.h

@@ -1,6 +1,6 @@
 #pragma once
-#include <jni.h>
 #include <android/log.h>
+#include <jni.h>
 #include <string>
 #include <vector>
 

oxygine/src/oxygine/core/android/jniUtils.cpp

@@ -1,7 +1,7 @@
 #include "jniUtils.h"
 #include "jniHelper.h"
-#include "../log.h"
 #include "../ThreadDispatcher.h"
+#include "../log.h"
 
 using namespace oxygine;
 

oxygine/src/oxygine/core/curl/HttpRequestCurlTask.cpp

@@ -1,9 +1,9 @@
 #include "HttpRequestCurlTask.h"
-#include "core/oxygine.h"
-#include "core/ThreadDispatcher.h"
 #include "SDL.h"
-#include "pthread.h"
 #include "key.h"
+#include "pthread.h"
+#include "core/ThreadDispatcher.h"
+#include "core/oxygine.h"
 
 namespace oxygine
 {
@@ -175,7 +175,7 @@ namespace oxygine
             return s;
 
         char buff[512];
-        int i = 0;
+        size_t i = 0;
         for (; i < s; ++i)
             buff[i] = tolower(d[i]);
         buff[i] = 0;

oxygine/src/oxygine/core/curl/HttpRequestCurlTask.h

@@ -1,9 +1,9 @@
 #pragma once
-#include "curl/curl.h"
 #include "../../oxygine-include.h"
 #include "../../HttpRequestTask.h"
-#include "../file.h"
 #include "../ThreadDispatcher.h"
+#include "../file.h"
+#include "curl/curl.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/core/emscripten/HttpRequestEmscriptenTask.cpp

@@ -1,6 +1,6 @@
 #include "HttpRequestEmscriptenTask.h"
-#include <emscripten.h>
 #include "core/file.h"
+#include <emscripten.h>
 
 namespace oxygine
 {

oxygine/src/oxygine/core/emscripten/emsc.cpp

@@ -1,4 +1,5 @@
 #include "emsc.h"
+
 namespace oxygine
 {
     void emscSyncFS(bool read)

oxygine/src/oxygine/core/emscripten/emsc.h

@@ -1,6 +1,7 @@
 #pragma once
-#include "oxygine_include.h"
 #include "Event.h"
+#include "oxygine_include.h"
+
 namespace oxygine
 {
     class EmscSyncFsEvent: public Event

oxygine/src/oxygine/core/file.cpp

@@ -1,9 +1,9 @@
-#include <string>
-#include "STDFileSystem.h"
 #include "file.h"
+#include "Object.h"
+#include "STDFileSystem.h"
 #include "log.h"
 #include "../utils/stringUtils.h"
-#include "Object.h"
+#include <string>
 
 #ifdef __S3E__
 #include <s3eFile.h>

oxygine/src/oxygine/core/file.h

@@ -1,9 +1,9 @@
 #pragma once
 #include "../oxygine-include.h"
-#include <vector>
-#include "Object.h"
 #include "FileSystem.h"
+#include "Object.h"
 #include <string>
+#include <vector>
 
 namespace oxygine
 {

oxygine/src/oxygine/core/gl/NativeTextureGLES.cpp

@@ -1,12 +1,11 @@
-#include <stdio.h>
 #include "NativeTextureGLES.h"
 #include "oxgl.h"
 #include "../../Image.h"
-#include "../NativeTexture.h"
 #include "../ImageDataOperations.h"
+#include "../NativeTexture.h"
 #include "../file.h"
 #include "../log.h"
-
+#include <stdio.h>
 
 namespace oxygine
 {

oxygine/src/oxygine/core/gl/ShaderProgramGL.h

@@ -1,6 +1,7 @@
 #pragma once
-#include "../ShaderProgram.h"
 #include "oxgl.h"
+#include "../ShaderProgram.h"
+
 namespace oxygine
 {
     class VertexDeclarationGL;

oxygine/src/oxygine/core/gl/VertexDeclarationGL.cpp

@@ -1,5 +1,6 @@
 #include "VertexDeclarationGL.h"
 #include "../../utils/stringUtils.h"
+
 namespace oxygine
 {
     void VertexDeclarationGL::init(bvertex_format fmt)

oxygine/src/oxygine/core/gl/VertexDeclarationGL.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "../../oxygine-include.h"
-#include "../VertexDeclaration.h"
 #include "oxgl.h"
+#include "../VertexDeclaration.h"
 
 namespace oxygine
 {