tweens to folder

CMakeLists.txt

@@ -37,7 +37,7 @@ set(OXYGINE_SRC ${OXYGINE_ROOT}/src/oxygine)
 
 set(FOLDERS oxygine oxygine/closure oxygine/minizip oxygine/core
 			oxygine/core/gl oxygine/dev_tools oxygine/minizip 
-			oxygine/math oxygine/actor oxygine/pugixml oxygine/json oxygine/res 
+			oxygine/math oxygine/actor oxygine/tween oxygine/pugixml oxygine/json oxygine/res 
 			oxygine/text_utils oxygine/utils oxygine/winnie_alloc)
 
 

oxygine/src/oxygine-framework.h

@@ -33,8 +33,8 @@
 #include "oxygine/actor/MaskedSprite.h"
 #include "oxygine/actor/TextField.h"
 #include "oxygine/TextStyle.h"
-#include "oxygine/Tween.h"
-#include "oxygine/TweenQueue.h"
+#include "oxygine/tween/Tween.h"
+#include "oxygine/tween/TweenQueue.h"
 #include "oxygine/TouchEvent.h"
 #include "oxygine/KeyEvent.h"
 #include "oxygine/UpdateState.h"
@@ -44,9 +44,9 @@
 #include "oxygine/actor/WebImage.h"
 #include "oxygine/key.h"
 #include "oxygine/actor/Polygon.h"
-#include "oxygine/TweenOutline.h"
-#include "oxygine/TweenGlow.h"
-#include "oxygine/TweenAlphaFade.h"
+#include "oxygine/tween/TweenOutline.h"
+#include "oxygine/tween/TweenGlow.h"
+#include "oxygine/tween/TweenAlphaFade.h"
 #include "oxygine/MaterialX.h"
 #include "oxygine/MaterialCache.h"
 

oxygine/src/oxygine/PostProcess.h

@@ -4,7 +4,7 @@
 #include "core/NativeTexture.h"
 #include "core/Renderer.h"
 #include "Material.h"
-#include "Tween.h"
+#include "tween/Tween.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/actor/Actor.cpp

@@ -3,7 +3,7 @@
 #include "../res/ResAnim.h"
 #include "Stage.h"
 #include "../Clock.h"
-#include "../Tween.h"
+#include "../tween/Tween.h"
 #include "../math/AffineTransform.h"
 #include <sstream>
 #include <typeinfo>

oxygine/src/oxygine/actor/Actor.h

@@ -9,7 +9,7 @@
 #include "../Serializable.h"
 #include "../EventDispatcher.h"
 #include "../TouchEvent.h"
-#include "../Tween.h"
+#include "../tween/Tween.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/actor/Sprite.h

@@ -6,7 +6,7 @@
 #include "Actor.h"
 #include "../AnimationFrame.h"
 #include "../VisualStyle.h"
-#include "../TweenAnim.h"
+#include "../tween/TweenAnim.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/core/Mem2Native.cpp

@@ -1,130 +0,0 @@
-#include "Mem2Native.h"
-#include "ImageDataOperations.h"
-
-namespace oxygine
-{
-    const int RECT_SIZE = 4096;
-
-    Mem2Native::Mem2Native(): _prev(0, 0), _size(0), _opt(0)
-    {
-    }
-
-    Mem2Native::~Mem2Native()
-    {
-    }
-
-    void Mem2Native::push(const CreateTextureTask& opt)
-    {
-        //copy should be deleted later
-        CreateTextureTask* copy = new CreateTextureTask(opt);
-        _messages.send(0, copy, 0);
-    }
-
-    bool Mem2Native::isEmpty()
-    {
-        return _prev == Point(0, 0) && _messages.empty();
-    }
-
-    void Mem2Native::textureDone()
-    {
-        _opt->ready();
-        delete _opt;
-        _opt = 0;
-    }
-
-    void Mem2Native::updateTexture()
-    {
-        int SIZE = _size;
-        if (!SIZE)
-            SIZE = RECT_SIZE;
-
-        Image* src = _opt->src.get();
-        NativeTexture* dest = _opt->dest.get();
-        Point& prev = _prev;
-
-        bool done = false;
-
-        if (isCompressedFormat(src->getFormat()))
-        {
-            dest->init(src->lock(), false);
-            done = true;
-        }
-        else
-        {
-
-            Rect textureRect(0, 0, src->getWidth(), src->getHeight());
-
-            if (dest->getHandle() == 0)
-                dest->init(textureRect.getWidth(), textureRect.getHeight(), src->getFormat());
-
-
-            Rect srcRect(prev.x, prev.y,
-                         std::min(SIZE, textureRect.getWidth()), std::min(SIZE, textureRect.getHeight()));
-            srcRect.clip(textureRect);
-
-
-            ImageData srcim = src->lock(&srcRect);
-
-
-            ImageData destim;
-            if (srcRect != textureRect)
-            {
-                int pitch = srcRect.getWidth() * getBytesPerPixel(dest->getFormat());
-                _buffer.resize(srcRect.getHeight() * pitch);
-                destim = ImageData(
-                             srcRect.getWidth(), srcRect.getHeight(),
-                             pitch,
-                             dest->getFormat(),
-                             &_buffer[0]
-                         );
-
-                operations::copy(srcim, destim);
-            }
-            else
-            {
-                destim = srcim;
-            }
-
-            dest->updateRegion(srcRect.pos.x, srcRect.pos.y, destim);
-
-            prev.x += SIZE;
-            if (prev.x >= textureRect.getWidth())
-            {
-                prev.x = 0;
-                prev.y += SIZE;
-            }
-
-            if (prev.y >= textureRect.getBottom())
-            {
-                _buffer.clear();
-                prev = Point(0, 0);
-                done = true;
-            }
-        }
-
-        if (done)
-        {
-            textureDone();
-        }
-    }
-
-    void Mem2Native::update()
-    {
-        //update only one texture per frame
-        if (_prev == Point(0, 0))
-        {
-            ThreadDispatcher::peekMessage ev;
-            if (_messages.peek(ev, true))
-            {
-                CreateTextureTask* opt = (CreateTextureTask*)ev.arg1;
-                _opt = opt;
-
-                updateTexture();
-            }
-        }
-        else
-        {
-            updateTexture();
-        }
-    }
-}

