min

oxygine/SDL/win32/oxygine.vcxproj

@@ -284,6 +284,8 @@
     <ClInclude Include="..\..\src\minizip\ioapi.h" />
     <ClInclude Include="..\..\src\minizip\ioapi_mem.h" />
     <ClInclude Include="..\..\src\minizip\unzip.h" />
+    <ClInclude Include="..\..\src\oxygine-forwards.h" />
+    <ClInclude Include="..\..\src\oxygine-include.h" />
     <ClInclude Include="..\..\src\PostProcess.h" />
     <ClInclude Include="..\..\src\res\SingleResAnim.h" />
     <ClInclude Include="..\..\src\ThreadLoader.h" />

oxygine/SDL/win32/oxygine.vcxproj.filters

@@ -749,6 +749,12 @@
     <ClInclude Include="..\..\src\res\SingleResAnim.h">
       <Filter>src\res</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\oxygine-forwards.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\oxygine-include.h">
+      <Filter>src</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="ReadMe.txt" />

oxygine/src/Actor.h

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

oxygine/src/AnimationFrame.h

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

oxygine/src/Box9Sprite.h

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

oxygine/src/Button.h

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

oxygine/src/ClipRectActor.h

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

oxygine/src/Clock.h

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

oxygine/src/ColorRectSprite.h

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

oxygine/src/DebugActor.h

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

oxygine/src/Draggable.h

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

oxygine/src/Event.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine_include.h"
+#include "oxygine-include.h"
 #include "closure/closure.h"
 #include "Input.h"
 #include "EventDispatcher.h"

oxygine/src/EventDispatcher.h

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

oxygine/src/Font.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine_include.h"
+#include "oxygine-include.h"
 #include "core/Object.h"
 #include "math/Rect.h"
 #ifdef __S3E__

oxygine/src/HttpRequestTask.h

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

oxygine/src/Image.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine_include.h"
+#include "oxygine-include.h"
 #include "core/Texture.h"
 #include "core/file.h"
 

oxygine/src/Input.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine_include.h"
+#include "oxygine-include.h"
 #include "EventDispatcher.h"
 #include "closure/closure.h"
 #include "PointerState.h"

oxygine/src/InputText.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine_include.h"
+#include "oxygine-include.h"
 #include "EventDispatcher.h"
 #include <string>
 

oxygine/src/MaskedRenderer.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine_include.h"
+#include "oxygine-include.h"
 #include "STDRenderer.h"
 
 namespace oxygine

oxygine/src/MaskedSprite.h

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

oxygine/src/Material.h

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

oxygine/src/PointerState.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine_include.h"
+#include "oxygine-include.h"
 #include "math/Vector2.h"
 #include <list>
 

oxygine/src/Polygon.h

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

oxygine/src/PostProcess.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine_include.h"
+#include "oxygine-include.h"
 #include "math/Rect.h"
 #include "core/NativeTexture.h"
 #include "core/Renderer.h"

oxygine/src/ProgressBar.h

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

oxygine/src/RenderState.h

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

oxygine/src/STDMaterial.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine_include.h"
+#include "oxygine-include.h"
 #include "STDRenderer.h"
 #include "Material.h"
 

oxygine/src/STDRenderer.h

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

oxygine/src/Serializable.h

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

oxygine/src/Serialize.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine_include.h"
+#include "oxygine-include.h"
 #include "core/Object.h"
 #include "pugixml/pugixml.hpp"
 #include "res/ResAnim.h"

oxygine/src/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/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/Stage.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine_include.h"
+#include "oxygine-include.h"
 #include "Actor.h"
 
 #ifdef OXYGINE_SDL

oxygine/src/TextField.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine_include.h"
+#include "oxygine-include.h"
 #include "Actor.h"
 #include "TextStyle.h"
 #include "VisualStyle.h"

oxygine/src/TextStyle.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine_include.h"
+#include "oxygine-include.h"
 #include "math/Color.h"
 #include <string>
 

oxygine/src/ThreadLoader.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine_include.h"
+#include "oxygine-include.h"
 #include "EventDispatcher.h"
 #include "pthread.h"
 #include "core/ThreadDispatcher.h"

