From 5a8fa7d0401267aa262715f2778c874787c1156f Mon Sep 17 00:00:00 2001 From: core Date: Sun, 16 Apr 2023 15:39:41 -0400 Subject: [PATCH] tweak hearty mass - adjust planet scaling --- client/src/index.ts | 18 ------------------ server/src/handler.rs | 2 +- server/src/planet.rs | 2 +- 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/client/src/index.ts b/client/src/index.ts index 73fe541c3973472eb75343b52230e879e67f2844..ea9b646734d6503730c10796042c0cc6d8368ec1 100644 --- a/client/src/index.ts +++ b/client/src/index.ts @@ -207,24 +207,6 @@ if (!(query.has("server") || query.has("username") || query.has("textures"))) { client_main(query.get("server")!, query.get("username")!, query.get("textures")!).then(() => {}); -/* - -let app = new PIXI.Application({width: window.innerWidth, height: window.innerHeight, resizeTo: window }); - -// @ts-ignore -document.body.appendChild(app.view); - -let sprite = PIXI.Sprite.from("./hearty.png"); -app.stage.addChild(sprite); - -let elapsed = 0.0; -app.ticker.add((delta) => { - elapsed += delta; - sprite.x = 100.0 + Math.cos(elapsed/50.0) * 100.0; -}); - - */ - function planet_type_to_tex_id(ty: PlanetType): string { if (ty == PlanetType.Earth) { return "earth.png" diff --git a/server/src/handler.rs b/server/src/handler.rs index 06f5d44ff90ff914f36eb72847af1cb34ada602b..6bf69bfce755a4dd694877ab0fc448cb0d9dbca7 100644 --- a/server/src/handler.rs +++ b/server/src/handler.rs @@ -139,7 +139,7 @@ pub async fn handle_client(mgr: ClientManager, data: Arc>, r .translation(vector![0.0, 2100.0/SCALE]) .build(); let player_collider: Collider = ColliderBuilder::cuboid(25.0 / SCALE, 25.0 / SCALE) - .mass_properties(MassProperties::new(point![0.0, 0.0], 75.0, 61250.0)) + .mass_properties(MassProperties::new(point![0.0, 0.0], 250.0, 61250.0)) //.mass(75.0) .build(); let player_handle = rigid_body_set.insert(player_body); diff --git a/server/src/planet.rs b/server/src/planet.rs index 370cd27cfc261afd0ef06228c5a8863505af6b47..9d3f2a66df650ee5781d9326f5cabe2dc68e43d6 100644 --- a/server/src/planet.rs +++ b/server/src/planet.rs @@ -36,7 +36,7 @@ impl Planets { let collider = ColliderBuilder::ball(radius / SCALE) .build(); let body = RigidBodyBuilder::fixed() - .translation(vector![position.0, position.1]) + .translation(vector![position.0 / SCALE, position.1 / SCALE]) .additional_mass(0.0); let body_handle = rigid_body_set.insert(body);