VAR/CandyFucker
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code formatting

Browse Source
This commit is contained in:
Valeriano A.R.
2015-12-05 12:28:39 +01:00
parent dda5c8e77c
commit 497ae3a1a7
2 changed files with 70 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
code/CandyFucker.js
View File

@@ -1,27 +1,33 @@
window.Images = new ImageLoader();
/////////////////////////////////////////
//
// Particle
//
var Particle = function(game, position, image) {
this.Game = game;
this.GameEntity = new GameEntity(
game.GameScreen,
position,
{X:image.naturalWidth, Y:image.naturalHeight},
image,
"Particle"
);
this.Speed = Vec2D.Scale(Vec2D.Normalize({
X: Math.floor(Math.random() * 33)-16,
Y: Math.floor(Math.random() * 33)-16}),32);
this.Game = game;
this.GameEntity = new GameEntity(
game.GameScreen,
position,
{X:image.naturalWidth, Y:image.naturalHeight},
image,
"Particle"
);
this.Speed = Vec2D.Scale(Vec2D.Normalize({
X: Math.floor(Math.random() * 33)-16,
Y: Math.floor(Math.random() * 33)-16}),32);
};
Particle.prototype = {
Update: function() {
this.Speed = Vec2D.Scale(this.Speed, 1.2);
this.GameEntity.AddPosition(this.Speed);
if(this.GameEntity.InsideScreen()==false){
this.GameEntity.Delete();
}
}
Update: function() {
this.Speed = Vec2D.Scale(this.Speed, 1.2);
this.GameEntity.AddPosition(this.Speed);
if(this.GameEntity.InsideScreen()==false){
this.GameEntity.Delete();
}
}
};
@@ -33,7 +39,7 @@ var CandyEntity = function(game, color, gridPosition){
this.Game = game;
this.GridPosition = gridPosition || {X: 0, Y: 0};
this.Color = color;
this.GameEntity = new GameEntity(
this.GameEntity = new GameEntity(
game.GameScreen,
null,
{X: 32, Y: 32},
@@ -53,15 +59,15 @@ CandyEntity.prototype = {
});
},
Delete: function(){
var frag;
for(var i=0; i<4; i++){
frag = new Particle(
this.Game,
this.GameEntity.PositionDest,
Images.GetImage(this.Color)
);
this.Game.GameScreen.AddEntity(frag);
}
var frag;
for(var i=0; i<4; i++){
frag = new Particle(
this.Game,
this.GameEntity.PositionDest,
Images.GetImage(this.Color)
);
this.Game.GameScreen.AddEntity(frag);
}
this.GameEntity.Delete();
},
SetOffset: function(x, y){
@@ -299,8 +305,6 @@ CandyFucker.prototype = {
var entCandy = this.RemoveCandy(x, y);
if(entCandy){
entCandy.Delete();
// FIXME: explosion FX
return true;
}
return false;

66
code/GameLib.js
View File

@@ -1,21 +1,27 @@
var Vec2D = {
Scale: function(vecIn, scale) {
return {
X: vecIn.X * scale,
Y: vecIn.Y * scale
};
},
Normalize: function(vecIn){
var len = Math.sqrt(
(vecIn.X * vecIn.X) +
(vecIn.Y * vecIn.Y));
return {
X: vecIn.X / len,
Y: vecIn.Y / len};
}
};
/////////////////////////////////////////
//
// Vec2D
//
var Vec2D = {
Scale: function(vecIn, scale) {
return {
X: vecIn.X * scale,
Y: vecIn.Y * scale
};
},
Normalize: function(vecIn){
var len = Math.sqrt(
(vecIn.X * vecIn.X) +
(vecIn.Y * vecIn.Y));
return {
X: vecIn.X / len,
Y: vecIn.Y / len
};
}
};
/////////////////////////////////////////
//
@@ -182,10 +188,10 @@ GameEntity.prototype = {
this.PositionDest.X = position.X;
this.PositionDest.Y = position.Y;
},
AddPosition: function(delta) {
this.PositionDest.X = this.Position.X + delta.X;
this.PositionDest.Y = this.Position.Y + delta.Y;
},
AddPosition: function(delta) {
this.PositionDest.X = this.Position.X + delta.X;
this.PositionDest.Y = this.Position.Y + delta.Y;
},
Delete: function(){
this.Deleted = true;
},
@@ -198,16 +204,16 @@ GameEntity.prototype = {
true
);
},
InsideScreen: function(){
return (
(this.Position.X+(this.Size.X/2))>0 &&
(this.Position.Y+(this.Size.Y/2))>0 &&
(this.Position.X-(this.Size.X/2))
<this.GameScreen.Size.X &&
(this.Position.Y-(this.Size.Y/2))
<this.GameScreen.Size.Y
);
},
InsideScreen: function(){
return (
(this.Position.X+(this.Size.X/2))>0 &&
(this.Position.Y+(this.Size.Y/2))>0 &&
(this.Position.X-(this.Size.X/2))
<this.GameScreen.Size.X &&
(this.Position.Y-(this.Size.Y/2))
<this.GameScreen.Size.Y
);
},
Debug: false
};