From d9bd02c2471ec14c52df65cf7b5c106eddabe080 Mon Sep 17 00:00:00 2001 From: chai Date: Fri, 3 Dec 2021 09:58:56 +0800 Subject: *misc --- .../VisualStudio/PND_LIB/PND_LIB.vcxproj.filters | 17 +---------------- Client/Project/VisualStudio/Phy2Dlite/imgui.ini | 5 +++++ Client/Project/VisualStudio/Sand2D/Sand2D.vcxproj | 2 ++ .../Project/VisualStudio/Sand2D/Sand2D.vcxproj.filters | 14 ++++++++++++++ Client/Resources/ui/hello.ui | 3 +++ Client/Source/Phy2DLite/Tests/test.cpp | 1 + Client/Source/Sand2D/Common/Settings.h | 10 ++++++++++ Client/Source/Sand2D/Common/Type.h | 8 ++++++++ 8 files changed, 44 insertions(+), 16 deletions(-) create mode 100644 Client/Project/VisualStudio/Phy2Dlite/imgui.ini create mode 100644 Client/Resources/ui/hello.ui create mode 100644 Client/Source/Sand2D/Common/Settings.h create mode 100644 Client/Source/Sand2D/Common/Type.h diff --git a/Client/Project/VisualStudio/PND_LIB/PND_LIB.vcxproj.filters b/Client/Project/VisualStudio/PND_LIB/PND_LIB.vcxproj.filters index 6546942..ef1ebf5 100644 --- a/Client/Project/VisualStudio/PND_LIB/PND_LIB.vcxproj.filters +++ b/Client/Project/VisualStudio/PND_LIB/PND_LIB.vcxproj.filters @@ -1,17 +1,2 @@  - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - \ No newline at end of file + \ No newline at end of file diff --git a/Client/Project/VisualStudio/Phy2Dlite/imgui.ini b/Client/Project/VisualStudio/Phy2Dlite/imgui.ini new file mode 100644 index 0000000..4a5c201 --- /dev/null +++ b/Client/Project/VisualStudio/Phy2Dlite/imgui.ini @@ -0,0 +1,5 @@ +[Window][Debug##Default] +Pos=60,60 +Size=400,400 +Collapsed=0 + diff --git a/Client/Project/VisualStudio/Sand2D/Sand2D.vcxproj b/Client/Project/VisualStudio/Sand2D/Sand2D.vcxproj index cd3760a..40ccb7d 100644 --- a/Client/Project/VisualStudio/Sand2D/Sand2D.vcxproj +++ b/Client/Project/VisualStudio/Sand2D/Sand2D.vcxproj @@ -123,6 +123,8 @@ + + diff --git a/Client/Project/VisualStudio/Sand2D/Sand2D.vcxproj.filters b/Client/Project/VisualStudio/Sand2D/Sand2D.vcxproj.filters index 6e01002..09fef17 100644 --- a/Client/Project/VisualStudio/Sand2D/Sand2D.vcxproj.filters +++ b/Client/Project/VisualStudio/Sand2D/Sand2D.vcxproj.filters @@ -4,5 +4,19 @@ {77ef3ecd-dd1e-49c7-a8fc-bcc241814405} + + {b84e6025-d740-4214-9aaf-b7344a5aa14a} + + + {cf6ce978-9e4b-4fd5-b187-3b3701eea6b0} + + + + + Common + + + Common + \ No newline at end of file diff --git a/Client/Resources/ui/hello.ui b/Client/Resources/ui/hello.ui new file mode 100644 index 0000000..14a5c30 --- /dev/null +++ b/Client/Resources/ui/hello.ui @@ -0,0 +1,3 @@ +{ + "name" : "hello screen" +} \ No newline at end of file diff --git a/Client/Source/Phy2DLite/Tests/test.cpp b/Client/Source/Phy2DLite/Tests/test.cpp index c2dbc54..0660c21 100644 --- a/Client/Source/Phy2DLite/Tests/test.cpp +++ b/Client/Source/Phy2DLite/Tests/test.cpp @@ -231,6 +231,7 @@ static void Demo5(Body* b, Joint* j) // A teeter static void Demo6(Body* b, Joint* j) { + // Body* b1 = b + 0; b1->Set(Vec2(100.0f, 20.0f), NUMBER_MAX); b1->position.Set(0.0f, (fixed)-0.5f * b1->width.y); diff --git a/Client/Source/Sand2D/Common/Settings.h b/Client/Source/Sand2D/Common/Settings.h new file mode 100644 index 0000000..18825cb --- /dev/null +++ b/Client/Source/Sand2D/Common/Settings.h @@ -0,0 +1,10 @@ +#pragma once + +#include "Type.h" + +namespace Sand2D +{ + + + +} \ No newline at end of file diff --git a/Client/Source/Sand2D/Common/Type.h b/Client/Source/Sand2D/Common/Type.h new file mode 100644 index 0000000..edb79bb --- /dev/null +++ b/Client/Source/Sand2D/Common/Type.h @@ -0,0 +1,8 @@ +#pragma once + +namespace Sand2D +{ + + + +} \ No newline at end of file -- cgit v1.1-26-g67d0