|
@ -42,7 +42,7 @@ |
|
|
|
|
|
|
|
|
var context = canvas.getContext('2d'); |
|
|
var context = canvas.getContext('2d'); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var bullets = []; |
|
|
|
|
|
|
|
|
var keysDown = {}; |
|
|
var keysDown = {}; |
|
|
|
|
|
|
|
@ -67,7 +67,7 @@ |
|
|
//bullet class |
|
|
//bullet class |
|
|
var Bullet = function(dir, x, y) |
|
|
var Bullet = function(dir, x, y) |
|
|
{ |
|
|
{ |
|
|
console.log(dir + " " + x + " " + y); |
|
|
|
|
|
|
|
|
//console.log(dir + " " + x + " " + y); |
|
|
|
|
|
|
|
|
this.dir = dir; |
|
|
this.dir = dir; |
|
|
|
|
|
|
|
@ -83,7 +83,7 @@ |
|
|
this.move = function() |
|
|
this.move = function() |
|
|
{ |
|
|
{ |
|
|
|
|
|
|
|
|
sonsole.log("move"); |
|
|
|
|
|
|
|
|
//console.log("move"); |
|
|
this.x += this.speed * Math.sin(this.dir); |
|
|
this.x += this.speed * Math.sin(this.dir); |
|
|
|
|
|
|
|
|
this.y += this.speed * Math.cos(this.dir); |
|
|
this.y += this.speed * Math.cos(this.dir); |
|
@ -91,19 +91,19 @@ |
|
|
|
|
|
|
|
|
this.render = function() |
|
|
this.render = function() |
|
|
{ |
|
|
{ |
|
|
context.fillStyle = "rgba(255, 255, 255 , 1)"; //green |
|
|
|
|
|
|
|
|
context.fillStyle = "rgba(255, 0, 0 , 1)"; //green |
|
|
context.beginPath(); |
|
|
context.beginPath(); |
|
|
context.arc(this.x,this.y,this.width,0,2*Math.PI); |
|
|
context.arc(this.x,this.y,this.width,0,2*Math.PI); |
|
|
context.fill(); |
|
|
context.fill(); |
|
|
console.log(this.x); |
|
|
|
|
|
|
|
|
//console.log(this.x); |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
//array of bullets |
|
|
//array of bullets |
|
|
var bullets = []; |
|
|
|
|
|
|
|
|
|
|
|
bullets.push(new Bullet(Math.PI, 100, 100)); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//bullets[0] = new Bullet(Math.PI, 100, 100); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var Player = function(x,y) |
|
|
var Player = function(x,y) |
|
@ -118,6 +118,8 @@ |
|
|
|
|
|
|
|
|
this.dir = Math.PI; |
|
|
this.dir = Math.PI; |
|
|
|
|
|
|
|
|
|
|
|
this.dirSpeed = 10; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.render = function() |
|
|
this.render = function() |
|
@ -139,13 +141,13 @@ |
|
|
|
|
|
|
|
|
if(value == 37) //left |
|
|
if(value == 37) //left |
|
|
{ |
|
|
{ |
|
|
//one degree |
|
|
|
|
|
this.dir += Math.PI / 360; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.dir += this.dirSpeed * Math.PI / 360; |
|
|
} |
|
|
} |
|
|
else if(value == 39) |
|
|
else if(value == 39) |
|
|
{ |
|
|
{ |
|
|
//one degree |
|
|
|
|
|
this.dir -= Math.PI / 360; |
|
|
|
|
|
|
|
|
// |
|
|
|
|
|
this.dir -= this.dirSpeed * Math.PI / 360; |
|
|
} |
|
|
} |
|
|
else if(value == 38) // up |
|
|
else if(value == 38) // up |
|
|
{ |
|
|
{ |
|
@ -213,7 +215,7 @@ |
|
|
{ |
|
|
{ |
|
|
var dimmed = false; |
|
|
var dimmed = false; |
|
|
|
|
|
|
|
|
for(i = 0; i> bullets.size; i++) |
|
|
|
|
|
|
|
|
for(i = 0; i> bullets.length; i++) |
|
|
{ |
|
|
{ |
|
|
if(bullets[i] == -1) |
|
|
if(bullets[i] == -1) |
|
|
{ |
|
|
{ |
|
@ -327,7 +329,7 @@ |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
for (i = 0; i < bullets.lenght; i++) |
|
|
|
|
|
|
|
|
for (var i = bullets.length; i--; ) |
|
|
{ |
|
|
{ |
|
|
if(bullets[i] != -1) |
|
|
if(bullets[i] != -1) |
|
|
{ |
|
|
{ |
|
@ -349,28 +351,40 @@ |
|
|
addAstroid(); |
|
|
addAstroid(); |
|
|
p.move(); |
|
|
p.move(); |
|
|
|
|
|
|
|
|
for (i = 0; i< astroids.length; i++) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var halp = bullets.lenght |
|
|
|
|
|
|
|
|
|
|
|
//console.log(halp); |
|
|
|
|
|
//for (b = 0; b < bullets.lenght; b++) |
|
|
|
|
|
//var b; |
|
|
|
|
|
for (var i = bullets.length; i--; ) |
|
|
{ |
|
|
{ |
|
|
if(astroids[i] != -1) |
|
|
|
|
|
|
|
|
console.log("b"); |
|
|
|
|
|
if(bullets[i] != -1) |
|
|
{ |
|
|
{ |
|
|
if(astroids[i].move()) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(bullets[i].move()) |
|
|
{ |
|
|
{ |
|
|
astroids[i] = -1; |
|
|
|
|
|
|
|
|
b = -1; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
console.log(bullets.lenght); |
|
|
|
|
|
for (i = 0; i < bullets.lenght; i++) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for (i = 0; i< astroids.length; i++) |
|
|
{ |
|
|
{ |
|
|
if(bullets[i] != -1) |
|
|
|
|
|
|
|
|
if(astroids[i] != -1) |
|
|
{ |
|
|
{ |
|
|
if(bullets[i].move()) |
|
|
|
|
|
|
|
|
if(astroids[i].move()) |
|
|
{ |
|
|
{ |
|
|
bullets[i] = -1; |
|
|
|
|
|
|
|
|
astroids[i] = -1; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|