alois/OpenFrontIO
1
0
Fork 0
mirror of https://github.com/openfrontio/OpenFrontIO.git synced 2026-06-23 00:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into sounds

Browse Source
This commit is contained in:
evanpelle
2025-10-05 17:20:31 -07:00
committed by GitHub
parent ebfcecb88b 6307a2702b
commit 85e271b76b
2 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/client/graphics/fx/TargetFx.ts
+13 -11
View File
@@ -4,12 +4,14 @@ export class TargetFx implements Fx {
private lifeTime = 0;
private ended = false;
private endFade = 300;
private offset = 0;
private rotationSpeed = 14; // px per seconds
private radius = 4;
constructor(
private x: number,
private y: number,
private duration = 0,
private radius = 8,
private persistent = false,
) {}
@@ -36,26 +38,26 @@ export class TargetFx implements Fx {
const fadeAlpha =
this.persistent && this.ended ? 1 - this.lifeTime / this.endFade : 1;
const alpha = Math.max(0, Math.min(1, baseAlpha * fadeAlpha));
const pulse = 1 + 0.2 * Math.sin(t * Math.PI * 2);
ctx.save();
ctx.globalAlpha = alpha;
ctx.lineWidth = 1;
ctx.strokeStyle = `rgba(255,0,0,${alpha})`;
// size follows the pulsing radius so crosshair scales with it
const size = this.radius * pulse;
this.offset += this.rotationSpeed * (frameTime / 1000);
ctx.beginPath();
ctx.arc(this.x, this.y, size, 0, Math.PI * 2);
ctx.lineWidth = 1;
ctx.lineDashOffset = this.offset;
ctx.setLineDash([3, 3]);
ctx.arc(this.x, this.y, this.radius, 0, Math.PI * 2);
ctx.stroke();
// crosshair (fixed size, does not scale with pulse)
ctx.beginPath();
ctx.moveTo(this.x - this.radius * 1.2, this.y);
ctx.lineTo(this.x + this.radius * 1.2, this.y);
ctx.moveTo(this.x, this.y - this.radius * 1.2);
ctx.lineTo(this.x, this.y + this.radius * 1.2);
ctx.strokeStyle = `rgba(255,0,0,${alpha})`;
ctx.lineWidth = 2;
ctx.lineDashOffset = -this.offset / 2;
ctx.setLineDash([19, 3]);
ctx.arc(this.x, this.y, 7, 0, Math.PI * 2);
ctx.stroke();
ctx.restore();
src/client/graphics/layers/FxLayer.ts
+1 -6
View File
@@ -117,11 +117,6 @@ export class FxLayer implements Layer {
this.allFx.push(textFx);
}
addTargetFx(x: number, y: number) {
const fx = new TargetFx(x, y, 1200, 12);
this.allFx.push(fx);
}
onUnitEvent(unit: UnitView) {
switch (unit.type()) {
case UnitType.TransportShip: {
@@ -135,7 +130,7 @@ export class FxLayer implements Layer {
const x = this.game.x(t);
const y = this.game.y(t);
// persistent until boat finishes or retreats
const fx = new TargetFx(x, y, 0, 12, true);
const fx = new TargetFx(x, y, 0, true);
this.allFx.push(fx);
this.boatTargetFxByUnitId.set(unit.id(), fx);
}