From fdd228071a3112aeebda20766c7df3b20b8651aa Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Thu, 2 Dec 2021 14:44:36 +0800
Subject: +Fix32

---
 Client/Project/VisualStudio/Phy2D/Phy2D.vcxproj    | 19 ++-----
 .../VisualStudio/Phy2D/Phy2D.vcxproj.filters       | 60 ++++++----------------
 .../VisualStudio/Phy2Dlite/Phy2Dlite.vcxproj       |  3 ++
 .../Phy2Dlite/Phy2Dlite.vcxproj.filters            | 15 ++++++
 4 files changed, 37 insertions(+), 60 deletions(-)

(limited to 'Client/Project/VisualStudio')

diff --git a/Client/Project/VisualStudio/Phy2D/Phy2D.vcxproj b/Client/Project/VisualStudio/Phy2D/Phy2D.vcxproj
index 54f9787..84b0365 100644
--- a/Client/Project/VisualStudio/Phy2D/Phy2D.vcxproj
+++ b/Client/Project/VisualStudio/Phy2D/Phy2D.vcxproj
@@ -137,13 +137,6 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\Source\Phy2D\Common\Math.cpp" />
-    <ClCompile Include="..\..\..\Source\Phy2D\Dynamic\Arbiter.cpp" />
-    <ClCompile Include="..\..\..\Source\Phy2D\Dynamic\Body.cpp" />
-    <ClCompile Include="..\..\..\Source\Phy2D\Dynamic\Collide.cpp" />
-    <ClCompile Include="..\..\..\Source\Phy2D\Dynamic\Joint.cpp" />
-    <ClCompile Include="..\..\..\Source\Phy2D\Dynamic\World.cpp" />
-    <ClCompile Include="..\..\..\Source\Phy2D\Shapes\p2CircleShape.cpp" />
-    <ClCompile Include="..\..\..\Source\Phy2D\Shapes\p2PolygonShape.cpp" />
     <ClCompile Include="..\..\..\Source\Phy2D\Tests\test_p2d.cpp" />
     <ClCompile Include="..\..\..\Source\Phy2D\Tests\test_math.cpp" />
     <ClCompile Include="..\..\..\ThirdParty\fix32\fix32.cpp" />
@@ -163,21 +156,16 @@
     <ClCompile Include="..\..\..\ThirdParty\libfixmath\libfixmath\fix16_trig.c" />
     <ClCompile Include="..\..\..\ThirdParty\libfixmath\libfixmath\fract32.c" />
     <ClCompile Include="..\..\..\ThirdParty\libfixmath\libfixmath\uint32.c" />
+    <ClCompile Include="..\..\..\ThirdParty\math-sll\math-sll.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\Source\Phy2D\Common\Math.h" />
     <ClInclude Include="..\..\..\Source\Phy2D\Common\Settings.h" />
-    <ClInclude Include="..\..\..\Source\Phy2D\Dynamic\Arbiter.h" />
-    <ClInclude Include="..\..\..\Source\Phy2D\Dynamic\Body.h" />
-    <ClInclude Include="..\..\..\Source\Phy2D\Dynamic\Joint.h" />
-    <ClInclude Include="..\..\..\Source\Phy2D\Dynamic\World.h" />
+    <ClInclude Include="..\..\..\Source\Phy2D\Common\Type.h" />
     <ClInclude Include="..\..\..\Source\Phy2D\Phy2D.h" />
     <ClInclude Include="..\..\..\Source\Phy2D\Rendering\Visualize.h" />
-    <ClInclude Include="..\..\..\Source\Phy2D\Shapes\p2CircleShape.h" />
-    <ClInclude Include="..\..\..\Source\Phy2D\Shapes\p2PolygonShape.h" />
-    <ClInclude Include="..\..\..\Source\Phy2D\Shapes\p2Shape.h" />
     <ClInclude Include="..\..\..\Source\Phy2D\Tests\test.h" />
-    <ClInclude Include="..\..\..\ThirdParty\fix32\fix32.h" />
+    <ClInclude Include="..\..\..\ThirdParty\fix32\fix32.hpp" />
     <ClInclude Include="..\..\..\ThirdParty\glad\glad.h" />
     <ClInclude Include="..\..\..\ThirdParty\glad\khrplatform.h" />
     <ClInclude Include="..\..\..\ThirdParty\imgui\backends\imgui_impl_opengl2.h" />
