From 04b4fe77fc00edec2ebdf606649f26f0ea3fe92a Mon Sep 17 00:00:00 2001 From: TerraMaster85 Date: Sun, 7 Apr 2024 13:26:25 -0400 Subject: [PATCH] fmt --- starkingdoms-client/src/hub.ts | 24 ++++++++++++++++++------ starkingdoms-client/src/rendering.ts | 27 +++++++++++++++++---------- 2 files changed, 35 insertions(+), 16 deletions(-) diff --git a/starkingdoms-client/src/hub.ts b/starkingdoms-client/src/hub.ts index 9f01845fe36d75b14a0dc16970d10498e8d76596..59bb5c9d6bdebc00f0a4eb00cb31698e9a11fedc 100644 --- a/starkingdoms-client/src/hub.ts +++ b/starkingdoms-client/src/hub.ts @@ -149,10 +149,16 @@ export async function hub_connect( document.onmousedown = (e) => { if (global.me !== null) { let me_transform = global.parts_map.get(global.me?.part_id)!.transform; - let x = e.clientX / global.scale - window.innerWidth / 2 / global.scale + me_transform.x; - let y = e.clientY / global.scale - window.innerHeight / 2 / global.scale + me_transform.y; - - console.log(x,y); + let x = + e.clientX / global.scale - + window.innerWidth / 2 / global.scale + + me_transform.x; + let y = + e.clientY / global.scale - + window.innerHeight / 2 / global.scale + + me_transform.y; + + console.log(x, y); let button: ButtonType; if (e.button == 0) { @@ -177,8 +183,14 @@ export async function hub_connect( document.onmouseup = (e) => { if (global.me !== null) { let me_transform = global.parts_map.get(global.me?.part_id)!.transform; - let x = e.clientX / global.scale - window.innerWidth / 2 / global.scale + me_transform.x; - let y = e.clientY / global.scale - window.innerHeight / 2 / global.scale + me_transform.y; + let x = + e.clientX / global.scale - + window.innerWidth / 2 / global.scale + + me_transform.x; + let y = + e.clientY / global.scale - + window.innerHeight / 2 / global.scale + + me_transform.y; let button: ButtonType; if (e.button == 0) { diff --git a/starkingdoms-client/src/rendering.ts b/starkingdoms-client/src/rendering.ts index 8d68577db5b2c16ba12ec52ba690958213e2b333..55ec7e70da35587c4004a179c88cca38c07e466f 100644 --- a/starkingdoms-client/src/rendering.ts +++ b/starkingdoms-client/src/rendering.ts @@ -76,11 +76,14 @@ export function startRender() { // TODO: refactor, make parallax configurable // Main starfield - const sprite_size_scale_basis = 3/4; + const sprite_size_scale_basis = 3 / 4; const sprite_size_px_basis = 512; - const sprite_size = sprite_size_px_basis * sprite_size_scale_basis / global.scale; - global.rendering!.starfield.sprite.height = window.innerHeight / global.scale + sprite_size; - global.rendering!.starfield.sprite.width = window.innerWidth / global.scale + sprite_size; + const sprite_size = + (sprite_size_px_basis * sprite_size_scale_basis) / global.scale; + global.rendering!.starfield.sprite.height = + window.innerHeight / global.scale + sprite_size; + global.rendering!.starfield.sprite.width = + window.innerWidth / global.scale + sprite_size; global.rendering!.starfield.off_x = (player()?.transform.x! * sprite_size_scale_basis) % sprite_size; @@ -102,18 +105,22 @@ export function startRender() { global.rendering!.starfield.off_y; // Near starfield - global.rendering!.starfield_near.sprite.height = window.innerHeight + 2*sprite_size; - global.rendering!.starfield_near.sprite.width = window.innerWidth + 2*sprite_size; + global.rendering!.starfield_near.sprite.height = + window.innerHeight + 2 * sprite_size; + global.rendering!.starfield_near.sprite.width = + window.innerWidth + 2 * sprite_size; - global.rendering!.starfield_near.off_x = (player()?.transform.x! / 2) % (2*sprite_size); - global.rendering!.starfield_near.off_y = (player()?.transform.y! / 2) % (2*sprite_size); + global.rendering!.starfield_near.off_x = + (player()?.transform.x! / 2) % (2 * sprite_size); + global.rendering!.starfield_near.off_y = + (player()?.transform.y! / 2) % (2 * sprite_size); global.rendering!.starfield_near.sprite.x = - Math.floor(player()?.transform.x! / 2*sprite_size) * 2*sprite_size - + Math.floor((player()?.transform.x! / 2) * sprite_size) * 2 * sprite_size - global.rendering!.starfield_near.sprite.width / 2 + sprite_size; global.rendering!.starfield_near.sprite.y = - Math.floor(player()?.transform.y! / 2*sprite_size) * 2*sprite_size - + Math.floor((player()?.transform.y! / 2) * sprite_size) * 2 * sprite_size - global.rendering!.starfield_near.sprite.height / 2 + sprite_size;