Split CandyBoard from CandyFucker. Code cleanup.

code/GameLib.js

@@ -1,22 +1,150 @@
 
 
+/////////////////////////////////////////
+//
+// Mouse
+//
+var Mouse = function (screen, size) {
+	this.Screen = screen;
+	this.Size = size || {
+		X: screen.width,
+		Y: screen.height
+	};
+
+	this.Down = false;
+	this.StartPosition = {
+		X: 0,
+		Y: 0
+	};
+	this.EndPosition = {
+		X: 0,
+		Y: 0
+	};
+
+	this.Screen.addEventListener("mousedown", this.OnMouseDown.bind(this), false);
+	this.Screen.addEventListener("mousemove", this.OnMouseMove.bind(this), false);
+	this.Screen.addEventListener("mouseup", this.OnMouseUp.bind(this), false);
+	this.Screen.addEventListener("mouseleave", this.OnMouseLeave.bind(this),
+		false);
+	this.Screen.addEventListener("touchstart", this.OnTouchStart.bind(this),
+		false);
+	this.Screen.addEventListener("touchmove", this.OnTouchMove.bind(this), false);
+	this.Screen.addEventListener("touchend", this.OnTouchEnd.bind(this), false);
+	this.Screen.addEventListener("touchcancel", this.OnTouchEnd.bind(this), false);
+};
+Mouse.prototype = {
+	GetEventPoistion: function (positionEvent) {
+		var position = {
+			X: positionEvent.X,
+			Y: positionEvent.Y
+		};
+		var element = this.Screen;
+		while (element) {
+			position.X -= element.offsetLeft;
+			position.Y -= element.offsetTop;
+			element = element.offsetParent;
+		}
+		position.X = (position.X / this.Screen.offsetWidth) * this.Size.X;
+		position.Y = (position.Y / this.Screen.offsetHeight) * this.Size.Y;
+		return position;
+	},
+	OnMouseDown: function (event) {
+		var position = this.GetEventPoistion({
+			X: event.clientX,
+			Y: event.clientY
+		});
+		this.RealDown = true;
+		this.Down = true;
+		this.StartPosition.X = position.X;
+		this.StartPosition.Y = position.Y;
+		this.EndPosition.X = position.X;
+		this.EndPosition.Y = position.Y;
+	},
+	OnMouseMove: function (event) {
+		if (this.RealDown === false) {
+			return;
+		}
+		var position = this.GetEventPoistion({
+			X: event.clientX,
+			Y: event.clientY
+		});
+		this.RealDown = true;
+		this.Down = true;
+		this.EndPosition.X = position.X;
+		this.EndPosition.Y = position.Y;
+	},
+	OnMouseUp: function (event) {
+		var position = this.GetEventPoistion({
+			X: event.clientX,
+			Y: event.clientY
+		});
+		this.RealDown = false;
+		this.EndPosition.X = position.X;
+		this.EndPosition.Y = position.Y;
+	},
+	OnMouseLeave: function () {
+		this.RealDown = false;
+		this.Down = false;
+	},
+	OnTouchStart: function (event) {
+		var position = this.GetEventPoistion({
+			X: event.touches[0].clientX,
+			Y: event.touches[0].clientY
+		});
+		this.RealDown = true;
+		this.Down = true;
+		this.StartPosition.X = position.X;
+		this.StartPosition.Y = position.Y;
+		this.EndPosition.X = position.X;
+		this.EndPosition.Y = position.Y;
+	},
+	OnTouchMove: function (event) {
+		if (this.RealDown === false) {
+			return;
+		}
+		var position = this.GetEventPoistion({
+			X: event.touches[0].clientX,
+			Y: event.touches[0].clientY
+		});
+		this.RealDown = true;
+		this.Down = true;
+		this.EndPosition.X = position.X;
+		this.EndPosition.Y = position.Y;
+	},
+	OnTouchEnd: function () {
+		this.RealDown = false;
+	},
+	Update: function () {
+		if (this.RealDown === false) {
+			this.Down = false;
+		}
+	},
+	Cancel: function () {
+		this.RealDown = false;
+		this.Down = false;
+	},
+	Debug: false
+};
+
+
 /////////////////////////////////////////
 //
 // Vec2D
 //
 var Vec2D = {
-	Scale: function(vecIn, scale) {
+	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));
+	Normalize: function (vecIn) {
+		var len =
+			Math.sqrt(
+				(vecIn.X * vecIn.X) +
+				(vecIn.Y * vecIn.Y));
 		return {
-			X: vecIn.X / len, 
+			X: vecIn.X / len,
 			Y: vecIn.Y / len
 		};
 	}
