small things

including : make functions start with a lower case letter,
rename variables to avoid double definitions,
inline some variables

Author: Raphaël Vandon

.gitignore

@@ -1 +1,2 @@
 *~
+.idea

js/collisions.js

@@ -1,37 +1,35 @@
 var EPSILON = 0.1; //size of buffer between player and obstacles
 
-function GetValidMove(bb, direction, obstacles)
+function getValidMove(bb, direction, obstacles)
 {
 	//try x move
 	bb.width += Math.abs(direction.x);
 	if(direction.x < 0)
 		bb.x += direction.x;
-	for(var b = 0; b < obstacles.length; b++)
+	for(var bX = 0; bX < obstacles.length; bX++)
 	{
-		var block = obstacles[b];
-		var inter = bb.intersection(block);
-		if(inter)
+		var interX = bb.intersection(obstacles[bX]);
+		if(interX)
 		{
-			moveback = inter.width + EPSILON;
-			if(direction.x < 0) moveback = -moveback;
-			direction.x -= moveback;
-			bb.x -= moveback;
+			var moveBackX = interX.width + EPSILON;
+			if(direction.x < 0) moveBackX = -moveBackX;
+			direction.x -= moveBackX;
+			bb.x -= moveBackX;
 			break;
 		}
 	}
 	//try y move
 	bb.height += Math.abs(direction.y);
 	if(direction.y < 0)
 		bb.y += direction.y;
-	for(var b = 0; b < obstacles.length; b++)
+	for(var bY = 0; bY < obstacles.length; bY++)
 	{
-		block = obstacles[b];
-		inter = bb.intersection(block);
-		if(inter)
+		var interY = bb.intersection(obstacles[bY]);
+		if(interY)
 		{
-			var moveback = inter.height + EPSILON;
-			if(direction.y < 0) moveback = -moveback;
-			direction.y -= moveback;
+			var moveBackY = interY.height + EPSILON;
+			if(direction.y < 0) moveBackY = -moveBackY;
+			direction.y -= moveBackY;
 			break;
 		}
 	}

js/core.js

@@ -1,5 +1,4 @@
-/* global debug */
-debug = true;
+displayDebug = false;
 
 var isKeyPressed = [];
 
@@ -63,7 +62,7 @@ function launchGame()
 	stage.addChild(objBg);
 
 	objTerrain = new Terrain(stage, imgBlock);
-	objTerrain.Load();
+	objTerrain.load();
 
 	var spSheet = new createjs.SpriteSheet({
 			images: [imgPlayer],
@@ -101,7 +100,7 @@ function code(e)
 
 function update(event)
 {
-	objPlayer.Update(event);
+	objPlayer.update(event);
 
 	stage.update();
 }

js/player.js

@@ -15,13 +15,13 @@ function Player(initX, initY, bitmap)
 
 	this.onGround = false;
 
-	if(debug)
+	if(displayDebug)
 	{
 		this.debugBB = new createjs.Bitmap(imgDebug);
 		stage.addChild(this.debugBB);
 	}
 
-	this.Update = function (event)
+	this.update = function (event)
 	{
 		var wantedX = 0;
 		var wantedY = 0;
@@ -52,7 +52,7 @@ function Player(initX, initY, bitmap)
 
 		var rect = new createjs.Rectangle(this.internal.x-19, this.internal.y, 40, 53);
 
-		if(debug)
+		if(displayDebug)
 		{
 			//debug bounding box is one frame off
 			this.debugBB.x = rect.x;
@@ -61,12 +61,11 @@ function Player(initX, initY, bitmap)
 			this.debugBB.scaleY = rect.height;
 		}
 
-		var validatedMove = GetValidMove(rect, {x:wantedX, y:wantedY}, objTerrain.obstaclesBBs);
+		var validatedMove = getValidMove(rect, {x:wantedX, y:wantedY}, objTerrain.obstaclesBBs);
 		if((validatedMove.x > 0 && this.internal.x + validatedMove.x > 800) || (validatedMove.x < 0 && this.internal.x + validatedMove.x < 400))
 		{
 			//move terrain instead of player
-			var remaining = objTerrain.TryMove(validatedMove.x);
-			this.internal.x += remaining;
+			this.internal.x += objTerrain.tryMove(validatedMove.x);
 		}
 		else
 		{

js/terrain.js

@@ -20,12 +20,11 @@ function Terrain(stage, texX)
 	var levelWidth = level[0].length * 40;
 	var screenWidth = 1200;
 
-	this.texX = texX;
 	this.obstaclesBBs = [];
 	this.obstaclesSprites = [];
 	this.offsetX = 0;
 
-	this.Load = function()
+	this.load = function()
 	{
 		for(var l = 0; l < level.length; l++)
 		{
@@ -49,7 +48,7 @@ function Terrain(stage, texX)
 		}
 	}
 
-	this.TryMove = function(x)
+	this.tryMove = function(x)
 	{
 		var remaining = 0;
 		if(x > 0 && levelWidth - screenWidth < this.offsetX + x)
@@ -64,10 +63,10 @@ function Terrain(stage, texX)
 			x = -this.offsetX;
 		}
 
-		for(var o = 0; o < this.obstaclesBBs.length; o++)
-			this.obstaclesBBs[o].x -= x;
-		for(var o = 0; o < this.obstaclesSprites.length; o++)
-			this.obstaclesSprites[o].x -= x;
+		for(var oBB = 0; oBB < this.obstaclesBBs.length; oBB++)
+			this.obstaclesBBs[oBB].x -= x;
+		for(var oS = 0; oS < this.obstaclesSprites.length; oS++)
+			this.obstaclesSprites[oS].x -= x;
 		this.offsetX += x;
 
 		return remaining;