oxygine/src/Tween.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine_include.h"
+#include "oxygine-include.h"
 #include "core/Object.h"
 #include "closure/closure.h"
 #include "utils/intrusive_list.h"

oxygine/src/TweenAlphaFade.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine_include.h"
+#include "oxygine-include.h"
 #include "Tween.h"
 #include "PostProcess.h"
 

oxygine/src/TweenAnim.h

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

oxygine/src/TweenGlow.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine_include.h"
+#include "oxygine-include.h"
 #include "PostProcess.h"
 
 namespace oxygine

oxygine/src/TweenOutline.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine_include.h"
+#include "oxygine-include.h"
 #include "PostProcess.h"
 
 namespace oxygine

oxygine/src/UpdateState.h

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

oxygine/src/VisualStyle.h

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

oxygine/src/core/FileSystem.h

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

oxygine/src/core/ImageData.h

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

oxygine/src/core/ImageDataOperations.h

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

oxygine/src/core/Mem2Native.h

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

oxygine/src/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/core/NativeTexture.h

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

oxygine/src/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/core/Renderer.h

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

oxygine/src/core/Restorable.h

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

oxygine/src/core/STDFileSystem.h

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

oxygine/src/core/ShaderProgram.h

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

oxygine/src/core/Texture.h

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

oxygine/src/core/ThreadDispatcher.h

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

oxygine/src/core/VertexDeclaration.h

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

oxygine/src/core/VideoDriver.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine_include.h"
+#include "oxygine-include.h"
 #include "ref_counter.h"
 #include "vertex.h"
 #include "math/Rect.h"

oxygine/src/core/ZipFileSystem.h

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

oxygine/src/core/coroutines.h

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

oxygine/src/core/curl/HttpRequestCurlTask.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "curl/curl.h"
-#include "oxygine_include.h"
+#include "oxygine-include.h"
 #include "HttpRequestTask.h"
 #include "core/file.h"
 #include "core/ThreadDispatcher.h"

oxygine/src/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/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/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/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/core/gl/VideoDriverGLES20.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine_include.h"
+#include "oxygine-include.h"
 #include "VideoDriverGL.h"
 #include "core/Restorable.h"
 #include "../ShaderProgram.h"

oxygine/src/core/gl/oxgl.h

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

oxygine/src/core/intrusive_ptr.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine_include.h"
+#include "oxygine-include.h"
 //#include "ref_counter.h"
 #include "ox_debug.h"
 

oxygine/src/core/log.h

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

oxygine/src/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/core/oxygine.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine_include.h"
+#include "oxygine-include.h"
 #include "../EventDispatcher.h"
 #include "math/Vector2.h"
 #include <string>

oxygine/src/core/pixel.h

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

oxygine/src/core/ref_counter.h

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

oxygine/src/core/vertex.h

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

oxygine/src/dev_tools/DeveloperMenu.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine_include.h"
+#include "oxygine-include.h"
 #include "ClipRectActor.h"
 #include "ColorRectSprite.h"
 #include "Draggable.h"

oxygine/src/dev_tools/TexturesInspector.h

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

oxygine/src/dev_tools/TreeInspector.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine_include.h"
+#include "oxygine-include.h"
 #include "Actor.h"
 #include "ClipRectActor.h"
 #include "Draggable.h"

oxygine/src/dev_tools/TreeInspectorLine.h

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

oxygine/src/dev_tools/TreeInspectorPage.h

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

oxygine/src/dev_tools/TreeInspectorPreview.h

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

oxygine/src/initActor.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine_include.h"
+#include "oxygine-include.h"
 #include "Actor.h"
 #include "Sprite.h"
 #include "Button.h"

oxygine/src/key.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine_include.h"
+#include "oxygine-include.h"
 #ifdef __S3E__
 #else
 #   include "SDL_keyboard.h"

oxygine/src/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/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/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/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/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/math/ScalarMath.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine_include.h"
+#include "oxygine-include.h"
 
 #include <math.h>
 #include <stdlib.h>

oxygine/src/math/Vector2.h

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

oxygine/src/math/Vector3.h

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

oxygine/src/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-forwards.h

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

oxygine/src/oxygine-framework.h

