*misc

8 files changed, 44 insertions, 16 deletions

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 @@
 <?xml version="1.0" encoding="utf-8"?>

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

-  <ItemGroup>

-    <Filter Include="源文件">

-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>

-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>

-    </Filter>

-    <Filter Include="头文件">

-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>

-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>

-    </Filter>

-    <Filter Include="资源文件">

-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>

-    </Filter>

-  </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
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 @@
     </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