From c27041877438b58d7b9e64401ca749791b7cfc51 Mon Sep 17 00:00:00 2001 From: Nomango <569629550@qq.com> Date: Wed, 13 Mar 2019 15:48:25 +0800 Subject: [PATCH] add String::copy refactoring --- project/Box2DSample/Box2DSample.vcxproj | 8 +- project/Easy2D/Easy2D.vcxproj | 250 +++++++++--------- project/Easy2D/Easy2D.vcxproj.filters | 250 +++++++++--------- project/HelloWorld/HelloWorld.vcxproj | 8 +- project/ImGuiSample/ImGuiSample.vcxproj | 22 +- .../ImGuiSample/ImGuiSample.vcxproj.filters | 14 +- project/ImGuiSample/main.cpp | 2 +- project/Samples/Samples.vcxproj | 9 +- .../easy2d-imgui/ImGuiLayer.cpp | 0 .../easy2d-imgui/ImGuiLayer.h | 0 .../easy2d-imgui/ImGuiView.cpp | 0 .../easy2d-imgui/ImGuiView.h | 0 .../easy2d-imgui/easy2d-imgui.h | 0 .../easy2d-imgui/imgui_impl_dx11.cpp | 0 .../easy2d-imgui/imgui_impl_dx11.h | 0 src/{ => easy2d}/audio/Music.cpp | 0 src/{ => easy2d}/audio/Music.h | 0 src/{ => easy2d}/audio/Player.cpp | 0 src/{ => easy2d}/audio/Player.h | 0 src/{ => easy2d}/audio/Transcoder.cpp | 0 src/{ => easy2d}/audio/Transcoder.h | 0 src/{ => easy2d}/audio/Voice.cpp | 0 src/{ => easy2d}/audio/Voice.h | 0 src/{ => easy2d}/audio/audio-modules.cpp | 0 src/{ => easy2d}/audio/audio-modules.h | 0 src/{ => easy2d}/audio/audio.cpp | 0 src/{ => easy2d}/audio/audio.h | 0 src/{ => easy2d}/common/Array.h | 0 src/{ => easy2d}/common/ComPtr.hpp | 0 src/{ => easy2d}/common/IntrusiveList.hpp | 0 src/{ => easy2d}/common/IntrusivePtr.hpp | 0 src/{ => easy2d}/common/Singleton.hpp | 0 src/{ => easy2d}/common/String.cpp | 0 src/{ => easy2d}/common/String.h | 2 + src/{ => easy2d}/common/closure.hpp | 0 src/{ => easy2d}/common/noncopyable.hpp | 0 src/{ => easy2d}/config.h | 0 src/{ => easy2d}/core/Action.cpp | 0 src/{ => easy2d}/core/Action.h | 0 src/{ => easy2d}/core/ActionGroup.cpp | 0 src/{ => easy2d}/core/ActionGroup.h | 0 src/{ => easy2d}/core/ActionHelper.h | 0 src/{ => easy2d}/core/ActionManager.cpp | 0 src/{ => easy2d}/core/ActionManager.h | 0 src/{ => easy2d}/core/ActionTween.cpp | 0 src/{ => easy2d}/core/ActionTween.h | 0 src/{ => easy2d}/core/Animation.cpp | 0 src/{ => easy2d}/core/Animation.h | 0 src/{ => easy2d}/core/Application.cpp | 0 src/{ => easy2d}/core/Application.h | 0 src/{ => easy2d}/core/Canvas.cpp | 0 src/{ => easy2d}/core/Canvas.h | 0 src/{ => easy2d}/core/Color.cpp | 0 src/{ => easy2d}/core/Color.h | 0 src/{ => easy2d}/core/Component.h | 0 src/{ => easy2d}/core/DebugNode.cpp | 0 src/{ => easy2d}/core/DebugNode.h | 0 src/{ => easy2d}/core/Event.hpp | 0 src/{ => easy2d}/core/EventDispatcher.cpp | 0 src/{ => easy2d}/core/EventDispatcher.h | 0 src/{ => easy2d}/core/EventListener.cpp | 0 src/{ => easy2d}/core/EventListener.h | 0 src/{ => easy2d}/core/Font.hpp | 0 src/{ => easy2d}/core/Frames.cpp | 0 src/{ => easy2d}/core/Frames.h | 0 src/{ => easy2d}/core/Geometry.cpp | 0 src/{ => easy2d}/core/Geometry.h | 0 src/{ => easy2d}/core/GeometryNode.cpp | 0 src/{ => easy2d}/core/GeometryNode.h | 0 src/{ => easy2d}/core/Image.cpp | 0 src/{ => easy2d}/core/Image.h | 0 src/{ => easy2d}/core/Input.cpp | 0 src/{ => easy2d}/core/Input.h | 0 src/{ => easy2d}/core/Layer.cpp | 0 src/{ => easy2d}/core/Layer.h | 0 src/{ => easy2d}/core/Node.cpp | 0 src/{ => easy2d}/core/Node.h | 0 src/{ => easy2d}/core/Object.cpp | 0 src/{ => easy2d}/core/Object.h | 0 src/{ => easy2d}/core/RefCounter.hpp | 0 src/{ => easy2d}/core/Resource.cpp | 0 src/{ => easy2d}/core/Resource.h | 0 src/{ => easy2d}/core/Scene.cpp | 0 src/{ => easy2d}/core/Scene.h | 0 src/{ => easy2d}/core/Sprite.cpp | 0 src/{ => easy2d}/core/Sprite.h | 0 src/{ => easy2d}/core/Task.cpp | 0 src/{ => easy2d}/core/Task.h | 0 src/{ => easy2d}/core/TaskManager.cpp | 0 src/{ => easy2d}/core/TaskManager.h | 0 src/{ => easy2d}/core/Text.cpp | 0 src/{ => easy2d}/core/Text.h | 0 src/{ => easy2d}/core/TextStyle.hpp | 0 src/{ => easy2d}/core/Transform.hpp | 0 src/{ => easy2d}/core/Transition.cpp | 0 src/{ => easy2d}/core/Transition.h | 0 src/{ => easy2d}/core/helper.h | 0 src/{ => easy2d}/core/include-forwards.h | 0 src/{ => easy2d}/core/keys.hpp | 0 src/{ => easy2d}/core/logs.cpp | 0 src/{ => easy2d}/core/logs.h | 0 src/{ => easy2d}/core/modules.cpp | 0 src/{ => easy2d}/core/modules.h | 0 src/{ => easy2d}/core/render.cpp | 0 src/{ => easy2d}/core/render.h | 0 src/{ => easy2d}/core/time.cpp | 0 src/{ => easy2d}/core/time.h | 0 src/{ => easy2d}/core/window.cpp | 0 src/{ => easy2d}/core/window.h | 0 src/{ => easy2d}/dx/D2DDeviceResources.cpp | 0 src/{ => easy2d}/dx/D2DDeviceResources.h | 0 src/{ => easy2d}/dx/D3D10DeviceResources.cpp | 0 src/{ => easy2d}/dx/D3D10DeviceResources.h | 0 src/{ => easy2d}/dx/D3D11DeviceResources.cpp | 0 src/{ => easy2d}/dx/D3D11DeviceResources.h | 0 src/{ => easy2d}/dx/DeviceResources.h | 0 src/{ => easy2d}/dx/TextRenderer.cpp | 0 src/{ => easy2d}/dx/TextRenderer.h | 0 src/{ => easy2d}/dx/helper.hpp | 0 src/{ => easy2d}/easy2d.h | 0 src/{ => easy2d}/macros.h | 0 src/{ => easy2d}/math/Matrix.hpp | 0 src/{ => easy2d}/math/Rect.hpp | 0 src/{ => easy2d}/math/constants.hpp | 0 src/{ => easy2d}/math/ease.hpp | 0 src/{ => easy2d}/math/rand.h | 0 src/{ => easy2d}/math/scalar.hpp | 0 src/{ => easy2d}/math/vector.hpp | 0 src/{ => easy2d}/ui/Button.cpp | 0 src/{ => easy2d}/ui/Button.h | 0 src/{ => easy2d}/ui/Menu.cpp | 0 src/{ => easy2d}/ui/Menu.h | 0 src/{ => easy2d}/utils/Data.cpp | 0 src/{ => easy2d}/utils/Data.h | 0 src/{ => easy2d}/utils/File.cpp | 0 src/{ => easy2d}/utils/File.h | 0 src/{ => easy2d}/utils/Path.cpp | 0 src/{ => easy2d}/utils/Path.h | 0 src/{ => easy2d}/utils/ResLoader.cpp | 0 src/{ => easy2d}/utils/ResLoader.h | 0 src/{ => easy2d}/utils/string.cpp | 0 src/{ => easy2d}/utils/string.h | 0 142 files changed, 284 insertions(+), 281 deletions(-) rename {project/ImGuiSample => src}/easy2d-imgui/ImGuiLayer.cpp (100%) rename {project/ImGuiSample => src}/easy2d-imgui/ImGuiLayer.h (100%) rename {project/ImGuiSample => src}/easy2d-imgui/ImGuiView.cpp (100%) rename {project/ImGuiSample => src}/easy2d-imgui/ImGuiView.h (100%) rename {project/ImGuiSample => src}/easy2d-imgui/easy2d-imgui.h (100%) rename {project/ImGuiSample => src}/easy2d-imgui/imgui_impl_dx11.cpp (100%) rename {project/ImGuiSample => src}/easy2d-imgui/imgui_impl_dx11.h (100%) rename src/{ => easy2d}/audio/Music.cpp (100%) rename src/{ => easy2d}/audio/Music.h (100%) rename src/{ => easy2d}/audio/Player.cpp (100%) rename src/{ => easy2d}/audio/Player.h (100%) rename src/{ => easy2d}/audio/Transcoder.cpp (100%) rename src/{ => easy2d}/audio/Transcoder.h (100%) rename src/{ => easy2d}/audio/Voice.cpp (100%) rename src/{ => easy2d}/audio/Voice.h (100%) rename src/{ => easy2d}/audio/audio-modules.cpp (100%) rename src/{ => easy2d}/audio/audio-modules.h (100%) rename src/{ => easy2d}/audio/audio.cpp (100%) rename src/{ => easy2d}/audio/audio.h (100%) rename src/{ => easy2d}/common/Array.h (100%) rename src/{ => easy2d}/common/ComPtr.hpp (100%) rename src/{ => easy2d}/common/IntrusiveList.hpp (100%) rename src/{ => easy2d}/common/IntrusivePtr.hpp (100%) rename src/{ => easy2d}/common/Singleton.hpp (100%) rename src/{ => easy2d}/common/String.cpp (100%) rename src/{ => easy2d}/common/String.h (98%) rename src/{ => easy2d}/common/closure.hpp (100%) rename src/{ => easy2d}/common/noncopyable.hpp (100%) rename src/{ => easy2d}/config.h (100%) rename src/{ => easy2d}/core/Action.cpp (100%) rename src/{ => easy2d}/core/Action.h (100%) rename src/{ => easy2d}/core/ActionGroup.cpp (100%) rename src/{ => easy2d}/core/ActionGroup.h (100%) rename src/{ => easy2d}/core/ActionHelper.h (100%) rename src/{ => easy2d}/core/ActionManager.cpp (100%) rename src/{ => easy2d}/core/ActionManager.h (100%) rename src/{ => easy2d}/core/ActionTween.cpp (100%) rename src/{ => easy2d}/core/ActionTween.h (100%) rename src/{ => easy2d}/core/Animation.cpp (100%) rename src/{ => easy2d}/core/Animation.h (100%) rename src/{ => easy2d}/core/Application.cpp (100%) rename src/{ => easy2d}/core/Application.h (100%) rename src/{ => easy2d}/core/Canvas.cpp (100%) rename src/{ => easy2d}/core/Canvas.h (100%) rename src/{ => easy2d}/core/Color.cpp (100%) rename src/{ => easy2d}/core/Color.h (100%) rename src/{ => easy2d}/core/Component.h (100%) rename src/{ => easy2d}/core/DebugNode.cpp (100%) rename src/{ => easy2d}/core/DebugNode.h (100%) rename src/{ => easy2d}/core/Event.hpp (100%) rename src/{ => easy2d}/core/EventDispatcher.cpp (100%) rename src/{ => easy2d}/core/EventDispatcher.h (100%) rename src/{ => easy2d}/core/EventListener.cpp (100%) rename src/{ => easy2d}/core/EventListener.h (100%) rename src/{ => easy2d}/core/Font.hpp (100%) rename src/{ => easy2d}/core/Frames.cpp (100%) rename src/{ => easy2d}/core/Frames.h (100%) rename src/{ => easy2d}/core/Geometry.cpp (100%) rename src/{ => easy2d}/core/Geometry.h (100%) rename src/{ => easy2d}/core/GeometryNode.cpp (100%) rename src/{ => easy2d}/core/GeometryNode.h (100%) rename src/{ => easy2d}/core/Image.cpp (100%) rename src/{ => easy2d}/core/Image.h (100%) rename src/{ => easy2d}/core/Input.cpp (100%) rename src/{ => easy2d}/core/Input.h (100%) rename src/{ => easy2d}/core/Layer.cpp (100%) rename src/{ => easy2d}/core/Layer.h (100%) rename src/{ => easy2d}/core/Node.cpp (100%) rename src/{ => easy2d}/core/Node.h (100%) rename src/{ => easy2d}/core/Object.cpp (100%) rename src/{ => easy2d}/core/Object.h (100%) rename src/{ => easy2d}/core/RefCounter.hpp (100%) rename src/{ => easy2d}/core/Resource.cpp (100%) rename src/{ => easy2d}/core/Resource.h (100%) rename src/{ => easy2d}/core/Scene.cpp (100%) rename src/{ => easy2d}/core/Scene.h (100%) rename src/{ => easy2d}/core/Sprite.cpp (100%) rename src/{ => easy2d}/core/Sprite.h (100%) rename src/{ => easy2d}/core/Task.cpp (100%) rename src/{ => easy2d}/core/Task.h (100%) rename src/{ => easy2d}/core/TaskManager.cpp (100%) rename src/{ => easy2d}/core/TaskManager.h (100%) rename src/{ => easy2d}/core/Text.cpp (100%) rename src/{ => easy2d}/core/Text.h (100%) rename src/{ => easy2d}/core/TextStyle.hpp (100%) rename src/{ => easy2d}/core/Transform.hpp (100%) rename src/{ => easy2d}/core/Transition.cpp (100%) rename src/{ => easy2d}/core/Transition.h (100%) rename src/{ => easy2d}/core/helper.h (100%) rename src/{ => easy2d}/core/include-forwards.h (100%) rename src/{ => easy2d}/core/keys.hpp (100%) rename src/{ => easy2d}/core/logs.cpp (100%) rename src/{ => easy2d}/core/logs.h (100%) rename src/{ => easy2d}/core/modules.cpp (100%) rename src/{ => easy2d}/core/modules.h (100%) rename src/{ => easy2d}/core/render.cpp (100%) rename src/{ => easy2d}/core/render.h (100%) rename src/{ => easy2d}/core/time.cpp (100%) rename src/{ => easy2d}/core/time.h (100%) rename src/{ => easy2d}/core/window.cpp (100%) rename src/{ => easy2d}/core/window.h (100%) rename src/{ => easy2d}/dx/D2DDeviceResources.cpp (100%) rename src/{ => easy2d}/dx/D2DDeviceResources.h (100%) rename src/{ => easy2d}/dx/D3D10DeviceResources.cpp (100%) rename src/{ => easy2d}/dx/D3D10DeviceResources.h (100%) rename src/{ => easy2d}/dx/D3D11DeviceResources.cpp (100%) rename src/{ => easy2d}/dx/D3D11DeviceResources.h (100%) rename src/{ => easy2d}/dx/DeviceResources.h (100%) rename src/{ => easy2d}/dx/TextRenderer.cpp (100%) rename src/{ => easy2d}/dx/TextRenderer.h (100%) rename src/{ => easy2d}/dx/helper.hpp (100%) rename src/{ => easy2d}/easy2d.h (100%) rename src/{ => easy2d}/macros.h (100%) rename src/{ => easy2d}/math/Matrix.hpp (100%) rename src/{ => easy2d}/math/Rect.hpp (100%) rename src/{ => easy2d}/math/constants.hpp (100%) rename src/{ => easy2d}/math/ease.hpp (100%) rename src/{ => easy2d}/math/rand.h (100%) rename src/{ => easy2d}/math/scalar.hpp (100%) rename src/{ => easy2d}/math/vector.hpp (100%) rename src/{ => easy2d}/ui/Button.cpp (100%) rename src/{ => easy2d}/ui/Button.h (100%) rename src/{ => easy2d}/ui/Menu.cpp (100%) rename src/{ => easy2d}/ui/Menu.h (100%) rename src/{ => easy2d}/utils/Data.cpp (100%) rename src/{ => easy2d}/utils/Data.h (100%) rename src/{ => easy2d}/utils/File.cpp (100%) rename src/{ => easy2d}/utils/File.h (100%) rename src/{ => easy2d}/utils/Path.cpp (100%) rename src/{ => easy2d}/utils/Path.h (100%) rename src/{ => easy2d}/utils/ResLoader.cpp (100%) rename src/{ => easy2d}/utils/ResLoader.h (100%) rename src/{ => easy2d}/utils/string.cpp (100%) rename src/{ => easy2d}/utils/string.h (100%) diff --git a/project/Box2DSample/Box2DSample.vcxproj b/project/Box2DSample/Box2DSample.vcxproj index a344242d..b2caafcd 100644 --- a/project/Box2DSample/Box2DSample.vcxproj +++ b/project/Box2DSample/Box2DSample.vcxproj @@ -80,7 +80,7 @@ Level3 Disabled true - ../../src;../../3rd-party/box2d + ../../src/easy2d;../../3rd-party/box2d true @@ -92,7 +92,7 @@ Level3 Disabled true - ../../src;../../3rd-party/box2d + ../../src/easy2d;../../3rd-party/box2d true @@ -106,7 +106,7 @@ true true true - ../../src;../../3rd-party/box2d + ../../src/easy2d;../../3rd-party/box2d true @@ -122,7 +122,7 @@ true true true - ../../src;../../3rd-party/box2d + ../../src/easy2d;../../3rd-party/box2d true diff --git a/project/Easy2D/Easy2D.vcxproj b/project/Easy2D/Easy2D.vcxproj index 6b7a0681..91b69c1a 100644 --- a/project/Easy2D/Easy2D.vcxproj +++ b/project/Easy2D/Easy2D.vcxproj @@ -1,133 +1,133 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/Easy2D/Easy2D.vcxproj.filters b/project/Easy2D/Easy2D.vcxproj.filters index 41cce6b1..8a075ec5 100644 --- a/project/Easy2D/Easy2D.vcxproj.filters +++ b/project/Easy2D/Easy2D.vcxproj.filters @@ -24,375 +24,375 @@ - - + + core - + core - + core - + core - + core - + core - + core - + core - + core - + core - + core - + core - + core - + core - + core - + core - + core - + math - + math - + math - + utils - + utils - + utils - + ui - + ui - + core - + core - + core - + core - + core - + core - + core - + core - + math - + core - + core - + math - + core - + core - + core - + core - + core - + core - + math - + utils - + core - + core - + core - + core - + core - + math - + dx - + dx - + dx - + dx - + dx - + dx - + audio - + audio - + audio - + audio - + audio - + core - + audio - + core - - - + + + common - + common - + common - + common - + common - + common - + common - + core - + common - + core - + core - + core - + core - + core - + core - + core - + core - + core - + core - + core - + core - + core - + core - + core - + core - + utils - + utils - + utils - + ui - + ui - + core - + core - + core - + core - + core - + core - + core - + core - + core - + core - + core - + utils - + core - + core - + core - + dx - + dx - + dx - + dx - + audio - + audio - + audio - + audio - + audio - + audio - + core - + common diff --git a/project/HelloWorld/HelloWorld.vcxproj b/project/HelloWorld/HelloWorld.vcxproj index 937b78f8..70887eda 100644 --- a/project/HelloWorld/HelloWorld.vcxproj +++ b/project/HelloWorld/HelloWorld.vcxproj @@ -82,7 +82,7 @@ true WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ../../src + ../../src/easy2d true @@ -96,7 +96,7 @@ true _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ../../src + ../../src/easy2d true @@ -112,7 +112,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ../../src + ../../src/easy2d true @@ -130,7 +130,7 @@ true NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ../../src + ../../src/easy2d true diff --git a/project/ImGuiSample/ImGuiSample.vcxproj b/project/ImGuiSample/ImGuiSample.vcxproj index 144cccaa..f7945346 100644 --- a/project/ImGuiSample/ImGuiSample.vcxproj +++ b/project/ImGuiSample/ImGuiSample.vcxproj @@ -80,7 +80,7 @@ Level3 Disabled true - ../../src;../../3rd-party/ImGui + ../../src/easy2d;../../src/easy2d-imgui;../../3rd-party/ImGui true @@ -92,7 +92,7 @@ Level3 Disabled true - ../../src;../../3rd-party/ImGui + ../../src/easy2d;../../src/easy2d-imgui;../../3rd-party/ImGui true @@ -106,7 +106,7 @@ true true true - ../../src;../../3rd-party/ImGui + ../../src/easy2d;../../src/easy2d-imgui;../../3rd-party/ImGui true @@ -122,7 +122,7 @@ true true true - ../../src;../../3rd-party/ImGui + ../../src/easy2d;../../src/easy2d-imgui;../../3rd-party/ImGui true @@ -136,9 +136,9 @@ - - - + + + @@ -148,10 +148,10 @@ - - - - + + + + diff --git a/project/ImGuiSample/ImGuiSample.vcxproj.filters b/project/ImGuiSample/ImGuiSample.vcxproj.filters index a89be911..e993db3d 100644 --- a/project/ImGuiSample/ImGuiSample.vcxproj.filters +++ b/project/ImGuiSample/ImGuiSample.vcxproj.filters @@ -14,13 +14,13 @@ imgui - + easy2d-imgui - + easy2d-imgui - + easy2d-imgui @@ -43,16 +43,16 @@ imgui - + easy2d-imgui - + easy2d-imgui - + easy2d-imgui - + easy2d-imgui diff --git a/project/ImGuiSample/main.cpp b/project/ImGuiSample/main.cpp index a3f81827..bd2b05e7 100644 --- a/project/ImGuiSample/main.cpp +++ b/project/ImGuiSample/main.cpp @@ -1,7 +1,7 @@ // Copyright (C) 2019 Nomango #include "easy2d.h" -#include "easy2d-imgui/easy2d-imgui.h" +#include "easy2d-imgui.h" using namespace easy2d; diff --git a/project/Samples/Samples.vcxproj b/project/Samples/Samples.vcxproj index 9479c9e6..0c28845e 100644 --- a/project/Samples/Samples.vcxproj +++ b/project/Samples/Samples.vcxproj @@ -39,6 +39,7 @@ Application true Unicode + v141 Application @@ -81,7 +82,7 @@ Level3 Disabled true - ../../src + ../../src/easy2d true @@ -93,7 +94,7 @@ Level3 Disabled true - ../../src + ../../src/easy2d true @@ -107,7 +108,7 @@ true true true - ../../src + ../../src/easy2d true @@ -123,7 +124,7 @@ true true true - ../../src + ../../src/easy2d true diff --git a/project/ImGuiSample/easy2d-imgui/ImGuiLayer.cpp b/src/easy2d-imgui/ImGuiLayer.cpp similarity index 100% rename from project/ImGuiSample/easy2d-imgui/ImGuiLayer.cpp rename to src/easy2d-imgui/ImGuiLayer.cpp diff --git a/project/ImGuiSample/easy2d-imgui/ImGuiLayer.h b/src/easy2d-imgui/ImGuiLayer.h similarity index 100% rename from project/ImGuiSample/easy2d-imgui/ImGuiLayer.h rename to src/easy2d-imgui/ImGuiLayer.h diff --git a/project/ImGuiSample/easy2d-imgui/ImGuiView.cpp b/src/easy2d-imgui/ImGuiView.cpp similarity index 100% rename from project/ImGuiSample/easy2d-imgui/ImGuiView.cpp rename to src/easy2d-imgui/ImGuiView.cpp diff --git a/project/ImGuiSample/easy2d-imgui/ImGuiView.h b/src/easy2d-imgui/ImGuiView.h similarity index 100% rename from project/ImGuiSample/easy2d-imgui/ImGuiView.h rename to src/easy2d-imgui/ImGuiView.h diff --git a/project/ImGuiSample/easy2d-imgui/easy2d-imgui.h b/src/easy2d-imgui/easy2d-imgui.h similarity index 100% rename from project/ImGuiSample/easy2d-imgui/easy2d-imgui.h rename to src/easy2d-imgui/easy2d-imgui.h diff --git a/project/ImGuiSample/easy2d-imgui/imgui_impl_dx11.cpp b/src/easy2d-imgui/imgui_impl_dx11.cpp similarity index 100% rename from project/ImGuiSample/easy2d-imgui/imgui_impl_dx11.cpp rename to src/easy2d-imgui/imgui_impl_dx11.cpp diff --git a/project/ImGuiSample/easy2d-imgui/imgui_impl_dx11.h b/src/easy2d-imgui/imgui_impl_dx11.h similarity index 100% rename from project/ImGuiSample/easy2d-imgui/imgui_impl_dx11.h rename to src/easy2d-imgui/imgui_impl_dx11.h diff --git a/src/audio/Music.cpp b/src/easy2d/audio/Music.cpp similarity index 100% rename from src/audio/Music.cpp rename to src/easy2d/audio/Music.cpp diff --git a/src/audio/Music.h b/src/easy2d/audio/Music.h similarity index 100% rename from src/audio/Music.h rename to src/easy2d/audio/Music.h diff --git a/src/audio/Player.cpp b/src/easy2d/audio/Player.cpp similarity index 100% rename from src/audio/Player.cpp rename to src/easy2d/audio/Player.cpp diff --git a/src/audio/Player.h b/src/easy2d/audio/Player.h similarity index 100% rename from src/audio/Player.h rename to src/easy2d/audio/Player.h diff --git a/src/audio/Transcoder.cpp b/src/easy2d/audio/Transcoder.cpp similarity index 100% rename from src/audio/Transcoder.cpp rename to src/easy2d/audio/Transcoder.cpp diff --git a/src/audio/Transcoder.h b/src/easy2d/audio/Transcoder.h similarity index 100% rename from src/audio/Transcoder.h rename to src/easy2d/audio/Transcoder.h diff --git a/src/audio/Voice.cpp b/src/easy2d/audio/Voice.cpp similarity index 100% rename from src/audio/Voice.cpp rename to src/easy2d/audio/Voice.cpp diff --git a/src/audio/Voice.h b/src/easy2d/audio/Voice.h similarity index 100% rename from src/audio/Voice.h rename to src/easy2d/audio/Voice.h diff --git a/src/audio/audio-modules.cpp b/src/easy2d/audio/audio-modules.cpp similarity index 100% rename from src/audio/audio-modules.cpp rename to src/easy2d/audio/audio-modules.cpp diff --git a/src/audio/audio-modules.h b/src/easy2d/audio/audio-modules.h similarity index 100% rename from src/audio/audio-modules.h rename to src/easy2d/audio/audio-modules.h diff --git a/src/audio/audio.cpp b/src/easy2d/audio/audio.cpp similarity index 100% rename from src/audio/audio.cpp rename to src/easy2d/audio/audio.cpp diff --git a/src/audio/audio.h b/src/easy2d/audio/audio.h similarity index 100% rename from src/audio/audio.h rename to src/easy2d/audio/audio.h diff --git a/src/common/Array.h b/src/easy2d/common/Array.h similarity index 100% rename from src/common/Array.h rename to src/easy2d/common/Array.h diff --git a/src/common/ComPtr.hpp b/src/easy2d/common/ComPtr.hpp similarity index 100% rename from src/common/ComPtr.hpp rename to src/easy2d/common/ComPtr.hpp diff --git a/src/common/IntrusiveList.hpp b/src/easy2d/common/IntrusiveList.hpp similarity index 100% rename from src/common/IntrusiveList.hpp rename to src/easy2d/common/IntrusiveList.hpp diff --git a/src/common/IntrusivePtr.hpp b/src/easy2d/common/IntrusivePtr.hpp similarity index 100% rename from src/common/IntrusivePtr.hpp rename to src/easy2d/common/IntrusivePtr.hpp diff --git a/src/common/Singleton.hpp b/src/easy2d/common/Singleton.hpp similarity index 100% rename from src/common/Singleton.hpp rename to src/easy2d/common/Singleton.hpp diff --git a/src/common/String.cpp b/src/easy2d/common/String.cpp similarity index 100% rename from src/common/String.cpp rename to src/easy2d/common/String.cpp diff --git a/src/common/String.h b/src/easy2d/common/String.h similarity index 98% rename from src/common/String.h rename to src/easy2d/common/String.h index 7c1699ee..d44735da 100644 --- a/src/common/String.h +++ b/src/easy2d/common/String.h @@ -130,6 +130,8 @@ namespace easy2d inline void push_back(const wchar_t ch) { append(1, ch); } inline wchar_t pop_back() { if (empty()) throw std::out_of_range("pop_back() called on empty string"); check_operability(); wchar_t ch = str_[--size_]; str_[size_] = value_type(); return ch; } + inline size_type copy(wchar_t* cstr, size_type count, size_type pos = 0) const { check_offset(pos); if (count == 0 || cstr == const_str_) return 0; count = clamp_suffix_size(pos, count); traits::move(cstr, cbegin() + pos, count); return count; } + std::string to_string() const; std::wstring to_wstring() const; diff --git a/src/common/closure.hpp b/src/easy2d/common/closure.hpp similarity index 100% rename from src/common/closure.hpp rename to src/easy2d/common/closure.hpp diff --git a/src/common/noncopyable.hpp b/src/easy2d/common/noncopyable.hpp similarity index 100% rename from src/common/noncopyable.hpp rename to src/easy2d/common/noncopyable.hpp diff --git a/src/config.h b/src/easy2d/config.h similarity index 100% rename from src/config.h rename to src/easy2d/config.h diff --git a/src/core/Action.cpp b/src/easy2d/core/Action.cpp similarity index 100% rename from src/core/Action.cpp rename to src/easy2d/core/Action.cpp diff --git a/src/core/Action.h b/src/easy2d/core/Action.h similarity index 100% rename from src/core/Action.h rename to src/easy2d/core/Action.h diff --git a/src/core/ActionGroup.cpp b/src/easy2d/core/ActionGroup.cpp similarity index 100% rename from src/core/ActionGroup.cpp rename to src/easy2d/core/ActionGroup.cpp diff --git a/src/core/ActionGroup.h b/src/easy2d/core/ActionGroup.h similarity index 100% rename from src/core/ActionGroup.h rename to src/easy2d/core/ActionGroup.h diff --git a/src/core/ActionHelper.h b/src/easy2d/core/ActionHelper.h similarity index 100% rename from src/core/ActionHelper.h rename to src/easy2d/core/ActionHelper.h diff --git a/src/core/ActionManager.cpp b/src/easy2d/core/ActionManager.cpp similarity index 100% rename from src/core/ActionManager.cpp rename to src/easy2d/core/ActionManager.cpp diff --git a/src/core/ActionManager.h b/src/easy2d/core/ActionManager.h similarity index 100% rename from src/core/ActionManager.h rename to src/easy2d/core/ActionManager.h diff --git a/src/core/ActionTween.cpp b/src/easy2d/core/ActionTween.cpp similarity index 100% rename from src/core/ActionTween.cpp rename to src/easy2d/core/ActionTween.cpp diff --git a/src/core/ActionTween.h b/src/easy2d/core/ActionTween.h similarity index 100% rename from src/core/ActionTween.h rename to src/easy2d/core/ActionTween.h diff --git a/src/core/Animation.cpp b/src/easy2d/core/Animation.cpp similarity index 100% rename from src/core/Animation.cpp rename to src/easy2d/core/Animation.cpp diff --git a/src/core/Animation.h b/src/easy2d/core/Animation.h similarity index 100% rename from src/core/Animation.h rename to src/easy2d/core/Animation.h diff --git a/src/core/Application.cpp b/src/easy2d/core/Application.cpp similarity index 100% rename from src/core/Application.cpp rename to src/easy2d/core/Application.cpp diff --git a/src/core/Application.h b/src/easy2d/core/Application.h similarity index 100% rename from src/core/Application.h rename to src/easy2d/core/Application.h diff --git a/src/core/Canvas.cpp b/src/easy2d/core/Canvas.cpp similarity index 100% rename from src/core/Canvas.cpp rename to src/easy2d/core/Canvas.cpp diff --git a/src/core/Canvas.h b/src/easy2d/core/Canvas.h similarity index 100% rename from src/core/Canvas.h rename to src/easy2d/core/Canvas.h diff --git a/src/core/Color.cpp b/src/easy2d/core/Color.cpp similarity index 100% rename from src/core/Color.cpp rename to src/easy2d/core/Color.cpp diff --git a/src/core/Color.h b/src/easy2d/core/Color.h similarity index 100% rename from src/core/Color.h rename to src/easy2d/core/Color.h diff --git a/src/core/Component.h b/src/easy2d/core/Component.h similarity index 100% rename from src/core/Component.h rename to src/easy2d/core/Component.h diff --git a/src/core/DebugNode.cpp b/src/easy2d/core/DebugNode.cpp similarity index 100% rename from src/core/DebugNode.cpp rename to src/easy2d/core/DebugNode.cpp diff --git a/src/core/DebugNode.h b/src/easy2d/core/DebugNode.h similarity index 100% rename from src/core/DebugNode.h rename to src/easy2d/core/DebugNode.h diff --git a/src/core/Event.hpp b/src/easy2d/core/Event.hpp similarity index 100% rename from src/core/Event.hpp rename to src/easy2d/core/Event.hpp diff --git a/src/core/EventDispatcher.cpp b/src/easy2d/core/EventDispatcher.cpp similarity index 100% rename from src/core/EventDispatcher.cpp rename to src/easy2d/core/EventDispatcher.cpp diff --git a/src/core/EventDispatcher.h b/src/easy2d/core/EventDispatcher.h similarity index 100% rename from src/core/EventDispatcher.h rename to src/easy2d/core/EventDispatcher.h diff --git a/src/core/EventListener.cpp b/src/easy2d/core/EventListener.cpp similarity index 100% rename from src/core/EventListener.cpp rename to src/easy2d/core/EventListener.cpp diff --git a/src/core/EventListener.h b/src/easy2d/core/EventListener.h similarity index 100% rename from src/core/EventListener.h rename to src/easy2d/core/EventListener.h diff --git a/src/core/Font.hpp b/src/easy2d/core/Font.hpp similarity index 100% rename from src/core/Font.hpp rename to src/easy2d/core/Font.hpp diff --git a/src/core/Frames.cpp b/src/easy2d/core/Frames.cpp similarity index 100% rename from src/core/Frames.cpp rename to src/easy2d/core/Frames.cpp diff --git a/src/core/Frames.h b/src/easy2d/core/Frames.h similarity index 100% rename from src/core/Frames.h rename to src/easy2d/core/Frames.h diff --git a/src/core/Geometry.cpp b/src/easy2d/core/Geometry.cpp similarity index 100% rename from src/core/Geometry.cpp rename to src/easy2d/core/Geometry.cpp diff --git a/src/core/Geometry.h b/src/easy2d/core/Geometry.h similarity index 100% rename from src/core/Geometry.h rename to src/easy2d/core/Geometry.h diff --git a/src/core/GeometryNode.cpp b/src/easy2d/core/GeometryNode.cpp similarity index 100% rename from src/core/GeometryNode.cpp rename to src/easy2d/core/GeometryNode.cpp diff --git a/src/core/GeometryNode.h b/src/easy2d/core/GeometryNode.h similarity index 100% rename from src/core/GeometryNode.h rename to src/easy2d/core/GeometryNode.h diff --git a/src/core/Image.cpp b/src/easy2d/core/Image.cpp similarity index 100% rename from src/core/Image.cpp rename to src/easy2d/core/Image.cpp diff --git a/src/core/Image.h b/src/easy2d/core/Image.h similarity index 100% rename from src/core/Image.h rename to src/easy2d/core/Image.h diff --git a/src/core/Input.cpp b/src/easy2d/core/Input.cpp similarity index 100% rename from src/core/Input.cpp rename to src/easy2d/core/Input.cpp diff --git a/src/core/Input.h b/src/easy2d/core/Input.h similarity index 100% rename from src/core/Input.h rename to src/easy2d/core/Input.h diff --git a/src/core/Layer.cpp b/src/easy2d/core/Layer.cpp similarity index 100% rename from src/core/Layer.cpp rename to src/easy2d/core/Layer.cpp diff --git a/src/core/Layer.h b/src/easy2d/core/Layer.h similarity index 100% rename from src/core/Layer.h rename to src/easy2d/core/Layer.h diff --git a/src/core/Node.cpp b/src/easy2d/core/Node.cpp similarity index 100% rename from src/core/Node.cpp rename to src/easy2d/core/Node.cpp diff --git a/src/core/Node.h b/src/easy2d/core/Node.h similarity index 100% rename from src/core/Node.h rename to src/easy2d/core/Node.h diff --git a/src/core/Object.cpp b/src/easy2d/core/Object.cpp similarity index 100% rename from src/core/Object.cpp rename to src/easy2d/core/Object.cpp diff --git a/src/core/Object.h b/src/easy2d/core/Object.h similarity index 100% rename from src/core/Object.h rename to src/easy2d/core/Object.h diff --git a/src/core/RefCounter.hpp b/src/easy2d/core/RefCounter.hpp similarity index 100% rename from src/core/RefCounter.hpp rename to src/easy2d/core/RefCounter.hpp diff --git a/src/core/Resource.cpp b/src/easy2d/core/Resource.cpp similarity index 100% rename from src/core/Resource.cpp rename to src/easy2d/core/Resource.cpp diff --git a/src/core/Resource.h b/src/easy2d/core/Resource.h similarity index 100% rename from src/core/Resource.h rename to src/easy2d/core/Resource.h diff --git a/src/core/Scene.cpp b/src/easy2d/core/Scene.cpp similarity index 100% rename from src/core/Scene.cpp rename to src/easy2d/core/Scene.cpp diff --git a/src/core/Scene.h b/src/easy2d/core/Scene.h similarity index 100% rename from src/core/Scene.h rename to src/easy2d/core/Scene.h diff --git a/src/core/Sprite.cpp b/src/easy2d/core/Sprite.cpp similarity index 100% rename from src/core/Sprite.cpp rename to src/easy2d/core/Sprite.cpp diff --git a/src/core/Sprite.h b/src/easy2d/core/Sprite.h similarity index 100% rename from src/core/Sprite.h rename to src/easy2d/core/Sprite.h diff --git a/src/core/Task.cpp b/src/easy2d/core/Task.cpp similarity index 100% rename from src/core/Task.cpp rename to src/easy2d/core/Task.cpp diff --git a/src/core/Task.h b/src/easy2d/core/Task.h similarity index 100% rename from src/core/Task.h rename to src/easy2d/core/Task.h diff --git a/src/core/TaskManager.cpp b/src/easy2d/core/TaskManager.cpp similarity index 100% rename from src/core/TaskManager.cpp rename to src/easy2d/core/TaskManager.cpp diff --git a/src/core/TaskManager.h b/src/easy2d/core/TaskManager.h similarity index 100% rename from src/core/TaskManager.h rename to src/easy2d/core/TaskManager.h diff --git a/src/core/Text.cpp b/src/easy2d/core/Text.cpp similarity index 100% rename from src/core/Text.cpp rename to src/easy2d/core/Text.cpp diff --git a/src/core/Text.h b/src/easy2d/core/Text.h similarity index 100% rename from src/core/Text.h rename to src/easy2d/core/Text.h diff --git a/src/core/TextStyle.hpp b/src/easy2d/core/TextStyle.hpp similarity index 100% rename from src/core/TextStyle.hpp rename to src/easy2d/core/TextStyle.hpp diff --git a/src/core/Transform.hpp b/src/easy2d/core/Transform.hpp similarity index 100% rename from src/core/Transform.hpp rename to src/easy2d/core/Transform.hpp diff --git a/src/core/Transition.cpp b/src/easy2d/core/Transition.cpp similarity index 100% rename from src/core/Transition.cpp rename to src/easy2d/core/Transition.cpp diff --git a/src/core/Transition.h b/src/easy2d/core/Transition.h similarity index 100% rename from src/core/Transition.h rename to src/easy2d/core/Transition.h diff --git a/src/core/helper.h b/src/easy2d/core/helper.h similarity index 100% rename from src/core/helper.h rename to src/easy2d/core/helper.h diff --git a/src/core/include-forwards.h b/src/easy2d/core/include-forwards.h similarity index 100% rename from src/core/include-forwards.h rename to src/easy2d/core/include-forwards.h diff --git a/src/core/keys.hpp b/src/easy2d/core/keys.hpp similarity index 100% rename from src/core/keys.hpp rename to src/easy2d/core/keys.hpp diff --git a/src/core/logs.cpp b/src/easy2d/core/logs.cpp similarity index 100% rename from src/core/logs.cpp rename to src/easy2d/core/logs.cpp diff --git a/src/core/logs.h b/src/easy2d/core/logs.h similarity index 100% rename from src/core/logs.h rename to src/easy2d/core/logs.h diff --git a/src/core/modules.cpp b/src/easy2d/core/modules.cpp similarity index 100% rename from src/core/modules.cpp rename to src/easy2d/core/modules.cpp diff --git a/src/core/modules.h b/src/easy2d/core/modules.h similarity index 100% rename from src/core/modules.h rename to src/easy2d/core/modules.h diff --git a/src/core/render.cpp b/src/easy2d/core/render.cpp similarity index 100% rename from src/core/render.cpp rename to src/easy2d/core/render.cpp diff --git a/src/core/render.h b/src/easy2d/core/render.h similarity index 100% rename from src/core/render.h rename to src/easy2d/core/render.h diff --git a/src/core/time.cpp b/src/easy2d/core/time.cpp similarity index 100% rename from src/core/time.cpp rename to src/easy2d/core/time.cpp diff --git a/src/core/time.h b/src/easy2d/core/time.h similarity index 100% rename from src/core/time.h rename to src/easy2d/core/time.h diff --git a/src/core/window.cpp b/src/easy2d/core/window.cpp similarity index 100% rename from src/core/window.cpp rename to src/easy2d/core/window.cpp diff --git a/src/core/window.h b/src/easy2d/core/window.h similarity index 100% rename from src/core/window.h rename to src/easy2d/core/window.h diff --git a/src/dx/D2DDeviceResources.cpp b/src/easy2d/dx/D2DDeviceResources.cpp similarity index 100% rename from src/dx/D2DDeviceResources.cpp rename to src/easy2d/dx/D2DDeviceResources.cpp diff --git a/src/dx/D2DDeviceResources.h b/src/easy2d/dx/D2DDeviceResources.h similarity index 100% rename from src/dx/D2DDeviceResources.h rename to src/easy2d/dx/D2DDeviceResources.h diff --git a/src/dx/D3D10DeviceResources.cpp b/src/easy2d/dx/D3D10DeviceResources.cpp similarity index 100% rename from src/dx/D3D10DeviceResources.cpp rename to src/easy2d/dx/D3D10DeviceResources.cpp diff --git a/src/dx/D3D10DeviceResources.h b/src/easy2d/dx/D3D10DeviceResources.h similarity index 100% rename from src/dx/D3D10DeviceResources.h rename to src/easy2d/dx/D3D10DeviceResources.h diff --git a/src/dx/D3D11DeviceResources.cpp b/src/easy2d/dx/D3D11DeviceResources.cpp similarity index 100% rename from src/dx/D3D11DeviceResources.cpp rename to src/easy2d/dx/D3D11DeviceResources.cpp diff --git a/src/dx/D3D11DeviceResources.h b/src/easy2d/dx/D3D11DeviceResources.h similarity index 100% rename from src/dx/D3D11DeviceResources.h rename to src/easy2d/dx/D3D11DeviceResources.h diff --git a/src/dx/DeviceResources.h b/src/easy2d/dx/DeviceResources.h similarity index 100% rename from src/dx/DeviceResources.h rename to src/easy2d/dx/DeviceResources.h diff --git a/src/dx/TextRenderer.cpp b/src/easy2d/dx/TextRenderer.cpp similarity index 100% rename from src/dx/TextRenderer.cpp rename to src/easy2d/dx/TextRenderer.cpp diff --git a/src/dx/TextRenderer.h b/src/easy2d/dx/TextRenderer.h similarity index 100% rename from src/dx/TextRenderer.h rename to src/easy2d/dx/TextRenderer.h diff --git a/src/dx/helper.hpp b/src/easy2d/dx/helper.hpp similarity index 100% rename from src/dx/helper.hpp rename to src/easy2d/dx/helper.hpp diff --git a/src/easy2d.h b/src/easy2d/easy2d.h similarity index 100% rename from src/easy2d.h rename to src/easy2d/easy2d.h diff --git a/src/macros.h b/src/easy2d/macros.h similarity index 100% rename from src/macros.h rename to src/easy2d/macros.h diff --git a/src/math/Matrix.hpp b/src/easy2d/math/Matrix.hpp similarity index 100% rename from src/math/Matrix.hpp rename to src/easy2d/math/Matrix.hpp diff --git a/src/math/Rect.hpp b/src/easy2d/math/Rect.hpp similarity index 100% rename from src/math/Rect.hpp rename to src/easy2d/math/Rect.hpp diff --git a/src/math/constants.hpp b/src/easy2d/math/constants.hpp similarity index 100% rename from src/math/constants.hpp rename to src/easy2d/math/constants.hpp diff --git a/src/math/ease.hpp b/src/easy2d/math/ease.hpp similarity index 100% rename from src/math/ease.hpp rename to src/easy2d/math/ease.hpp diff --git a/src/math/rand.h b/src/easy2d/math/rand.h similarity index 100% rename from src/math/rand.h rename to src/easy2d/math/rand.h diff --git a/src/math/scalar.hpp b/src/easy2d/math/scalar.hpp similarity index 100% rename from src/math/scalar.hpp rename to src/easy2d/math/scalar.hpp diff --git a/src/math/vector.hpp b/src/easy2d/math/vector.hpp similarity index 100% rename from src/math/vector.hpp rename to src/easy2d/math/vector.hpp diff --git a/src/ui/Button.cpp b/src/easy2d/ui/Button.cpp similarity index 100% rename from src/ui/Button.cpp rename to src/easy2d/ui/Button.cpp diff --git a/src/ui/Button.h b/src/easy2d/ui/Button.h similarity index 100% rename from src/ui/Button.h rename to src/easy2d/ui/Button.h diff --git a/src/ui/Menu.cpp b/src/easy2d/ui/Menu.cpp similarity index 100% rename from src/ui/Menu.cpp rename to src/easy2d/ui/Menu.cpp diff --git a/src/ui/Menu.h b/src/easy2d/ui/Menu.h similarity index 100% rename from src/ui/Menu.h rename to src/easy2d/ui/Menu.h diff --git a/src/utils/Data.cpp b/src/easy2d/utils/Data.cpp similarity index 100% rename from src/utils/Data.cpp rename to src/easy2d/utils/Data.cpp diff --git a/src/utils/Data.h b/src/easy2d/utils/Data.h similarity index 100% rename from src/utils/Data.h rename to src/easy2d/utils/Data.h diff --git a/src/utils/File.cpp b/src/easy2d/utils/File.cpp similarity index 100% rename from src/utils/File.cpp rename to src/easy2d/utils/File.cpp diff --git a/src/utils/File.h b/src/easy2d/utils/File.h similarity index 100% rename from src/utils/File.h rename to src/easy2d/utils/File.h diff --git a/src/utils/Path.cpp b/src/easy2d/utils/Path.cpp similarity index 100% rename from src/utils/Path.cpp rename to src/easy2d/utils/Path.cpp diff --git a/src/utils/Path.h b/src/easy2d/utils/Path.h similarity index 100% rename from src/utils/Path.h rename to src/easy2d/utils/Path.h diff --git a/src/utils/ResLoader.cpp b/src/easy2d/utils/ResLoader.cpp similarity index 100% rename from src/utils/ResLoader.cpp rename to src/easy2d/utils/ResLoader.cpp diff --git a/src/utils/ResLoader.h b/src/easy2d/utils/ResLoader.h similarity index 100% rename from src/utils/ResLoader.h rename to src/easy2d/utils/ResLoader.h diff --git a/src/utils/string.cpp b/src/easy2d/utils/string.cpp similarity index 100% rename from src/utils/string.cpp rename to src/easy2d/utils/string.cpp diff --git a/src/utils/string.h b/src/easy2d/utils/string.h similarity index 100% rename from src/utils/string.h rename to src/easy2d/utils/string.h