From be8972f52a9e45d8704f49526aa65bdde8181556 Mon Sep 17 00:00:00 2001
From: Nomango <569629550@qq.com>
Date: Tue, 17 Jul 2018 12:37:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=9C=BA=E6=99=AF=E7=9A=84on?=
 =?UTF-8?q?Collision=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/Manager/CollisionManager.cpp | 5 ++---
 core/e2dcommon.h                  | 3 ---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/core/Manager/CollisionManager.cpp b/core/Manager/CollisionManager.cpp
index 0aafe0e9..08c5ffce 100644
--- a/core/Manager/CollisionManager.cpp
+++ b/core/Manager/CollisionManager.cpp
@@ -70,9 +70,8 @@ void e2d::CollisionManager::__updateCollider(Collider* collider)
 		if (relation != Collider::Relation::Unknown &&
 			relation != Collider::Relation::Disjoin)
 		{
-			Collision collision(passive, relation);
-			active->getParentScene()->onCollision(collision);
-			active->onCollision(collision);
+			active->onCollision(Collision(passive, relation));
+			passive->onCollision(Collision(active, relation));
 		}
 	}
 }
diff --git a/core/e2dcommon.h b/core/e2dcommon.h
index 98690f0b..c07a9f00 100644
--- a/core/e2dcommon.h
+++ b/core/e2dcommon.h
@@ -911,9 +911,6 @@ public:
 	// 说明：返回 false 将阻止消息继续传递
 	virtual bool onMouseEvent(MouseEvent e) { return true; }
 
-	// 碰撞消息
-	virtual void onCollision(Collision collision) { }
-
 	// 关闭窗口
 	// 说明：返回 false 将阻止窗口关闭
 	virtual bool onCloseWindow() { return true; }