Merge branch 'master' of warmcat.org:/home/git-repo/PND

# Conflicts:
#	Client/Project/VisualStudio/PND_LIB/PND_LIB.vcxproj.filters
#	Client/Project/VisualStudio/Phy2Dlite/imgui.ini

8 files changed, 44 insertions, 82 deletions

diff --git a/Client/Project/VisualStudio/PND_LIB/PND_LIB.vcxproj.filters b/Client/Project/VisualStudio/PND_LIB/PND_LIB.vcxproj.filters
index 920e301..ef1ebf5 100644
--- a/Client/Project/VisualStudio/PND_LIB/PND_LIB.vcxproj.filters
+++ b/Client/Project/VisualStudio/PND_LIB/PND_LIB.vcxproj.filters
@@ -1,78 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup>

-    <Filter Include="Animation">

-      <UniqueIdentifier>{73913a85-4152-4ecb-8a2c-3e36849d21ae}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Common">

-      <UniqueIdentifier>{c5ed6e67-2e83-4845-97bc-5c013f8bfb7d}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="GameCode">

-      <UniqueIdentifier>{72e20810-8126-4b0f-a36f-32f11b3ac19c}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="GameCode\Components">

-      <UniqueIdentifier>{2a4fa516-8c89-428b-afcb-aca4806a13e5}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Graphics">

-      <UniqueIdentifier>{bc2c69cb-ebb4-4e55-b0eb-6174efd4e970}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="GUI">

-      <UniqueIdentifier>{e49ff05d-4b4e-433a-a335-683439b65561}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Math">

-      <UniqueIdentifier>{bdc96687-46e3-490a-b612-7b467803bd0f}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Networking">

-      <UniqueIdentifier>{466d0dc0-cd4d-4a68-a37c-b66db796e643}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Phy2D">

-      <UniqueIdentifier>{4812f18a-79bd-4ef3-a6a2-6df76e06ce8e}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Sand2D">

-      <UniqueIdentifier>{3420320a-2fd5-4ae5-bddc-b3190e2be605}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="ThirdParty">

-      <UniqueIdentifier>{185e4d48-3278-408e-8952-9eae4c54e052}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="ThirdParty\json">

-      <UniqueIdentifier>{dd6facc4-308c-4259-a1db-5f2f50ce2f2f}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="ThirdParty\libfixmath">

-      <UniqueIdentifier>{ae16fdbc-3f39-4b3c-b727-e54b65b622c4}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="ThirdParty\glad">

-      <UniqueIdentifier>{1ab66501-f8e9-4d46-883b-43d72d037a2c}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Threading">

-      <UniqueIdentifier>{8b068df4-700c-43c7-875e-38c6e5181d55}</UniqueIdentifier>

-    </Filter>

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="..\..\..\Source\PND\Animation\Animation.h">

-      <Filter>Animation</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Source\PND\Common\Type.h">

-      <Filter>Common</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Source\PND\GameCode\Component.h">

-      <Filter>GameCode</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Source\PND\GameCode\Entity.h">

-      <Filter>GameCode</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Source\PND\GameCode\Components\MovementComponent.h">

-      <Filter>GameCode\Components</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\Source\PND\Math\Vector2.h">

-      <Filter>Math</Filter>

-    </ClInclude>

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\..\Source\PND\GameCode\Component.cpp">

-      <Filter>GameCode</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\..\Source\PND\GameCode\Entity.cpp">

-      <Filter>GameCode</Filter>

-    </ClCompile>

-  </ItemGroup>

-</Project>
\ No newline at end of file
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
\ No newline at end of file
diff --git a/Client/Project/VisualStudio/Phy2Dlite/imgui.ini b/Client/Project/VisualStudio/Phy2Dlite/imgui.ini
index 5e7278e..4a5c201 100644
--- a/Client/Project/VisualStudio/Phy2Dlite/imgui.ini
+++ b/Client/Project/VisualStudio/Phy2Dlite/imgui.ini
@@ -1,5 +1,5 @@
-[Window][Debug##Default]

-Pos=60,60

-Size=400,400

-Collapsed=0

-

+[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 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

+    <ClInclude Include="..\..\..\Source\Sand2D\Common\Settings.h" />

+    <ClInclude Include="..\..\..\Source\Sand2D\Common\Type.h" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

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 @@
     <Filter Include="Test">

       <UniqueIdentifier>{77ef3ecd-dd1e-49c7-a8fc-bcc241814405}</UniqueIdentifier>

     </Filter>

+    <Filter Include="Common">

+      <UniqueIdentifier>{b84e6025-d740-4214-9aaf-b7344a5aa14a}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Elements">

+      <UniqueIdentifier>{cf6ce978-9e4b-4fd5-b187-3b3701eea6b0}</UniqueIdentifier>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\..\Source\Sand2D\Common\Settings.h">

+      <Filter>Common</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\Source\Sand2D\Common\Type.h">

+      <Filter>Common</Filter>

+    </ClInclude>

   </ItemGroup>

 </Project>
\ 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