updated short includes

include/ox/Actor.hpp

@@ -1 +1 @@
-#include "Actor.h"
+#include "oxygine/actor/Actor.h"

include/ox/AffineTransform.hpp

@@ -1 +1 @@
-#include "math/AffineTransform.h"
+#include "oxygine/math/AffineTransform.h"

include/ox/AnimationFrame.hpp

@@ -1 +1 @@
-#include "AnimationFrame.h"
+#include "oxygine/AnimationFrame.h"

include/ox/AsyncTask.hpp

@@ -1 +1 @@
-#include "AsyncTask.h"
+#include "oxygine/AsyncTask.h"

include/ox/AtlasBuilder.hpp

@@ -0,0 +1 @@
+#include "oxygine/utils/AtlasBuilder.h"

include/ox/Box9Sprite.hpp

@@ -1 +1 @@
-#include "Box9Sprite.h"
+#include "oxygine/actor/Box9Sprite.h"

include/ox/Button.hpp

@@ -1 +1 @@
-#include "Button.h"
+#include "oxygine/actor/Button.h"

include/ox/ClipRectActor.hpp

@@ -1 +1 @@
-#include "ClipRectActor.h"
+#include "oxygine/actor/ClipRectActor.h"

include/ox/Clock.hpp

@@ -1 +1 @@
-#include "Clock.h"
+#include "oxygine/Clock.h"

include/ox/Color.hpp

@@ -1 +1 @@
-#include "math/Color.h"
+#include "oxygine/math/Color.h"

include/ox/ColorRectSprite.hpp

@@ -1 +1 @@
-#include "ColorRectSprite.h"
+#include "oxygine/actor/ColorRectSprite.h"

include/ox/CreateResourceContext.hpp

@@ -1 +1 @@
-#include "res/CreateResourceContext.h"
+#include "oxygine/res/CreateResourceContext.h"

include/ox/DebugActor.hpp

@@ -1 +1 @@
-#include "DebugActor.h"
+#include "oxygine/actor/DebugActor.h"

include/ox/Draggable.hpp

@@ -1 +1 @@
-#include "Draggable.h"
+#include "oxygine/Draggable.h"

include/ox/Event.hpp

@@ -1 +1 @@
-#include "Event.h"
+#include "oxygine/Event.h"

include/ox/EventDispatcher.hpp

@@ -1 +1 @@
-#include "EventDispatcher.h"
+#include "oxygine/EventDispatcher.h"

include/ox/FileSystem.hpp

@@ -1 +1 @@
-#include "core/FileSystem.h"
+#include "oxygine/core/FileSystem.h"

include/ox/Font.hpp

@@ -1 +1 @@
-#include "Font.h"
+#include "oxygine/Font.h"

include/ox/HttpRequestTask.hpp

@@ -1 +1 @@
-#include "HttpRequestTask.h"
+#include "oxygine/HttpRequestTask.h"

include/ox/Image.hpp

@@ -0,0 +1 @@
+#include "oxygine/Image.h"

include/ox/ImageData.hpp

@@ -1 +1 @@
-#include "core/ImageData.h"
+#include "oxygine/core/ImageData.h"

include/ox/ImageDataOperations.hpp

@@ -1 +1 @@
-#include "core/ImageDataOperations.h"
+#include "oxygine/core/ImageDataOperations.h"

include/ox/ImageUtils.hpp

@@ -0,0 +1 @@
+#include "oxygine/utils/ImageUtils.h"

include/ox/Input.hpp

@@ -1 +1 @@
-#include "Input.h"
+#include "oxygine/Input.h"

include/ox/InputText.hpp

@@ -1 +1 @@
-#include "InputText.h"
+#include "oxygine/InputText.h"

include/ox/KeyEvent.hpp

@@ -1 +1 @@
-#include "KeyEvent.h"
+#include "oxygine/KeyEvent.h"

include/ox/MaskedRenderer.hpp

@@ -1 +1 @@
-#include "MaskedRenderer.h"
+#include "oxygine/MaskedRenderer.h"

include/ox/MaskedSprite.hpp

@@ -1 +1 @@
-#include "MaskedSprite.h"
+#include "oxygine/actor/MaskedSprite.h"

include/ox/Material.hpp

@@ -0,0 +1 @@
+#include "oxygine/Material.h"

include/ox/MaterialCache.hpp

@@ -0,0 +1 @@
+#include "oxygine/MaterialCache.h"

include/ox/MaterialX.hpp

@@ -0,0 +1 @@
+#include "oxygine/MaterialX.h"

include/ox/Matrix.hpp

@@ -1 +1 @@
-#include "math/Matrix.h"
+#include "oxygine/math/Matrix.h"

include/ox/Mem2Native.hpp

@@ -1 +1 @@
-#include "core/Mem2Native.h"
+#include "oxygine/core/Mem2Native.h"

