8 年之前 · e85c85561f
--- a/oxygine/src/ox/Actor.hpp
+++ b/oxygine/src/ox/Actor.hpp
--- a/oxygine/src/ox/AffineTransform.hpp
+++ b/oxygine/src/ox/AffineTransform.hpp
--- a/oxygine/src/ox/AnimationFrame.hpp
+++ b/oxygine/src/ox/AnimationFrame.hpp
--- a/oxygine/src/ox/AsyncTask.hpp
+++ b/oxygine/src/ox/AsyncTask.hpp
--- a/oxygine/src/ox/AtlasBuilder.hpp
+++ b/oxygine/src/ox/AtlasBuilder.hpp
--- a/oxygine/src/ox/Box9Sprite.hpp
+++ b/oxygine/src/ox/Box9Sprite.hpp
--- a/oxygine/src/ox/Button.hpp
+++ b/oxygine/src/ox/Button.hpp
--- a/oxygine/src/ox/ClipRectActor.hpp
+++ b/oxygine/src/ox/ClipRectActor.hpp
--- a/oxygine/src/ox/Clock.hpp
+++ b/oxygine/src/ox/Clock.hpp
--- a/oxygine/src/ox/Color.hpp
+++ b/oxygine/src/ox/Color.hpp
--- a/oxygine/src/ox/ColorRectSprite.hpp
+++ b/oxygine/src/ox/ColorRectSprite.hpp
--- a/oxygine/src/ox/CreateResourceContext.hpp
+++ b/oxygine/src/ox/CreateResourceContext.hpp
--- a/oxygine/src/ox/DebugActor.hpp
+++ b/oxygine/src/ox/DebugActor.hpp
--- a/oxygine/src/ox/Draggable.hpp
+++ b/oxygine/src/ox/Draggable.hpp
--- a/oxygine/src/ox/Event.hpp
+++ b/oxygine/src/ox/Event.hpp
--- a/oxygine/src/ox/EventDispatcher.hpp
+++ b/oxygine/src/ox/EventDispatcher.hpp
--- a/oxygine/src/ox/FileSystem.hpp
+++ b/oxygine/src/ox/FileSystem.hpp
--- a/oxygine/src/ox/Font.hpp
+++ b/oxygine/src/ox/Font.hpp
--- a/oxygine/src/ox/HttpRequestTask.hpp
+++ b/oxygine/src/ox/HttpRequestTask.hpp
--- a/oxygine/src/ox/Image.hpp
+++ b/oxygine/src/ox/Image.hpp
--- a/oxygine/src/ox/ImageData.hpp
+++ b/oxygine/src/ox/ImageData.hpp
--- a/oxygine/src/ox/ImageDataOperations.hpp
+++ b/oxygine/src/ox/ImageDataOperations.hpp
--- a/oxygine/src/ox/ImageUtils.hpp
+++ b/oxygine/src/ox/ImageUtils.hpp
--- a/oxygine/src/ox/Input.hpp
+++ b/oxygine/src/ox/Input.hpp
--- a/oxygine/src/ox/InputText.hpp
+++ b/oxygine/src/ox/InputText.hpp
--- a/oxygine/src/ox/KeyEvent.hpp
+++ b/oxygine/src/ox/KeyEvent.hpp
--- a/oxygine/src/ox/MaskedRenderer.hpp
+++ b/oxygine/src/ox/MaskedRenderer.hpp
--- a/oxygine/src/ox/MaskedSprite.hpp
+++ b/oxygine/src/ox/MaskedSprite.hpp
--- a/oxygine/src/ox/Material.hpp
+++ b/oxygine/src/ox/Material.hpp
--- a/oxygine/src/ox/MaterialCache.hpp
+++ b/oxygine/src/ox/MaterialCache.hpp
--- a/oxygine/src/ox/MaterialX.hpp
+++ b/oxygine/src/ox/MaterialX.hpp
--- a/oxygine/src/ox/Matrix.hpp
+++ b/oxygine/src/ox/Matrix.hpp
--- a/oxygine/src/ox/Mem2Native.hpp
+++ b/oxygine/src/ox/Mem2Native.hpp
--- a/oxygine/src/ox/MemoryTexture.hpp
+++ b/oxygine/src/ox/MemoryTexture.hpp
--- a/oxygine/src/ox/Mutex.hpp
+++ b/oxygine/src/ox/Mutex.hpp
--- a/oxygine/src/ox/NativeTexture.hpp
+++ b/oxygine/src/ox/NativeTexture.hpp
--- a/oxygine/src/ox/OBBox.hpp
+++ b/oxygine/src/ox/OBBox.hpp
--- a/oxygine/src/ox/Object.hpp
+++ b/oxygine/src/ox/Object.hpp
--- a/oxygine/src/ox/PointerState.hpp
+++ b/oxygine/src/ox/PointerState.hpp
--- a/oxygine/src/ox/Polygon.hpp
+++ b/oxygine/src/ox/Polygon.hpp
--- a/oxygine/src/ox/PostProcess.hpp
+++ b/oxygine/src/ox/PostProcess.hpp
--- a/oxygine/src/ox/ProgressBar.hpp
+++ b/oxygine/src/ox/ProgressBar.hpp
--- a/oxygine/src/ox/Property.hpp
+++ b/oxygine/src/ox/Property.hpp
--- a/oxygine/src/ox/Rect.hpp
+++ b/oxygine/src/ox/Rect.hpp
--- a/oxygine/src/ox/RenderState.hpp
+++ b/oxygine/src/ox/RenderState.hpp
--- a/oxygine/src/ox/Renderer.hpp
+++ b/oxygine/src/ox/Renderer.hpp
--- a/oxygine/src/ox/ResAnim.hpp
+++ b/oxygine/src/ox/ResAnim.hpp
--- a/oxygine/src/ox/ResAtlas.hpp
+++ b/oxygine/src/ox/ResAtlas.hpp
--- a/oxygine/src/ox/ResAtlasGeneric.hpp
+++ b/oxygine/src/ox/ResAtlasGeneric.hpp
--- a/oxygine/src/ox/ResAtlasPrebuilt.hpp
+++ b/oxygine/src/ox/ResAtlasPrebuilt.hpp
--- a/oxygine/src/ox/ResBuffer.hpp
+++ b/oxygine/src/ox/ResBuffer.hpp
--- a/oxygine/src/ox/ResFont.hpp
+++ b/oxygine/src/ox/ResFont.hpp
--- a/oxygine/src/ox/ResFontBM.hpp
+++ b/oxygine/src/ox/ResFontBM.hpp
--- a/oxygine/src/ox/ResStarlingAtlas.hpp
+++ b/oxygine/src/ox/ResStarlingAtlas.hpp
--- a/oxygine/src/ox/Resource.hpp
+++ b/oxygine/src/ox/Resource.hpp
--- a/oxygine/src/ox/Resources.hpp
+++ b/oxygine/src/ox/Resources.hpp
--- a/oxygine/src/ox/Restorable.hpp
+++ b/oxygine/src/ox/Restorable.hpp
--- a/oxygine/src/ox/STDFileSystem.hpp
+++ b/oxygine/src/ox/STDFileSystem.hpp
--- a/oxygine/src/ox/STDMaterial.hpp
+++ b/oxygine/src/ox/STDMaterial.hpp
--- a/oxygine/src/ox/STDRenderer.hpp
+++ b/oxygine/src/ox/STDRenderer.hpp
--- a/oxygine/src/ox/ScalarMath.hpp
+++ b/oxygine/src/ox/ScalarMath.hpp
--- a/oxygine/src/ox/Serializable.hpp
+++ b/oxygine/src/ox/Serializable.hpp
--- a/oxygine/src/ox/Serialize.hpp
+++ b/oxygine/src/ox/Serialize.hpp
--- a/oxygine/src/ox/ShaderProgram.hpp
+++ b/oxygine/src/ox/ShaderProgram.hpp
--- a/oxygine/src/ox/SingleResAnim.hpp
+++ b/oxygine/src/ox/SingleResAnim.hpp
--- a/oxygine/src/ox/SlidingActor.hpp
+++ b/oxygine/src/ox/SlidingActor.hpp
--- a/oxygine/src/ox/Sprite.hpp
+++ b/oxygine/src/ox/Sprite.hpp
--- a/oxygine/src/ox/Stage.hpp
+++ b/oxygine/src/ox/Stage.hpp
--- a/oxygine/src/ox/TextField.hpp
+++ b/oxygine/src/ox/TextField.hpp
--- a/oxygine/src/ox/TextStyle.hpp
+++ b/oxygine/src/ox/TextStyle.hpp
--- a/oxygine/src/ox/Texture.hpp
+++ b/oxygine/src/ox/Texture.hpp
--- a/oxygine/src/ox/ThreadDispatcher.hpp
+++ b/oxygine/src/ox/ThreadDispatcher.hpp
--- a/oxygine/src/ox/ThreadLoader.hpp
+++ b/oxygine/src/ox/ThreadLoader.hpp
--- a/oxygine/src/ox/ThreadMessages.hpp
+++ b/oxygine/src/ox/ThreadMessages.hpp
--- a/oxygine/src/ox/TouchEvent.hpp
+++ b/oxygine/src/ox/TouchEvent.hpp
--- a/oxygine/src/ox/Tween.hpp
+++ b/oxygine/src/ox/Tween.hpp
--- a/oxygine/src/ox/TweenAlphaFade.hpp
+++ b/oxygine/src/ox/TweenAlphaFade.hpp
--- a/oxygine/src/ox/TweenAnim.hpp
+++ b/oxygine/src/ox/TweenAnim.hpp
--- a/oxygine/src/ox/TweenGlow.hpp
+++ b/oxygine/src/ox/TweenGlow.hpp
--- a/oxygine/src/ox/TweenOutline.hpp
+++ b/oxygine/src/ox/TweenOutline.hpp
--- a/oxygine/src/ox/TweenQueue.hpp
+++ b/oxygine/src/ox/TweenQueue.hpp
--- a/oxygine/src/ox/UberShaderProgram.hpp
+++ b/oxygine/src/ox/UberShaderProgram.hpp
--- a/oxygine/src/ox/UpdateState.hpp
+++ b/oxygine/src/ox/UpdateState.hpp
--- a/oxygine/src/ox/Vector2.hpp
+++ b/oxygine/src/ox/Vector2.hpp
--- a/oxygine/src/ox/Vector3.hpp
+++ b/oxygine/src/ox/Vector3.hpp
--- a/oxygine/src/ox/Vector4.hpp
+++ b/oxygine/src/ox/Vector4.hpp
--- a/oxygine/src/ox/VertexDeclaration.hpp
+++ b/oxygine/src/ox/VertexDeclaration.hpp
--- a/oxygine/src/ox/VideoDriver.hpp
+++ b/oxygine/src/ox/VideoDriver.hpp
--- a/oxygine/src/ox/VisualStyle.hpp
+++ b/oxygine/src/ox/VisualStyle.hpp
--- a/oxygine/src/ox/WebImage.hpp
+++ b/oxygine/src/ox/WebImage.hpp
--- a/oxygine/src/ox/ZipFileSystem.hpp
+++ b/oxygine/src/ox/ZipFileSystem.hpp
--- a/oxygine/src/ox/file.hpp
+++ b/oxygine/src/ox/file.hpp
--- a/oxygine/src/ox/initActor.hpp
+++ b/oxygine/src/ox/initActor.hpp
--- a/oxygine/src/ox/intrusive_list.hpp
+++ b/oxygine/src/ox/intrusive_list.hpp
--- a/oxygine/src/ox/intrusive_ptr.hpp
+++ b/oxygine/src/ox/intrusive_ptr.hpp
--- a/oxygine/src/ox/json.hpp
+++ b/oxygine/src/ox/json.hpp
@@ -0,0 +1 @@
 
				+#include "oxygine/json/json.h"
			
--- a/oxygine/src/ox/key.hpp
+++ b/oxygine/src/ox/key.hpp
--- a/oxygine/src/ox/log.hpp
+++ b/oxygine/src/ox/log.hpp
--- a/oxygine/src/ox/ox_debug.hpp
+++ b/oxygine/src/ox/ox_debug.hpp
--- a/oxygine/src/ox/oxygine-framework.hpp
+++ b/oxygine/src/ox/oxygine-framework.hpp