Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2025-02-16 22:18:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removed debug work.

Browse source
This commit is contained in:
photonstorm 2017-08-18 17:01:51 +01:00
parent e35524a1f5
commit a734b74ca7
1 changed files with 9 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
v3/src/physics/impact/CollisionMap.js
View file

@ -77,15 +77,9 @@ var CollisionMap = new Class({
step: function (res, x, y, vx, vy, width, height, rvx, rvy, step) step: function (res, x, y, vx, vy, width, height, rvx, rvy, step)
{ {
// res.pos.x += vx;
// res.pos.y += vy;
// if (window.dumpit)
// {
// console.log('STEP', res.pos.x, res.pos.y, 'VX', vx, 'VY', vy, 'step', step);
// }
var t = 0; var t = 0;
var tileX;
var tileY;
var tilesize = this.tilesize; var tilesize = this.tilesize;
var mapWidth = this.width; var mapWidth = this.width;
var mapHeight = this.height; var mapHeight = this.height;
@ -98,7 +92,8 @@ var CollisionMap = new Class({
var firstTileY = Math.max(Math.floor(y / tilesize), 0); var firstTileY = Math.max(Math.floor(y / tilesize), 0);
var lastTileY = Math.min(Math.ceil((y + height) / tilesize), mapHeight); var lastTileY = Math.min(Math.ceil((y + height) / tilesize), mapHeight);
var tileX = Math.floor((res.pos.x + pxOffsetX) / tilesize);
tileX = Math.floor((res.pos.x + pxOffsetX) / tilesize);
var prevTileX = Math.floor((x + pxOffsetX) / tilesize); var prevTileX = Math.floor((x + pxOffsetX) / tilesize);
@ -107,50 +102,26 @@ var CollisionMap = new Class({
prevTileX = -1; prevTileX = -1;
} }
// if (window.debugslopes)
// {
// console.group('VX');
// console.log('pxOffsetX', pxOffsetX);
// console.log('tileOffsetX', tileOffsetX);
// console.log('firstTileY', firstTileY);
// console.log('lastTileY', lastTileY);
// console.log('tileX', tileX);
// console.log('prevTileX', prevTileX);
// }
if (tileX >= 0 && tileX < mapWidth) if (tileX >= 0 && tileX < mapWidth)
{ {
// console.log('X:', tileX); for (tileY = firstTileY; tileY < lastTileY; tileY++)
for (var tileY = firstTileY; tileY < lastTileY; tileY++)
{ {
// console.log('Y:', tileY);
if (prevTileX !== -1) if (prevTileX !== -1)
{ {
t = this.data[tileY][prevTileX]; t = this.data[tileY][prevTileX];
// console.log('t1', t);
if (t > 1 && t <= this.lastSlope && this.checkDef(res, t, x, y, rvx, rvy, width, height, prevTileX, tileY)) if (t > 1 && t <= this.lastSlope && this.checkDef(res, t, x, y, rvx, rvy, width, height, prevTileX, tileY))
{ {
// console.log('t1 break');
break; break;
} }
} }
t = this.data[tileY][tileX]; t = this.data[tileY][tileX];
// if (window.debugslopes)
// {
// console.log('Tile at', tileX, 'x', tileY, '=', t);
// }
if (t === 1 || t > this.lastSlope || (t > 1 && this.checkDef(res, t, x, y, rvx, rvy, width, height, tileX, tileY))) if (t === 1 || t > this.lastSlope || (t > 1 && this.checkDef(res, t, x, y, rvx, rvy, width, height, tileX, tileY)))
{ {
if (t > 1 && t <= this.lastSlope && res.collision.slope) if (t > 1 && t <= this.lastSlope && res.collision.slope)
{ {
// console.log('t2 break');
break; break;
} }
@ -160,26 +131,10 @@ var CollisionMap = new Class({
x = res.pos.x; x = res.pos.x;
rvx = 0; rvx = 0;
// if (window.debugslopes)
// {
// console.log('>>> Hit solid tile <<<');
// console.log('tileX', tileX);
// console.log('tilesize', tilesize);
// console.log('pxOffsetX', pxOffsetX);
// console.log('tileOffsetX', tileOffsetX);
// console.log('=', res.pos.x);
// }
break; break;
} }
} }
} }
// if (window.debugslopes)
// {
// console.groupEnd();
// }
} }
// Vertical // Vertical
@ -190,7 +145,8 @@ var CollisionMap = new Class({
var firstTileX = Math.max(Math.floor(res.pos.x / tilesize), 0); var firstTileX = Math.max(Math.floor(res.pos.x / tilesize), 0);
var lastTileX = Math.min(Math.ceil((res.pos.x + width) / tilesize), mapWidth); var lastTileX = Math.min(Math.ceil((res.pos.x + width) / tilesize), mapWidth);
var tileY = Math.floor((res.pos.y + pxOffsetY) / tilesize);
tileY = Math.floor((res.pos.y + pxOffsetY) / tilesize);
var prevTileY = Math.floor((y + pxOffsetY) / tilesize); var prevTileY = Math.floor((y + pxOffsetY) / tilesize);
@ -201,7 +157,7 @@ var CollisionMap = new Class({
if (tileY >= 0 && tileY < mapHeight) if (tileY >= 0 && tileY < mapHeight)
{ {
for (var tileX = firstTileX; tileX < lastTileX; tileX++) for (tileX = firstTileX; tileX < lastTileX; tileX++)
{ {
if (prevTileY !== -1) if (prevTileY !== -1)
{ {