From 0c391fdbce5a079cf03e483eb6174dd47806163d Mon Sep 17 00:00:00 2001 From: chai Date: Wed, 7 Aug 2019 21:08:47 +0800 Subject: *misc --- source/modules/asura-core/Application.h | 6 +-- source/modules/asura-core/CoreModule.h | 4 +- source/modules/asura-core/Font/String.hpp | 2 +- source/modules/asura-core/Graphics/BlendMode.h | 2 +- source/modules/asura-core/Graphics/Canvas.h | 8 ++-- source/modules/asura-core/Graphics/Color.h | 4 +- source/modules/asura-core/Graphics/Color32.h | 4 +- source/modules/asura-core/Graphics/DrawInfo.h | 2 +- source/modules/asura-core/Graphics/GPUBuffer.h | 6 +-- source/modules/asura-core/Graphics/GfxDevice.cpp | 2 +- source/modules/asura-core/Graphics/GfxDevice.h | 8 ++-- .../modules/asura-core/Graphics/GraphicsHelper.h | 2 +- source/modules/asura-core/Graphics/Image.cpp | 4 +- source/modules/asura-core/Graphics/Image.h | 12 ++--- source/modules/asura-core/Graphics/IndexBuffer.h | 2 +- source/modules/asura-core/Graphics/MatrixStack.h | 6 +-- source/modules/asura-core/Graphics/Mesh2D.h | 4 +- source/modules/asura-core/Graphics/RenderState.h | 4 +- source/modules/asura-core/Graphics/RenderTarget.h | 6 +-- source/modules/asura-core/Graphics/Shader.cpp | 2 +- source/modules/asura-core/Graphics/Shader.h | 20 ++++---- source/modules/asura-core/Graphics/SpriteBatch.h | 2 +- source/modules/asura-core/Graphics/Texture.cpp | 2 +- source/modules/asura-core/Graphics/Texture.h | 4 +- source/modules/asura-core/Graphics/VBO.h | 2 +- source/modules/asura-core/Graphics/VertexBuffer.h | 2 +- source/modules/asura-core/Image/ImageData.cpp | 2 +- source/modules/asura-core/Image/ImageData.h | 14 +++--- source/modules/asura-core/Image/ImageDecodeTask.h | 6 +-- source/modules/asura-core/Image/ImageDecoder.h | 6 +-- source/modules/asura-core/Image/PngDecoder.cpp | 4 +- source/modules/asura-core/Image/PngDecoder.h | 4 +- source/modules/asura-core/Image/StbDecoder.cpp | 6 +-- source/modules/asura-core/Image/StbDecoder.h | 4 +- .../asura-core/Image/binding/_image_data.cpp | 6 +-- source/modules/asura-core/Input/Button.h | 2 +- source/modules/asura-core/Input/InputAxis.h | 2 +- source/modules/asura-core/Input/InputDevice.h | 53 ++++++++++++++++++---- source/modules/asura-core/Input/InputEvent.h | 4 +- source/modules/asura-core/Input/InputManager.cpp | 16 +++++++ source/modules/asura-core/Input/InputManager.h | 10 ++-- source/modules/asura-core/Input/JoystickState.h | 2 +- source/modules/asura-core/Input/MouseState.h | 2 +- source/modules/asura-core/Mesh/Am2Handler.h | 6 +-- source/modules/asura-core/Mesh/Mesh2DData.h | 10 ++-- source/modules/asura-core/Mesh/Mesh2DHandler.h | 10 ++-- source/modules/asura-core/Threads/Channel.h | 4 +- source/modules/asura-core/Threads/ThreadEx.cpp | 2 +- source/modules/asura-core/Threads/ThreadEx.h | 4 +- source/modules/asura-core/Type.h | 11 ----- source/modules/asura-core/Window/Window.cpp | 2 +- source/modules/asura-core/Window/Window.h | 6 +-- source/modules/asura-core/Window/WindowImplSDL.cpp | 2 +- source/modules/asura-core/application.h | 6 +-- source/modules/asura-core/font/string.hpp | 2 +- source/modules/asura-core/graphics/canvas.h | 8 ++-- source/modules/asura-core/graphics/color.h | 4 +- source/modules/asura-core/graphics/color32.h | 4 +- source/modules/asura-core/graphics/image.cpp | 4 +- source/modules/asura-core/graphics/image.h | 12 ++--- source/modules/asura-core/graphics/mesh2d.h | 4 +- source/modules/asura-core/graphics/shader.cpp | 2 +- source/modules/asura-core/graphics/shader.h | 20 ++++---- source/modules/asura-core/graphics/texture.cpp | 2 +- source/modules/asura-core/graphics/texture.h | 4 +- .../asura-core/image/binding/_image_data.cpp | 6 +-- source/modules/asura-core/input/button.h | 2 +- source/modules/asura-core/type.h | 11 ----- source/modules/asura-core/window/window.cpp | 2 +- source/modules/asura-core/window/window.h | 6 +-- 70 files changed, 226 insertions(+), 195 deletions(-) delete mode 100644 source/modules/asura-core/Type.h delete mode 100644 source/modules/asura-core/type.h (limited to 'source/modules/asura-core') diff --git a/source/modules/asura-core/Application.h b/source/modules/asura-core/Application.h index 696d125..cccd6f7 100644 --- a/source/modules/asura-core/Application.h +++ b/source/modules/asura-core/Application.h @@ -1,9 +1,9 @@ #ifndef _ASURA_ENGINE_APPLICATION_H_ #define _ASURA_ENGINE_APPLICATION_H_ -#include -#include -#include +#include +#include +#include #include #include "CoreConfig.h" diff --git a/source/modules/asura-core/CoreModule.h b/source/modules/asura-core/CoreModule.h index 1781885..d592f42 100644 --- a/source/modules/asura-core/CoreModule.h +++ b/source/modules/asura-core/CoreModule.h @@ -1,8 +1,8 @@ #ifndef _ASURA_CORE_MODULE_H_ #define _ASURA_CORE_MODULE_H_ -#include -#include +#include +#include #include "graphics/image.h" #include "graphics/texture.h" diff --git a/source/modules/asura-core/Font/String.hpp b/source/modules/asura-core/Font/String.hpp index 13a8b2d..845a1d5 100644 --- a/source/modules/asura-core/Font/String.hpp +++ b/source/modules/asura-core/Font/String.hpp @@ -1,7 +1,7 @@ //#ifndef _ASURA_ENGINE_STRING_H_ //#define _ASURA_ENGINE_STRING_H_ // -//#include +//#include // //#include //#include diff --git a/source/modules/asura-core/Graphics/BlendMode.h b/source/modules/asura-core/Graphics/BlendMode.h index 7a31eed..fb17b45 100644 --- a/source/modules/asura-core/Graphics/BlendMode.h +++ b/source/modules/asura-core/Graphics/BlendMode.h @@ -1,7 +1,7 @@ #ifndef _ASURA_ENGINE_BLEND_MODE_H_ #define _ASURA_ENGINE_BLEND_MODE_H_ -#include +#include namespace_begin(AsuraEngine) namespace_begin(Graphics) diff --git a/source/modules/asura-core/Graphics/Canvas.h b/source/modules/asura-core/Graphics/Canvas.h index 0ec55bc..de02b9d 100644 --- a/source/modules/asura-core/Graphics/Canvas.h +++ b/source/modules/asura-core/Graphics/Canvas.h @@ -1,10 +1,10 @@ #ifndef _ASURA_ENGINE_CANVAS_H_ #define _ASURA_ENGINE_CANVAS_H_ -#include -#include -#include -#include +#include +#include +#include +#include #include "GfxDevice.h" #include "Texture.h" diff --git a/source/modules/asura-core/Graphics/Color.h b/source/modules/asura-core/Graphics/Color.h index a16f17d..c81b601 100644 --- a/source/modules/asura-core/Graphics/Color.h +++ b/source/modules/asura-core/Graphics/Color.h @@ -1,8 +1,8 @@ #ifndef _ASURA_ENGINE_COLOR_H_ #define _ASURA_ENGINE_COLOR_H_ -#include -#include +#include +#include #include "../CoreConfig.h" diff --git a/source/modules/asura-core/Graphics/Color32.h b/source/modules/asura-core/Graphics/Color32.h index aa445fe..4dbfe2d 100644 --- a/source/modules/asura-core/Graphics/Color32.h +++ b/source/modules/asura-core/Graphics/Color32.h @@ -1,8 +1,8 @@ #ifndef _ASURA_ENGINE_COLOR32_H__ #define _ASURA_ENGINE_COLOR32_H__ -#include -#include +#include +#include #include "../CoreConfig.h" diff --git a/source/modules/asura-core/Graphics/DrawInfo.h b/source/modules/asura-core/Graphics/DrawInfo.h index 9042f2f..0082102 100644 --- a/source/modules/asura-core/Graphics/DrawInfo.h +++ b/source/modules/asura-core/Graphics/DrawInfo.h @@ -1,7 +1,7 @@ #ifndef _ASURA_ENGINE_DRAWINFO_H_ #define _ASURA_ENGINE_DRAWINFO_H_ -#include +#include namespace_begin(AsuraEngine) namespace_begin(Graphics) diff --git a/source/modules/asura-core/Graphics/GPUBuffer.h b/source/modules/asura-core/Graphics/GPUBuffer.h index 0aa3c29..565db17 100644 --- a/source/modules/asura-core/Graphics/GPUBuffer.h +++ b/source/modules/asura-core/Graphics/GPUBuffer.h @@ -1,9 +1,9 @@ #ifndef _ASURA_GPU_BUFFER_H_ #define _ASURA_GPU_BUFFER_H_ -#include -#include -#include +#include +#include +#include #include "GfxDevice.h" diff --git a/source/modules/asura-core/Graphics/GfxDevice.cpp b/source/modules/asura-core/Graphics/GfxDevice.cpp index ea95f54..529a76c 100644 --- a/source/modules/asura-core/Graphics/GfxDevice.cpp +++ b/source/modules/asura-core/Graphics/GfxDevice.cpp @@ -1,4 +1,4 @@ -#include +#include #include "../CoreConfig.h" diff --git a/source/modules/asura-core/Graphics/GfxDevice.h b/source/modules/asura-core/Graphics/GfxDevice.h index 02c7392..2b105df 100644 --- a/source/modules/asura-core/Graphics/GfxDevice.h +++ b/source/modules/asura-core/Graphics/GfxDevice.h @@ -5,10 +5,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include "Color.h" #include "MatrixStack.h" diff --git a/source/modules/asura-core/Graphics/GraphicsHelper.h b/source/modules/asura-core/Graphics/GraphicsHelper.h index b93756a..3125292 100644 --- a/source/modules/asura-core/Graphics/GraphicsHelper.h +++ b/source/modules/asura-core/Graphics/GraphicsHelper.h @@ -1,7 +1,7 @@ #ifndef _ASURA_GRAPHICS_HELPER_H_ #define _ASURA_GRAPHICS_HELPER_H_ -#include +#include namespace_begin(AsuraEngine) namespace_begin(Graphics) diff --git a/source/modules/asura-core/Graphics/Image.cpp b/source/modules/asura-core/Graphics/Image.cpp index d2b2ec9..36d2478 100644 --- a/source/modules/asura-core/Graphics/Image.cpp +++ b/source/modules/asura-core/Graphics/Image.cpp @@ -1,4 +1,4 @@ -#include +#include #include "../CoreConfig.h" @@ -6,7 +6,7 @@ #include "Image.h" #include "GfxDevice.h" -using namespace AEIO; +using namespace AEFileSystem; using namespace AEImage; namespace_begin(AsuraEngine) diff --git a/source/modules/asura-core/Graphics/Image.h b/source/modules/asura-core/Graphics/Image.h index 5cbfe23..a76d06f 100644 --- a/source/modules/asura-core/Graphics/Image.h +++ b/source/modules/asura-core/Graphics/Image.h @@ -2,12 +2,12 @@ #define _ASURA_ENGINE_IMAGE_H_ // asura modules -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include // module #include "../Image/ImageData.h" diff --git a/source/modules/asura-core/Graphics/IndexBuffer.h b/source/modules/asura-core/Graphics/IndexBuffer.h index 73a6f9b..b7886b7 100644 --- a/source/modules/asura-core/Graphics/IndexBuffer.h +++ b/source/modules/asura-core/Graphics/IndexBuffer.h @@ -1,7 +1,7 @@ #ifndef _ASURA_INDEX_BUFFER_H_ #define _ASURA_INDEX_BUFFER_H_ -#include +#include #include "GPUBuffer.h" diff --git a/source/modules/asura-core/Graphics/MatrixStack.h b/source/modules/asura-core/Graphics/MatrixStack.h index 867011e..8dd56bf 100644 --- a/source/modules/asura-core/Graphics/MatrixStack.h +++ b/source/modules/asura-core/Graphics/MatrixStack.h @@ -1,9 +1,9 @@ #ifndef _ASURA_MATRIX_STACK_H_ #define _ASURA_MATRIX_STACK_H_ -#include -#include -#include +#include +#include +#include namespace_begin(AsuraEngine) namespace_begin(Graphics) diff --git a/source/modules/asura-core/Graphics/Mesh2D.h b/source/modules/asura-core/Graphics/Mesh2D.h index 1546765..7a0f62e 100644 --- a/source/modules/asura-core/Graphics/Mesh2D.h +++ b/source/modules/asura-core/Graphics/Mesh2D.h @@ -5,8 +5,8 @@ #include // asura modules -#include -#include +#include +#include // module #include "../Mesh/Mesh2dData.h" diff --git a/source/modules/asura-core/Graphics/RenderState.h b/source/modules/asura-core/Graphics/RenderState.h index 5dcf12d..23804d8 100644 --- a/source/modules/asura-core/Graphics/RenderState.h +++ b/source/modules/asura-core/Graphics/RenderState.h @@ -1,8 +1,8 @@ #ifndef _ASURA_ENGINE_RENDER_STATE_H_ #define _ASURA_ENGINE_RENDER_STATE_H_ -#include -#include +#include +#include #include "BlendMode.h" diff --git a/source/modules/asura-core/Graphics/RenderTarget.h b/source/modules/asura-core/Graphics/RenderTarget.h index bcd7276..ab09e35 100644 --- a/source/modules/asura-core/Graphics/RenderTarget.h +++ b/source/modules/asura-core/Graphics/RenderTarget.h @@ -1,9 +1,9 @@ #ifndef _ASURA_ENGINE_RENDERTARGET_H_ #define _ASURA_ENGINE_RENDERTARGET_H_ -#include -#include -#include +#include +#include +#include #include "Texture.h" #include "Color.h" diff --git a/source/modules/asura-core/Graphics/Shader.cpp b/source/modules/asura-core/Graphics/Shader.cpp index 30e0161..329b3f1 100644 --- a/source/modules/asura-core/Graphics/Shader.cpp +++ b/source/modules/asura-core/Graphics/Shader.cpp @@ -1,4 +1,4 @@ -#include +#include #include "GfxDevice.h" #include "Shader.h" diff --git a/source/modules/asura-core/Graphics/Shader.h b/source/modules/asura-core/Graphics/Shader.h index c96b99f..615b028 100644 --- a/source/modules/asura-core/Graphics/Shader.h +++ b/source/modules/asura-core/Graphics/Shader.h @@ -4,15 +4,15 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "GfxDevice.h" #include "Color.h" @@ -30,7 +30,7 @@ namespace_begin(Graphics) /// class Shader ASURA_FINAL : public Scripting::Portable - , public AEIO::Renewable + , public AEFileSystem::Renewable { public: diff --git a/source/modules/asura-core/Graphics/SpriteBatch.h b/source/modules/asura-core/Graphics/SpriteBatch.h index a98d1f4..30cb56c 100644 --- a/source/modules/asura-core/Graphics/SpriteBatch.h +++ b/source/modules/asura-core/Graphics/SpriteBatch.h @@ -1,7 +1,7 @@ #ifndef _ASURA_ENGINE_SPRITE_BATCH_H_ #define _ASURA_ENGINE_SPRITE_BATCH_H_ -#include +#include #include "GPUBuffer.h" diff --git a/source/modules/asura-core/Graphics/Texture.cpp b/source/modules/asura-core/Graphics/Texture.cpp index bae0f7c..03f005d 100644 --- a/source/modules/asura-core/Graphics/Texture.cpp +++ b/source/modules/asura-core/Graphics/Texture.cpp @@ -1,4 +1,4 @@ -#include +#include #include "Texture.h" diff --git a/source/modules/asura-core/Graphics/Texture.h b/source/modules/asura-core/Graphics/Texture.h index 7d37c31..76b9a8f 100644 --- a/source/modules/asura-core/Graphics/Texture.h +++ b/source/modules/asura-core/Graphics/Texture.h @@ -1,8 +1,8 @@ #ifndef _ASURA_TEXTURE_H_ #define _ASURA_TEXTURE_H_ -#include -#include +#include +#include #include "../CoreConfig.h" diff --git a/source/modules/asura-core/Graphics/VBO.h b/source/modules/asura-core/Graphics/VBO.h index 80f405f..f80991e 100644 --- a/source/modules/asura-core/Graphics/VBO.h +++ b/source/modules/asura-core/Graphics/VBO.h @@ -1,7 +1,7 @@ #ifndef _ASURA_ENGINE_VBO_H_ #define _ASURA_ENGINE_VBO_H_ -#include +#include namespace_begin(AsuraEngine) namespace_begin(Graphics) diff --git a/source/modules/asura-core/Graphics/VertexBuffer.h b/source/modules/asura-core/Graphics/VertexBuffer.h index 83e9b09..0622388 100644 --- a/source/modules/asura-core/Graphics/VertexBuffer.h +++ b/source/modules/asura-core/Graphics/VertexBuffer.h @@ -1,7 +1,7 @@ #ifndef _ASURA_VERTEX_BUFFER_H_ #define _ASURA_VERTEX_BUFFER_H_ -#include +#include #include "GPUBuffer.h" diff --git a/source/modules/asura-core/Image/ImageData.cpp b/source/modules/asura-core/Image/ImageData.cpp index c75166f..bbfd177 100644 --- a/source/modules/asura-core/Image/ImageData.cpp +++ b/source/modules/asura-core/Image/ImageData.cpp @@ -31,7 +31,7 @@ ImageData::~ImageData() delete[] pixels; } -void ImageData::Decode(IO::DataBuffer& buffer) +void ImageData::Decode(FileSystem::DataBuffer& buffer) { for (ImageDecoder* decoder : ImageDecoders) { diff --git a/source/modules/asura-core/Image/ImageData.h b/source/modules/asura-core/Image/ImageData.h index cd2fe1a..2d70edc 100644 --- a/source/modules/asura-core/Image/ImageData.h +++ b/source/modules/asura-core/Image/ImageData.h @@ -3,11 +3,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "../Graphics/Texture.h" #include "../Graphics/Color.h" @@ -19,7 +19,7 @@ class ImageDecoder; class ImageData ASURA_FINAL : public Scripting::Portable - , public AEIO::DecodedData + , public AEFileSystem::DecodedData { public: @@ -29,7 +29,7 @@ public: ImageData(); ~ImageData(); - void Decode(AEIO::DataBuffer& buffer) override; + void Decode(AEFileSystem::DataBuffer& buffer) override; void Lock(); void Unlock(); diff --git a/source/modules/asura-core/Image/ImageDecodeTask.h b/source/modules/asura-core/Image/ImageDecodeTask.h index 74ecf24..194ac3e 100644 --- a/source/modules/asura-core/Image/ImageDecodeTask.h +++ b/source/modules/asura-core/Image/ImageDecodeTask.h @@ -1,9 +1,9 @@ #ifndef _ASURA_IMAGE_DECODE_TASK_H_ #define _ASURA_IMAGE_DECODE_TASK_H_ -#include -#include -#include +#include +#include +#include namespace_begin(AsuraEngine) namespace_begin(Image) diff --git a/source/modules/asura-core/Image/ImageDecoder.h b/source/modules/asura-core/Image/ImageDecoder.h index 7de92d6..6cea8fd 100644 --- a/source/modules/asura-core/Image/ImageDecoder.h +++ b/source/modules/asura-core/Image/ImageDecoder.h @@ -1,7 +1,7 @@ #ifndef _ASURA_ENGINE_IMAGE_DECODER_H_ #define _ASURA_ENGINE_IMAGE_DECODER_H_ -#include +#include #include "ImageData.h" @@ -18,12 +18,12 @@ public: /// /// 判断内存是否能用本decoder解压 /// - virtual bool CanDecode(AEIO::DataBuffer& input) = 0; + virtual bool CanDecode(AEFileSystem::DataBuffer& input) = 0; /// /// 输入一个编码后的内存，输出一个解压后的Image data，如果解压失败返回nullptr /// - virtual void Decode(AEIO::DataBuffer& input, ImageData& target) = 0; + virtual void Decode(AEFileSystem::DataBuffer& input, ImageData& target) = 0; }; diff --git a/source/modules/asura-core/Image/PngDecoder.cpp b/source/modules/asura-core/Image/PngDecoder.cpp index 618c16e..b314561 100644 --- a/source/modules/asura-core/Image/PngDecoder.cpp +++ b/source/modules/asura-core/Image/PngDecoder.cpp @@ -3,12 +3,12 @@ namespace_begin(AsuraEngine) namespace_begin(Image) -bool PNGDecoder::CanDecode(AEIO::DataBuffer& buffer) +bool PNGDecoder::CanDecode(AEFileSystem::DataBuffer& buffer) { return false; } -void PNGDecoder::Decode(AEIO::DataBuffer& buffer, ImageData& data) +void PNGDecoder::Decode(AEFileSystem::DataBuffer& buffer, ImageData& data) { } diff --git a/source/modules/asura-core/Image/PngDecoder.h b/source/modules/asura-core/Image/PngDecoder.h index b6ea3ba..3b2a39c 100644 --- a/source/modules/asura-core/Image/PngDecoder.h +++ b/source/modules/asura-core/Image/PngDecoder.h @@ -13,9 +13,9 @@ class PNGDecoder ASURA_FINAL: public ImageDecoder { public: - bool CanDecode(AEIO::DataBuffer& buffer) override; + bool CanDecode(AEFileSystem::DataBuffer& buffer) override; - void Decode(AEIO::DataBuffer& buffer, ImageData& data) override; + void Decode(AEFileSystem::DataBuffer& buffer, ImageData& data) override; }; diff --git a/source/modules/asura-core/Image/StbDecoder.cpp b/source/modules/asura-core/Image/StbDecoder.cpp index 8d3537c..101b148 100644 --- a/source/modules/asura-core/Image/StbDecoder.cpp +++ b/source/modules/asura-core/Image/StbDecoder.cpp @@ -1,4 +1,4 @@ -#include +#include #include "StbDecoder.h" @@ -10,7 +10,7 @@ using namespace AEGraphics; namespace_begin(AsuraEngine) namespace_begin(Image) -bool STBDecoder::CanDecode(IO::DataBuffer& buffer) +bool STBDecoder::CanDecode(FileSystem::DataBuffer& buffer) { int w = 0; int h = 0; @@ -21,7 +21,7 @@ bool STBDecoder::CanDecode(IO::DataBuffer& buffer) return status == 1 && w > 0 && h > 0; } -void STBDecoder::Decode(IO::DataBuffer& db, ImageData& imageData) +void STBDecoder::Decode(FileSystem::DataBuffer& db, ImageData& imageData) { const stbi_uc *buffer = (const stbi_uc *)db.GetData(); // databuffer数据长 diff --git a/source/modules/asura-core/Image/StbDecoder.h b/source/modules/asura-core/Image/StbDecoder.h index a86073a..23e8c38 100644 --- a/source/modules/asura-core/Image/StbDecoder.h +++ b/source/modules/asura-core/Image/StbDecoder.h @@ -14,9 +14,9 @@ class STBDecoder ASURA_FINAL { public: - bool CanDecode(AEIO::DataBuffer& buffer) override; + bool CanDecode(AEFileSystem::DataBuffer& buffer) override; - void Decode(AEIO::DataBuffer& buffer, ImageData& data) override; + void Decode(AEFileSystem::DataBuffer& buffer, ImageData& data) override; }; diff --git a/source/modules/asura-core/Image/binding/_image_data.cpp b/source/modules/asura-core/Image/binding/_image_data.cpp index 77f3a96..375f854 100644 --- a/source/modules/asura-core/Image/binding/_image_data.cpp +++ b/source/modules/asura-core/Image/binding/_image_data.cpp @@ -1,11 +1,11 @@ -#include -#include +#include +#include #include "../ImageData.h" using namespace std; using namespace AEThreading; -using namespace AEIO; +using namespace AEFileSystem; namespace_begin(AsuraEngine) namespace_begin(Image) diff --git a/source/modules/asura-core/Input/Button.h b/source/modules/asura-core/Input/Button.h index 5c3c0de..528063d 100644 --- a/source/modules/asura-core/Input/Button.h +++ b/source/modules/asura-core/Input/Button.h @@ -1,7 +1,7 @@ #ifndef __BUTTON_H__ #define __BUTTON_H__ -#include +#include namespace_begin(AsuraEngine) namespace_begin(Input) diff --git a/source/modules/asura-core/Input/InputAxis.h b/source/modules/asura-core/Input/InputAxis.h index 3052f0b..9f721d7 100644 --- a/source/modules/asura-core/Input/InputAxis.h +++ b/source/modules/asura-core/Input/InputAxis.h @@ -1,7 +1,7 @@ #ifndef _ASURA_ENGINE_INPUT_AXIS_H_ #define _ASURA_ENGINE_INPUT_AXIS_H_ -#include +#include namespace_begin(AsuraEngine) namespace_begin(Input) diff --git a/source/modules/asura-core/Input/InputDevice.h b/source/modules/asura-core/Input/InputDevice.h index 0ecce99..2b3ff9b 100644 --- a/source/modules/asura-core/Input/InputDevice.h +++ b/source/modules/asura-core/Input/InputDevice.h @@ -1,9 +1,11 @@ #ifndef _ASURA_ENGINE_INPUT_BASE_H_ #define _ASURA_ENGINE_INPUT_BASE_H_ -#include -#include -#include +#include +#include +#include + +#include #include "../CoreConfig.h" @@ -14,28 +16,63 @@ namespace_begin(AsuraEngine) namespace_begin(Input) -class InputDevice +class InputDevice ASURA_FINAL { public: InputDevice(); - virtual ~InputDevice(); + ~InputDevice(); + +#if ASURA_EDITOR + + bool Open(HWND window); + void Close(); + + bool ToggleFullscreen(bool fullscreen, HWND window); + + bool Process(bool discard); + LRESULT OnKey(HWND window, UINT message, WPARAM wParam, LPARAM lParam); + LRESULT OnInput(HWND window, UINT message, WPARAM wParam, LPARAM lParam); + LRESULT OnDeviceChange(LPCWSTR name, bool add); + + static bool ConvertPositionToClientAreaCoord(HWND activeWindow, POINT position, AEMath::Vector2f& newPos); + +#elif ASURA_RUNNER + + bool Open(); + void Close(); + +#endif + + bool Activate(bool active); + + bool GetJoystickNames(std::vector &names); protected: - virtual bool UpdateState(); + bool UpdateState(); MouseState m_Mouse; KeyboardState m_Keyboard; JoystickState m_Joysticks; -private: +private: bool UpdateMousePosition(); }; -//bool ConvertPositionToClientAreaCoord(); +extern InputDevice g_InputDevice; + +#if ASURA_EDITOR + +bool ConvertPositionToClientAreaCoord(); + +#elif ASURA_RUNNER + +bool ConvertPositionToClientAreaCoord(); + +#endif namespace_end namespace_end diff --git a/source/modules/asura-core/Input/InputEvent.h b/source/modules/asura-core/Input/InputEvent.h index d7643b6..c643b75 100644 --- a/source/modules/asura-core/Input/InputEvent.h +++ b/source/modules/asura-core/Input/InputEvent.h @@ -2,8 +2,8 @@ #define _ASURA_ENGINE_INPUT_EVENT_H_ #include -#include -#include +#include +#include #include #include diff --git a/source/modules/asura-core/Input/InputManager.cpp b/source/modules/asura-core/Input/InputManager.cpp index fe49c29..cec1b36 100644 --- a/source/modules/asura-core/Input/InputManager.cpp +++ b/source/modules/asura-core/Input/InputManager.cpp @@ -17,69 +17,85 @@ void InputManager::Reset() bool InputManager::GetButton(const std::string& name) { + return 0; } bool InputManager::GetButtonDown(const std::string& name) { + return 0; } bool InputManager::GetButtonUp(const std::string& name) { + return 0; } bool InputManager::HasAxisOrButton(const std::string& name) { + return 0; } float InputManager::GetAxis(const std::string& name) { + return 0; } float InputManager::GetAxisRaw(const std::string& name) { + return 0; } bool InputManager::GetMouseButton(int mouseBut) { + return 0; } bool InputManager::GetMouseButtonState(int mouseBut) { + return 0; } bool InputManager::GetMouseButtonDown(int mouseBut) { + return 0; } bool InputManager::GetMouseButtonUp(int mouseBut) { + return 0; } bool InputManager::GetKey(int key) { + return 0; } bool InputManager::GetKeyDown(int key) { + return 0; } bool InputManager::GetKeyUp(int key) { + return 0; } const AEMath::Vector2f& InputManager::GetMouseDelta() { + return m_MouseDelta; } const AEMath::Vector2f& InputManager::GetMousePosition() { + return m_MousePos; } float InputManager::GetJoystickPosition() { + return 0; } void InputManager::setJoystickPosition() diff --git a/source/modules/asura-core/Input/InputManager.h b/source/modules/asura-core/Input/InputManager.h index bbdafd8..3c44745 100644 --- a/source/modules/asura-core/Input/InputManager.h +++ b/source/modules/asura-core/Input/InputManager.h @@ -1,11 +1,11 @@ #ifndef _ASURA_INPUT_MAMANGER_H_ #define _ASURA_INPUT_MAMANGER_H_ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/source/modules/asura-core/Input/JoystickState.h b/source/modules/asura-core/Input/JoystickState.h index 42d0a79..e97e235 100644 --- a/source/modules/asura-core/Input/JoystickState.h +++ b/source/modules/asura-core/Input/JoystickState.h @@ -1,7 +1,7 @@ #ifndef _ASURA_JOYSTICKSTATE_H_ #define _ASURA_JOYSTICKSTATE_H_ -#include +#include namespace_begin(AsuraEngine) namespace_begin(Input) diff --git a/source/modules/asura-core/Input/MouseState.h b/source/modules/asura-core/Input/MouseState.h index 1192a34..6b44070 100644 --- a/source/modules/asura-core/Input/MouseState.h +++ b/source/modules/asura-core/Input/MouseState.h @@ -1,7 +1,7 @@ #ifndef _ASURA_MOUSESTATE_H_ #define _ASURA_MOUSESTATE_H_ -#include +#include namespace_begin(AsuraEngine) namespace_begin(Input) diff --git a/source/modules/asura-core/Mesh/Am2Handler.h b/source/modules/asura-core/Mesh/Am2Handler.h index 8bd0612..ff5dbfa 100644 --- a/source/modules/asura-core/Mesh/Am2Handler.h +++ b/source/modules/asura-core/Mesh/Am2Handler.h @@ -16,11 +16,11 @@ public: AM2Handler(); ~AM2Handler(); - bool CanDecode(AEIO::DataBuffer& input) override; + bool CanDecode(AEFileSystem::DataBuffer& input) override; - void Decode(AEIO::DataBuffer& input, Mesh2DData& target) override; + void Decode(AEFileSystem::DataBuffer& input, Mesh2DData& target) override; - void Encode(Mesh2DData& input, AEIO::DataBuffer& target) override; + void Encode(Mesh2DData& input, AEFileSystem::DataBuffer& target) override; }; diff --git a/source/modules/asura-core/Mesh/Mesh2DData.h b/source/modules/asura-core/Mesh/Mesh2DData.h index 1144846..3e30a06 100644 --- a/source/modules/asura-core/Mesh/Mesh2DData.h +++ b/source/modules/asura-core/Mesh/Mesh2DData.h @@ -5,9 +5,9 @@ #include // asura modules -#include -#include -#include +#include +#include +#include // module #include "../Graphics/Color.h" @@ -30,7 +30,7 @@ struct Vertex /// mesh的顶点数据和索引数据 /// class Mesh2DData - : AEIO::DecodedData + : AEFileSystem::DecodedData , AEScripting::Portable { public: @@ -45,7 +45,7 @@ public: MESH2D_COMPONENT_TEXCOORD3, }; - void Decode(AEIO::DataBuffer& buffer) override; + void Decode(AEFileSystem::DataBuffer& buffer) override; private: diff --git a/source/modules/asura-core/Mesh/Mesh2DHandler.h b/source/modules/asura-core/Mesh/Mesh2DHandler.h index e50ace8..9ddb724 100644 --- a/source/modules/asura-core/Mesh/Mesh2DHandler.h +++ b/source/modules/asura-core/Mesh/Mesh2DHandler.h @@ -1,8 +1,8 @@ #ifndef _ASURA_MESH2D_HANDLER_H__ #define _ASURA_MESH2D_HANDLER_H__ -#include -#include +#include +#include #include "Mesh2dData.h" @@ -18,11 +18,11 @@ public: Mesh2DHandler() {}; virtual ~Mesh2DHandler() {}; - virtual bool CanDecode(AEIO::DataBuffer& input) = 0; + virtual bool CanDecode(AEFileSystem::DataBuffer& input) = 0; - virtual void Decode(AEIO::DataBuffer& input, Mesh2DData& target) = 0; + virtual void Decode(AEFileSystem::DataBuffer& input, Mesh2DData& target) = 0; - virtual void Encode(Mesh2DData& input, AEIO::DataBuffer& target) = 0; + virtual void Encode(Mesh2DData& input, AEFileSystem::DataBuffer& target) = 0; }; diff --git a/source/modules/asura-core/Threads/Channel.h b/source/modules/asura-core/Threads/Channel.h index 01b9ded..901564f 100644 --- a/source/modules/asura-core/Threads/Channel.h +++ b/source/modules/asura-core/Threads/Channel.h @@ -1,8 +1,8 @@ #ifndef _ASURA_THREAD_CHANNEL_H_ #define _ASURA_THREAD_CHANNEL_H_ -#include -#include +#include +#include namespace_begin(AsuraEngine) namespace_begin(Threads) diff --git a/source/modules/asura-core/Threads/ThreadEx.cpp b/source/modules/asura-core/Threads/ThreadEx.cpp index cc8107c..cec5ba7 100644 --- a/source/modules/asura-core/Threads/ThreadEx.cpp +++ b/source/modules/asura-core/Threads/ThreadEx.cpp @@ -1,4 +1,4 @@ -#include +#include #include "ThreadEx.h" diff --git a/source/modules/asura-core/Threads/ThreadEx.h b/source/modules/asura-core/Threads/ThreadEx.h index 53600a6..ec597c5 100644 --- a/source/modules/asura-core/Threads/ThreadEx.h +++ b/source/modules/asura-core/Threads/ThreadEx.h @@ -1,8 +1,8 @@ #ifndef _ASURA_THREAD_EX_H_ #define _ASURA_THREAD_EX_H_ -#include -#include +#include +#include namespace_begin(AsuraEngine) namespace_begin(Threads) diff --git a/source/modules/asura-core/Type.h b/source/modules/asura-core/Type.h deleted file mode 100644 index 39880e2..0000000 --- a/source/modules/asura-core/Type.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef _ASURA_ENGINE_TYPE_H_ -#define _ASURA_ENGINE_TYPE_H_ - -#include - -namespace AsuraEngine -{ - -} - -#endif \ No newline at end of file diff --git a/source/modules/asura-core/Window/Window.cpp b/source/modules/asura-core/Window/Window.cpp index adba7c9..d75b9a7 100644 --- a/source/modules/asura-core/Window/Window.cpp +++ b/source/modules/asura-core/Window/Window.cpp @@ -1,4 +1,4 @@ -#include +#include #include "window.h" diff --git a/source/modules/asura-core/Window/Window.h b/source/modules/asura-core/Window/Window.h index f5498c1..0f2850b 100644 --- a/source/modules/asura-core/Window/Window.h +++ b/source/modules/asura-core/Window/Window.h @@ -1,9 +1,9 @@ #ifndef _ASURA_ENGINE_WINDOW_H_ #define _ASURA_ENGINE_WINDOW_H_ -#include -#include -#include +#include +#include +#include #include "../Graphics/Image.h" #include "../Graphics/RenderState.h" diff --git a/source/modules/asura-core/Window/WindowImplSDL.cpp b/source/modules/asura-core/Window/WindowImplSDL.cpp index 3cbad70..23b2aed 100644 --- a/source/modules/asura-core/Window/WindowImplSDL.cpp +++ b/source/modules/asura-core/Window/WindowImplSDL.cpp @@ -4,7 +4,7 @@ #include -#include +#include #include "WindowImplSDL.h" diff --git a/source/modules/asura-core/application.h b/source/modules/asura-core/application.h index 696d125..cccd6f7 100644 --- a/source/modules/asura-core/application.h +++ b/source/modules/asura-core/application.h @@ -1,9 +1,9 @@ #ifndef _ASURA_ENGINE_APPLICATION_H_ #define _ASURA_ENGINE_APPLICATION_H_ -#include -#include -#include +#include +#include +#include #include #include "CoreConfig.h" diff --git a/source/modules/asura-core/font/string.hpp b/source/modules/asura-core/font/string.hpp index 13a8b2d..845a1d5 100644 --- a/source/modules/asura-core/font/string.hpp +++ b/source/modules/asura-core/font/string.hpp @@ -1,7 +1,7 @@ //#ifndef _ASURA_ENGINE_STRING_H_ //#define _ASURA_ENGINE_STRING_H_ // -//#include +//#include // //#include //#include diff --git a/source/modules/asura-core/graphics/canvas.h b/source/modules/asura-core/graphics/canvas.h index 0ec55bc..de02b9d 100644 --- a/source/modules/asura-core/graphics/canvas.h +++ b/source/modules/asura-core/graphics/canvas.h @@ -1,10 +1,10 @@ #ifndef _ASURA_ENGINE_CANVAS_H_ #define _ASURA_ENGINE_CANVAS_H_ -#include -#include -#include -#include +#include +#include +#include +#include #include "GfxDevice.h" #include "Texture.h" diff --git a/source/modules/asura-core/graphics/color.h b/source/modules/asura-core/graphics/color.h index a16f17d..c81b601 100644 --- a/source/modules/asura-core/graphics/color.h +++ b/source/modules/asura-core/graphics/color.h @@ -1,8 +1,8 @@ #ifndef _ASURA_ENGINE_COLOR_H_ #define _ASURA_ENGINE_COLOR_H_ -#include -#include +#include +#include #include "../CoreConfig.h" diff --git a/source/modules/asura-core/graphics/color32.h b/source/modules/asura-core/graphics/color32.h index aa445fe..4dbfe2d 100644 --- a/source/modules/asura-core/graphics/color32.h +++ b/source/modules/asura-core/graphics/color32.h @@ -1,8 +1,8 @@ #ifndef _ASURA_ENGINE_COLOR32_H__ #define _ASURA_ENGINE_COLOR32_H__ -#include -#include +#include +#include #include "../CoreConfig.h" diff --git a/source/modules/asura-core/graphics/image.cpp b/source/modules/asura-core/graphics/image.cpp index d2b2ec9..36d2478 100644 --- a/source/modules/asura-core/graphics/image.cpp +++ b/source/modules/asura-core/graphics/image.cpp @@ -1,4 +1,4 @@ -#include +#include #include "../CoreConfig.h" @@ -6,7 +6,7 @@ #include "Image.h" #include "GfxDevice.h" -using namespace AEIO; +using namespace AEFileSystem; using namespace AEImage; namespace_begin(AsuraEngine) diff --git a/source/modules/asura-core/graphics/image.h b/source/modules/asura-core/graphics/image.h index 5cbfe23..a76d06f 100644 --- a/source/modules/asura-core/graphics/image.h +++ b/source/modules/asura-core/graphics/image.h @@ -2,12 +2,12 @@ #define _ASURA_ENGINE_IMAGE_H_ // asura modules -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include // module #include "../Image/ImageData.h" diff --git a/source/modules/asura-core/graphics/mesh2d.h b/source/modules/asura-core/graphics/mesh2d.h index 1546765..7a0f62e 100644 --- a/source/modules/asura-core/graphics/mesh2d.h +++ b/source/modules/asura-core/graphics/mesh2d.h @@ -5,8 +5,8 @@ #include // asura modules -#include -#include +#include +#include // module #include "../Mesh/Mesh2dData.h" diff --git a/source/modules/asura-core/graphics/shader.cpp b/source/modules/asura-core/graphics/shader.cpp index 30e0161..329b3f1 100644 --- a/source/modules/asura-core/graphics/shader.cpp +++ b/source/modules/asura-core/graphics/shader.cpp @@ -1,4 +1,4 @@ -#include +#include #include "GfxDevice.h" #include "Shader.h" diff --git a/source/modules/asura-core/graphics/shader.h b/source/modules/asura-core/graphics/shader.h index c96b99f..615b028 100644 --- a/source/modules/asura-core/graphics/shader.h +++ b/source/modules/asura-core/graphics/shader.h @@ -4,15 +4,15 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "GfxDevice.h" #include "Color.h" @@ -30,7 +30,7 @@ namespace_begin(Graphics) /// class Shader ASURA_FINAL : public Scripting::Portable - , public AEIO::Renewable + , public AEFileSystem::Renewable { public: diff --git a/source/modules/asura-core/graphics/texture.cpp b/source/modules/asura-core/graphics/texture.cpp index bae0f7c..03f005d 100644 --- a/source/modules/asura-core/graphics/texture.cpp +++ b/source/modules/asura-core/graphics/texture.cpp @@ -1,4 +1,4 @@ -#include +#include #include "Texture.h" diff --git a/source/modules/asura-core/graphics/texture.h b/source/modules/asura-core/graphics/texture.h index 7d37c31..76b9a8f 100644 --- a/source/modules/asura-core/graphics/texture.h +++ b/source/modules/asura-core/graphics/texture.h @@ -1,8 +1,8 @@ #ifndef _ASURA_TEXTURE_H_ #define _ASURA_TEXTURE_H_ -#include -#include +#include +#include #include "../CoreConfig.h" diff --git a/source/modules/asura-core/image/binding/_image_data.cpp b/source/modules/asura-core/image/binding/_image_data.cpp index 77f3a96..375f854 100644 --- a/source/modules/asura-core/image/binding/_image_data.cpp +++ b/source/modules/asura-core/image/binding/_image_data.cpp @@ -1,11 +1,11 @@ -#include -#include +#include +#include #include "../ImageData.h" using namespace std; using namespace AEThreading; -using namespace AEIO; +using namespace AEFileSystem; namespace_begin(AsuraEngine) namespace_begin(Image) diff --git a/source/modules/asura-core/input/button.h b/source/modules/asura-core/input/button.h index 5c3c0de..528063d 100644 --- a/source/modules/asura-core/input/button.h +++ b/source/modules/asura-core/input/button.h @@ -1,7 +1,7 @@ #ifndef __BUTTON_H__ #define __BUTTON_H__ -#include +#include namespace_begin(AsuraEngine) namespace_begin(Input) diff --git a/source/modules/asura-core/type.h b/source/modules/asura-core/type.h deleted file mode 100644 index 39880e2..0000000 --- a/source/modules/asura-core/type.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef _ASURA_ENGINE_TYPE_H_ -#define _ASURA_ENGINE_TYPE_H_ - -#include - -namespace AsuraEngine -{ - -} - -#endif \ No newline at end of file diff --git a/source/modules/asura-core/window/window.cpp b/source/modules/asura-core/window/window.cpp index adba7c9..d75b9a7 100644 --- a/source/modules/asura-core/window/window.cpp +++ b/source/modules/asura-core/window/window.cpp @@ -1,4 +1,4 @@ -#include +#include #include "window.h" diff --git a/source/modules/asura-core/window/window.h b/source/modules/asura-core/window/window.h index f5498c1..0f2850b 100644 --- a/source/modules/asura-core/window/window.h +++ b/source/modules/asura-core/window/window.h @@ -1,9 +1,9 @@ #ifndef _ASURA_ENGINE_WINDOW_H_ #define _ASURA_ENGINE_WINDOW_H_ -#include -#include -#include +#include +#include +#include #include "../Graphics/Image.h" #include "../Graphics/RenderState.h" -- cgit v1.1-26-g67d0