@@ -4,7 +4,7 @@
 //oxygine single include
 
 //
-#include "oxygine_include.h"
+#include "oxygine-include.h"
 #include "Actor.h"
 #include "AnimationFrame.h"
 #include "Box9Sprite.h"

oxygine/src/oxygine-include.h

@@ -0,0 +1,179 @@
+#pragma once
+#ifndef OXYGINE_INCLUDE
+#define OXYGINE_INCLUDE
+#include <assert.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+
+#if __APPLE__
+#include <TargetConditionals.h>
+#endif
+
+#if EMSCRIPTEN
+#include <emscripten.h>
+#endif
+
+
+//Round everything to whole pixels during rendering.
+// Helps to avoid artifacts in pixel art games
+// when using textures with linearFilter="false"
+// and fractional sprite coordinates or sprite scaling.
+// Introduces some CPU overhead.
+//#define OXYGINE_NO_SUBPIXEL_RENDERING 1
+
+
+#ifdef __ANDROID__
+#define HAVE_NPOT_RT()  (true)
+#else
+#define HAVE_NPOT_RT()  (true)
+#endif
+
+//#define OXYGINE_NO_YEILD 1
+
+// Bypass SDL file functions and use plain fopen, fread etc.
+//#define OXYGINE_FILESYSTEM_USE_STDIO 1
+
+#if __S3E__
+#   define OXYGINE_MARMALADE 1
+#   ifdef IW_DEBUG
+#       define OX_DEBUG 1
+#   endif
+#elif EMSCRIPTEN
+#   define OXYGINE_EMSCRIPTEN 1
+#   define OXYGINE_SDL 1
+#   ifndef NDEBUG
+#       define OX_DEBUG 1
+#   endif // DEBUG  
+#elif OXYGINE_EDITOR
+#   define OXYGINE_FILESYSTEM_USE_STDIO 1
+#   include <qglobal.h>
+#else
+#   define OXYGINE_SDL 1
+#   ifdef _WIN32
+#       ifndef _CRT_SECURE_NO_WARNINGS
+#           define _CRT_SECURE_NO_WARNINGS
+#       endif
+#   endif
+#endif
+
+
+#if _DEBUG || DEBUG
+#   ifndef OX_DEBUG
+#       define OX_DEBUG 1
+#   endif
+#endif
+
+
+#define DYNAMIC_OBJECT_NAME 1
+
+
+#ifndef OX_DEBUG
+#   ifndef EMSCRIPTEN
+#       define USE_MEMORY_POOL 1
+#       define OBJECT_POOL_ALLOCATOR 1
+#   endif
+#endif
+
+#if OX_DEBUG
+#   define OXYGINE_DEBUG_TRACE_LEAKS 1
+#   define OXYGINE_DEBUG_T2P 1
+#   define OXYGINE_DEBUG_SAFECAST 1
+#   define OXYGINE_TRACE_VIDEO_STATS 1
+#endif
+
+#define OXYGINE_ASSERT2LOG 1
+
+namespace oxygine { namespace log { void error(const char* format, ...); } }
+
+#define OX_LOG_ERROR(x)     if (!(x)) {oxygine::log::error("Assert! %s in %s:%d", #x, __FILE__, __LINE__);}
+
+
+//assert without log::error
+#ifdef OXYGINE_QT
+#   define OX_ASSERT_NL(x) { if (!(x)) __asm("int3"); Q_ASSERT(x);}
+#elif !OX_DEBUG || EMSCRIPTEN
+#   define OX_ASSERT_NL(x)
+#else
+#   define OX_ASSERT_NL(x) {assert(x);}
+#endif
+
+
+#if OXYGINE_ASSERT2LOG
+#   define OX_ASSERT(x) {OX_LOG_ERROR(x); OX_ASSERT_NL(x);}
+#else
+#   define OX_ASSERT(x) {OX_ASSERT_NL(x);}
+#endif
+
+#define OXYGINE_HAS_RESTORE
+
+#define OXYGINE_RENDERER 4
+
+#define OXYGINE_VERSION 5
+
+#ifdef __GNUC__
+#   define OXYGINE_DEPRECATED __attribute__((deprecated))
+#elif defined(_MSC_VER)
+#   define OXYGINE_DEPRECATED __declspec(deprecated)
+#else
+#   pragma message("WARNING: You need to implement DEPRECATED for this compiler")
+#   define OXYGINE_DEPRECATED
+#endif
+
+
+#ifdef _MSC_VER
+#   define OVERRIDE override
+#else
+#   define OVERRIDE
+#endif
+
+
+#ifndef __S3E__
+#   if defined(_MSC_VER) || defined(__BORLANDC__)
+typedef unsigned __int64 uint64;
+typedef signed __int64 int64;
+#   else
+typedef unsigned long long uint64;
+typedef signed long long int64;
+#   endif
+#endif
+
+#ifdef OXYGINE_QT
+#define INHERITED(CLASS) private: typedef Editor##CLASS inherited
+#else
+#define INHERITED(CLASS) private: typedef CLASS inherited
+#endif
+
+#ifndef EDITOR_INCLUDE
+#define EDITOR_INCLUDE(CLASS)
+#endif
+
+
+#if !defined(__S3E__) && ( (defined(_MSC_VER) && (_MSC_VER > 1800)) || (__cplusplus > 199711L))
+#define OX_HAS_CPP11
+#endif
+
+namespace oxygine
+{
+    enum error_policy
+    {
+        ep_show_error,//shows assert and prints error to log
+        ep_show_warning,//prints warning to log
+        ep_ignore_error//doesn't show any errors
+    };
+
+
+    void handleErrorPolicy(error_policy ep, const char* format, ...);
+
+    typedef int timeMS;
+    typedef unsigned char pointer_index;
+
+    /** returns local app time in milliseconds (1sec = 1000ms). Counting starts from zero*/
+    timeMS          getTimeMS();
+
+    void* fastAlloc(size_t size);
+    void fastFree(void* data);
+}
+
+#endif //OXYGINE_INCLUDE