oxygine/src/oxygine/core/Mem2Native.h

@@ -1,43 +0,0 @@
-#pragma once
-#include "../oxygine-include.h"
-#include "ref_counter.h"
-#include <vector>
-#include <list>
-#include "NativeTexture.h"
-#include "../Image.h"
-#include "Mutex.h"
-#include "ThreadDispatcher.h"
-#include "../res/CreateResourceContext.h"
-
-namespace oxygine
-{
-    DECLARE_SMART(Image, spImage);
-    DECLARE_SMART(NativeTexture, spNativeTexture);
-
-    class Mem2Native
-    {
-    public:
-        Mem2Native();
-        ~Mem2Native();
-
-        bool isEmpty();
-
-        void push(const CreateTextureTask& opt);
-        void update();
-
-        void setUpdateSize(int size) {_size = size;}
-
-    private:
-
-        void updateTexture();
-        void textureDone();
-
-        int _size;
-        Point _prev;
-
-        CreateTextureTask* _opt;
-
-        std::vector<unsigned char> _buffer;
-        ThreadDispatcher _messages;//todo, use global messages
-    };
-}

oxygine/src/oxygine/oxygine-framework.h

@@ -33,7 +33,7 @@
 #include "MaskedSprite.h"
 #include "TextField.h"
 #include "TextStyle.h"
-#include "Tween.h"
+#include "tween/Tween.h"
 #include "TweenQueue.h"
 #include "TouchEvent.h"
 #include "KeyEvent.h"

oxygine/src/oxygine/oxygine_include.h

@@ -1,3 +0,0 @@
-#pragma once
-// "oxygine-include.h" DEPRECATED, use "oxygine-include.h"
-#include "oxygine-include.h"

oxygine/src/oxygine/res/ResFontBM.cpp

@@ -8,7 +8,6 @@
 #include "../core/file.h"
 #include "CreateResourceContext.h"
 #include "../utils/stringUtils.h"
-#include "../core/Mem2Native.h"
 #include "Resources.h"
 namespace oxygine
 {

oxygine/src/oxygine/Tween.cpp → oxygine/src/oxygine/tween/Tween.cpp

@@ -1,6 +1,6 @@
 #include "Tween.h"
-#include "actor/Actor.h"
-#include "actor/ColorRectSprite.h"
+#include "../actor/Actor.h"
+#include "../actor/ColorRectSprite.h"
 #include <limits.h>
 
 namespace oxygine

oxygine/src/oxygine/Tween.h → oxygine/src/oxygine/tween/Tween.h

@@ -1,15 +1,16 @@
 #pragma once
 #include "oxygine-include.h"
-#include "core/Object.h"
-#include "closure/closure.h"
-#include "utils/intrusive_list.h"
-#include "UpdateState.h"
+#include "../core/Object.h"
+#include "../closure/closure.h"
+#include "../utils/intrusive_list.h"
+#include "../UpdateState.h"
+
+#include "../EventDispatcher.h"
+#include "../Event.h"
+#include "../Property.h"
 
-#include "EventDispatcher.h"
-#include "Event.h"
 #include <stdint.h>
 #include <limits>
-#include "Property.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/TweenAlphaFade.cpp → oxygine/src/oxygine/tween/TweenAlphaFade.cpp

@@ -1,6 +1,6 @@
 #include "TweenAlphaFade.h"
-#include "STDMaterial.h"
-#include "actor/Actor.h"
+#include "../STDMaterial.h"
+#include "../actor/Actor.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/TweenAlphaFade.h → oxygine/src/oxygine/tween/TweenAlphaFade.h

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

oxygine/src/oxygine/TweenAnim.cpp → oxygine/src/oxygine/tween/TweenAnim.cpp

@@ -1,6 +1,6 @@
 #include "TweenAnim.h"
-#include "actor/Sprite.h"
-#include "res/ResAnim.h"
+#include "../actor/Sprite.h"
+#include "../res/ResAnim.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/TweenGlow.cpp → oxygine/src/oxygine/tween/TweenGlow.cpp

@@ -1,9 +1,9 @@
 #include "TweenGlow.h"
-#include "STDMaterial.h"
-#include "actor/Actor.h"
-#include "RenderState.h"
+#include "../STDMaterial.h"
+#include "../actor/Actor.h"
+#include "../RenderState.h"
 
-#include "core/gl/VertexDeclarationGL.h"
+#include "../core/gl/VertexDeclarationGL.h"
 
 
 

oxygine/src/oxygine/TweenGlow.h → oxygine/src/oxygine/tween/TweenGlow.h

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

oxygine/src/oxygine/TweenOutline.cpp → oxygine/src/oxygine/tween/TweenOutline.cpp

@@ -1,8 +1,8 @@
 #include "TweenOutline.h"
-#include "STDMaterial.h"
-#include "actor/Actor.h"
-#include "RenderState.h"
-#include "core/gl/VertexDeclarationGL.h"
+#include "../STDMaterial.h"
+#include "../actor/Actor.h"
+#include "../RenderState.h"
+#include "../core/gl/VertexDeclarationGL.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/TweenOutline.h → oxygine/src/oxygine/tween/TweenOutline.h

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