From 69d57202aff3ebcb94c7239fe13f197f5e548fac Mon Sep 17 00:00:00 2001 From: core Date: Sun, 16 Apr 2023 15:50:22 -0400 Subject: [PATCH] add planetary constants --- server/src/main.rs | 1 + server/src/orbit/constants.rs | 7 +++++++ server/src/orbit/mod.rs | 1 + server/src/planet.rs | 3 ++- 4 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 server/src/orbit/constants.rs create mode 100644 server/src/orbit/mod.rs diff --git a/server/src/main.rs b/server/src/main.rs index 2feec86b209054f7cf56d058b212cd189c652518..012e257a4414193bcd71884da2ed748e76f3557f 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -23,6 +23,7 @@ pub mod timer; #[macro_use] pub mod macros; pub mod planet; +pub mod orbit; const SCALE: f64 = 1.0; diff --git a/server/src/orbit/constants.rs b/server/src/orbit/constants.rs new file mode 100644 index 0000000000000000000000000000000000000000..26366e1534c64f00d9b6b70c781cc6281ed83df0 --- /dev/null +++ b/server/src/orbit/constants.rs @@ -0,0 +1,7 @@ +pub const GAME_SCALE: f64 = 0.0001567865; // 1000 / EARTH_RADIUS_RL + +pub const EARTH_RADIUS_RL: f64 = 6_378_100.0; +pub const EARTH_RADIUS: f64 = EARTH_RADIUS_RL * GAME_SCALE; + +pub const MOON_RADIUS_RL: f64 = 1_737_400.0; +pub const MOON_RADIUS: f64 = MOON_RADIUS_RL * GAME_SCALE; \ No newline at end of file diff --git a/server/src/orbit/mod.rs b/server/src/orbit/mod.rs new file mode 100644 index 0000000000000000000000000000000000000000..987b09fc8a97bf1fea08ba0ac006aae4affb489a --- /dev/null +++ b/server/src/orbit/mod.rs @@ -0,0 +1 @@ +pub mod constants; \ No newline at end of file diff --git a/server/src/planet.rs b/server/src/planet.rs index 9d3f2a66df650ee5781d9326f5cabe2dc68e43d6..ef7809b0ae3d320f7e29716c74a4e28606e0c9ce 100644 --- a/server/src/planet.rs +++ b/server/src/planet.rs @@ -3,6 +3,7 @@ use rapier2d_f64::prelude::{RigidBodyHandle, RigidBodySet, ColliderBuilder, Rigi use starkingdoms_protocol::planet::PlanetType; use crate::{SCALE, manager::ClientHandlerMessage}; +use crate::orbit::constants::EARTH_RADIUS; //const GRAVITY: f64 = 0.001; const GRAVITY: f64 = 12.6674; @@ -58,7 +59,7 @@ impl Planets { &mut planets, PlanetType::Earth, 4000.0, - 1000.0, + EARTH_RADIUS, (100.0, 100.0), rigid_body_set, collider_set,