include/ox/MemoryTexture.hpp

@@ -1 +1 @@
-#include "MemoryTexture.h"
+#include "oxygine/MemoryTexture.h"

include/ox/Multithreading.hpp

@@ -1 +0,0 @@
-#include "Multithreading.h"

include/ox/Mutex.hpp

@@ -1 +1 @@
-#include "core/Mutex.h"
+#include "oxygine/core/Mutex.h"

include/ox/NativeTexture.hpp

@@ -1 +1 @@
-#include "core/NativeTexture.h"
+#include "oxygine/core/NativeTexture.h"

include/ox/OBBox.hpp

@@ -0,0 +1 @@
+#include "oxygine/math/OBBox.h"

include/ox/Object.hpp

@@ -1 +1 @@
-#include "core/Object.h"
+#include "oxygine/core/Object.h"

include/ox/PointerState.hpp

@@ -1 +1 @@
-#include "PointerState.h"
+#include "oxygine/PointerState.h"

include/ox/Polygon.hpp

@@ -1 +1 @@
-#include "Polygon.h"
+#include "oxygine/actor/Polygon.h"

include/ox/PostProcess.hpp

@@ -0,0 +1 @@
+#include "oxygine/PostProcess.h"

include/ox/ProgressBar.hpp

@@ -1 +1 @@
-#include "ProgressBar.h"
+#include "oxygine/actor/ProgressBar.h"

include/ox/Property.hpp

@@ -1 +1 @@
-#include "Property.h"
+#include "oxygine/Property.h"

include/ox/Rect.hpp

@@ -1 +1 @@
-#include "math/Rect.h"
+#include "oxygine/math/Rect.h"

include/ox/RenderState.hpp

@@ -1 +1 @@
-#include "RenderState.h"
+#include "oxygine/RenderState.h"

include/ox/Renderer.hpp

@@ -1 +1 @@
-#include "core/Renderer.h"
+#include "oxygine/core/Renderer.h"

include/ox/ResAnim.hpp

@@ -1 +1 @@
-#include "res/ResAnim.h"
+#include "oxygine/res/ResAnim.h"

include/ox/ResAtlas.hpp

@@ -1 +1 @@
-#include "res/ResAtlas.h"
+#include "oxygine/res/ResAtlas.h"

include/ox/ResAtlasGeneric.hpp

@@ -0,0 +1 @@
+#include "oxygine/res/ResAtlasGeneric.h"

include/ox/ResAtlasPrebuilt.hpp

@@ -0,0 +1 @@
+#include "oxygine/res/ResAtlasPrebuilt.h"

include/ox/ResBuffer.hpp

@@ -1 +1 @@
-#include "res/ResBuffer.h"
+#include "oxygine/res/ResBuffer.h"

include/ox/ResFont.hpp

@@ -1 +1 @@
-#include "res/ResFont.h"
+#include "oxygine/res/ResFont.h"

include/ox/ResFontBM.hpp

@@ -1 +1 @@
-#include "res/ResFontBM.h"
+#include "oxygine/res/ResFontBM.h"

include/ox/ResStarlingAtlas.hpp

@@ -1 +1 @@
-#include "res/ResStarlingAtlas.h"
+#include "oxygine/res/ResStarlingAtlas.h"

include/ox/Resource.hpp

@@ -1 +1 @@
-#include "res/Resource.h"
+#include "oxygine/res/Resource.h"

include/ox/Resources.hpp

@@ -1 +1 @@
-#include "res/Resources.h"
+#include "oxygine/res/Resources.h"

include/ox/Restorable.hpp

@@ -1 +1 @@
-#include "core/Restorable.h"
+#include "oxygine/core/Restorable.h"

include/ox/STDFileSystem.hpp

@@ -1 +1 @@
-#include "core/STDFileSystem.h"
+#include "oxygine/core/STDFileSystem.h"

include/ox/STDMaterial.hpp

@@ -0,0 +1 @@
+#include "oxygine/STDMaterial.h"

include/ox/STDRenderer.hpp

@@ -1 +1 @@
-#include "STDRenderer.h"
+#include "oxygine/STDRenderer.h"

include/ox/ScalarMath.hpp

@@ -1 +1 @@
-#include "math/ScalarMath.h"
+#include "oxygine/math/ScalarMath.h"

include/ox/Serializable.hpp

@@ -0,0 +1 @@
+#include "oxygine/Serializable.h"

include/ox/Serialize.hpp

@@ -0,0 +1 @@
+#include "oxygine/Serialize.h"

include/ox/ShaderProgram.hpp

@@ -1 +1 @@
-#include "core/ShaderProgram.h"
+#include "oxygine/core/ShaderProgram.h"

include/ox/SingleResAnim.hpp

@@ -0,0 +1 @@
+#include "oxygine/res/SingleResAnim.h"

