Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-27 23:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3542 from jdotrjs/jdotrjs/#3535/fix-arcade-collisions

Browse source 
[fixes #3535] Fix constructed functions in RTree
This commit is contained in:
Richard Davey 2018-04-11 10:12:01 +01:00 committed by GitHub
commit 0baa15e3fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/structs/RTree.js
View file

@ -465,29 +465,41 @@ rbush.prototype = {
_initFormat: function (format)
{
// data format (minX, minY, maxX, maxY accessors)
// format: [minX, minY, maxX, maxY accessors]
// accessors will be dotted names
// Because we have historically used eval-based function constructor
// the format accerrsors need to have their leading dots stripped to
// obtain the actual accessor
format = format.map(
function (f)
{
return f.substring(1);
}
);
// Do not use string-generated Functions for CSP policies
// Instead a combination of anonymous functions and grabbing
// properties by string is used.
var compareArr = function (accessor)
{
return function (a, b)
{
return this[a + accessor] - this[b + accessor];
};
// Instead a combination of anonymous functions and grabbing properties
// by string is used.
// cf. https://github.com/photonstorm/phaser/issues/3441
// and https://github.com/photonstorm/phaser/issues/3535
var mkCompareFn = function(attr) {
return function(a, b) {
return a[attr] - b[attr];
};
};
this.compareMinX = compareArr(format[0]);
this.compareMinY = compareArr(format[1]);
this.compareMinX = mkCompareFn(format[0]);
this.compareMinY = mkCompareFn(format[1]);
this.toBBox = function (a)
this.toBBox = function(a)
{
return {
minX: a + format[0],
minY: a + format[1],
maxX: a + format[2],
maxy: a + format[3]
minX: a[format[0]],
minY: a[format[1]],
maxX: a[format[2]],
maxY: a[format[3]],
};
};
}