move

examples/Demo/src/TestUserShader.h

@@ -24,7 +24,7 @@ public:
         return a.uniform == b.uniform;
     }
 
-    void xapply()
+    void xapply() override
     {
         STDMaterialX::xapply();
         IVideoDriver::instance->setUniform("userValue", uniform);

oxygine/src/oxygine/actor/Actor.cpp

@@ -1,20 +1,20 @@
 #include "Actor.h"
-#include "core/Texture.h"
-#include "res/ResAnim.h"
+#include "../core/Texture.h"
+#include "../res/ResAnim.h"
 #include "Stage.h"
-#include "Clock.h"
-#include "Tween.h"
-#include "math/AffineTransform.h"
+#include "../Clock.h"
+#include "../Tween.h"
+#include "../math/AffineTransform.h"
 #include <sstream>
 #include <typeinfo>
 #define _USE_MATH_DEFINES
 #include <math.h>
-#include "utils/stringUtils.h"
-#include "RenderState.h"
+#include "../utils/stringUtils.h"
+#include "../RenderState.h"
 #include <stdio.h>
-#include "Serialize.h"
-#include "Material.h"
-#include "math/OBBox.h"
+#include "../Serialize.h"
+#include "../Material.h"
+#include "../math/OBBox.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/actor/Actor.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine-include.h"
+#include "../oxygine-include.h"
 #include "../oxygine-forwards.h"
 #include "../core/Object.h"
 #include "../core/Renderer.h"

oxygine/src/oxygine/actor/Box9Sprite.cpp

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

oxygine/src/oxygine/actor/Box9Sprite.h

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

oxygine/src/oxygine/actor/Button.cpp

@@ -1,8 +1,8 @@
 #include "Button.h"
 #include "Stage.h"
 #include "DebugActor.h"
-#include "res/ResAnim.h"
-#include "res/Resources.h"
+#include "../res/ResAnim.h"
+#include "../res/Resources.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/actor/Button.h

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

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 "RenderState.h"
-#include "Serialize.h"
-#include "Material.h"
+#include "../core/log.h"
+#include "../core/oxygine.h"
+#include "../RenderState.h"
+#include "../Serialize.h"
+#include "../Material.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/actor/ClipRectActor.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine-include.h"
+#include "../oxygine-include.h"
 #include "Actor.h"
 
 namespace oxygine

oxygine/src/oxygine/actor/ColorRectSprite.cpp

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

oxygine/src/oxygine/actor/ColorRectSprite.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine-include.h"
+#include "../oxygine-include.h"
 #include "Sprite.h"
 
 namespace oxygine

oxygine/src/oxygine/actor/DebugActor.cpp

@@ -1,42 +1,42 @@
 #include <sstream>
-#include "core/oxygine.h"
+#include "../core/oxygine.h"
 
-#include "res/ResAnim.h"
-#include "res/ResFont.h"
-#include "res/Resources.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 "../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 "../dev_tools/DeveloperMenu.h"
+#include "../dev_tools/TreeInspector.h"
+#include "../dev_tools/TexturesInspector.h"
 
-#include "STDRenderer.h"
+#include "../STDRenderer.h"
 #include "DebugActor.h"
 #include "Stage.h"
 #include "TextField.h"
 #include "ColorRectSprite.h"
 #include "Button.h"
-#include "Event.h"
-#include "RenderState.h"
-#include "initActor.h"
+#include "../Event.h"
+#include "../RenderState.h"
+#include "../initActor.h"
 #include "MaskedSprite.h"
-#include "STDMaterial.h"
+#include "../STDMaterial.h"
 
 #include <stdio.h>
 #include <stdarg.h>
 #include <iomanip>
-#include "core/oxygine.h"
+#include "../core/oxygine.h"
 
 #ifdef __S3E__
-#include "s3eMemory.h"
+#include "../s3eMemory.h"
 #elif __APPLE__
-#include "core/ios/ios.h"
+#include "../core/ios/ios.h"
 #endif
 
 #ifndef __S3E__

oxygine/src/oxygine/actor/DebugActor.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine-include.h"
+#include "../oxygine-include.h"
 #include "Actor.h"
 
 

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 "../MaskedRenderer.h"
+#include "../Serialize.h"
+#include "../Material.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/actor/MaskedSprite.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine-include.h"
+#include "../oxygine-include.h"
 #include "Sprite.h"
 
 namespace oxygine

oxygine/src/oxygine/actor/Polygon.cpp

@@ -1,12 +1,12 @@
 #include "Polygon.h"
-#include "Serialize.h"
-#include "RenderState.h"
-#include "core/VertexDeclaration.h"
+#include "../Serialize.h"
+#include "../RenderState.h"
+#include "../core/VertexDeclaration.h"
 #include <sstream>
-#include "core/UberShaderProgram.h"
-#include "STDRenderer.h"
-#include "Material.h"
-#include "STDMaterial.h"
+#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/Polygon.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine-include.h"
+#include "../oxygine-include.h"
 #include "Sprite.h"
 
 namespace oxygine

oxygine/src/oxygine/actor/ProgressBar.cpp

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

oxygine/src/oxygine/actor/ProgressBar.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine-include.h"
+#include "../oxygine-include.h"
 #include "Sprite.h"
 
 namespace oxygine

oxygine/src/oxygine/actor/SlidingActor.cpp

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

oxygine/src/oxygine/actor/SlidingActor.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine-include.h"
+#include "../oxygine-include.h"
 #include "Actor.h"
 #include "../math/Vector2.h"
 #include "../Draggable.h"

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 "../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 "../Serialize.h"
+#include "../Material.h"
+#include "../core/UberShaderProgram.h"
+#include "../MaterialCache.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/actor/Sprite.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine-include.h"
+#include "../oxygine-include.h"
 #include "../core/Texture.h"
 #include "../math/Rect.h"
 #include "../res/ResAnim.h"

oxygine/src/oxygine/actor/Stage.cpp

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

oxygine/src/oxygine/actor/Stage.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine-include.h"
+#include "../oxygine-include.h"
 #include "Actor.h"
 
 

oxygine/src/oxygine/actor/TextField.cpp

@@ -2,18 +2,18 @@
 
 
 #include "TextField.h"
-#include "Font.h"
+#include "../Font.h"
 #include "DebugActor.h"
-#include "res/Resources.h"
-#include "RenderState.h"
+#include "../res/Resources.h"
+#include "../RenderState.h"
 
-#include "utils/stringUtils.h"
-#include "core/gl/VideoDriverGLES20.h"
-#include "text_utils/TextBuilder.h"
-#include "text_utils/Node.h"
-#include "Serialize.h"
+#include "../utils/stringUtils.h"
+#include "../core/gl/VideoDriverGLES20.h"
+#include "../text_utils/TextBuilder.h"
+#include "../text_utils/Node.h"
+#include "../Serialize.h"
 
-#include "Material.h"
+#include "../Material.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/actor/TextField.h

@@ -1,8 +1,8 @@
 #pragma once
-#include "oxygine-include.h"
+#include "../oxygine-include.h"
 #include "Actor.h"
-#include "TextStyle.h"
-#include "VisualStyle.h"
+#include "../TextStyle.h"
+#include "../VisualStyle.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/actor/WebImage.cpp

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

oxygine/src/oxygine/actor/WebImage.h

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