oxygine/src/oxygine_include.h

@@ -1,179 +1,3 @@
 #pragma once
-#ifndef OXYGINE_INCLUDE
-#define OXYGINE_INCLUDE
-#include <assert.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-
-#if __APPLE__
-#include <TargetConditionals.h>
-#endif
-
-#if EMSCRIPTEN
-#include <emscripten.h>
-#endif
-
-
-//Round everything to whole pixels during rendering.
-// Helps to avoid artifacts in pixel art games
-// when using textures with linearFilter="false"
-// and fractional sprite coordinates or sprite scaling.
-// Introduces some CPU overhead.
-//#define OXYGINE_NO_SUBPIXEL_RENDERING 1
-
-
-#ifdef __ANDROID__
-#define HAVE_NPOT_RT()  (true)
-#else
-#define HAVE_NPOT_RT()  (true)
-#endif
-
-//#define OXYGINE_NO_YEILD 1
-
-// Bypass SDL file functions and use plain fopen, fread etc.
-//#define OXYGINE_FILESYSTEM_USE_STDIO 1
-
-#if __S3E__
-#   define OXYGINE_MARMALADE 1
-#   ifdef IW_DEBUG
-#       define OX_DEBUG 1
-#   endif
-#elif EMSCRIPTEN
-#   define OXYGINE_EMSCRIPTEN 1
-#   define OXYGINE_SDL 1
-#   ifndef NDEBUG
-#       define OX_DEBUG 1
-#   endif // DEBUG  
-#elif OXYGINE_EDITOR
-#   define OXYGINE_FILESYSTEM_USE_STDIO 1
-#   include <qglobal.h>
-#else
-#   define OXYGINE_SDL 1
-#   ifdef _WIN32
-#       ifndef _CRT_SECURE_NO_WARNINGS
-#           define _CRT_SECURE_NO_WARNINGS
-#       endif
-#   endif
-#endif
-
-
-#if _DEBUG || DEBUG
-#   ifndef OX_DEBUG
-#       define OX_DEBUG 1
-#   endif
-#endif
-
-
-#define DYNAMIC_OBJECT_NAME 1
-
-
-#ifndef OX_DEBUG
-#   ifndef EMSCRIPTEN
-#       define USE_MEMORY_POOL 1
-#       define OBJECT_POOL_ALLOCATOR 1
-#   endif
-#endif
-
-#if OX_DEBUG
-#   define OXYGINE_DEBUG_TRACE_LEAKS 1
-#   define OXYGINE_DEBUG_T2P 1
-#   define OXYGINE_DEBUG_SAFECAST 1
-#   define OXYGINE_TRACE_VIDEO_STATS 1
-#endif
-
-#define OXYGINE_ASSERT2LOG 1
-
-namespace oxygine { namespace log { void error(const char* format, ...); } }
-
-#define OX_LOG_ERROR(x)     if (!(x)) {oxygine::log::error("Assert! %s in %s:%d", #x, __FILE__, __LINE__);}
-
-
-//assert without log::error
-#ifdef OXYGINE_QT
-#   define OX_ASSERT_NL(x) { if (!(x)) __asm("int3"); Q_ASSERT(x);}
-#elif !OX_DEBUG || EMSCRIPTEN
-#   define OX_ASSERT_NL(x)
-#else
-#   define OX_ASSERT_NL(x) {assert(x);}
-#endif
-
-
-#if OXYGINE_ASSERT2LOG
-#   define OX_ASSERT(x) {OX_LOG_ERROR(x); OX_ASSERT_NL(x);}
-#else
-#   define OX_ASSERT(x) {OX_ASSERT_NL(x);}
-#endif
-
-#define OXYGINE_HAS_RESTORE
-
-#define OXYGINE_RENDERER 4
-
-#define OXYGINE_VERSION 5
-
-#ifdef __GNUC__
-#   define OXYGINE_DEPRECATED __attribute__((deprecated))
-#elif defined(_MSC_VER)
-#   define OXYGINE_DEPRECATED __declspec(deprecated)
-#else
-#   pragma message("WARNING: You need to implement DEPRECATED for this compiler")
-#   define OXYGINE_DEPRECATED
-#endif
-
-
-#ifdef _MSC_VER
-#   define OVERRIDE override
-#else
-#   define OVERRIDE
-#endif
-
-
-#ifndef __S3E__
-#   if defined(_MSC_VER) || defined(__BORLANDC__)
-typedef unsigned __int64 uint64;
-typedef signed __int64 int64;
-#   else
-typedef unsigned long long uint64;
-typedef signed long long int64;
-#   endif
-#endif
-
-#ifdef OXYGINE_QT
-#define INHERITED(CLASS) private: typedef Editor##CLASS inherited
-#else
-#define INHERITED(CLASS) private: typedef CLASS inherited
-#endif
-
-#ifndef EDITOR_INCLUDE
-#define EDITOR_INCLUDE(CLASS)
-#endif
-
-
-#if !defined(__S3E__) && ( (defined(_MSC_VER) && (_MSC_VER > 1800)) || (__cplusplus > 199711L))
-#define OX_HAS_CPP11
-#endif
-
-namespace oxygine
-{
-    enum error_policy
-    {
-        ep_show_error,//shows assert and prints error to log
-        ep_show_warning,//prints warning to log
-        ep_ignore_error//doesn't show any errors
-    };
-
-
-    void handleErrorPolicy(error_policy ep, const char* format, ...);
-
-    typedef int timeMS;
-    typedef unsigned char pointer_index;
-
-    /** returns local app time in milliseconds (1sec = 1000ms). Counting starts from zero*/
-    timeMS          getTimeMS();
-
-    void* fastAlloc(size_t size);
-    void fastFree(void* data);
-}
-
-#endif //OXYGINE_INCLUDE
+// "oxygine-include.h" DEPRECATED, use "oxygine-include.h"
+#include "oxygine-include.h"

oxygine/src/res/CreateResourceContext.h

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

oxygine/src/res/ResAnim.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine_include.h"
+#include "oxygine-include.h"
 #include "Resource.h"
 #include "AnimationFrame.h"
 #include "core/Texture.h"

oxygine/src/res/ResAtlas.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine_include.h"
+#include "oxygine-include.h"
 #include "Resource.h"
 #include "ResAnim.h"
 #include "CreateResourceContext.h"

oxygine/src/res/ResBuffer.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "oxygine_include.h"
+#include "oxygine-include.h"
 #include "Resource.h"
 #include "core/file.h"
 #include <vector>

oxygine/src/res/ResFont.h

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