Lenheart
/
Magic_Game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

移除场景的onCollision函数

This commit is contained in:
Nomango 2018-07-17 12:37:37 +08:00
parent 109bebb1e4
commit be8972f52a
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/Manager/CollisionManager.cpp
View File

@ -70,9 +70,8 @@ void e2d::CollisionManager::__updateCollider(Collider* collider)
if (relation != Collider::Relation::Unknown && if (relation != Collider::Relation::Unknown &&
relation != Collider::Relation::Disjoin) relation != Collider::Relation::Disjoin)
{ {
Collision collision(passive, relation); active->onCollision(Collision(passive, relation));
active->getParentScene()->onCollision(collision); passive->onCollision(Collision(active, relation));
active->onCollision(collision);
} }
} }
} }

3
core/e2dcommon.h
View File

@ -911,9 +911,6 @@ public:
// 说明：返回 false 将阻止消息继续传递 // 说明：返回 false 将阻止消息继续传递
virtual bool onMouseEvent(MouseEvent e) { return true; } virtual bool onMouseEvent(MouseEvent e) { return true; }
// ÅöײÏûÏ¢
virtual void onCollision(Collision collision) { }
// 关闭窗口 // 关闭窗口
// 说明：返回 false 将阻止窗口关闭 // 说明：返回 false 将阻止窗口关闭
virtual bool onCloseWindow() { return true; } virtual bool onCloseWindow() { return true; }