From 5e144fc15de22fcaae9ae3e83c4d5ab816dea98a Mon Sep 17 00:00:00 2001 From: Renan LE CARO Date: Thu, 27 Feb 2025 19:11:31 +0100 Subject: [PATCH] Automatic deploy 29011331 --- app/build.gradle.kts | 4 ++-- app/src/main/assets/game.js | 23 ++++++++++++++++++++++- app/src/main/assets/index.html | 8 ++++---- 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 62e76a3..2520163 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -11,8 +11,8 @@ android { applicationId = "me.lecaro.breakout" minSdk = 21 targetSdk = 34 - versionCode = 29010156 - versionName = "29010156" + versionCode = 29011331 + versionName = "29011331" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { useSupportLibrary = true diff --git a/app/src/main/assets/game.js b/app/src/main/assets/game.js index fd5a0e4..18f8141 100644 --- a/app/src/main/assets/game.js +++ b/app/src/main/assets/game.js @@ -141,6 +141,11 @@ function pause(playerAskedForPause) { pauseUsesDuringRun++ } + if(document.exitPointerLock) { + document.exitPointerLock() + } + + } let offsetX, offsetXRoundedDown, gameZoneWidth, gameZoneWidthRoundedUp, gameZoneHeight, brickWidth, needsRender = true; @@ -874,11 +879,20 @@ canvas.addEventListener("mouseup", (e) => { pause(true) } else { play() + if(isSettingOn('pointerLock')){ + canvas.requestPointerLock() + } } }); canvas.addEventListener("mousemove", (e) => { + if(document.pointerLockElement === canvas){ + setMousePos(puck+e.movementX); + }else{ + + setMousePos(e.x); + } }); canvas.addEventListener("touchstart", (e) => { @@ -1682,7 +1696,7 @@ function render() { scoreInfo += "🖤 "; } - scoreInfo += score.toString(); + scoreInfo += score.toString(); scoreDisplay.innerText = scoreInfo; @@ -2557,6 +2571,11 @@ const options = { default: false, name: `Basic graphics`, help: `Better performance on older devices.`, disabled: () => false }, + pointerLock: { + default: false, name: `Pointer lock`, + help: `Locks and hides the mouse cursor.`, + disabled: () => !canvas.requestPointerLock + }, "easy": { default: false, name: `Kids mode`, help: `Starting perk always "slower ball".`, restart: true, disabled: () => false @@ -3139,6 +3158,8 @@ document.addEventListener('keyup',e=>{ document.querySelector('button:focus')?.previousElementSibling?.focus() }else if(e.key==='Escape' && closeModal){ closeModal() + }else if(e.key==='Escape' && running){ + pause() }else if(e.key.toLowerCase()==='m' && !alertsOpen){ openSettingsPanel() }else if(e.key.toLowerCase()==='s'&& !alertsOpen){ diff --git a/app/src/main/assets/index.html b/app/src/main/assets/index.html index 46a165f..50f9f40 100644 --- a/app/src/main/assets/index.html +++ b/app/src/main/assets/index.html @@ -8,17 +8,17 @@ /> Breakout 71 - + - + - - + +