*misc

20 files changed, 122 insertions, 8 deletions

diff --git a/Client/Project/VisualStudio/Phy2D/Phy2D.vcxproj b/Client/Project/VisualStudio/Phy2D/Phy2D.vcxproj
index 5dd7295..1be97e2 100644
--- a/Client/Project/VisualStudio/Phy2D/Phy2D.vcxproj
+++ b/Client/Project/VisualStudio/Phy2D/Phy2D.vcxproj
@@ -136,7 +136,14 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

+    <ClCompile Include="..\..\..\Source\Phy2D\Collision\BoxCollider.cpp" />

+    <ClCompile Include="..\..\..\Source\Phy2D\Collision\CapsuleCollider.cpp" />

+    <ClCompile Include="..\..\..\Source\Phy2D\Collision\PolygonCollider.cpp" />

     <ClCompile Include="..\..\..\Source\Phy2D\Common\Math.cpp" />

+    <ClCompile Include="..\..\..\Source\Phy2D\Dynamic\RigidBody.cpp" />

+    <ClCompile Include="..\..\..\Source\Phy2D\Dynamic\World.cpp" />

+    <ClCompile Include="..\..\..\Source\Phy2D\Joints\FixedJoint.cpp" />

+    <ClCompile Include="..\..\..\Source\Phy2D\Joints\Joint.cpp" />

     <ClCompile Include="..\..\..\Source\Phy2D\Math\Mat22.cpp" />

     <ClCompile Include="..\..\..\Source\Phy2D\Math\Mat33.cpp" />

     <ClCompile Include="..\..\..\Source\Phy2D\Math\Vec2.cpp" />

@@ -161,9 +168,17 @@
     <ClCompile Include="..\..\..\ThirdParty\math-sll\math-sll.c" />

   </ItemGroup>

   <ItemGroup>

+    <ClInclude Include="..\..\..\Source\Phy2D\Collision\BoxCollider.h" />

+    <ClInclude Include="..\..\..\Source\Phy2D\Collision\CapsuleCollider.h" />

+    <ClInclude Include="..\..\..\Source\Phy2D\Collision\Collider.h" />

+    <ClInclude Include="..\..\..\Source\Phy2D\Collision\PolygonCollider.h" />

     <ClInclude Include="..\..\..\Source\Phy2D\Common\Math.h" />

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

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

+    <ClInclude Include="..\..\..\Source\Phy2D\Dynamic\RigidBody.h" />

+    <ClInclude Include="..\..\..\Source\Phy2D\Dynamic\World.h" />

+    <ClInclude Include="..\..\..\Source\Phy2D\Joints\FixedJoint.h" />

+    <ClInclude Include="..\..\..\Source\Phy2D\Joints\Joint.h" />

     <ClInclude Include="..\..\..\Source\Phy2D\Math\Mat22.h" />

     <ClInclude Include="..\..\..\Source\Phy2D\Math\Mat33.h" />

     <ClInclude Include="..\..\..\Source\Phy2D\Math\Vec2.h" />

diff --git a/Client/Project/VisualStudio/Phy2D/Phy2D.vcxproj.filters b/Client/Project/VisualStudio/Phy2D/Phy2D.vcxproj.filters
index 79e95cb..73f22ca 100644
--- a/Client/Project/VisualStudio/Phy2D/Phy2D.vcxproj.filters
+++ b/Client/Project/VisualStudio/Phy2D/Phy2D.vcxproj.filters
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>

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

   <ItemGroup>

-    <Filter Include="Shapes">

-      <UniqueIdentifier>{62eaceb5-1503-4237-b8b9-5dcc05212dbd}</UniqueIdentifier>

-    </Filter>

     <Filter Include="Common">

       <UniqueIdentifier>{c51efad7-946b-4948-957e-4f4d6737ed93}</UniqueIdentifier>

     </Filter>

@@ -13,9 +10,6 @@
     <Filter Include="Rendering">

       <UniqueIdentifier>{b4d78560-5498-4b35-8f8d-f87db40a4e52}</UniqueIdentifier>

     </Filter>

-    <Filter Include="Dynamic">

-      <UniqueIdentifier>{596062aa-a263-4c8c-acf2-1267b28a0f97}</UniqueIdentifier>

