Merge pull request #87 from ratulSharker/web-staging

Web staging
ratulSharker · Jan 23, 2023 · 5e9592f · 5e9592f
2 parents 9ac358a + 7b42f61
commit 5e9592f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/src/js/game-essentials/bat.js b/src/js/game-essentials/bat.js
@@ -84,7 +84,7 @@ Bat.prototype.repositionBatInsideWindow = function() {
 }
 
 Bat.prototype.draw = function() {
-	this.ctx.clearRect(0, 0, this.ctx.canvas.width, this.ctx.canvas.height)
+	this.clearCanvas()
 
 	this.ctx.fillStyle = "#b89ae4"
 
@@ -96,6 +96,10 @@ Bat.prototype.draw = function() {
 	)
 }
 
+Bat.prototype.clearCanvas = function() {
+	this.ctx.clearRect(0, 0, this.ctx.canvas.width, this.ctx.canvas.height)
+}
+
 Bat.prototype.centerTop = function() {
 	return {
 		x : this.rect.x + (this.rect.width / 2.0),

diff --git a/src/js/game-essentials/game.js b/src/js/game-essentials/game.js
@@ -162,7 +162,6 @@ Game.prototype.operateBall = function () {
 	}
 }
 
-
 Game.prototype.operatePower = function () {
 	if (this.curState == this.state.running && this.currentPower) {
 
@@ -340,6 +339,7 @@ Game.prototype.draw = function () {
 		this.drawGameOver()
 		this.drawScore()
 		this.drawStageName()
+		this.bat.clearCanvas()
 	} else {
 		this.drawLife()
 		this.drawScore()

diff --git a/src/js/gameplay.js b/src/js/gameplay.js
@@ -2,12 +2,12 @@ $(document).ready(function () {
 
 	// setup gameplay
 	var game = new Game(window.innerWidth, window.innerHeight, $("#canvas")[0], $("#bat_canvas")[0], $("#stage_canvas")[0])
-	const fps = 60
-	var intervalId = setInterval(gameloop, 1000 / fps)
+	window.requestAnimationFrame(gameloop);
 
 	// Events
 	function gameloop() {
 		game.draw()
+		window.requestAnimationFrame(gameloop);
 	}
 
 	$(window).resize(function () {
@@ -27,11 +27,10 @@ $(document).ready(function () {
 	game.on("no_more_life", gameCompletedEitherAllStageCompletedOrNoMoreLife)
 
 	function gameCompletedEitherAllStageCompletedOrNoMoreLife(score) {
-		// TODO: Why need this inside of a `setTimeout` ?
-		setTimeout(function () {
-			clearInterval(intervalId)
-			updateScore(score)
-		}, 500)
+		$("body").off("mousemove");
+		$("body").off("mouseup");
+		$(window).off("resize");
+		updateScore(score);
 	}
 
 	function updateScore(score) {