Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Also send events to the top body in a multipart body #9

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 21 additions & 26 deletions build/matter-collision-events.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,31 @@ module.exports = __WEBPACK_EXTERNAL_MODULE_0__;
/***/ (function(module, exports, __webpack_require__) {

var Matter = __webpack_require__(0);


var MatterCollisionEvents = {
name: 'matter-collision-events',
version: '0.1.5',
for: 'matter-js@^0.12.0',
install: function(matter) {
// add the onCollide, onCollideEnd, and onCollideActive callback handlers
// to the native Matter.Body created

function triggerRecursively(body, eventName, pair) {
matter.Events.trigger(body, eventName, { pair : pair });
body._mceOC &&
body._mceOC(pair)

if (body.parent !== undefined && body.parent !== body) {
triggerRecursively(body.parent, eventName, pair);
}
}

function sendEvent(pair, eventName) {
triggerRecursively(pair.bodyA, eventName, pair);
triggerRecursively(pair.bodyB, eventName, pair);
}

var create = matter.Body.create;
matter.Body.create = function() {
var body = create.apply(null, arguments);
Expand All @@ -105,42 +123,19 @@ var MatterCollisionEvents = {
matter.after('Engine.create', function() {
matter.Events.on(this, 'collisionStart', function(event) {
event.pairs.map(function(pair) {
matter.Events.trigger(pair.bodyA, 'onCollide', { pair : pair });
matter.Events.trigger(pair.bodyB, 'onCollide', { pair : pair });
pair.bodyA._mceOC &&
pair.bodyA._mceOC(pair)
pair.bodyB._mceOC &&
pair.bodyB._mceOC(pair)
sendEvent(pair, 'onCollide');
});
});

matter.Events.on(this, 'collisionActive', function(event) {
event.pairs.map(function(pair) {
matter.Events.trigger(
pair.bodyA,
'onCollideActive',
{ pair: pair }
);
matter.Events.trigger(
pair.bodyB,
'onCollideActive',
{ pair: pair }
);
pair.bodyA._mceOCA &&
pair.bodyA._mceOCA(pair)
pair.bodyB._mceOCA &&
pair.bodyB._mceOCA(pair)
sendEvent(pair, 'onCollideActive');
});
});

matter.Events.on(this, 'collisionEnd', function(event) {
event.pairs.map(function(pair) {
matter.Events.trigger(pair.bodyA, 'onCollideEnd', { pair : pair });
matter.Events.trigger(pair.bodyB, 'onCollideEnd', { pair : pair });
pair.bodyA._mceOCE &&
pair.bodyA._mceOCE(pair)
pair.bodyB._mceOCE &&
pair.bodyB._mceOCE(pair)
sendEvent(pair, 'onCollideEnd');
});
});
});
Expand Down
2 changes: 1 addition & 1 deletion build/matter-collision-events.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 21 additions & 26 deletions docs/lib/matter-collision-events.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,31 @@ module.exports = __WEBPACK_EXTERNAL_MODULE_0__;
/***/ (function(module, exports, __webpack_require__) {

var Matter = __webpack_require__(0);


var MatterCollisionEvents = {
name: 'matter-collision-events',
version: '0.1.5',
for: 'matter-js@^0.12.0',
install: function(matter) {
// add the onCollide, onCollideEnd, and onCollideActive callback handlers
// to the native Matter.Body created

function triggerRecursively(body, eventName, pair) {
matter.Events.trigger(body, eventName, { pair : pair });
body._mceOC &&
body._mceOC(pair)

if (body.parent !== undefined && body.parent !== body) {
triggerRecursively(body.parent, eventName, pair);
}
}

function sendEvent(pair, eventName) {
triggerRecursively(pair.bodyA, eventName, pair);
triggerRecursively(pair.bodyB, eventName, pair);
}

var create = matter.Body.create;
matter.Body.create = function() {
var body = create.apply(null, arguments);
Expand All @@ -105,42 +123,19 @@ var MatterCollisionEvents = {
matter.after('Engine.create', function() {
matter.Events.on(this, 'collisionStart', function(event) {
event.pairs.map(function(pair) {
matter.Events.trigger(pair.bodyA, 'onCollide', { pair : pair });
matter.Events.trigger(pair.bodyB, 'onCollide', { pair : pair });
pair.bodyA._mceOC &&
pair.bodyA._mceOC(pair)
pair.bodyB._mceOC &&
pair.bodyB._mceOC(pair)
sendEvent(pair, 'onCollide');
});
});

matter.Events.on(this, 'collisionActive', function(event) {
event.pairs.map(function(pair) {
matter.Events.trigger(
pair.bodyA,
'onCollideActive',
{ pair: pair }
);
matter.Events.trigger(
pair.bodyB,
'onCollideActive',
{ pair: pair }
);
pair.bodyA._mceOCA &&
pair.bodyA._mceOCA(pair)
pair.bodyB._mceOCA &&
pair.bodyB._mceOCA(pair)
sendEvent(pair, 'onCollideActive');
});
});

matter.Events.on(this, 'collisionEnd', function(event) {
event.pairs.map(function(pair) {
matter.Events.trigger(pair.bodyA, 'onCollideEnd', { pair : pair });
matter.Events.trigger(pair.bodyB, 'onCollideEnd', { pair : pair });
pair.bodyA._mceOCE &&
pair.bodyA._mceOCE(pair)
pair.bodyB._mceOCE &&
pair.bodyB._mceOCE(pair)
sendEvent(pair, 'onCollideEnd');
});
});
});
Expand Down
47 changes: 21 additions & 26 deletions src/entry.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,29 @@
var Matter = require('matter-js');


var MatterCollisionEvents = {
name: 'matter-collision-events',
version: '0.1.5',
for: 'matter-js@^0.12.0',
install: function(matter) {
// add the onCollide, onCollideEnd, and onCollideActive callback handlers
// to the native Matter.Body created

function triggerRecursively(body, eventName, pair) {
matter.Events.trigger(body, eventName, { pair : pair });
body._mceOC &&
body._mceOC(pair)

if (body.parent !== undefined && body.parent !== body) {
triggerRecursively(body.parent, eventName, pair);
}
}

function sendEvent(pair, eventName) {
triggerRecursively(pair.bodyA, eventName, pair);
triggerRecursively(pair.bodyB, eventName, pair);
}

var create = matter.Body.create;
matter.Body.create = function() {
var body = create.apply(null, arguments);
Expand All @@ -17,42 +35,19 @@ var MatterCollisionEvents = {
matter.after('Engine.create', function() {
matter.Events.on(this, 'collisionStart', function(event) {
event.pairs.map(function(pair) {
matter.Events.trigger(pair.bodyA, 'onCollide', { pair : pair });
matter.Events.trigger(pair.bodyB, 'onCollide', { pair : pair });
pair.bodyA._mceOC &&
pair.bodyA._mceOC(pair)
pair.bodyB._mceOC &&
pair.bodyB._mceOC(pair)
sendEvent(pair, 'onCollide');
});
});

matter.Events.on(this, 'collisionActive', function(event) {
event.pairs.map(function(pair) {
matter.Events.trigger(
pair.bodyA,
'onCollideActive',
{ pair: pair }
);
matter.Events.trigger(
pair.bodyB,
'onCollideActive',
{ pair: pair }
);
pair.bodyA._mceOCA &&
pair.bodyA._mceOCA(pair)
pair.bodyB._mceOCA &&
pair.bodyB._mceOCA(pair)
sendEvent(pair, 'onCollideActive');
});
});

matter.Events.on(this, 'collisionEnd', function(event) {
event.pairs.map(function(pair) {
matter.Events.trigger(pair.bodyA, 'onCollideEnd', { pair : pair });
matter.Events.trigger(pair.bodyB, 'onCollideEnd', { pair : pair });
pair.bodyA._mceOCE &&
pair.bodyA._mceOCE(pair)
pair.bodyB._mceOCE &&
pair.bodyB._mceOCE(pair)
sendEvent(pair, 'onCollideEnd');
});
});
});
Expand Down