@@ -27,10 +155,13 @@ var Vec2D = {
 //
 // GameScreen
 //
-var GameScreen = function(idScreen, funcInit, funcProc, funcEnd, tps){
+var GameScreen = function (idScreen, funcInit, funcProc, funcEnd, tps) {
 	this.Screen = document.getElementById(idScreen);
 	this.Ctx = this.Screen.getContext('2d');
-	this.Size = {X: this.Screen.width, Y: this.Screen.height};
+	this.Size = {
+		X: this.Screen.width,
+		Y: this.Screen.height
+	};
 	this.Entities = [];
 	this.NewEntities = [];
 	this.Running = false;
@@ -38,18 +169,18 @@ var GameScreen = function(idScreen, funcInit, funcProc, funcEnd, tps){
 	this.FuncProc = funcProc;
 	this.FuncEnd = funcEnd;
 	this.TPS = tps || 10;
-	
-	this.TickTime = 1000/this.TPS;
+
+	this.TickTime = 1000 / this.TPS;
 	this.AccTickTime = this.TickTime;
 	this.PreviousTime = 0;
-	
+
 	this.Mouse = new Mouse(this.Screen, this.Size);
-	
+
 	var self = this;
-	this.Tick = function(){
-		while(self.AccTickTime>=self.TickTime){
+	this.Tick = function () {
+		while (self.AccTickTime >= self.TickTime) {
 			self.Update();
-			if(self.FuncProc){
+			if (self.FuncProc) {
 				self.FuncProc(self);
 			}
 			self.Mouse.Update();
@@ -57,82 +188,91 @@ var GameScreen = function(idScreen, funcInit, funcProc, funcEnd, tps){
 			self.InsertAdded();
 			self.AccTickTime -= self.TickTime;
 		}
-		self.Draw(self.AccTickTime/self.TickTime);
-		
+		self.Draw(self.AccTickTime / self.TickTime);
+
 		var timeNow = performance.now();
 		self.AccTickTime += timeNow - self.PreviousTime;
 		self.PreviousTime = timeNow;
-		
-		if(self.Running){
+
+		if (self.Running) {
 			window.requestAnimationFrame(self.Tick);
-		}else{
-			if(self.FuncEnd){
+		} else {
+			if (self.FuncEnd) {
 				self.FuncEnd(self);
 			}
 		}
-	}
+	};
 };
 GameScreen.prototype = {
 	// For internal use
-	CleanDead: function(){
-		var i = this.Entities.length-1;
-		while(i>0){
-			if(this.Entities[i].GameEntity.Deleted){
-				this.Entities.splice(i,1);
+	CleanDead: function () {
+		var i = this.Entities.length - 1;
+		while (i > 0) {
+			if (this.Entities[i].GameEntity.Deleted) {
+				this.Entities.splice(i, 1);
 			}
 			i--;
 		}
 	},
-	InsertAdded: function(){
-		for(var i=0,n=this.NewEntities.length;i<n;i++){
+	InsertAdded: function () {
+		var i;
+		for (i = 0, n = this.NewEntities.length; i < n; i++) {
 			this.Entities.push(this.NewEntities[i]);
 		}
 		this.NewEntities = [];
 	},
-	Update: function(){
-		for(var i=0,n=this.Entities.length;i<n;i++){
+	Update: function () {
+		for (var i = 0, n = this.Entities.length; i < n; i++) {
 			var entity = this.Entities[i];
-			if(entity.GameEntity.Deleted){ continue; }
+			if (entity.GameEntity.Deleted) {
+				continue;
+			}
 			entity.GameEntity.Update();
-			if(entity.Update){
+			if (entity.Update) {
 				entity.Update();
 			}
 		}
 	},
-	Draw: function(factor){
+	Draw: function (factor) {
 		this.Ctx.clearRect(0, 0, this.Size.X, this.Size.Y);
-		for(var i=0,n=this.Entities.length;i<n;i++){
+		for (var i = 0, n = this.Entities.length; i < n; i++) {
 			var entity = this.Entities[i];
-			if(entity.GameEntity.Deleted){ continue; }
+			if (entity.GameEntity.Deleted) {
+				continue;
+			}
 			entity.GameEntity.Draw(factor);
 		}
 	},
-	
+
 	// For public use
-	Start: function(){
-		if(this.Running == false && this.FuncInit){
+	Start: function () {
+		if (this.Running === false && this.FuncInit) {
 			this.FuncInit(this);
 		}
 		this.Running = true;
-		
+
 		this.PreviousTime = performance.now();
 		this.Tick();
 	},
-	Stop: function(){
+	Stop: function () {
 		this.Running = false;
 	},
-	AddEntity: function(newEntity){
+	AddEntity: function (newEntity) {
 		this.NewEntities.push(newEntity);
 	},
-	GetEntitiesUnderPoint: function(point, type){
+	GetEntitiesUnderPoint: function (point, type) {
 		var entities = [];
-		for(var i=0,n=this.Entities.length;i<n;i++){
+		for (var i = 0, n = this.Entities.length; i < n; i++) {
 			var entity = this.Entities[i];
-			if(entity.GameEntity.Deleted){ continue; }
-			if(type){
-				if(entity.GameEntity.Type!==type){ continue; }
+			if (entity.GameEntity.Deleted) {
+				continue;
 			}
-			if(entity.GameEntity.IntersectPoint(point)){
+			if (type) {
+				if (entity.GameEntity.Type !== type) {
+					continue;
+				}
+			}
+			if (entity.GameEntity.IntersectPoint(point)) {
 				entities.push(entity);
 			}
 		}
@@ -146,167 +286,86 @@ GameScreen.prototype = {
 //
 // GameEntity
 //
-var GameEntity = function(gameScreen, position, size, image, type){
+var GameEntity = function (gameScreen, position, size, image, type) {
 	this.GameScreen = gameScreen;
-	if(position){
-		this.Position = {X: position.X, Y: position.Y};
-		this.PositionDest = {X: position.X, Y: position.Y};
-	}else{
-		this.Position = {X: 0, Y: 0};
-		this.PositionDest = {X: 0, Y: 0};
+	if (position) {
+		this.Position = {
+			X: position.X,
+			Y: position.Y
+		};
+		this.PositionDest = {
+			X: position.X,
+			Y: position.Y
+		};
+	} else {
+		this.Position = {
+			X: 0,
+			Y: 0
+		};
+		this.PositionDest = {
+			X: 0,
+			Y: 0
+		};
 	}
-	this.Size = size || {X: 0, Y: 0};
+	this.Size = size || {
+		X: 0,
+		Y: 0
+	};
 	this.Type = type || "Undefined";
 	this.Image = image;
 	this.Deleted = false;
 };
 GameEntity.prototype = {
-	Update: function(){
+	Update: function () {
 		this.Position.X = this.PositionDest.X;
 		this.Position.Y = this.PositionDest.Y;
 	},
-	Draw: function(factor){
-		if(!this.Image){ return; }
+	Draw: function (factor) {
+		if (!this.Image) {
+			return;
+		}
 		var x = this.Position.X - factor * (this.Position.X - this.PositionDest.X);
 		var y = this.Position.Y - factor * (this.Position.Y - this.PositionDest.Y);
 		this.GameScreen.Ctx.drawImage(this.Image,
 			x - (this.Size.X / 2),
 			y - (this.Size.Y / 2));
 	},
-	SetImage: function(image){
+	SetImage: function (image) {
 		this.Image = image;
 	},
-	SetPosition: function(position){
+	SetPosition: function (position) {
 		this.Position.X = position.X;
 		this.Position.Y = position.Y;
 		this.PositionDest.X = position.X;
 		this.PositionDest.Y = position.Y;
 	},
-	UpdatePosition: function(position){
+	UpdatePosition: function (position) {
 		this.Position.X = this.PositionDest.X;
 		this.Position.Y = this.PositionDest.Y;
 		this.PositionDest.X = position.X;
 		this.PositionDest.Y = position.Y;
 	},
-	AddPosition: function(delta) {
+	AddPosition: function (delta) {
 		this.PositionDest.X = this.Position.X + delta.X;
 		this.PositionDest.Y = this.Position.Y + delta.Y;
 	},
-	Delete: function(){
+	Delete: function () {
 		this.Deleted = true;
 	},
-	IntersectPoint: function(point){
+	IntersectPoint: function (point) {
 		return (
-			point.X < (this.PositionDest.X + (this.Size.X/2)) &&
-			point.X > (this.PositionDest.X - (this.Size.X/2)) &&
-			point.Y < (this.PositionDest.Y + (this.Size.Y/2)) &&
-			point.Y > (this.PositionDest.Y - (this.Size.Y/2)) &&
-			true
-		);
+			point.X < (this.PositionDest.X + (this.Size.X / 2)) &&
+			point.X > (this.PositionDest.X - (this.Size.X / 2)) &&
+			point.Y < (this.PositionDest.Y + (this.Size.Y / 2)) &&
+			point.Y > (this.PositionDest.Y - (this.Size.Y / 2)) &&
+			true);
 	},
-	InsideScreen: function(){
+	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
-};
-
-
-/////////////////////////////////////////
-//
-// Mouse
-//
-var Mouse = function(screen, size){
-	this.Screen = screen;
-	this.Size = size || {X: screen.width, Y: screen.height};
-	
-	this.Down = false;
-	this.StartPosition = {X: 0, Y: 0};
-	this.EndPosition = {X: 0, Y: 0};
-	
-	this.Screen.addEventListener("mousedown", this.OnMouseDown.bind(this), false);
-	this.Screen.addEventListener("mousemove", this.OnMouseMove.bind(this), false);
-	this.Screen.addEventListener("mouseup", this.OnMouseUp.bind(this), false);
-	this.Screen.addEventListener("mouseleave", this.OnMouseLeave.bind(this), false);
-	this.Screen.addEventListener("touchstart", this.OnTouchStart.bind(this), false);
-	this.Screen.addEventListener("touchmove", this.OnTouchMove.bind(this), false);
-	this.Screen.addEventListener("touchend", this.OnTouchEnd.bind(this), false);
-	this.Screen.addEventListener("touchcancel", this.OnTouchEnd.bind(this), false);
-};
-Mouse.prototype = {
-	GetEventPoistion: function(positionEvent){
-		var position = {X: positionEvent.X, Y: positionEvent.Y};
-		var element = this.Screen;
-		while(element){
-			position.X -= element.offsetLeft;
-			position.Y -= element.offsetTop;
-			element = element.offsetParent;
-		}
-		position.X = (position.X / this.Screen.offsetWidth) * this.Size.X;
-		position.Y = (position.Y / this.Screen.offsetHeight) * this.Size.Y;
-		return position;
-	},
-	OnMouseDown: function(event){
-		var position = this.GetEventPoistion({X: event.clientX, Y: event.clientY});
-		this.RealDown = true;
-		this.Down = true;
-		this.StartPosition.X = position.X;
-		this.StartPosition.Y = position.Y;
-		this.EndPosition.X = position.X;
-		this.EndPosition.Y = position.Y;
-	},
-	OnMouseMove: function(event){
-		if(this.RealDown == false){ return; }
-		var position = this.GetEventPoistion({X: event.clientX, Y: event.clientY});
-		this.RealDown = true;
-		this.Down = true;
-		this.EndPosition.X = position.X;
-		this.EndPosition.Y = position.Y;
-	},
-	OnMouseUp: function(event){
-		var position = this.GetEventPoistion({X: event.clientX, Y: event.clientY});
-		this.RealDown = false;
-		this.EndPosition.X = position.X;
-		this.EndPosition.Y = position.Y;
-	},
-	OnMouseLeave: function(){
-		this.RealDown = false;
-		this.Down = false;
-	},
-	OnTouchStart: function(event){
-		var position = this.GetEventPoistion({X: event.touches[0].clientX, Y: event.touches[0].clientY});
-		this.RealDown = true;
-		this.Down = true;
-		this.StartPosition.X = position.X;
-		this.StartPosition.Y = position.Y;
-		this.EndPosition.X = position.X;
-		this.EndPosition.Y = position.Y;
-	},
-	OnTouchMove: function(event){
-		if(this.RealDown == false){ return; }
-		var position = this.GetEventPoistion({X: event.touches[0].clientX, Y: event.touches[0].clientY});
-		this.RealDown = true;
-		this.Down = true;
-		this.EndPosition.X = position.X;
-		this.EndPosition.Y = position.Y;
-	},
-	OnTouchEnd: function(event){
-		this.RealDown = false;
-	},
-	Update: function(){
-		if(this.RealDown == false){
-			this.Down = false;
-		}
-	},
-	Cancel: function(){
-		this.RealDown = false;
-		this.Down = false;
+			(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
 };
@@ -316,11 +375,11 @@ Mouse.prototype = {
 //
 // ImageLoader
 //
-var ImageLoader = function(){
+var ImageLoader = function () {
 	this.Images = {};
 };
 ImageLoader.prototype = {
-	IsImageOk: function(img){
+	IsImageOk: function (img) {
 		if (!img.complete) {
 			return false;
 		}
@@ -329,101 +388,110 @@ ImageLoader.prototype = {
 		}
 		return true;
 	},
-	LoadImages: function(imageList, funcOnLoad){
+	LoadImages: function (imageList, funcOnLoad) {
 		this.ImageCount = imageList.length;
 		this.FuncOnLoad = funcOnLoad;
-		
-		var i,n;
-		for(i=0,n=imageList.length;i<n;i++){
-			var name = imageList[i].Name;
-			this.Images[name] = new Image();
+		var imageName;
+
+		var i,
+			n;
+		for (i = 0, n = imageList.length; i < n; i++) {
+			imageName = imageList[i].Name;
+			this.Images[imageName] = new Image();
 		}
-		
+
 		var self = this;
 		var launched = false;
-		var privateOnLoad = function(){
-			if(launched){ return; }
+		var privateOnLoad = function () {
+			if (launched) {
+				return;
+			}
 			var count = 0;
 			for (var name in self.Images) {
 				if (self.Images.hasOwnProperty(name)) {
-					if(self.IsImageOk(self.Images[name])){
+					if (self.IsImageOk(self.Images[name])) {
 						count++;
 					}
 				}
 			}
-			
+
 			console.log("Images: " + count + "/" + self.ImageCount);
-			if(count == self.ImageCount){
+			if (count == self.ImageCount) {
 				launched = true;
-				if(self.FuncOnLoad){
+				if (self.FuncOnLoad) {
 					self.FuncOnLoad();
 				}
 			}
 		};
-		for(i=0,n=imageList.length;i<n;i++){
-			var name = imageList[i].Name;
-			this.Images[name].onload = privateOnLoad;
-			this.Images[name].src = imageList[i].Url;
+		for (i = 0, n = imageList.length; i < n; i++) {
+			imageName = imageList[i].Name;
+			this.Images[imageName].onload = privateOnLoad;
+			this.Images[imageName].src = imageList[i].Url;
 		}
 		privateOnLoad();
 	},
-	GetImage: function(name){
+	GetImage: function (name) {
 		return this.Images[name];
 	},
 	Debug: false
 };
 
-
 /////////////////////////////////////////
 //
 // SoundLoader
 //
-var SoundLoader = function(){
+var SoundLoader = function () {
 	this.Sounds = {};
 };
 SoundLoader.prototype = {
-	LoadSounds: function(soundsList, funcOnLoad){
+	LoadSounds: function (soundsList, funcOnLoad) {
 		this.SoundsCount = soundsList.length;
 		this.FuncOnLoad = funcOnLoad;
-		
-		var i,n;
-		for(i=0,n=soundsList.length;i<n;i++){
-			var name = soundsList[i].Name;
-			this.Sounds[name] = new Audio();
+
+		var soundName;
+
+		var i,
+			n;
+		for (i = 0, n = soundsList.length; i < n; i++) {
+			soundName = soundsList[i].Name;
+			this.Sounds[soundName] = new Audio();
 		}
-		
+
 		var self = this;
 		var launched = false;
-		var privateOnLoad = function(){
-			if(launched){ return; }
+		var privateOnLoad = function () {
+			if (launched) {
+				return;
+			}
 			var count = 0;
 			for (var name in self.Sounds) {
 				if (self.Sounds.hasOwnProperty(name)) {
-					if(self.Sounds[name].readyState){
+					if (self.Sounds[name].readyState) {
 						count++;
 					}
 				}
 			}
-			
+
 			console.log("Sounds: " + count + "/" + self.SoundsCount);
-			if(count == self.SoundsCount){
+			if (count == self.SoundsCount) {
 				launched = true;
-				if(self.FuncOnLoad){
+				if (self.FuncOnLoad) {
 					self.FuncOnLoad();
 				}
 			}
 		};
-		for(i=0,n=soundsList.length;i<n;i++){
-			var name = soundsList[i].Name;
-			this.Sounds[name].onloadeddata = privateOnLoad;
-			this.Sounds[name].src = soundsList[i].Url;
+		for (i = 0, n = soundsList.length; i < n; i++) {
+			soundName = soundsList[i].Name;
+			this.Sounds[soundName].onloadeddata = privateOnLoad;
+			this.Sounds[soundName].src = soundsList[i].Url;
 		}
 		privateOnLoad();
 	},
-	PlaySound: function(name){
+	PlaySound: function (name) {
 		var sndOrig = this.Sounds[name];
 		var sndCopy = sndOrig.cloneNode();
 		sndCopy.play();
 	},
 	Debug: false
 };
+