-    </Filter>

     <Filter Include="Libs">

       <UniqueIdentifier>{e496beb9-5af2-42a7-afb5-29cf18b93f78}</UniqueIdentifier>

     </Filter>

@@ -40,6 +34,12 @@
     <Filter Include="Math">

       <UniqueIdentifier>{ea4df851-7347-4fbd-a050-e7b4adf1bb68}</UniqueIdentifier>

     </Filter>

+    <Filter Include="Dynamic">

+      <UniqueIdentifier>{d0099037-a6dd-450a-bfb2-f83b15101ce3}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Collision">

+      <UniqueIdentifier>{94977a7c-15e5-4c9a-b99f-ae334df7ace0}</UniqueIdentifier>

+    </Filter>

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="..\..\..\Source\Phy2D\Common\Math.cpp">

@@ -111,6 +111,27 @@
     <ClCompile Include="..\..\..\Source\Phy2D\Math\Vec2.cpp">

       <Filter>Math</Filter>

     </ClCompile>

+    <ClCompile Include="..\..\..\Source\Phy2D\Dynamic\RigidBody.cpp">

+      <Filter>Dynamic</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\Source\Phy2D\Dynamic\World.cpp">

+      <Filter>Dynamic</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\Source\Phy2D\Collision\BoxCollider.cpp">

+      <Filter>Collision</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\Source\Phy2D\Collision\CapsuleCollider.cpp">

+      <Filter>Collision</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\Source\Phy2D\Collision\PolygonCollider.cpp">

+      <Filter>Collision</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\Source\Phy2D\Joints\FixedJoint.cpp">

+      <Filter>Joints</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\Source\Phy2D\Joints\Joint.cpp">

+      <Filter>Joints</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="..\..\..\Source\Phy2D\Phy2D.h" />

@@ -195,6 +216,30 @@
     <ClInclude Include="..\..\..\Source\Phy2D\Math\Vec2.h">

       <Filter>Math</Filter>

     </ClInclude>

+    <ClInclude Include="..\..\..\Source\Phy2D\Dynamic\RigidBody.h">

+      <Filter>Dynamic</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\Source\Phy2D\Dynamic\World.h">

+      <Filter>Dynamic</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\Source\Phy2D\Collision\BoxCollider.h">

+      <Filter>Collision</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\Source\Phy2D\Collision\Collider.h">

+      <Filter>Collision</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\Source\Phy2D\Collision\CapsuleCollider.h">

+      <Filter>Collision</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\Source\Phy2D\Collision\PolygonCollider.h">

+      <Filter>Collision</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\Source\Phy2D\Joints\FixedJoint.h">

+      <Filter>Joints</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\Source\Phy2D\Joints\Joint.h">

+      <Filter>Joints</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <Text Include="..\..\..\Source\Phy2D\README.txt" />

diff --git a/Client/Source/Phy2D/Collision/BoxCollider.cpp b/Client/Source/Phy2D/Collision/BoxCollider.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Client/Source/Phy2D/Collision/BoxCollider.cpp
diff --git a/Client/Source/Phy2D/Collision/BoxCollider.h b/Client/Source/Phy2D/Collision/BoxCollider.h
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Client/Source/Phy2D/Collision/BoxCollider.h
diff --git a/Client/Source/Phy2D/Collision/CapsuleCollider.cpp b/Client/Source/Phy2D/Collision/CapsuleCollider.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Client/Source/Phy2D/Collision/CapsuleCollider.cpp
diff --git a/Client/Source/Phy2D/Collision/CapsuleCollider.h b/Client/Source/Phy2D/Collision/CapsuleCollider.h
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Client/Source/Phy2D/Collision/CapsuleCollider.h
diff --git a/Client/Source/Phy2D/Collision/Collider.h b/Client/Source/Phy2D/Collision/Collider.h
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Client/Source/Phy2D/Collision/Collider.h
diff --git a/Client/Source/Phy2D/Collision/PolygonCollider.cpp b/Client/Source/Phy2D/Collision/PolygonCollider.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Client/Source/Phy2D/Collision/PolygonCollider.cpp
diff --git a/Client/Source/Phy2D/Collision/PolygonCollider.h b/Client/Source/Phy2D/Collision/PolygonCollider.h
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Client/Source/Phy2D/Collision/PolygonCollider.h
diff --git a/Client/Source/Phy2D/Common/Type.h b/Client/Source/Phy2D/Common/Type.h
index c985d99..4c0088d 100644
--- a/Client/Source/Phy2D/Common/Type.h
+++ b/Client/Source/Phy2D/Common/Type.h
@@ -1,9 +1,13 @@
 #include "fix32/fix32.hpp"