include/ox/SlidingActor.hpp

@@ -1 +1 @@
-#include "SlidingActor.h"
+#include "oxygine/actor/SlidingActor.h"

include/ox/Sprite.hpp

@@ -1 +1 @@
-#include "Sprite.h"
+#include "oxygine/actor/Sprite.h"

include/ox/Stage.hpp

@@ -1 +1 @@
-#include "Stage.h"
+#include "oxygine/actor/Stage.h"

include/ox/TextField.hpp

@@ -1 +1 @@
-#include "TextField.h"
+#include "oxygine/actor/TextField.h"

include/ox/TextStyle.hpp

@@ -1 +1 @@
-#include "TextStyle.h"
+#include "oxygine/TextStyle.h"

include/ox/Texture.hpp

@@ -1 +1 @@
-#include "core/Texture.h"
+#include "oxygine/core/Texture.h"

include/ox/ThreadDispatcher.hpp

@@ -0,0 +1 @@
+#include "oxygine/core/ThreadDispatcher.h"

include/ox/ThreadLoader.hpp

@@ -0,0 +1 @@
+#include "oxygine/ThreadLoader.h"

include/ox/ThreadMessages.hpp

@@ -1 +1 @@
-#include "core/ThreadMessages.h"
+#include "oxygine/core/ThreadMessages.h"

include/ox/TouchEvent.hpp

@@ -1 +1 @@
-#include "TouchEvent.h"
+#include "oxygine/TouchEvent.h"

include/ox/Tween.hpp

@@ -1 +1 @@
-#include "Tween.h"
+#include "oxygine/Tween.h"

include/ox/TweenAlphaFade.hpp

@@ -0,0 +1 @@
+#include "oxygine/TweenAlphaFade.h"

include/ox/TweenAnim.hpp

@@ -1 +1 @@
-#include "TweenAnim.h"
+#include "oxygine/TweenAnim.h"

include/ox/TweenGlow.hpp

@@ -0,0 +1 @@
+#include "oxygine/TweenGlow.h"

include/ox/TweenOutline.hpp

@@ -0,0 +1 @@
+#include "oxygine/TweenOutline.h"

include/ox/TweenQueue.hpp

@@ -1 +1 @@
-#include "TweenQueue.h"
+#include "oxygine/TweenQueue.h"

include/ox/Tweener.hpp

@@ -1 +0,0 @@
-#include "Tweener.h"

include/ox/UberShaderProgram.hpp

@@ -1 +1 @@
-#include "core/UberShaderProgram.h"
+#include "oxygine/core/UberShaderProgram.h"

include/ox/UpdateState.hpp

@@ -1 +1 @@
-#include "UpdateState.h"
+#include "oxygine/UpdateState.h"

include/ox/Vector2.hpp

@@ -1 +1 @@
-#include "math/Vector2.h"
+#include "oxygine/math/vector2.h"

include/ox/Vector3.hpp

@@ -1 +1 @@
-#include "math/Vector3.h"
+#include "oxygine/math/Vector3.h"

include/ox/Vector4.hpp

@@ -1 +1 @@
-#include "math/Vector4.h"
+#include "oxygine/math/Vector4.h"

include/ox/VertexDeclaration.hpp

@@ -1 +1 @@
-#include "core/VertexDeclaration.h"
+#include "oxygine/core/VertexDeclaration.h"

include/ox/VideoDriver.hpp

@@ -1 +1 @@
-#include "core/VideoDriver.h"
+#include "oxygine/core/VideoDriver.h"

include/ox/VisualStyle.hpp

@@ -1 +1 @@
-#include "VisualStyle.h"
+#include "oxygine/VisualStyle.h"

include/ox/WebImage.hpp

@@ -1 +1 @@
-#include "WebImage.h"
+#include "oxygine/actor/WebImage.h"

include/ox/ZipFileSystem.hpp

@@ -1 +1 @@
-#include "core/ZipFileSystem.h"
+#include "oxygine/core/ZipFileSystem.h"

include/ox/file.hpp

@@ -1 +1 @@
-#include "core/file.h"
+#include "oxygine/core/file.h"

include/ox/initActor.hpp

@@ -1 +1 @@
-#include "initActor.h"
+#include "oxygine/InitActor.h"

include/ox/intrusive_list.hpp

@@ -0,0 +1 @@
+#include "oxygine/utils/intrusive_list.h"

include/ox/intrusive_ptr.hpp

@@ -1 +1 @@
-#include "core/intrusive_ptr.h"
+#include "oxygine/core/intrusive_ptr.h"

include/ox/json.hpp

@@ -1 +0,0 @@
-#include "json/json.h"

include/ox/key.hpp

@@ -0,0 +1 @@
+#include "oxygine/key.h"

include/ox/log.hpp

@@ -1 +1 @@
-#include "core/log.h"
+#include "oxygine/core/log.h"