Skip to content

Commit a734b74

Browse files
committed
Removed debug work.
1 parent e35524a commit a734b74

1 file changed

Lines changed: 9 additions & 53 deletions

File tree

v3/src/physics/impact/CollisionMap.js

Lines changed: 9 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,9 @@ var CollisionMap = new Class({
7777

7878
step: function (res, x, y, vx, vy, width, height, rvx, rvy, step)
7979
{
80-
// res.pos.x += vx;
81-
// res.pos.y += vy;
82-
83-
// if (window.dumpit)
84-
// {
85-
// console.log('STEP', res.pos.x, res.pos.y, 'VX', vx, 'VY', vy, 'step', step);
86-
// }
87-
8880
var t = 0;
81+
var tileX;
82+
var tileY;
8983
var tilesize = this.tilesize;
9084
var mapWidth = this.width;
9185
var mapHeight = this.height;
@@ -98,59 +92,36 @@ var CollisionMap = new Class({
9892

9993
var firstTileY = Math.max(Math.floor(y / tilesize), 0);
10094
var lastTileY = Math.min(Math.ceil((y + height) / tilesize), mapHeight);
101-
var tileX = Math.floor((res.pos.x + pxOffsetX) / tilesize);
95+
96+
tileX = Math.floor((res.pos.x + pxOffsetX) / tilesize);
10297

10398
var prevTileX = Math.floor((x + pxOffsetX) / tilesize);
10499

105100
if (step > 0 || tileX === prevTileX || prevTileX < 0 || prevTileX >= mapWidth)
106101
{
107102
prevTileX = -1;
108103
}
109-
110-
// if (window.debugslopes)
111-
// {
112-
// console.group('VX');
113-
// console.log('pxOffsetX', pxOffsetX);
114-
// console.log('tileOffsetX', tileOffsetX);
115-
// console.log('firstTileY', firstTileY);
116-
// console.log('lastTileY', lastTileY);
117-
// console.log('tileX', tileX);
118-
// console.log('prevTileX', prevTileX);
119-
// }
120-
104+
121105
if (tileX >= 0 && tileX < mapWidth)
122106
{
123-
// console.log('X:', tileX);
124-
125-
for (var tileY = firstTileY; tileY < lastTileY; tileY++)
107+
for (tileY = firstTileY; tileY < lastTileY; tileY++)
126108
{
127-
// console.log('Y:', tileY);
128-
129109
if (prevTileX !== -1)
130110
{
131111
t = this.data[tileY][prevTileX];
132112

133-
// console.log('t1', t);
134-
135113
if (t > 1 && t <= this.lastSlope && this.checkDef(res, t, x, y, rvx, rvy, width, height, prevTileX, tileY))
136114
{
137-
// console.log('t1 break');
138115
break;
139116
}
140117
}
141118

142119
t = this.data[tileY][tileX];
143120

144-
// if (window.debugslopes)
145-
// {
146-
// console.log('Tile at', tileX, 'x', tileY, '=', t);
147-
// }
148-
149121
if (t === 1 || t > this.lastSlope || (t > 1 && this.checkDef(res, t, x, y, rvx, rvy, width, height, tileX, tileY)))
150122
{
151123
if (t > 1 && t <= this.lastSlope && res.collision.slope)
152124
{
153-
// console.log('t2 break');
154125
break;
155126
}
156127

@@ -160,26 +131,10 @@ var CollisionMap = new Class({
160131
x = res.pos.x;
161132
rvx = 0;
162133

163-
// if (window.debugslopes)
164-
// {
165-
// console.log('>>> Hit solid tile <<<');
166-
167-
// console.log('tileX', tileX);
168-
// console.log('tilesize', tilesize);
169-
// console.log('pxOffsetX', pxOffsetX);
170-
// console.log('tileOffsetX', tileOffsetX);
171-
// console.log('=', res.pos.x);
172-
// }
173-
174134
break;
175135
}
176136
}
177137
}
178-
179-
// if (window.debugslopes)
180-
// {
181-
// console.groupEnd();
182-
// }
183138
}
184139

185140
// Vertical
@@ -190,7 +145,8 @@ var CollisionMap = new Class({
190145

191146
var firstTileX = Math.max(Math.floor(res.pos.x / tilesize), 0);
192147
var lastTileX = Math.min(Math.ceil((res.pos.x + width) / tilesize), mapWidth);
193-
var tileY = Math.floor((res.pos.y + pxOffsetY) / tilesize);
148+
149+
tileY = Math.floor((res.pos.y + pxOffsetY) / tilesize);
194150

195151
var prevTileY = Math.floor((y + pxOffsetY) / tilesize);
196152

@@ -201,7 +157,7 @@ var CollisionMap = new Class({
201157

202158
if (tileY >= 0 && tileY < mapHeight)
203159
{
204-
for (var tileX = firstTileX; tileX < lastTileX; tileX++)
160+
for (tileX = firstTileX; tileX < lastTileX; tileX++)
205161
{
206162
if (prevTileY !== -1)
207163
{

0 commit comments

Comments
 (0)