+#include "libfixmath/libfixmath/fix16.hpp"

 

 namespace Phy2D

 {

 

-    using fixed = Fix32;

+	// Phy2DÀïµÄÊýÖµÀàÐÍÓÃreal±íʾ

+	using real = Fix32;

 

-}

+	// constants

+	static real kPI = real(1ll);

 

+}
\ No newline at end of file
diff --git a/Client/Source/Phy2D/Documents/Phy2D.xlsx b/Client/Source/Phy2D/Documents/Phy2D.xlsx
index 5b6ba93..c03b2b7 100644
--- a/Client/Source/Phy2D/Documents/Phy2D.xlsx
+++ b/Client/Source/Phy2D/Documents/Phy2D.xlsx
diff --git a/Client/Source/Phy2D/Dynamic/RigidBody.cpp b/Client/Source/Phy2D/Dynamic/RigidBody.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Client/Source/Phy2D/Dynamic/RigidBody.cpp
diff --git a/Client/Source/Phy2D/Dynamic/RigidBody.h b/Client/Source/Phy2D/Dynamic/RigidBody.h
new file mode 100644
index 0000000..0301a05
--- /dev/null
+++ b/Client/Source/Phy2D/Dynamic/RigidBody.h
@@ -0,0 +1,23 @@
+#pragma once
+ 
+namespace Phy2D
+{
+	class Collider;
+	class BoxCollider;
+
+	enum RigidBodyType
+	{
+		BodyType_Static, 
+		BodyType_Kinematic,
+		BodyType_Dynamic,
+	};
+
+	// ¿ÉÒÔ±»Ê©¼ÓÁ¦¡¢³åÁ¿¡¢Å¤¾Ø
+	class RigidBody
+	{
+	public:
+
+	private: 
+
+	};
+}
\ No newline at end of file
diff --git a/Client/Source/Phy2D/Dynamic/World.cpp b/Client/Source/Phy2D/Dynamic/World.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Client/Source/Phy2D/Dynamic/World.cpp
diff --git a/Client/Source/Phy2D/Dynamic/World.h b/Client/Source/Phy2D/Dynamic/World.h
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Client/Source/Phy2D/Dynamic/World.h
diff --git a/Client/Source/Phy2D/Joints/FixedJoint.cpp b/Client/Source/Phy2D/Joints/FixedJoint.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Client/Source/Phy2D/Joints/FixedJoint.cpp
diff --git a/Client/Source/Phy2D/Joints/FixedJoint.h b/Client/Source/Phy2D/Joints/FixedJoint.h
new file mode 100644
index 0000000..585f502
--- /dev/null
+++ b/Client/Source/Phy2D/Joints/FixedJoint.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include "Joint.h"
+
+
+namespace Phy2D
+{
+
+	class FixedJoint : public Joint
+	{
+	public:
+
+	};
+
+}
diff --git a/Client/Source/Phy2D/Joints/Joint.cpp b/Client/Source/Phy2D/Joints/Joint.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Client/Source/Phy2D/Joints/Joint.cpp
diff --git a/Client/Source/Phy2D/Joints/Joint.h b/Client/Source/Phy2D/Joints/Joint.h
new file mode 100644
index 0000000..2a16888
--- /dev/null
+++ b/Client/Source/Phy2D/Joints/Joint.h
@@ -0,0 +1,11 @@
+#pragma once
+ 
+namespace Phy2D
+{
+
+	class Joint
+	{
+	
+	};
+
+}
\ No newline at end of file
diff --git a/Client/Source/Phy2D/Phy2D.h b/Client/Source/Phy2D/Phy2D.h
index 2f41e80..723e729 100644
--- a/Client/Source/Phy2D/Phy2D.h
+++ b/Client/Source/Phy2D/Phy2D.h
@@ -1,5 +1,6 @@
 #pragma once

 

 // ¶¨µãÊýµÄÎïÀíÒýÇæ

+// ¦µ2D