@@ -195,6 +183,7 @@
     <ClInclude Include="..\..\..\ThirdParty\libfixmath\libfixmath\fract32.h" />
     <ClInclude Include="..\..\..\ThirdParty\libfixmath\libfixmath\int64.h" />
     <ClInclude Include="..\..\..\ThirdParty\libfixmath\libfixmath\uint32.h" />
+    <ClInclude Include="..\..\..\ThirdParty\math-sll\math-sll.h" />
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\..\..\Source\Phy2D\README.txt" />
diff --git a/Client/Project/VisualStudio/Phy2D/Phy2D.vcxproj.filters b/Client/Project/VisualStudio/Phy2D/Phy2D.vcxproj.filters
index 5a36dba..cf32e27 100644
--- a/Client/Project/VisualStudio/Phy2D/Phy2D.vcxproj.filters
+++ b/Client/Project/VisualStudio/Phy2D/Phy2D.vcxproj.filters
@@ -31,17 +31,11 @@
     <Filter Include="Dynamic">
       <UniqueIdentifier>{596062aa-a263-4c8c-acf2-1267b28a0f97}</UniqueIdentifier>
     </Filter>
+    <Filter Include="libs\sll">
+      <UniqueIdentifier>{fc4d6710-2d01-480a-892c-79a461ad0ec4}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\Source\Phy2D\Shapes\p2CircleShape.cpp">
-      <Filter>Shapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Phy2D\Shapes\p2PolygonShape.cpp">
-      <Filter>Shapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Phy2D\Dynamic\Body.cpp">
-      <Filter>Dynamic</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\Source\Phy2D\Common\Math.cpp">
       <Filter>Common</Filter>
     </ClCompile>
@@ -51,18 +45,6 @@
     <ClCompile Include="..\..\..\Source\Phy2D\Tests\test_p2d.cpp">
       <Filter>Test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Source\Phy2D\Dynamic\Joint.cpp">
-      <Filter>Dynamic</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Phy2D\Dynamic\World.cpp">
-      <Filter>Dynamic</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Phy2D\Dynamic\Arbiter.cpp">
-      <Filter>Dynamic</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Source\Phy2D\Dynamic\Collide.cpp">
-      <Filter>Dynamic</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\ThirdParty\glad\glad.c">
       <Filter>libs\glad</Filter>
     </ClCompile>
@@ -114,24 +96,15 @@
     <ClCompile Include="..\..\..\ThirdParty\libfixmath\libfixmath\uint32.c">
       <Filter>libs\libfixmath</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\ThirdParty\math-sll\math-sll.c">
+      <Filter>libs\sll</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\Source\Phy2D\Shapes\p2CircleShape.h">
-      <Filter>Shapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Phy2D\Shapes\p2PolygonShape.h">
-      <Filter>Shapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Phy2D\Shapes\p2Shape.h">
-      <Filter>Shapes</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\Source\Phy2D\Phy2D.h" />
     <ClInclude Include="..\..\..\Source\Phy2D\Rendering\Visualize.h">
       <Filter>Rendering</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Source\Phy2D\Dynamic\Body.h">
-      <Filter>Dynamic</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\Source\Phy2D\Common\Settings.h">
       <Filter>Common</Filter>
     </ClInclude>
@@ -141,24 +114,12 @@
     <ClInclude Include="..\..\..\Source\Phy2D\Tests\test.h">
       <Filter>Test</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Source\Phy2D\Dynamic\Joint.h">
-      <Filter>Dynamic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Phy2D\Dynamic\World.h">
-      <Filter>Dynamic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Source\Phy2D\Dynamic\Arbiter.h">
-      <Filter>Dynamic</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\ThirdParty\glad\glad.h">
       <Filter>libs\glad</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\ThirdParty\glad\khrplatform.h">
       <Filter>libs\glad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\ThirdParty\fix32\fix32.h">
-      <Filter>libs\fix32</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\ThirdParty\imgui\imstb_truetype.h">
       <Filter>libs\imgui</Filter>
     </ClInclude>
