wip

Android.mk

@@ -20,7 +20,7 @@ LOCAL_MODULE    := oxygine-framework_static
 LOCAL_MODULE_FILENAME := liboxygine-framework
 LOCAL_CPP_EXTENSION := .cpp
 
-SRC := $(LOCAL_PATH)/oxygine/src
+SRC := $(LOCAL_PATH)/oxygine/src/oxygine
 
 LOCAL_SRC_FILES := \
 				$(subst $(LOCAL_PATH)/,, \

CMakeLists.txt

@@ -33,12 +33,12 @@ endif(EMSCRIPTEN)
 
 
 set(OXYGINE_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/oxygine)
-set(OXYGINE_SRC ${OXYGINE_ROOT}/src)
+set(OXYGINE_SRC ${OXYGINE_ROOT}/oxygine/src/oxygine)
 
-set(FOLDERS src src/closure src/minizip src/core
-			src/core/gl src/dev_tools src/minizip 
-			src/math src/pugixml src/json src/res 
-			src/text_utils src/utils src/winnie_alloc)
+set(FOLDERS oxygine oxygine/closure oxygine/minizip oxygine/core
+			oxygine/core/gl oxygine/dev_tools oxygine/minizip 
+			oxygine/math oxygine/pugixml oxygine/json oxygine/res 
+			oxygine/text_utils oxygine/utils oxygine/winnie_alloc)
 
 
 if (EMSCRIPTEN)
@@ -116,9 +116,9 @@ endif(EMSCRIPTEN)
 
 foreach(ITEM ${FOLDERS})
 	file(GLOB FLS
-		${OXYGINE_ROOT}/${ITEM}/*.cpp
-		${OXYGINE_ROOT}/${ITEM}/*.c
-		${OXYGINE_ROOT}/${ITEM}/*.h)
+		${OXYGINE_ROOT}/src/${ITEM}/*.cpp
+		${OXYGINE_ROOT}/src/${ITEM}/*.c
+		${OXYGINE_ROOT}/src/${ITEM}/*.h)
 	set(SOURCES ${SOURCES} ${FLS})	
 	string(REPLACE / \\ SGROUP ${ITEM})
 	source_group(${SGROUP} FILES ${FLS})

examples/Demo/src/Counter.cpp

@@ -1,7 +1,5 @@
 #include "Counter.h"
-#include "utils/stringUtils.h"
-#include "Sprite.h"
-#include "res/Resources.h"
+
 
 DECLARE_SMART(Number, spNumber);
 class Number : public Actor

examples/Demo/src/Counter.h

@@ -1,6 +1,5 @@
 #pragma once
-#include "oxygine/ClipRectActor.h"
-#include "oxygine/res/Resources.h"
+#include "oxygine/oxygine-framework.h"
 
 using namespace oxygine;
 

examples/Demo/src/TestBox9Sprite.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "test.h"
-#include "Box9Sprite.h"
+
 class TestBox9Sprite: public Test
 {
 public:

examples/Demo/src/TestClipRect.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "test.h"
-#include "ClipRectActor.h"
+
 class TestClipRect: public Test
 {
 public:

examples/Demo/src/TestColorFont.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "test.h"
-#include "core/UberShaderProgram.h"
+
 
 DECLARE_SMART(ShaderTextField, spShaderTextField);
 class CustomShader : public Material

examples/Demo/src/TestDrag.h

@@ -1,7 +1,6 @@
 #pragma once
 #include "test.h"
-#include "oxygine/Draggable.h"
-#include "oxygine/TweenOutline.h"
+
 class DraggableSprite: public Sprite
 {
 public:

examples/Demo/src/TestEdges.h

@@ -1,5 +1,6 @@
 #pragma once
 #include "test.h"
+
 class TestEdges : public Test
 {
 public:

examples/Demo/src/TestHttp.h

@@ -1,9 +1,6 @@
 #pragma once
 #include "test.h"
-#include "ClipRectActor.h"
-#include "WebImage.h"
-#include "ProgressBar.h"
-#include "HttpRequestTask.h"
+
 
 class TestHttp: public Test
 {

examples/Demo/src/TestInputText.h

@@ -1,8 +1,5 @@
 #pragma once
 #include "test.h"
-#include "InputText.h"
-
-
 
 
 DECLARE_SMART(TextWithBackground, spTextWithBackground);

examples/Demo/src/TestManageRes.h

@@ -1,8 +1,6 @@
 #pragma once
 #include "test.h"
-#include "ThreadLoader.h"
 #include "pthread.h"
-#include "core/oxygine.h"
 
 #ifdef EMSCRIPTEN
 #include <emscripten.h>

examples/Demo/src/TestMask.h

@@ -1,8 +1,7 @@
 #pragma once
 #include "test.h"
-#include "Polygon.h"
 #include "TestPolygon.h"
-#include "TweenOutline.h"
+
 
 class TestMask: public Test
 {

examples/Demo/src/TestOpenGL.h

@@ -1,7 +1,5 @@
 #pragma once
 #include "test.h"
-#include "core/gl/oxgl.h"
-#include "core/gl/ShaderProgramGL.h"
 
 
 struct myVertex

examples/Demo/src/TestPolygon.h

@@ -1,9 +1,5 @@
 #pragma once
 #include "test.h"
-#include "Polygon.h"
-#include "res/ResAnim.h"
-#include "core/NativeTexture.h"
-#include "AnimationFrame.h"
 
 class TestPolygon: public Test
 {

examples/Demo/src/TestProgressBar.h

@@ -1,6 +1,5 @@
 #pragma once
 #include "test.h"
-#include "ProgressBar.h"
 
 class TestProgressBar: public Test
 {

examples/Demo/src/TestRender2Texture.h

@@ -1,7 +1,5 @@
 #pragma once
 #include "test.h"
-#include "STDMaterial.h"
-#include "core/gl/oxgl.h"
 
 class TestRender2Texture : public Test
 {

examples/Demo/src/TestSignedDistanceFont.h

@@ -1,6 +1,5 @@
 #pragma once
 #include "test.h"
-#include "core/UberShaderProgram.h"
 
 class TestSignedDistanceFont : public Test
 {

examples/Demo/src/TestSliding.h

@@ -1,8 +1,5 @@
 #pragma once
 #include "test.h"
-#include "ClipRectActor.h"
-#include "PointerState.h"
-#include "SlidingActor.h"
 
 class TestSliding: public Test
 {

examples/Demo/src/TestTexel2Pixel.h

@@ -1,5 +1,6 @@
 #pragma once
 #include "test.h"
+
 class TestTexel2Pixel: public Test
 {
 public:

examples/Demo/src/TestText.h

@@ -1,6 +1,5 @@
 #pragma once
 #include "test.h"
-#include "oxygine-framework.h"
 #include <sstream>
 
 struct text_test

examples/Demo/src/TestTiled.h

@@ -1,7 +1,5 @@
 #pragma once
 #include "test.h"
-#include "core/file.h"
-#include "res/SingleResAnim.h"
 
 // Bits on the far end of the 32-bit global tile ID are used for tile flags
 const unsigned FLIPPED_HORIZONTALLY_FLAG = 0x80000000;

examples/Demo/src/TestTouches.h

@@ -1,6 +1,5 @@
 #pragma once
 #include "test.h"
-#include "utils/stringUtils.h"
 
 class TestTouches: public Test
 {

examples/Demo/src/TestTweenPostProcessing.h

@@ -1,8 +1,6 @@
 #pragma once
 #include "test.h"
-#include "TweenAlphaFade.h"
-#include "TweenOutline.h"
-#include "TweenGlow.h"
+
 #undef OUT
 
 

examples/Demo/src/TestTweenShine.h

@@ -1,7 +1,5 @@
 #pragma once
 #include "test.h"
-#include "TextField.h"
-#include "utils/stringUtils.h"
 
 class TweenShine: public Tween
 {

examples/Demo/src/TestTweenText.h

@@ -1,7 +1,5 @@
 #pragma once
 #include "test.h"
-#include "TextField.h"
-#include "utils/stringUtils.h"
 
 class TweenText
 {

examples/Demo/src/TestTweens.h

@@ -1,6 +1,5 @@
 #pragma once
 #include "test.h"
-#include "oxygine/ColorRectSprite.h"
 #include <typeinfo>
 
 class TweensTest: public Test

examples/Demo/src/TestUserShader.h

@@ -1,9 +1,5 @@
 #pragma once
 #include "test.h"
-#include "core/UberShaderProgram.h"
-#include "core/gl/VideoDriverGLES20.h"
-#include "core/gl/oxgl.h"
-#include "STDMaterial.h"
 
 DECLARE_SMART(ShaderSprite, spShaderSprite);
 

examples/Demo/src/TestUserShader2.h

@@ -1,11 +1,6 @@
 #pragma once
 
 #include "test.h"
-#include "core/UberShaderProgram.h"
-#include "core/gl/VideoDriverGLES20.h"
-#include "core/gl/oxgl.h"
-#include "core/gl/ShaderProgramGL.h"
-
 
 class LightningMaterial : public Material
 {

examples/Demo/src/test.cpp

@@ -1,7 +1,5 @@
 #include "test.h"
 #include "oxygine/oxygine-framework.h"
-#include "oxygine/core/STDFileSystem.h"
-#include "oxygine/WebImage.h"
 
 Resources Test::resourcesUI;
 file::STDFileSystem extfs(true);

examples/Demo/src/test.h

@@ -1,9 +1,7 @@
 #pragma once
-#include "oxygine/Actor.h"
-#include "oxygine/Button.h"
-#include "oxygine/RenderState.h"
-#include "oxygine/STDRenderer.h"
-#include "oxygine/TextField.h"
+
+#include "oxygine/oxygine-framework.h"
+
 using namespace oxygine;
 using namespace std;
 

oxygine/src/oxygine/core/FileSystem.cpp

@@ -1,5 +1,5 @@
 #include "FileSystem.h"
-#include "utils/stringUtils.h"
+#include "../utils/stringUtils.h"
 #include <string.h>
 #include <algorithm>
 #include "file.h"

oxygine/src/oxygine/core/FileSystem.h

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

oxygine/src/oxygine/core/ImageData.cpp

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

oxygine/src/oxygine/core/ImageData.h

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

oxygine/src/oxygine/core/ImageDataOperations.cpp

@@ -1,5 +1,5 @@
 #include "ImageDataOperations.h"
-#include "math/Color.h"
+#include "../math/Color.h"
 #include <string.h>
 
 namespace oxygine

oxygine/src/oxygine/core/ImageDataOperations.h

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

oxygine/src/oxygine/core/Mem2Native.h

@@ -1,13 +1,13 @@
 #pragma once
-#include "oxygine-include.h"
+#include "../oxygine-include.h"
 #include "ref_counter.h"
 #include <vector>
 #include <list>
 #include "NativeTexture.h"
-#include "Image.h"
+#include "../Image.h"
 #include "Mutex.h"
 #include "ThreadDispatcher.h"
-#include "res/CreateResourceContext.h"
+#include "../res/CreateResourceContext.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/core/Mutex.h

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

oxygine/src/oxygine/core/NativeTexture.cpp

@@ -1,5 +1,5 @@
 #include "NativeTexture.h"
-#include "Image.h"
+#include "../Image.h"
 #include "ImageDataOperations.h"
 #include "file.h"
 #include "log.h"

oxygine/src/oxygine/core/NativeTexture.h

@@ -1,7 +1,7 @@
 #pragma once
-#include "oxygine-include.h"
-#include "closure/closure.h"
-#include "core/Restorable.h"
+#include "../oxygine-include.h"
+#include "../closure/closure.h"
+#include "Restorable.h"
 #include "ox_debug.h"
 #include "Texture.h"
 

oxygine/src/oxygine/core/Object.cpp

@@ -3,10 +3,10 @@
 #include <stdio.h>
 #include "log.h"
 #include "Mutex.h"
-#include "utils/stringUtils.h"
+#include "../utils/stringUtils.h"
 #include <string.h>
 #include <algorithm>
-#include "winnie_alloc/winnie_alloc.h"
+#include "../winnie_alloc/winnie_alloc.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/core/Object.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine-include.h"
+#include "../oxygine-include.h"
 #include "ref_counter.h"
 #include <string>
 #include <vector>

oxygine/src/oxygine/core/Renderer.cpp

@@ -1,9 +1,8 @@
 #include "Renderer.h"
-#include "math/Rect.h"
-#include "Actor.h"
-#include "Image.h"
+#include "../math/Rect.h"
+#include "../Image.h"
 #include "ImageDataOperations.h"
-#include "AnimationFrame.h"
+#include "../AnimationFrame.h"
 #include "VertexDeclaration.h"
 #include "gl/VideoDriverGLES20.h"
 
@@ -11,8 +10,8 @@
 #include "system_data.h"
 #include "UberShaderProgram.h"
 
-#include "RenderState.h"
-#include "VisualStyle.h"
+#include "../RenderState.h"
+#include "../VisualStyle.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/core/Renderer.h

@@ -1,10 +1,10 @@
 #pragma once
-#include "oxygine-include.h"
+#include "../oxygine-include.h"
 #include <vector>
 
-#include "math/Color.h"
-#include "math/Rect.h"
-#include "math/AffineTransform.h"
+#include "../math/Color.h"
+#include "../math/Rect.h"
+#include "../math/AffineTransform.h"
 #include "NativeTexture.h"
 #include "VideoDriver.h"
 

oxygine/src/oxygine/core/Restorable.h

@@ -1,6 +1,6 @@
 #pragma once
-#include "oxygine-include.h"
-#include "closure/closure.h"
+#include "../oxygine-include.h"
+#include "../closure/closure.h"
 #include <vector>
 
 namespace oxygine

oxygine/src/oxygine/core/STDFileSystem.cpp

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

oxygine/src/oxygine/core/STDFileSystem.h

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

oxygine/src/oxygine/core/ShaderProgram.h

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

oxygine/src/oxygine/core/Texture.h

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

oxygine/src/oxygine/core/ThreadDispatcher.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine-include.h"
+#include "../oxygine-include.h"
 #include <vector>
 #include <functional>
 

oxygine/src/oxygine/core/VertexDeclaration.h

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

oxygine/src/oxygine/core/VideoDriver.cpp

@@ -1,6 +1,6 @@
 #include "VideoDriver.h"
 #include "NativeTexture.h"
-#include "math/Color.h"
+#include "../math/Color.h"
 #include "ShaderProgram.h"
 
 

oxygine/src/oxygine/core/VideoDriver.h

@@ -1,10 +1,10 @@
 #pragma once
-#include "oxygine-include.h"
+#include "../oxygine-include.h"
 #include "ref_counter.h"
 #include "vertex.h"
-#include "math/Rect.h"
-#include "math/Vector4.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 "core/Object.h"
-#include "utils/stringUtils.h"
+#include "../core/ZipFileSystem.h"
+#include "../core/Object.h"
+#include "../utils/stringUtils.h"
 #include <algorithm>
-//#include "utils/utils.h"
+//#include "../utils/utils.h"
 
 #ifdef __S3E__
 #include "s3eFile.h"

oxygine/src/oxygine/core/ZipFileSystem.h

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

oxygine/src/oxygine/core/file.cpp

@@ -2,7 +2,7 @@
 #include "STDFileSystem.h"
 #include "file.h"
 #include "log.h"
-#include "utils/stringUtils.h"
+#include "../utils/stringUtils.h"
 #include "Object.h"
 
 #ifdef __S3E__

oxygine/src/oxygine/core/file.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine-include.h"
+#include "../oxygine-include.h"
 #include <vector>
 #include "Object.h"
 #include "FileSystem.h"

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

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include "NativeTextureGLES.h"
 #include "oxgl.h"
-#include "Image.h"
+#include "../../Image.h"
 #include "../NativeTexture.h"
 #include "../ImageDataOperations.h"
 #include "../file.h"

oxygine/src/oxygine/core/gl/NativeTextureGLES.h

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

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

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

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

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

oxygine/src/oxygine/core/gl/VideoDriverGL.cpp

@@ -1,8 +1,8 @@
 #include "VideoDriverGL.h"
 #include "NativeTextureGLES.h"
 #include "oxgl.h"
-#include "math/Color.h"
-#include "utils/stringUtils.h"
+#include "../../math/Color.h"
+#include "../../utils/stringUtils.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/core/gl/VideoDriverGL.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine-include.h"
+#include "../../oxygine-include.h"
 #include "../VideoDriver.h"
 #include "VertexDeclarationGL.h"
 #include "oxgl.h"

oxygine/src/oxygine/core/gl/VideoDriverGLES20.cpp

@@ -2,8 +2,8 @@
 #include "NativeTextureGLES.h"
 #include "ShaderProgramGL.h"
 #include "oxgl.h"
-#include "math/Color.h"
-#include "utils/stringUtils.h"
+#include "../../math/Color.h"
+#include "../../utils/stringUtils.h"
 #include "../vertex.h"
 #include "../file.h"
 #include "../log.h"

oxygine/src/oxygine/core/gl/VideoDriverGLES20.h

@@ -1,9 +1,9 @@
 #pragma once
-#include "oxygine-include.h"
-#include "VideoDriverGL.h"
-#include "core/Restorable.h"
+#include "../../oxygine-include.h"
+#include "../../core/Restorable.h"
 #include "../ShaderProgram.h"
 #include "../file.h"
+#include "VideoDriverGL.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/core/gl/oxgl.h

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

oxygine/src/oxygine/core/intrusive_ptr.h

@@ -2,7 +2,7 @@
 #ifndef INTRUSIVE_PTR_HEADER
 #define INTRUSIVE_PTR_HEADER
 
-#include "oxygine-include.h"
+#include "../oxygine-include.h"
 //#include "ref_counter.h"
 #include "ox_debug.h"
 

oxygine/src/oxygine/core/log.cpp

@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
-#include "utils/stringUtils.h"
+#include "../utils/stringUtils.h"
 
 
 

oxygine/src/oxygine/core/log.h

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

oxygine/src/oxygine/core/ox_debug.h

@@ -1,4 +1,4 @@
 #pragma once
-#include "oxygine-include.h"
+#include "../oxygine-include.h"
 #include <assert.h>
 #include "log.h"

oxygine/src/oxygine/core/oxygine.cpp

@@ -2,30 +2,30 @@
 #include <stdio.h>
 #include "log.h"
 #include "VideoDriver.h"
-#include "res/CreateResourceContext.h"
-#include "res/Resources.h"
+#include "../res/CreateResourceContext.h"
+#include "../res/Resources.h"
 
 
-#include "res/ResBuffer.h"
-#include "res/ResFontBM.h"
-#include "res/ResAtlas.h"
-#include "Image.h"
-#include "PointerState.h"
-#include "Input.h"
+#include "../res/ResBuffer.h"
+#include "../res/ResFontBM.h"
+#include "../res/ResAtlas.h"
+#include "../Image.h"
+#include "../PointerState.h"
+#include "../Input.h"
 
-#include "DebugActor.h"
-#include "Stage.h"
-#include "KeyEvent.h"
-#include "res/ResStarlingAtlas.h"
+#include "../DebugActor.h"
+#include "../Stage.h"
+#include "../KeyEvent.h"
+#include "../res/ResStarlingAtlas.h"
 
 
 #include "Mutex.h"
 
 #include "gl/oxgl.h"
-#include "winnie_alloc/winnie_alloc.h"
+#include "../winnie_alloc/winnie_alloc.h"
 #include "ThreadDispatcher.h"
-#include "PostProcess.h"
-#include "TextField.h"
+#include "../PostProcess.h"
+#include "../TextField.h"
 
 #ifdef __S3E__
 #include "s3e.h"
@@ -39,7 +39,7 @@
 
 
 #include "gl/VideoDriverGLES20.h"
-#include "STDMaterial.h"
+#include "../STDMaterial.h"
 
 
 #ifdef EMSCRIPTEN
@@ -49,7 +49,7 @@
 //#include <SDL_compat.h>
 #include <SDL_events.h>
 #elif __ANDROID__
-#include "core/android/jniUtils.h"
+#include "../core/android/jniUtils.h"
 #elif __APPLE__
 #include <TargetConditionals.h>
 #include "ios/ios.h"

oxygine/src/oxygine/core/pixel.h

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

oxygine/src/oxygine/core/ref_counter.h

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

oxygine/src/oxygine/core/vertex.h

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

oxygine/src/oxygine/dev_tools/DeveloperMenu.cpp

@@ -1,11 +1,11 @@
 #include "DeveloperMenu.h"
-#include "ColorRectSprite.h"
-#include "ClipRectActor.h"
-#include "TextField.h"
-#include "DebugActor.h"
-#include "res/Resources.h"
-#include "res/ResFont.h"
-#include "initActor.h"
+#include "../ColorRectSprite.h"
+#include "../ClipRectActor.h"
+#include "../TextField.h"
+#include "../DebugActor.h"
+#include "../res/Resources.h"
+#include "../res/ResFont.h"
+#include "../initActor.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/dev_tools/DeveloperMenu.h

@@ -1,8 +1,8 @@
 #pragma once
-#include "oxygine-include.h"
-#include "ClipRectActor.h"
-#include "ColorRectSprite.h"
-#include "Draggable.h"
+#include "../oxygine-include.h"
+#include "../ClipRectActor.h"
+#include "../ColorRectSprite.h"
+#include "../Draggable.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/dev_tools/TexturesInspector.cpp

@@ -1,14 +1,14 @@
 #include "TexturesInspector.h"
-#include "core/NativeTexture.h"
-#include "AnimationFrame.h"
-#include "Sprite.h"
-#include "initActor.h"
-#include "SlidingActor.h"
-#include "DebugActor.h"
-#include "res/Resources.h"
-#include "TextField.h"
-#include "ColorRectSprite.h"
-#include "utils/stringUtils.h"
+#include "../core/NativeTexture.h"
+#include "../AnimationFrame.h"
+#include "../Sprite.h"
+#include "../initActor.h"
+#include "../SlidingActor.h"
+#include "../DebugActor.h"
+#include "../res/Resources.h"
+#include "../TextField.h"
+#include "../ColorRectSprite.h"
+#include "../utils/stringUtils.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/dev_tools/TexturesInspector.h

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

oxygine/src/oxygine/dev_tools/TreeInspector.cpp

@@ -1,24 +1,24 @@
 #include "TreeInspector.h"
-#include "initActor.h"
-#include "ColorRectSprite.h"
-#include "RenderState.h"
-#include "Clock.h"
+#include "../initActor.h"
+#include "../ColorRectSprite.h"
+#include "../RenderState.h"
+#include "../Clock.h"
 
 #include "TreeInspectorPage.h"
 #include "TreeInspectorPreview.h"
 
-#include "res/ResAnim.h"
-#include "res/ResFontBM.h"
-#include "res/Resources.h"
+#include "../res/ResAnim.h"
+#include "../res/ResFontBM.h"
+#include "../res/Resources.h"
 
-#include "Image.h"
-#include "Font.h"
-#include "Stage.h"
+#include "../Image.h"
+#include "../Font.h"
+#include "../Stage.h"
 
-#include "TextField.h"
-#include "DebugActor.h"
+#include "../TextField.h"
+#include "../DebugActor.h"
 
-#include "SlidingActor.h"
+#include "../SlidingActor.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/dev_tools/TreeInspector.h

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

oxygine/src/oxygine/dev_tools/TreeInspectorLine.cpp

@@ -2,11 +2,11 @@
 #include "TreeInspectorPage.h"
 #include "TreeInspectorPreview.h"
 #include "TreeInspector.h"
-#include "TextField.h"
-#include "res/ResFont.h"
-#include "res/Resources.h"
-#include "Stage.h"
-#include "DebugActor.h"
+#include "../TextField.h"
+#include "../res/ResFont.h"
+#include "../res/Resources.h"
+#include "../Stage.h"
+#include "../DebugActor.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/dev_tools/TreeInspectorLine.h

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

oxygine/src/oxygine/dev_tools/TreeInspectorPage.cpp

@@ -1,8 +1,8 @@
 #include "TreeInspectorPage.h"
 #include "TreeInspectorLine.h"
 #include "TreeInspector.h"
-#include "Button.h"
-#include "res/Resources.h"
+#include "../Button.h"
+#include "../res/Resources.h"
 
 
 namespace oxygine

oxygine/src/oxygine/dev_tools/TreeInspectorPage.h

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

oxygine/src/oxygine/dev_tools/TreeInspectorPreview.cpp

@@ -1,13 +1,13 @@
 #include "TreeInspectorPreview.h"
 #include "TreeInspector.h"
-#include "Stage.h"
-#include "TextField.h"
-#include "res/Resources.h"
-#include "RenderState.h"
-#include "STDRenderer.h"
-#include "STDMaterial.h"
-#include "DebugActor.h"
-#include "core/NativeTexture.h"
+#include "../Stage.h"
+#include "../TextField.h"
+#include "../res/Resources.h"
+#include "../RenderState.h"
+#include "../STDRenderer.h"
+#include "../STDMaterial.h"
+#include "../DebugActor.h"
+#include "../core/NativeTexture.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/dev_tools/TreeInspectorPreview.h

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

oxygine/src/oxygine/json/jsoncpp.cpp

@@ -73,7 +73,7 @@ license you like.
 
 
 
-#include "json/json.h"
+#include "json.h"
 
 #ifndef JSON_IS_AMALGAMATION
 #error "Compile with -I PATH_TO_JSON_DIRECTORY"

oxygine/src/oxygine/math/AffineTransform.h

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

oxygine/src/oxygine/math/Color.h

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

oxygine/src/oxygine/math/Matrix.h

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

oxygine/src/oxygine/math/OBBox.h

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

oxygine/src/oxygine/math/Rect.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine-include.h"
+#include "../oxygine-include.h"
 #include "Vector2.h"
 #include <algorithm>
 #include <limits>

oxygine/src/oxygine/math/Vector3.h

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

oxygine/src/oxygine/math/Vector4.h

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

oxygine/src/oxygine/math/vector2.h

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

oxygine/src/oxygine/oxygine-framework.h

@@ -43,6 +43,11 @@
 #include "STDRenderer.h"
 #include "WebImage.h"
 #include "key.h"
+#include "Polygon.h"
+#include "TweenOutline.h"
+#include "TweenGlow.h"
+#include "TweenAlphaFade.h"
+
 
 //closure/
 #include "closure/closure.h"
@@ -69,14 +74,14 @@
 #include "core/VertexDeclaration.h"
 #include "core/VideoDriver.h"
 #include "core/STDFileSystem.h"
-
+#include "core/UberShaderProgram.h"
 
 //core/gl/
-//#include "core/gl/NativeTextureGLES.h"
-//#include "core/gl/oxgl.h"
-//#include "core/gl/VertexDeclarationGL.h"
-//#include "core/gl/VideoDriverGL.h"
-//#include "core/gl/VideoDriverGLES20.h"
+#include "core/gl/NativeTextureGLES.h"
+#include "core/gl/oxgl.h"
+#include "core/gl/VertexDeclarationGL.h"
+#include "core/gl/VideoDriverGLES20.h"
+#include "core/gl/ShaderProgramGL.h"
 
 //dev_tools/
 //#include "dev_tools/DeveloperMenu.h"

oxygine/src/oxygine/res/CreateResourceContext.cpp

@@ -1,8 +1,8 @@
 #include "CreateResourceContext.h"
-#include "core/NativeTexture.h"
-#include "Image.h"
-#include "core/ThreadDispatcher.h"
-#include "core/oxygine.h"
+#include "../core/NativeTexture.h"
+#include "../Image.h"
+#include "../core/ThreadDispatcher.h"
+#include "../core/oxygine.h"
 #include "pthread.h"
 
 namespace oxygine

oxygine/src/oxygine/res/CreateResourceContext.h

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

oxygine/src/oxygine/res/ResAnim.cpp

@@ -1,7 +1,7 @@
 #include "ResAnim.h"
-#include "Image.h"
-#include "core/NativeTexture.h"
-#include "core/VideoDriver.h"
+#include "../Image.h"
+#include "../core/NativeTexture.h"
+#include "../core/VideoDriver.h"
 #include "Resources.h"
 
 namespace oxygine