From 68f3ad0d2986a865d19b2dfcdfb8114b2f4b5285 Mon Sep 17 00:00:00 2001 From: Nomango <569629550@qq.com> Date: Fri, 5 Apr 2019 16:06:32 +0800 Subject: [PATCH] update ImGuiView minor fixes refactoring --- Easy2D-Audio/Easy2D-Audio.vcxproj | 186 ----------------- Easy2D-Audio/Easy2D-Audio.vcxproj.filters | 20 -- Easy2D-ImGui/Easy2D-ImGui.vcxproj | 190 ------------------ Easy2D-ImGui/Easy2D-ImGui.vcxproj.filters | 49 ----- Easy2D-Network/Easy2D-Network.vcxproj | 171 ---------------- Easy2D-Network/Easy2D-Network.vcxproj.filters | 13 -- Easy2D.sln | 34 +--- Easy2D/2d/Action.h | 2 +- Easy2D/2d/Scene.h | 2 +- Easy2D/Easy2D.vcxproj | 36 ++++ Easy2D/Easy2D.vcxproj.filters | 117 +++++++++++ {Easy2D-Audio => Easy2D/audio}/Music.cpp | 2 +- {Easy2D-Audio => Easy2D/audio}/Music.h | 0 {Easy2D-Audio => Easy2D/audio}/Player.cpp | 2 +- {Easy2D-Audio => Easy2D/audio}/Player.h | 0 {Easy2D-Audio => Easy2D/audio}/Transcoder.cpp | 2 +- {Easy2D-Audio => Easy2D/audio}/Transcoder.h | 0 {Easy2D-Audio => Easy2D/audio}/Voice.cpp | 2 +- {Easy2D-Audio => Easy2D/audio}/Voice.h | 0 .../audio}/audio-modules.cpp | 2 +- .../audio}/audio-modules.h | 0 {Easy2D-Audio => Easy2D/audio}/audio.cpp | 2 +- {Easy2D-Audio => Easy2D/audio}/audio.h | 0 Easy2D/common/String.h | 27 ++- {Easy2D-Audio => Easy2D}/easy2d-audio.h | 6 +- {Easy2D-ImGui => Easy2D}/easy2d-imgui.h | 7 +- {Easy2D-Network => Easy2D}/easy2d-network.h | 11 +- {Easy2D-ImGui => Easy2D/imgui}/ImGuiLayer.cpp | 3 +- {Easy2D-ImGui => Easy2D/imgui}/ImGuiLayer.h | 9 +- {Easy2D-ImGui => Easy2D/imgui}/ImGuiView.cpp | 34 +++- {Easy2D-ImGui => Easy2D/imgui}/ImGuiView.h | 23 ++- .../imgui}/imgui_impl_dx11.cpp | 2 +- .../imgui}/imgui_impl_dx11.h | 0 .../network}/HttpClient.cpp | 6 +- .../network}/HttpClient.h | 2 +- .../network}/HttpRequest.h | 2 +- .../network}/HttpResponse.h | 2 +- {Easy2D-Network => Easy2D/network}/helper.h | 0 Easy2D/platform/Application.cpp | 8 +- .../third-party}/ImGui/LICENSE.txt | 0 .../third-party}/ImGui/imconfig.h | 0 .../third-party}/ImGui/imgui.cpp | 0 .../libs => Easy2D/third-party}/ImGui/imgui.h | 0 .../third-party}/ImGui/imgui_demo.cpp | 0 .../third-party}/ImGui/imgui_draw.cpp | 0 .../third-party}/ImGui/imgui_internal.h | 0 .../third-party}/ImGui/imgui_widgets.cpp | 0 .../third-party}/ImGui/imstb_rectpack.h | 0 .../third-party}/ImGui/imstb_textedit.h | 0 .../third-party}/ImGui/imstb_truetype.h | 0 .../third-party}/curl/curl.h | 0 .../third-party}/curl/curlbuild.h | 0 .../third-party}/curl/curlrules.h | 0 .../third-party}/curl/curlver.h | 0 .../third-party}/curl/easy.h | 0 .../third-party}/curl/mprintf.h | 0 .../third-party}/curl/multi.h | 0 .../third-party}/curl/stdcheaders.h | 0 .../third-party}/curl/typecheck-gcc.h | 0 .../third-party}/dlls/libcrypto-1_1.dll | Bin .../third-party}/dlls/libcurl.dll | Bin .../third-party}/dlls/libssl-1_1.dll | Bin .../third-party}/libs/libcurl.lib | Bin samples/HelloWorld/HelloWorld.vcxproj | 8 +- samples/ImGuiSample/ImGuiSample.vcxproj | 11 +- samples/ImGuiSample/MainScene.h | 2 +- samples/Samples/Samples.vcxproj | 22 +- 67 files changed, 293 insertions(+), 724 deletions(-) delete mode 100644 Easy2D-Audio/Easy2D-Audio.vcxproj delete mode 100644 Easy2D-Audio/Easy2D-Audio.vcxproj.filters delete mode 100644 Easy2D-ImGui/Easy2D-ImGui.vcxproj delete mode 100644 Easy2D-ImGui/Easy2D-ImGui.vcxproj.filters delete mode 100644 Easy2D-Network/Easy2D-Network.vcxproj delete mode 100644 Easy2D-Network/Easy2D-Network.vcxproj.filters rename {Easy2D-Audio => Easy2D/audio}/Music.cpp (99%) rename {Easy2D-Audio => Easy2D/audio}/Music.h (100%) rename {Easy2D-Audio => Easy2D/audio}/Player.cpp (99%) rename {Easy2D-Audio => Easy2D/audio}/Player.h (100%) rename {Easy2D-Audio => Easy2D/audio}/Transcoder.cpp (99%) rename {Easy2D-Audio => Easy2D/audio}/Transcoder.h (100%) rename {Easy2D-Audio => Easy2D/audio}/Voice.cpp (99%) rename {Easy2D-Audio => Easy2D/audio}/Voice.h (100%) rename {Easy2D-Audio => Easy2D/audio}/audio-modules.cpp (99%) rename {Easy2D-Audio => Easy2D/audio}/audio-modules.h (100%) rename {Easy2D-Audio => Easy2D/audio}/audio.cpp (98%) rename {Easy2D-Audio => Easy2D/audio}/audio.h (100%) rename {Easy2D-Audio => Easy2D}/easy2d-audio.h (93%) rename {Easy2D-ImGui => Easy2D}/easy2d-imgui.h (92%) rename {Easy2D-Network => Easy2D}/easy2d-network.h (87%) rename {Easy2D-ImGui => Easy2D/imgui}/ImGuiLayer.cpp (98%) rename {Easy2D-ImGui => Easy2D/imgui}/ImGuiLayer.h (97%) rename {Easy2D-ImGui => Easy2D/imgui}/ImGuiView.cpp (79%) rename {Easy2D-ImGui => Easy2D/imgui}/ImGuiView.h (86%) rename {Easy2D-ImGui => Easy2D/imgui}/imgui_impl_dx11.cpp (99%) rename {Easy2D-ImGui => Easy2D/imgui}/imgui_impl_dx11.h (100%) rename {Easy2D-Network => Easy2D/network}/HttpClient.cpp (99%) rename {Easy2D-Network => Easy2D/network}/HttpClient.h (98%) rename {Easy2D-Network => Easy2D/network}/HttpRequest.h (99%) rename {Easy2D-Network => Easy2D/network}/HttpResponse.h (98%) rename {Easy2D-Network => Easy2D/network}/helper.h (100%) rename {Easy2D-ImGui/libs => Easy2D/third-party}/ImGui/LICENSE.txt (100%) rename {Easy2D-ImGui/libs => Easy2D/third-party}/ImGui/imconfig.h (100%) rename {Easy2D-ImGui/libs => Easy2D/third-party}/ImGui/imgui.cpp (100%) rename {Easy2D-ImGui/libs => Easy2D/third-party}/ImGui/imgui.h (100%) rename {Easy2D-ImGui/libs => Easy2D/third-party}/ImGui/imgui_demo.cpp (100%) rename {Easy2D-ImGui/libs => Easy2D/third-party}/ImGui/imgui_draw.cpp (100%) rename {Easy2D-ImGui/libs => Easy2D/third-party}/ImGui/imgui_internal.h (100%) rename {Easy2D-ImGui/libs => Easy2D/third-party}/ImGui/imgui_widgets.cpp (100%) rename {Easy2D-ImGui/libs => Easy2D/third-party}/ImGui/imstb_rectpack.h (100%) rename {Easy2D-ImGui/libs => Easy2D/third-party}/ImGui/imstb_textedit.h (100%) rename {Easy2D-ImGui/libs => Easy2D/third-party}/ImGui/imstb_truetype.h (100%) rename {Easy2D-Network => Easy2D/third-party}/curl/curl.h (100%) rename {Easy2D-Network => Easy2D/third-party}/curl/curlbuild.h (100%) rename {Easy2D-Network => Easy2D/third-party}/curl/curlrules.h (100%) rename {Easy2D-Network => Easy2D/third-party}/curl/curlver.h (100%) rename {Easy2D-Network => Easy2D/third-party}/curl/easy.h (100%) rename {Easy2D-Network => Easy2D/third-party}/curl/mprintf.h (100%) rename {Easy2D-Network => Easy2D/third-party}/curl/multi.h (100%) rename {Easy2D-Network => Easy2D/third-party}/curl/stdcheaders.h (100%) rename {Easy2D-Network => Easy2D/third-party}/curl/typecheck-gcc.h (100%) rename {Easy2D-Network => Easy2D/third-party}/dlls/libcrypto-1_1.dll (100%) rename {Easy2D-Network => Easy2D/third-party}/dlls/libcurl.dll (100%) rename {Easy2D-Network => Easy2D/third-party}/dlls/libssl-1_1.dll (100%) rename {Easy2D-Network => Easy2D/third-party}/libs/libcurl.lib (100%) diff --git a/Easy2D-Audio/Easy2D-Audio.vcxproj b/Easy2D-Audio/Easy2D-Audio.vcxproj deleted file mode 100644 index 1d177a8f..00000000 --- a/Easy2D-Audio/Easy2D-Audio.vcxproj +++ /dev/null @@ -1,186 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {5D45F66B-BECD-4909-BCFC-C0F3CED9D0A2} - Easy2D-Audio - - - - StaticLibrary - true - Unicode - v100 - v110 - v120 - v140 - v141 - v142 - - - StaticLibrary - false - true - Unicode - v100 - v110 - v120 - v140 - v141 - v142 - - - StaticLibrary - true - Unicode - v100 - v110 - v120 - v140 - v141 - v142 - - - StaticLibrary - false - true - Unicode - v100 - v110 - v120 - v140 - v141 - v142 - - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - - - - Level3 - Disabled - true - ../Easy2D - - - Windows - true - - - - - - - Level3 - Disabled - true - ../Easy2D - - - Windows - true - - - - - - - Level3 - MaxSpeed - true - true - true - ../Easy2D - - - Windows - true - true - true - - - - - - - Level3 - MaxSpeed - true - true - true - ../Easy2D - - - Windows - true - true - true - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Easy2D-Audio/Easy2D-Audio.vcxproj.filters b/Easy2D-Audio/Easy2D-Audio.vcxproj.filters deleted file mode 100644 index 883e2fa0..00000000 --- a/Easy2D-Audio/Easy2D-Audio.vcxproj.filters +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Easy2D-ImGui/Easy2D-ImGui.vcxproj b/Easy2D-ImGui/Easy2D-ImGui.vcxproj deleted file mode 100644 index e6dcc300..00000000 --- a/Easy2D-ImGui/Easy2D-ImGui.vcxproj +++ /dev/null @@ -1,190 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {23AFF03B-A670-4C33-B790-18EEC82C61AE} - Easy2D-ImGui - - - - StaticLibrary - true - Unicode - v100 - v110 - v120 - v140 - v141 - v142 - - - StaticLibrary - false - true - Unicode - v100 - v110 - v120 - v140 - v141 - v142 - - - StaticLibrary - true - Unicode - v100 - v110 - v120 - v140 - v141 - v142 - - - StaticLibrary - false - true - Unicode - v100 - v110 - v120 - v140 - v141 - v142 - - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - - - - Level3 - Disabled - true - ../Easy2D - - - Windows - true - - - - - - - Level3 - Disabled - true - ../Easy2D - - - Windows - true - - - - - - - Level3 - MaxSpeed - true - true - true - ../Easy2D - - - Windows - true - true - true - - - - - - - Level3 - MaxSpeed - true - true - true - ../Easy2D - - - Windows - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Easy2D-ImGui/Easy2D-ImGui.vcxproj.filters b/Easy2D-ImGui/Easy2D-ImGui.vcxproj.filters deleted file mode 100644 index 4df5b4b0..00000000 --- a/Easy2D-ImGui/Easy2D-ImGui.vcxproj.filters +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - imgui - - - imgui - - - imgui - - - imgui - - - imgui - - - imgui - - - - - - - - - imgui - - - imgui - - - imgui - - - imgui - - - - - {d0ea3700-326c-4dc2-a674-fcb657039e87} - - - \ No newline at end of file diff --git a/Easy2D-Network/Easy2D-Network.vcxproj b/Easy2D-Network/Easy2D-Network.vcxproj deleted file mode 100644 index b4e3b3bb..00000000 --- a/Easy2D-Network/Easy2D-Network.vcxproj +++ /dev/null @@ -1,171 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {05C5C84B-4EE3-4456-9AED-EECA583B793B} - Easy2DNetwork - - - - StaticLibrary - true - Unicode - v100 - v110 - v120 - v140 - v141 - v142 - - - Application - false - true - Unicode - v100 - v110 - v120 - v140 - v141 - v142 - - - Application - true - Unicode - v100 - v110 - v120 - v140 - v141 - v142 - - - Application - false - true - Unicode - v100 - v110 - v120 - v140 - v141 - v142 - - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - - Level3 - Disabled - true - ../Easy2D - - - true - Windows - - - - - Level3 - Disabled - true - ../Easy2D - - - true - Windows - - - - - Level3 - MaxSpeed - true - true - true - ../Easy2D - - - true - true - true - Windows - - - - - Level3 - MaxSpeed - true - true - true - ../Easy2D - - - true - true - true - Windows - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Easy2D-Network/Easy2D-Network.vcxproj.filters b/Easy2D-Network/Easy2D-Network.vcxproj.filters deleted file mode 100644 index f4f42863..00000000 --- a/Easy2D-Network/Easy2D-Network.vcxproj.filters +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Easy2D.sln b/Easy2D.sln index 9a6d1658..ecae1066 100644 --- a/Easy2D.sln +++ b/Easy2D.sln @@ -1,17 +1,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.271 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.28729.10 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloWorld", "samples\HelloWorld\HelloWorld.vcxproj", "{3561A359-F9FD-48AB-A977-34E7E568BC8E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Easy2D", "Easy2D\Easy2D.vcxproj", "{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Easy2D-ImGui", "Easy2D-ImGui\Easy2D-ImGui.vcxproj", "{23AFF03B-A670-4C33-B790-18EEC82C61AE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Easy2D-Audio", "Easy2D-Audio\Easy2D-Audio.vcxproj", "{5D45F66B-BECD-4909-BCFC-C0F3CED9D0A2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Easy2D-Network", "Easy2D-Network\Easy2D-Network.vcxproj", "{05C5C84B-4EE3-4456-9AED-EECA583B793B}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Samples", "samples\Samples\Samples.vcxproj", "{45F5738D-CDF2-4024-974D-25B64F9043DE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImGuiSample", "samples\ImGuiSample\ImGuiSample.vcxproj", "{6152D36C-EA40-4968-A696-244B6CA58395}" @@ -44,30 +38,6 @@ Global {FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Release|Win32.Build.0 = Release|Win32 {FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Release|x64.ActiveCfg = Release|x64 {FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Release|x64.Build.0 = Release|x64 - {23AFF03B-A670-4C33-B790-18EEC82C61AE}.Debug|Win32.ActiveCfg = Debug|Win32 - {23AFF03B-A670-4C33-B790-18EEC82C61AE}.Debug|Win32.Build.0 = Debug|Win32 - {23AFF03B-A670-4C33-B790-18EEC82C61AE}.Debug|x64.ActiveCfg = Debug|x64 - {23AFF03B-A670-4C33-B790-18EEC82C61AE}.Debug|x64.Build.0 = Debug|x64 - {23AFF03B-A670-4C33-B790-18EEC82C61AE}.Release|Win32.ActiveCfg = Release|Win32 - {23AFF03B-A670-4C33-B790-18EEC82C61AE}.Release|Win32.Build.0 = Release|Win32 - {23AFF03B-A670-4C33-B790-18EEC82C61AE}.Release|x64.ActiveCfg = Release|x64 - {23AFF03B-A670-4C33-B790-18EEC82C61AE}.Release|x64.Build.0 = Release|x64 - {5D45F66B-BECD-4909-BCFC-C0F3CED9D0A2}.Debug|Win32.ActiveCfg = Debug|Win32 - {5D45F66B-BECD-4909-BCFC-C0F3CED9D0A2}.Debug|Win32.Build.0 = Debug|Win32 - {5D45F66B-BECD-4909-BCFC-C0F3CED9D0A2}.Debug|x64.ActiveCfg = Debug|x64 - {5D45F66B-BECD-4909-BCFC-C0F3CED9D0A2}.Debug|x64.Build.0 = Debug|x64 - {5D45F66B-BECD-4909-BCFC-C0F3CED9D0A2}.Release|Win32.ActiveCfg = Release|Win32 - {5D45F66B-BECD-4909-BCFC-C0F3CED9D0A2}.Release|Win32.Build.0 = Release|Win32 - {5D45F66B-BECD-4909-BCFC-C0F3CED9D0A2}.Release|x64.ActiveCfg = Release|x64 - {5D45F66B-BECD-4909-BCFC-C0F3CED9D0A2}.Release|x64.Build.0 = Release|x64 - {05C5C84B-4EE3-4456-9AED-EECA583B793B}.Debug|Win32.ActiveCfg = Debug|Win32 - {05C5C84B-4EE3-4456-9AED-EECA583B793B}.Debug|Win32.Build.0 = Debug|Win32 - {05C5C84B-4EE3-4456-9AED-EECA583B793B}.Debug|x64.ActiveCfg = Debug|x64 - {05C5C84B-4EE3-4456-9AED-EECA583B793B}.Debug|x64.Build.0 = Debug|x64 - {05C5C84B-4EE3-4456-9AED-EECA583B793B}.Release|Win32.ActiveCfg = Release|Win32 - {05C5C84B-4EE3-4456-9AED-EECA583B793B}.Release|Win32.Build.0 = Release|Win32 - {05C5C84B-4EE3-4456-9AED-EECA583B793B}.Release|x64.ActiveCfg = Release|x64 - {05C5C84B-4EE3-4456-9AED-EECA583B793B}.Release|x64.Build.0 = Release|x64 {45F5738D-CDF2-4024-974D-25B64F9043DE}.Debug|Win32.ActiveCfg = Debug|Win32 {45F5738D-CDF2-4024-974D-25B64F9043DE}.Debug|Win32.Build.0 = Debug|Win32 {45F5738D-CDF2-4024-974D-25B64F9043DE}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/Easy2D/2d/Action.h b/Easy2D/2d/Action.h index a9e9684e..e479711a 100644 --- a/Easy2D/2d/Action.h +++ b/Easy2D/2d/Action.h @@ -27,7 +27,7 @@ namespace easy2d class ActionManager; - class Action + class E2D_API Action : public virtual Object , protected IntrusiveListItem { diff --git a/Easy2D/2d/Scene.h b/Easy2D/2d/Scene.h index 89b8510d..ea6bfeb7 100644 --- a/Easy2D/2d/Scene.h +++ b/Easy2D/2d/Scene.h @@ -25,7 +25,7 @@ namespace easy2d { // ³¡¾° class E2D_API Scene - : public VisualNode + : public Node { public: Scene(); diff --git a/Easy2D/Easy2D.vcxproj b/Easy2D/Easy2D.vcxproj index ee6c9a7d..3bf6cabd 100644 --- a/Easy2D/Easy2D.vcxproj +++ b/Easy2D/Easy2D.vcxproj @@ -4,6 +4,18 @@ + + + + + + + + + + + + @@ -61,6 +73,10 @@ + + + + @@ -70,6 +86,12 @@ + + + + + + @@ -96,6 +118,12 @@ + + + + + + @@ -107,6 +135,10 @@ + + + + @@ -114,6 +146,10 @@ + + + + diff --git a/Easy2D/Easy2D.vcxproj.filters b/Easy2D/Easy2D.vcxproj.filters index c3ba2907..7d1f81c2 100644 --- a/Easy2D/Easy2D.vcxproj.filters +++ b/Easy2D/Easy2D.vcxproj.filters @@ -25,6 +25,21 @@ {7897afce-24cb-42b4-9443-56508e4ec89c} + + {75bae23a-ca4e-4571-86b2-9ce77c385989} + + + {3ff6bc37-0aa4-4f22-8ba3-923d730c2591} + + + {622338f7-bf1e-4108-92d7-78625c447f74} + + + {91029e1e-40c2-40d9-bfc4-a51d9df02b80} + + + {2f24af2d-eba6-4be1-9ac4-fc58aeac6670} + @@ -246,6 +261,66 @@ base + + audio + + + audio + + + audio + + + audio + + + audio + + + audio + + + network + + + network + + + network + + + network + + + imgui + + + imgui + + + imgui + + + + + + third-party\ImGui + + + third-party\ImGui + + + third-party\ImGui + + + third-party\ImGui + + + third-party\ImGui + + + third-party\ImGui + @@ -374,5 +449,47 @@ base + + audio + + + audio + + + audio + + + audio + + + audio + + + audio + + + network + + + imgui + + + imgui + + + imgui + + + third-party\ImGui + + + third-party\ImGui + + + third-party\ImGui + + + third-party\ImGui + \ No newline at end of file diff --git a/Easy2D-Audio/Music.cpp b/Easy2D/audio/Music.cpp similarity index 99% rename from Easy2D-Audio/Music.cpp rename to Easy2D/audio/Music.cpp index 002a6a1f..3527467c 100644 --- a/Easy2D-Audio/Music.cpp +++ b/Easy2D/audio/Music.cpp @@ -18,7 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "easy2d-audio.h" +#include "../easy2d-audio.h" #include "Music.h" #include "Transcoder.h" diff --git a/Easy2D-Audio/Music.h b/Easy2D/audio/Music.h similarity index 100% rename from Easy2D-Audio/Music.h rename to Easy2D/audio/Music.h diff --git a/Easy2D-Audio/Player.cpp b/Easy2D/audio/Player.cpp similarity index 99% rename from Easy2D-Audio/Player.cpp rename to Easy2D/audio/Player.cpp index e49e2469..86fc47c1 100644 --- a/Easy2D-Audio/Player.cpp +++ b/Easy2D/audio/Player.cpp @@ -18,7 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "easy2d-audio.h" +#include "../easy2d-audio.h" #include "Player.h" namespace easy2d diff --git a/Easy2D-Audio/Player.h b/Easy2D/audio/Player.h similarity index 100% rename from Easy2D-Audio/Player.h rename to Easy2D/audio/Player.h diff --git a/Easy2D-Audio/Transcoder.cpp b/Easy2D/audio/Transcoder.cpp similarity index 99% rename from Easy2D-Audio/Transcoder.cpp rename to Easy2D/audio/Transcoder.cpp index 710af127..db0f74c9 100644 --- a/Easy2D-Audio/Transcoder.cpp +++ b/Easy2D/audio/Transcoder.cpp @@ -22,7 +22,7 @@ # define INITGUID // MFAudioFormat_PCM, MF_MT_MAJOR_TYPE, MF_MT_SUBTYPE, MFMediaType_Audio #endif -#include "easy2d-audio.h" +#include "../easy2d-audio.h" #include "Transcoder.h" #include "audio-modules.h" diff --git a/Easy2D-Audio/Transcoder.h b/Easy2D/audio/Transcoder.h similarity index 100% rename from Easy2D-Audio/Transcoder.h rename to Easy2D/audio/Transcoder.h diff --git a/Easy2D-Audio/Voice.cpp b/Easy2D/audio/Voice.cpp similarity index 99% rename from Easy2D-Audio/Voice.cpp rename to Easy2D/audio/Voice.cpp index 48dd3fe7..aa1cef6e 100644 --- a/Easy2D-Audio/Voice.cpp +++ b/Easy2D/audio/Voice.cpp @@ -18,7 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "easy2d-audio.h" +#include "../easy2d-audio.h" #include "Voice.h" namespace easy2d diff --git a/Easy2D-Audio/Voice.h b/Easy2D/audio/Voice.h similarity index 100% rename from Easy2D-Audio/Voice.h rename to Easy2D/audio/Voice.h diff --git a/Easy2D-Audio/audio-modules.cpp b/Easy2D/audio/audio-modules.cpp similarity index 99% rename from Easy2D-Audio/audio-modules.cpp rename to Easy2D/audio/audio-modules.cpp index 983f9aa5..f0a50fe3 100644 --- a/Easy2D-Audio/audio-modules.cpp +++ b/Easy2D/audio/audio-modules.cpp @@ -18,7 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "easy2d-audio.h" +#include "../easy2d-audio.h" #include "audio-modules.h" namespace easy2d diff --git a/Easy2D-Audio/audio-modules.h b/Easy2D/audio/audio-modules.h similarity index 100% rename from Easy2D-Audio/audio-modules.h rename to Easy2D/audio/audio-modules.h diff --git a/Easy2D-Audio/audio.cpp b/Easy2D/audio/audio.cpp similarity index 98% rename from Easy2D-Audio/audio.cpp rename to Easy2D/audio/audio.cpp index 233b1bd9..e1836c37 100644 --- a/Easy2D-Audio/audio.cpp +++ b/Easy2D/audio/audio.cpp @@ -18,7 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "easy2d-audio.h" +#include "../easy2d-audio.h" #include "audio.h" #include "audio-modules.h" diff --git a/Easy2D-Audio/audio.h b/Easy2D/audio/audio.h similarity index 100% rename from Easy2D-Audio/audio.h rename to Easy2D/audio/audio.h diff --git a/Easy2D/common/String.h b/Easy2D/common/String.h index ffd94e4c..61806d9d 100644 --- a/Easy2D/common/String.h +++ b/Easy2D/common/String.h @@ -164,7 +164,7 @@ namespace easy2d inline String& assign(const wchar_t* cstr, bool const_str = true) { String(cstr, const_str).swap(*this); return *this; } inline String& assign(std::wstring const& str) { String{ str }.swap(*this); return *this; } inline String& assign(String const& rhs) { String{ rhs }.swap(*this); return *this; } - inline String& assign(String const& rhs, size_type pos, size_type count = npos) { String(rhs, pos, count).swap(*this); return *this; } + String& assign(String const& rhs, size_type pos, size_type count = npos); template inline String& assign(_Iter first, _Iter last) { assign_iter(first, last); return(*this); } @@ -598,6 +598,31 @@ namespace easy2d return (*this); } + inline String& String::assign(String const& rhs, size_type pos, size_type count) + { + if (count == 0 || pos > rhs.size()) + { + clear(); + return (*this); + } + + discard_const_data(); + + count = rhs.clamp_suffix_size(pos, count); + + if (count > capacity_) + { + destroy(); + str_ = allocate(count + 1); + capacity_ = count; + } + size_ = count; + + char_traits::move(str_, rhs.begin().base() + pos, size_); + char_traits::assign(str_[size_], value_type()); + return (*this); + } + inline String & String::erase(size_type offset, size_type count) { if (count == 0) diff --git a/Easy2D-Audio/easy2d-audio.h b/Easy2D/easy2d-audio.h similarity index 93% rename from Easy2D-Audio/easy2d-audio.h rename to Easy2D/easy2d-audio.h index 07561f20..d42f3d6a 100644 --- a/Easy2D-Audio/easy2d-audio.h +++ b/Easy2D/easy2d-audio.h @@ -21,6 +21,6 @@ #pragma once #include "easy2d.h" -#include "audio.h" -#include "Music.h" -#include "Player.h" +#include "audio/audio.h" +#include "audio/Music.h" +#include "audio/Player.h" diff --git a/Easy2D-ImGui/easy2d-imgui.h b/Easy2D/easy2d-imgui.h similarity index 92% rename from Easy2D-ImGui/easy2d-imgui.h rename to Easy2D/easy2d-imgui.h index b01be242..bff8caf7 100644 --- a/Easy2D-ImGui/easy2d-imgui.h +++ b/Easy2D/easy2d-imgui.h @@ -20,8 +20,9 @@ #pragma once #include "easy2d.h" -#include "ImGuiView.h" -#include "ImGuiLayer.h" + +#include "imgui/ImGuiLayer.h" +#include "imgui/ImGuiView.h" // ImGui -#include "libs/ImGui/imgui.h" +#include "third-party/ImGui/imgui.h" diff --git a/Easy2D-Network/easy2d-network.h b/Easy2D/easy2d-network.h similarity index 87% rename from Easy2D-Network/easy2d-network.h rename to Easy2D/easy2d-network.h index a7452290..cbe8daa5 100644 --- a/Easy2D-Network/easy2d-network.h +++ b/Easy2D/easy2d-network.h @@ -21,7 +21,10 @@ #pragma once #include "easy2d.h" -#include "helper.h" -#include "HttpRequest.h" -#include "HttpResponse.h" -#include "HttpClient.h" +#include "network/helper.h" +#include "network/HttpRequest.h" +#include "network/HttpResponse.h" +#include "network/HttpClient.h" + +// CURL +#include "third-party/curl/curl.h" diff --git a/Easy2D-ImGui/ImGuiLayer.cpp b/Easy2D/imgui/ImGuiLayer.cpp similarity index 98% rename from Easy2D-ImGui/ImGuiLayer.cpp rename to Easy2D/imgui/ImGuiLayer.cpp index 7bab01bf..5a643fe9 100644 --- a/Easy2D-ImGui/ImGuiLayer.cpp +++ b/Easy2D/imgui/ImGuiLayer.cpp @@ -18,7 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "easy2d-imgui.h" +#include "../easy2d-imgui.h" namespace easy2d { @@ -39,6 +39,7 @@ namespace easy2d ImGuiLayer::~ImGuiLayer() { + ImGuiView::Instance().RemoveLayer(this); } void ImGuiLayer::OnMouseButtonDown(int btn, Point const & p) diff --git a/Easy2D-ImGui/ImGuiLayer.h b/Easy2D/imgui/ImGuiLayer.h similarity index 97% rename from Easy2D-ImGui/ImGuiLayer.h rename to Easy2D/imgui/ImGuiLayer.h index fb7039fa..e40529b8 100644 --- a/Easy2D-ImGui/ImGuiLayer.h +++ b/Easy2D/imgui/ImGuiLayer.h @@ -22,6 +22,8 @@ namespace easy2d { + class ImGuiView; + E2D_DECLARE_SMART_PTR(ImGuiLayer); using ImGuiPipeline = std::function; @@ -29,9 +31,9 @@ namespace easy2d class ImGuiLayer : public Layer { - public: - ImGuiLayer(); + friend class ImGuiView; + public: virtual ~ImGuiLayer(); // Ìí¼Ó ImGui ÔªËØ @@ -64,6 +66,9 @@ namespace easy2d void UpdateMousePos(); void UpdateMouseCursor(); + protected: + ImGuiLayer(); + protected: HWND target_window_; Map pipelines_; diff --git a/Easy2D-ImGui/ImGuiView.cpp b/Easy2D/imgui/ImGuiView.cpp similarity index 79% rename from Easy2D-ImGui/ImGuiView.cpp rename to Easy2D/imgui/ImGuiView.cpp index 000f110d..099ae899 100644 --- a/Easy2D-ImGui/ImGuiView.cpp +++ b/Easy2D/imgui/ImGuiView.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2019 Nomango -#include "easy2d-imgui.h" +#include "../easy2d-imgui.h" #include "imgui_impl_dx11.h" namespace easy2d @@ -80,4 +80,36 @@ namespace easy2d ImGui_ImplDX11_RenderDrawData(ImGui::GetDrawData()); } + ImGuiLayerPtr ImGuiView::CreateLayer(Scene* scene) + { + auto iter = layers_.find(scene); + if (iter == layers_.end()) + { + ImGuiLayerPtr layer = new (std::nothrow) ImGuiLayer; + if (layer) + { + layers_.insert(std::make_pair(scene, layer.Get())); + } + return layer; + } + else + { + return iter->second; + } + } + + void ImGuiView::RemoveLayer(ImGuiLayer* layer) + { + using value_type = Map::value_type; + + auto iter = std::find_if(layers_.begin(), layers_.end(), [=](value_type const& value) + { + return value.second == layer; + }); + if (iter != layers_.end()) + { + layers_.erase(iter); + } + } + } \ No newline at end of file diff --git a/Easy2D-ImGui/ImGuiView.h b/Easy2D/imgui/ImGuiView.h similarity index 86% rename from Easy2D-ImGui/ImGuiView.h rename to Easy2D/imgui/ImGuiView.h index 167dd932..267c762b 100644 --- a/Easy2D-ImGui/ImGuiView.h +++ b/Easy2D/imgui/ImGuiView.h @@ -22,23 +22,38 @@ namespace easy2d { + class ImGuiLayer; + class ImGuiView : public Singleton , public Component { E2D_DECLARE_SINGLETON(ImGuiView); - public: - void SetupComponent(Application* app) override; - - void DestroyComponent() override; + friend class ImGuiLayer; public: + // ´´½¨ ImGui ͼ²ã + ImGuiLayerPtr CreateLayer( + Scene* scene /* Ö¸¶¨³¡¾° */ + ); + + private: void Init(HWND hwnd); void NewFrame(); void Render(); + + void RemoveLayer(ImGuiLayer* layer); + + public: + void SetupComponent(Application* app) override; + + void DestroyComponent() override; + + private: + Map layers_; }; } diff --git a/Easy2D-ImGui/imgui_impl_dx11.cpp b/Easy2D/imgui/imgui_impl_dx11.cpp similarity index 99% rename from Easy2D-ImGui/imgui_impl_dx11.cpp rename to Easy2D/imgui/imgui_impl_dx11.cpp index d801c37a..aa75d433 100644 --- a/Easy2D-ImGui/imgui_impl_dx11.cpp +++ b/Easy2D/imgui/imgui_impl_dx11.cpp @@ -1,6 +1,6 @@ // dear imgui: Renderer for Easy2D (DirectX11) -#include "libs/ImGui/imgui.h" +#include "../easy2d-imgui.h" #include "imgui_impl_dx11.h" // DirectX diff --git a/Easy2D-ImGui/imgui_impl_dx11.h b/Easy2D/imgui/imgui_impl_dx11.h similarity index 100% rename from Easy2D-ImGui/imgui_impl_dx11.h rename to Easy2D/imgui/imgui_impl_dx11.h diff --git a/Easy2D-Network/HttpClient.cpp b/Easy2D/network/HttpClient.cpp similarity index 99% rename from Easy2D-Network/HttpClient.cpp rename to Easy2D/network/HttpClient.cpp index da1d5bfd..2302ffc7 100644 --- a/Easy2D-Network/HttpClient.cpp +++ b/Easy2D/network/HttpClient.cpp @@ -18,11 +18,13 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "easy2d-network.h" -#include "curl/curl.h" +#include "../easy2d-network.h" #include #include +// CURL +#include "../third-party/curl/curl.h" + #pragma comment(lib, "libcurl.lib") namespace diff --git a/Easy2D-Network/HttpClient.h b/Easy2D/network/HttpClient.h similarity index 98% rename from Easy2D-Network/HttpClient.h rename to Easy2D/network/HttpClient.h index 9855a133..1ec36b29 100644 --- a/Easy2D-Network/HttpClient.h +++ b/Easy2D/network/HttpClient.h @@ -26,7 +26,7 @@ namespace easy2d { namespace network { - class HttpClient + class E2D_API HttpClient : public Singleton , public Component { diff --git a/Easy2D-Network/HttpRequest.h b/Easy2D/network/HttpRequest.h similarity index 99% rename from Easy2D-Network/HttpRequest.h rename to Easy2D/network/HttpRequest.h index 788d59ce..0fc72ac1 100644 --- a/Easy2D-Network/HttpRequest.h +++ b/Easy2D/network/HttpRequest.h @@ -26,7 +26,7 @@ namespace easy2d { typedef std::function ResponseCallback; - class HttpRequest + class E2D_API HttpRequest : public Object { public: diff --git a/Easy2D-Network/HttpResponse.h b/Easy2D/network/HttpResponse.h similarity index 98% rename from Easy2D-Network/HttpResponse.h rename to Easy2D/network/HttpResponse.h index 27d21aeb..257ec64a 100644 --- a/Easy2D-Network/HttpResponse.h +++ b/Easy2D/network/HttpResponse.h @@ -24,7 +24,7 @@ namespace easy2d { namespace network { - class HttpResponse + class E2D_API HttpResponse : public Object { public: diff --git a/Easy2D-Network/helper.h b/Easy2D/network/helper.h similarity index 100% rename from Easy2D-Network/helper.h rename to Easy2D/network/helper.h diff --git a/Easy2D/platform/Application.cpp b/Easy2D/platform/Application.cpp index 5173fdbc..9201f070 100644 --- a/Easy2D/platform/Application.cpp +++ b/Easy2D/platform/Application.cpp @@ -144,6 +144,10 @@ namespace easy2d ::CoInitialize(nullptr); main_window_ = new Window; + + Use(&Renderer::Instance()); + Use(&Input::Instance()); + Use(&AsyncTaskThread::Instance()); } Application::~Application() @@ -171,10 +175,6 @@ namespace easy2d Renderer::Instance().SetClearColor(options.clear_color); Renderer::Instance().SetVSyncEnabled(options.vsync); - Use(&Renderer::Instance()); - Use(&Input::Instance()); - Use(&AsyncTaskThread::Instance()); - // Setup all components for (Component* c : components_) { diff --git a/Easy2D-ImGui/libs/ImGui/LICENSE.txt b/Easy2D/third-party/ImGui/LICENSE.txt similarity index 100% rename from Easy2D-ImGui/libs/ImGui/LICENSE.txt rename to Easy2D/third-party/ImGui/LICENSE.txt diff --git a/Easy2D-ImGui/libs/ImGui/imconfig.h b/Easy2D/third-party/ImGui/imconfig.h similarity index 100% rename from Easy2D-ImGui/libs/ImGui/imconfig.h rename to Easy2D/third-party/ImGui/imconfig.h diff --git a/Easy2D-ImGui/libs/ImGui/imgui.cpp b/Easy2D/third-party/ImGui/imgui.cpp similarity index 100% rename from Easy2D-ImGui/libs/ImGui/imgui.cpp rename to Easy2D/third-party/ImGui/imgui.cpp diff --git a/Easy2D-ImGui/libs/ImGui/imgui.h b/Easy2D/third-party/ImGui/imgui.h similarity index 100% rename from Easy2D-ImGui/libs/ImGui/imgui.h rename to Easy2D/third-party/ImGui/imgui.h diff --git a/Easy2D-ImGui/libs/ImGui/imgui_demo.cpp b/Easy2D/third-party/ImGui/imgui_demo.cpp similarity index 100% rename from Easy2D-ImGui/libs/ImGui/imgui_demo.cpp rename to Easy2D/third-party/ImGui/imgui_demo.cpp diff --git a/Easy2D-ImGui/libs/ImGui/imgui_draw.cpp b/Easy2D/third-party/ImGui/imgui_draw.cpp similarity index 100% rename from Easy2D-ImGui/libs/ImGui/imgui_draw.cpp rename to Easy2D/third-party/ImGui/imgui_draw.cpp diff --git a/Easy2D-ImGui/libs/ImGui/imgui_internal.h b/Easy2D/third-party/ImGui/imgui_internal.h similarity index 100% rename from Easy2D-ImGui/libs/ImGui/imgui_internal.h rename to Easy2D/third-party/ImGui/imgui_internal.h diff --git a/Easy2D-ImGui/libs/ImGui/imgui_widgets.cpp b/Easy2D/third-party/ImGui/imgui_widgets.cpp similarity index 100% rename from Easy2D-ImGui/libs/ImGui/imgui_widgets.cpp rename to Easy2D/third-party/ImGui/imgui_widgets.cpp diff --git a/Easy2D-ImGui/libs/ImGui/imstb_rectpack.h b/Easy2D/third-party/ImGui/imstb_rectpack.h similarity index 100% rename from Easy2D-ImGui/libs/ImGui/imstb_rectpack.h rename to Easy2D/third-party/ImGui/imstb_rectpack.h diff --git a/Easy2D-ImGui/libs/ImGui/imstb_textedit.h b/Easy2D/third-party/ImGui/imstb_textedit.h similarity index 100% rename from Easy2D-ImGui/libs/ImGui/imstb_textedit.h rename to Easy2D/third-party/ImGui/imstb_textedit.h diff --git a/Easy2D-ImGui/libs/ImGui/imstb_truetype.h b/Easy2D/third-party/ImGui/imstb_truetype.h similarity index 100% rename from Easy2D-ImGui/libs/ImGui/imstb_truetype.h rename to Easy2D/third-party/ImGui/imstb_truetype.h diff --git a/Easy2D-Network/curl/curl.h b/Easy2D/third-party/curl/curl.h similarity index 100% rename from Easy2D-Network/curl/curl.h rename to Easy2D/third-party/curl/curl.h diff --git a/Easy2D-Network/curl/curlbuild.h b/Easy2D/third-party/curl/curlbuild.h similarity index 100% rename from Easy2D-Network/curl/curlbuild.h rename to Easy2D/third-party/curl/curlbuild.h diff --git a/Easy2D-Network/curl/curlrules.h b/Easy2D/third-party/curl/curlrules.h similarity index 100% rename from Easy2D-Network/curl/curlrules.h rename to Easy2D/third-party/curl/curlrules.h diff --git a/Easy2D-Network/curl/curlver.h b/Easy2D/third-party/curl/curlver.h similarity index 100% rename from Easy2D-Network/curl/curlver.h rename to Easy2D/third-party/curl/curlver.h diff --git a/Easy2D-Network/curl/easy.h b/Easy2D/third-party/curl/easy.h similarity index 100% rename from Easy2D-Network/curl/easy.h rename to Easy2D/third-party/curl/easy.h diff --git a/Easy2D-Network/curl/mprintf.h b/Easy2D/third-party/curl/mprintf.h similarity index 100% rename from Easy2D-Network/curl/mprintf.h rename to Easy2D/third-party/curl/mprintf.h diff --git a/Easy2D-Network/curl/multi.h b/Easy2D/third-party/curl/multi.h similarity index 100% rename from Easy2D-Network/curl/multi.h rename to Easy2D/third-party/curl/multi.h diff --git a/Easy2D-Network/curl/stdcheaders.h b/Easy2D/third-party/curl/stdcheaders.h similarity index 100% rename from Easy2D-Network/curl/stdcheaders.h rename to Easy2D/third-party/curl/stdcheaders.h diff --git a/Easy2D-Network/curl/typecheck-gcc.h b/Easy2D/third-party/curl/typecheck-gcc.h similarity index 100% rename from Easy2D-Network/curl/typecheck-gcc.h rename to Easy2D/third-party/curl/typecheck-gcc.h diff --git a/Easy2D-Network/dlls/libcrypto-1_1.dll b/Easy2D/third-party/dlls/libcrypto-1_1.dll similarity index 100% rename from Easy2D-Network/dlls/libcrypto-1_1.dll rename to Easy2D/third-party/dlls/libcrypto-1_1.dll diff --git a/Easy2D-Network/dlls/libcurl.dll b/Easy2D/third-party/dlls/libcurl.dll similarity index 100% rename from Easy2D-Network/dlls/libcurl.dll rename to Easy2D/third-party/dlls/libcurl.dll diff --git a/Easy2D-Network/dlls/libssl-1_1.dll b/Easy2D/third-party/dlls/libssl-1_1.dll similarity index 100% rename from Easy2D-Network/dlls/libssl-1_1.dll rename to Easy2D/third-party/dlls/libssl-1_1.dll diff --git a/Easy2D-Network/libs/libcurl.lib b/Easy2D/third-party/libs/libcurl.lib similarity index 100% rename from Easy2D-Network/libs/libcurl.lib rename to Easy2D/third-party/libs/libcurl.lib diff --git a/samples/HelloWorld/HelloWorld.vcxproj b/samples/HelloWorld/HelloWorld.vcxproj index 36b5df36..815f20ee 100644 --- a/samples/HelloWorld/HelloWorld.vcxproj +++ b/samples/HelloWorld/HelloWorld.vcxproj @@ -105,7 +105,7 @@ Disabled true true - ../Easy2D + ../../Easy2D true @@ -118,7 +118,7 @@ Disabled true true - ../Easy2D + ../../Easy2D true @@ -133,7 +133,7 @@ true true true - ../Easy2D + ../../Easy2D true @@ -150,7 +150,7 @@ true true true - ../Easy2D + ../../Easy2D true diff --git a/samples/ImGuiSample/ImGuiSample.vcxproj b/samples/ImGuiSample/ImGuiSample.vcxproj index 857bdeb8..27e018a9 100644 --- a/samples/ImGuiSample/ImGuiSample.vcxproj +++ b/samples/ImGuiSample/ImGuiSample.vcxproj @@ -104,7 +104,7 @@ Level3 Disabled true - ../../Easy2D;../../Easy2D-ImGui + ../../Easy2D true @@ -116,7 +116,7 @@ Level3 Disabled true - ../../Easy2D;../../Easy2D-ImGui + ../../Easy2D true @@ -130,7 +130,7 @@ true true true - ../../Easy2D;../../Easy2D-ImGui + ../../Easy2D; true @@ -146,7 +146,7 @@ true true true - ../../Easy2D;../../Easy2D-ImGui + ../../Easy2D true @@ -159,9 +159,6 @@ - - {23aff03b-a670-4c33-b790-18eec82c61ae} - {ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf} diff --git a/samples/ImGuiSample/MainScene.h b/samples/ImGuiSample/MainScene.h index ce0a7fcf..ded35755 100644 --- a/samples/ImGuiSample/MainScene.h +++ b/samples/ImGuiSample/MainScene.h @@ -19,7 +19,7 @@ public: MainScene() { // ´´½¨ ImGui ͼ²ã - ImGuiLayerPtr layer = new ImGuiLayer; + ImGuiLayerPtr layer = ImGuiView::Instance().CreateLayer(this); AddChild(layer); // Ìí¼Ó ImGui ÌṩµÄ Demo ´°¿Ú diff --git a/samples/Samples/Samples.vcxproj b/samples/Samples/Samples.vcxproj index f724679c..e81039f2 100644 --- a/samples/Samples/Samples.vcxproj +++ b/samples/Samples/Samples.vcxproj @@ -104,12 +104,12 @@ Level3 Disabled true - ../../Easy2D;../../Easy2D-Audio;../../Easy2D-Network + ../../Easy2D; true Windows - ../../Easy2D-Network/libs; + ../../Easy2D/third-party/libs; @@ -117,12 +117,12 @@ Level3 Disabled true - ../../Easy2D;../../Easy2D-Audio;../../Easy2D-Network + ../../Easy2D; true Windows - ../../Easy2D-Network/libs; + ../../Easy2D/third-party/libs; @@ -132,14 +132,14 @@ true true true - ../../Easy2D;../../Easy2D-Audio;../../Easy2D-Network + ../../Easy2D; true true true Windows - ../../Easy2D-Network/libs; + ../../Easy2D/third-party/libs; @@ -149,14 +149,14 @@ true true true - ../../Easy2D;../../Easy2D-Audio;../../Easy2D-Network + ../../Easy2D; true true true Windows - ../../Easy2D-Network/libs; + ../../Easy2D/third-party/libs; @@ -171,12 +171,6 @@ - - {5d45f66b-becd-4909-bcfc-c0f3ced9d0a2} - - - {05c5c84b-4ee3-4456-9aed-eeca583b793b} - {ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf}