scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-01 02:38:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Paperoids example.

Browse source
This commit is contained in:
Jonathan Puckey 2013-03-07 14:45:51 +01:00
parent b8ca30a4cd
commit 304ca32d45
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
examples/Games/Paperoids.html
View file

@ -201,16 +201,15 @@
}, },
checkCollisions: function() { checkCollisions: function() {
var crash = -1; var crashRock;
// move rocks and do a hit test // move rocks and do a hit test
// between bounding rect of rocks and ship // between bounding rect of rocks and ship
for (var i = 0; i < Rocks.children.length; i++) { for (var i = 0; i < Rocks.children.length; i++) {
var rock = Rocks.children[i]; var rock = Rocks.children[i];
rock.position += rock.vector; rock.position += rock.vector;
if (rock.bounds.intersects(this.item.bounds)) { if (rock.bounds.intersects(this.item.bounds))
crash = i; crashRock = rock;
}
keepInView(rock); keepInView(rock);
} }
@ -231,10 +230,9 @@
// if bounding rect collision, do a line intersection test // if bounding rect collision, do a line intersection test
if (crash > -1) { if (crashRock) {
var index = Rocks.children[crash].typeIndex; var tempRock = crashRock.symbol.definition.clone();
var tempRock = Rocks.shapes[index].clone(); tempRock.transform(crashRock.matrix);
tempRock.transform(Rocks.children[crash].matrix);
tempRock.remove(); tempRock.remove();
var intersections = this.item.firstChild.getIntersections(tempRock); var intersections = this.item.firstChild.getIntersections(tempRock);
if (intersections.length > 0) if (intersections.length > 0)
@ -275,11 +273,11 @@
for (var r = 0; r < Rocks.children.length; r++) { for (var r = 0; r < Rocks.children.length; r++) {
var rock = Rocks.children[r]; var rock = Rocks.children[r];
if (rock.bounds.contains(bullet.position) ) { if (rock.bounds.contains(bullet.position) ) {
Score.update(rock.type); Score.update(rock.shapeType);
Rocks.explode(rock); Rocks.explode(rock);
if (rock.type < Rocks.TYPE_SMALL ) { if (rock.shapeType < Rocks.TYPE_SMALL ) {
for (var i = 0; i < 2; i++) { for (var j = 0; j < 2; j++) {
Rocks.add(1, rock.type + 4, rock.position); Rocks.add(1, rock.shapeType + 4, rock.position);
} }
} }
rock.remove(); rock.remove();
@ -344,8 +342,7 @@
angle: 360 * Math.random(), angle: 360 * Math.random(),
length: presets.maxRockSpeed * Math.random() + 0.1 length: presets.maxRockSpeed * Math.random() + 0.1
}); });
rock.typeIndex = randomRock; rock.shapeType = type;
rock.type = type;
return rock; return rock;
}, },
add: function(amount, type, position) { add: function(amount, type, position) {
@ -355,7 +352,7 @@
} }
}, },
explode: function(rock) { explode: function(rock) {
var boomRock = shapes[rock.typeIndex].clone(); var boomRock = rock.symbol.definition.clone();
boomRock.position = rock.position; boomRock.position = rock.position;
for (var i = 0; i < boomRock.segments.length; i++) { for (var i = 0; i < boomRock.segments.length; i++) {
var segmentPoint = boomRock.segments[i].point; var segmentPoint = boomRock.segments[i].point;