mirrors/breakout71
1
0
Fork 0
mirror of https://gitlab.com/lecarore/breakout71.git synced 2025-04-24 14:06:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Automatic deploy 29011519

Browse source
This commit is contained in:
Renan LE CARO 2025-02-27 22:19:50 +01:00
parent d3329c0d1e
commit 84f4b3155e
4 changed files with 44 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle.kts
View file

@ -11,8 +11,8 @@ android {
applicationId = "me.lecaro.breakout"
minSdk = 21
targetSdk = 34
versionCode = 29011397
versionName = "29011397"
versionCode = 29011519
versionName = "29011519"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {
useSupportLibrary = true

60
app/src/main/assets/game.js
View file

@ -1698,8 +1698,7 @@ function render() {
scoreInfo += score.toString();
scoreDisplay.innerText = scoreInfo;
// Clear
if (!isSettingOn("basic") && !level.color && level.svg && !level.black_puck) {
// Without this the light trails everything
@ -1889,7 +1888,6 @@ function render() {
if (!coin.destroyed) drawCoin(ctx, coin.color, coinSize, coin.x,coin.y, level.color || 'black', coin.a);
});
// Black shadow around balls
if (coins.length > 10 && !isSettingOn('basic')) {
ctx.globalAlpha = Math.min(0.8, (coins.length - 10) / 50);
@ -1903,7 +1901,7 @@ function render() {
ctx.globalCompositeOperation = "source-over";
const puckColor = level.black_puck ? '#000' : '#FFF'
balls.forEach((ball) => {
drawBall(ctx, ball.color, ballSize, ball.x, ball.y);
drawBall(ctx, ball.color, ballSize, ball.x, ball.y, puckColor);
// effect
if (isTelekinesisActive(ball)) {
ctx.strokeStyle = puckColor;
@ -1920,9 +1918,11 @@ function render() {
if (combo > 1) {
ctx.globalCompositeOperation = "source-over";
drawCoin(ctx, 'gold', coinSize, puck-coinSize, gameZoneHeight - puckHeight / 2, !level.black_puck ? '#FFF' : '#000', 0 )
drawText(ctx, "x " + combo, !level.black_puck ? '#000' : '#FFF', puckHeight,
puck, gameZoneHeight - puckHeight / 2,true);
const comboText="x " + combo
const comboTextWidth=comboText.length*puckHeight/2.6
drawCoin(ctx, 'gold', coinSize, puck-coinSize*1.5-comboTextWidth/2, gameZoneHeight - puckHeight / 2, !level.black_puck ? '#FFF' : '#000', 0 )
drawText(ctx, comboText, !level.black_puck ? '#000' : '#FFF', puckHeight,
puck-comboTextWidth/2, gameZoneHeight - puckHeight / 2,true);
}
// Borders
ctx.fillStyle = puckColor;
@ -2010,27 +2010,33 @@ function drawPuck(ctx, color, puckWidth, puckHeight) {
}
function drawBall(ctx, color, width, x, y) {
const key = "ball" + color + "_" + width;
function drawBall(ctx, color, width, x, y, borderColor='') {
const key = "ball" + color + "_" + width+'_'+borderColor;
const size = Math.round(width);
if (!cachedGraphics[key]) {
const can = document.createElement("canvas");
const size = Math.round(width);
can.width = size;
can.height = size;
const canctx = can.getContext("2d");
canctx.beginPath();
canctx.arc(size / 2, size / 2, Math.round(size / 2), 0, 2 * Math.PI);
canctx.arc(size / 2, size / 2, Math.round(size / 2)-1, 0, 2 * Math.PI);
canctx.fillStyle = color;
canctx.fill();
if(borderColor){
canctx.lineWidth=2
canctx.strokeStyle=borderColor
canctx.stroke()
}
cachedGraphics[key] = can;
}
ctx.drawImage(cachedGraphics[key], Math.round(x - width / 2), Math.round(y - width / 2),);
ctx.drawImage(cachedGraphics[key], Math.round(x - size / 2), Math.round(y - size / 2),);
}
function drawCoin(ctx, color, size, x,y, bg,rawAngle) {
if(isNaN(rawAngle)) debugger
const angle= (Math.round(rawAngle/Math.PI*2 * 16 ) % 16 + 16 ) % 16
const key = "coin with halo" + "_" + color + "_" + size + '_' + bg + '_'+angle;
@ -2047,23 +2053,25 @@ if(isNaN(rawAngle)) debugger
canctx.fillStyle = color;
canctx.fill();
canctx.strokeStyle = bg;
canctx.stroke();
if(color=== 'gold'){
canctx.beginPath();
canctx.arc(size / 2, size / 2, size / 2 * 0.6, 0, 2 * Math.PI);
canctx.fillStyle = 'rgba(255,255,255,0.5)';
canctx.fill();
canctx.strokeStyle = bg;
canctx.stroke();
canctx.beginPath();
canctx.arc(size / 2, size / 2, size / 2 * 0.6, 0, 2 * Math.PI);
canctx.fillStyle = 'rgba(255,255,255,0.5)';
canctx.fill();
canctx.translate(size / 2, size / 2);
canctx.rotate(angle/ 16);
canctx.translate(-size / 2, -size / 2);
canctx.translate(size / 2, size / 2);
canctx.rotate(angle/ 16);
canctx.translate(-size / 2, -size / 2);
canctx.globalCompositeOperation='multiply'
drawText(canctx, '$', color, size-2,size / 2, size / 2+1)
drawText(canctx, '$', color, size-2,size / 2, size / 2+1)
cachedGraphics[key] = can;
canctx.globalCompositeOperation='multiply'
drawText(canctx, '$', color, size-2,size / 2, size / 2+1)
drawText(canctx, '$', color, size-2,size / 2, size / 2+1)
}
cachedGraphics[key] = can;
}
ctx.drawImage(cachedGraphics[key], Math.round(x - size / 2), Math.round(y - size / 2));
}

8
app/src/main/assets/index.html
View file

@ -8,17 +8,17 @@
/>
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
<title>Breakout 71</title>
<link rel="stylesheet" href="style.css?v=29011397" />
<link rel="stylesheet" href="style.css?v=29011519" />
<link rel="icon" href="./icon.svg" />
</head>
<body>
<button id="menu">☰<span> menu</span></button>
<button id="score"></button>
<canvas id="game"></canvas>
<script>window.appVersion="?v=29011397".slice(3)</script>
<script>window.appVersion="?v=29011519".slice(3)</script>
<script src="gif.js"></script>
<script src="levels.js?v=29011397"></script>
<script src="game.js?v=29011397"></script>
<script src="levels.js?v=29011519"></script>
<script src="game.js?v=29011519"></script>
</body>