aboutsummaryrefslogtreecommitdiff
path: root/Client/Source/Phy2D/Dynamic
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2021-12-01 13:34:22 +0800
committerchai <chaifix@163.com>2021-12-01 13:34:22 +0800
commit09abf1b529b4226f585ecfbb20866715b901755b (patch)
tree16929f2a6bee3ad4667bdd006cfcc1e683ab7210 /Client/Source/Phy2D/Dynamic
parent84d961f754c905b37420f4d1b3fee8f4e523e58a (diff)
+fpm
Diffstat (limited to 'Client/Source/Phy2D/Dynamic')
-rw-r--r--Client/Source/Phy2D/Dynamic/Arbiter.cpp14
-rw-r--r--Client/Source/Phy2D/Dynamic/Arbiter.h2
-rw-r--r--Client/Source/Phy2D/Dynamic/Body.cpp2
-rw-r--r--Client/Source/Phy2D/Dynamic/Body.h6
-rw-r--r--Client/Source/Phy2D/Dynamic/Collide.cpp12
-rw-r--r--Client/Source/Phy2D/Dynamic/Joint.cpp14
-rw-r--r--Client/Source/Phy2D/Dynamic/Joint.h8
-rw-r--r--Client/Source/Phy2D/Dynamic/World.cpp16
-rw-r--r--Client/Source/Phy2D/Dynamic/World.h24
9 files changed, 49 insertions, 49 deletions
diff --git a/Client/Source/Phy2D/Dynamic/Arbiter.cpp b/Client/Source/Phy2D/Dynamic/Arbiter.cpp
index 11288a3..4163154 100644
--- a/Client/Source/Phy2D/Dynamic/Arbiter.cpp
+++ b/Client/Source/Phy2D/Dynamic/Arbiter.cpp
@@ -1,10 +1,10 @@
-#include "Arbiter.h"
-#include "World.h"
-#include "Body.h"
-#include "Joint.h"
-
-using namespace Phy2D;
-
+#include "Arbiter.h"
+#include "World.h"
+#include "Body.h"
+#include "Joint.h"
+
+using namespace Phy2D;
+
Arbiter::Arbiter(Body* b1, Body* b2)
{
if (b1 < b2)
diff --git a/Client/Source/Phy2D/Dynamic/Arbiter.h b/Client/Source/Phy2D/Dynamic/Arbiter.h
index b02b413..64bed72 100644
--- a/Client/Source/Phy2D/Dynamic/Arbiter.h
+++ b/Client/Source/Phy2D/Dynamic/Arbiter.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
#include "../Common/Math.h"
diff --git a/Client/Source/Phy2D/Dynamic/Body.cpp b/Client/Source/Phy2D/Dynamic/Body.cpp
index 73bafe2..1d896fd 100644
--- a/Client/Source/Phy2D/Dynamic/Body.cpp
+++ b/Client/Source/Phy2D/Dynamic/Body.cpp
@@ -1,4 +1,4 @@
-#include "Body.h"
+#include "Body.h"
using namespace Phy2D;
diff --git a/Client/Source/Phy2D/Dynamic/Body.h b/Client/Source/Phy2D/Dynamic/Body.h
index 6d86e07..8c2ac72 100644
--- a/Client/Source/Phy2D/Dynamic/Body.h
+++ b/Client/Source/Phy2D/Dynamic/Body.h
@@ -1,6 +1,6 @@
-#pragma once
-
-#include "../Common/Math.h"
+#pragma once
+
+#include "../Common/Math.h"
namespace Phy2D
{
diff --git a/Client/Source/Phy2D/Dynamic/Collide.cpp b/Client/Source/Phy2D/Dynamic/Collide.cpp
index 647147a..6849c0e 100644
--- a/Client/Source/Phy2D/Dynamic/Collide.cpp
+++ b/Client/Source/Phy2D/Dynamic/Collide.cpp
@@ -1,9 +1,9 @@
-#include "Arbiter.h"
-#include "Body.h"
-#include "World.h"
-#include "Joint.h"
-
-using namespace Phy2D;
+#include "Arbiter.h"
+#include "Body.h"
+#include "World.h"
+#include "Joint.h"
+
+using namespace Phy2D;
// Box vertex and edge numbering:
//
diff --git a/Client/Source/Phy2D/Dynamic/Joint.cpp b/Client/Source/Phy2D/Dynamic/Joint.cpp
index e0d10f9..95f7c64 100644
--- a/Client/Source/Phy2D/Dynamic/Joint.cpp
+++ b/Client/Source/Phy2D/Dynamic/Joint.cpp
@@ -1,8 +1,8 @@
-#include "Joint.h"
-#include "Body.h"
-#include "World.h"
-
-using namespace Phy2D;
+#include "Joint.h"
+#include "Body.h"
+#include "World.h"
+
+using namespace Phy2D;
void Joint::Set(Body* b1, Body* b2, const Vec2& anchor)
{
@@ -98,5 +98,5 @@ void Joint::ApplyImpulse()
P += impulse;
}
-
-
+
+
diff --git a/Client/Source/Phy2D/Dynamic/Joint.h b/Client/Source/Phy2D/Dynamic/Joint.h
index 34d8d8d..ee08b40 100644
--- a/Client/Source/Phy2D/Dynamic/Joint.h
+++ b/Client/Source/Phy2D/Dynamic/Joint.h
@@ -1,6 +1,6 @@
-#pragma once
-
-#include "../Common/Math.h"
+#pragma once
+
+#include "../Common/Math.h"
namespace Phy2D
{
@@ -31,4 +31,4 @@ namespace Phy2D
number softness;
};
-}
+}
diff --git a/Client/Source/Phy2D/Dynamic/World.cpp b/Client/Source/Phy2D/Dynamic/World.cpp
index 6b0174c..4f48b69 100644
--- a/Client/Source/Phy2D/Dynamic/World.cpp
+++ b/Client/Source/Phy2D/Dynamic/World.cpp
@@ -1,10 +1,10 @@
-#include "World.h"
-#include "Body.h"
-#include "Joint.h"
-#include "Arbiter.h"
-
-using namespace Phy2D;
-
+#include "World.h"
+#include "Body.h"
+#include "Joint.h"
+#include "Arbiter.h"
+
+using namespace Phy2D;
+
using std::vector;
using std::map;
@@ -126,4 +126,4 @@ void World::Step(number dt)
b->force.Set(0.0f, 0.0f);
b->torque = 0.0f;
}
-}
+}
diff --git a/Client/Source/Phy2D/Dynamic/World.h b/Client/Source/Phy2D/Dynamic/World.h
index d5c652c..93c883d 100644
--- a/Client/Source/Phy2D/Dynamic/World.h
+++ b/Client/Source/Phy2D/Dynamic/World.h
@@ -1,12 +1,12 @@
-#pragma once
-
-#include <vector>
-#include <map>
-#include "../Common/Math.h"
-#include "Arbiter.h"
-
-namespace Phy2D
-{
+#pragma once
+
+#include <vector>
+#include <map>
+#include "../Common/Math.h"
+#include "Arbiter.h"
+
+namespace Phy2D
+{
struct Body;
struct Joint;
@@ -31,6 +31,6 @@ namespace Phy2D
static bool accumulateImpulses;
static bool warmStarting;
static bool positionCorrection;
- };
-
-}
+ };
+
+}