@@ -204,6 +165,15 @@
     <ClInclude Include="..\..\..\ThirdParty\libfixmath\libfixmath\uint32.h">
       <Filter>libs\libfixmath</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Source\Phy2D\Common\Type.h">
+      <Filter>Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ThirdParty\math-sll\math-sll.h">
+      <Filter>libs\sll</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ThirdParty\fix32\fix32.hpp">
+      <Filter>libs\fix32</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\..\..\Source\Phy2D\README.txt" />
diff --git a/Client/Project/VisualStudio/Phy2Dlite/Phy2Dlite.vcxproj b/Client/Project/VisualStudio/Phy2Dlite/Phy2Dlite.vcxproj
index 61da1c4..3f7e430 100644
--- a/Client/Project/VisualStudio/Phy2Dlite/Phy2Dlite.vcxproj
+++ b/Client/Project/VisualStudio/Phy2Dlite/Phy2Dlite.vcxproj
@@ -160,6 +160,7 @@
     <ClCompile Include="..\..\..\ThirdParty\libfixmath\libfixmath\fix16_trig.c" />
     <ClCompile Include="..\..\..\ThirdParty\libfixmath\libfixmath\fract32.c" />
     <ClCompile Include="..\..\..\ThirdParty\libfixmath\libfixmath\uint32.c" />
+    <ClCompile Include="..\..\..\ThirdParty\math-sll\math-sll.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\Source\Phy2DLite\Arbiter.h" />
@@ -171,6 +172,7 @@
     <ClInclude Include="..\..\..\Source\Phy2DLite\Settings.h" />
     <ClInclude Include="..\..\..\Source\Phy2DLite\Tests\test.h" />
     <ClInclude Include="..\..\..\Source\Phy2DLite\World.h" />
+    <ClInclude Include="..\..\..\ThirdParty\fix32\fix32.hpp" />
     <ClInclude Include="..\..\..\ThirdParty\fpm\include\fpm\fixed.hpp" />
     <ClInclude Include="..\..\..\ThirdParty\fpm\include\fpm\ios.hpp" />
     <ClInclude Include="..\..\..\ThirdParty\fpm\include\fpm\math.hpp" />
@@ -191,6 +193,7 @@
     <ClInclude Include="..\..\..\ThirdParty\libfixmath\libfixmath\fract32.h" />
     <ClInclude Include="..\..\..\ThirdParty\libfixmath\libfixmath\int64.h" />
     <ClInclude Include="..\..\..\ThirdParty\libfixmath\libfixmath\uint32.h" />
+    <ClInclude Include="..\..\..\ThirdParty\math-sll\math-sll.h" />
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\..\..\Source\Phy2DLite\README.txt" />
diff --git a/Client/Project/VisualStudio/Phy2Dlite/Phy2Dlite.vcxproj.filters b/Client/Project/VisualStudio/Phy2Dlite/Phy2Dlite.vcxproj.filters
index 104e093..3b49c68 100644
--- a/Client/Project/VisualStudio/Phy2Dlite/Phy2Dlite.vcxproj.filters
+++ b/Client/Project/VisualStudio/Phy2Dlite/Phy2Dlite.vcxproj.filters
@@ -60,6 +60,9 @@
     <ClCompile Include="..\..\..\Source\Phy2DLite\Tests\test.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\ThirdParty\math-sll\math-sll.c">
+      <Filter>Libs\sll</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\Source\Phy2DLite\Arbiter.h" />
@@ -133,6 +136,12 @@
       <Filter>Libs\fpm</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Source\Phy2DLite\Constants.h" />
+    <ClInclude Include="..\..\..\ThirdParty\math-sll\math-sll.h">
+      <Filter>Libs\sll</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ThirdParty\fix32\fix32.hpp">
+      <Filter>Libs\fix32</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Tests">
@@ -153,6 +162,12 @@
     <Filter Include="Libs\fpm">
       <UniqueIdentifier>{4670ccf3-2964-42b4-bb00-6b48eae171ad}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Libs\sll">
+      <UniqueIdentifier>{1b250cf1-a3ca-4e90-9bc9-bc10df919ccf}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Libs\fix32">
+      <UniqueIdentifier>{e9dd5549-728e-408f-b740-15e38984d253}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\..\..\ThirdParty\libfixmath\libfixmath\code_style.txt">
-- 
cgit v1.1-26-g67d0