2 files changed, 10 insertions(+), 6 deletions(-)

M server/src/main.rs
M starkingdoms-client/src/pages/Play.svelte

@@ 21,6 21,7 @@ static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
 
 use std::collections::HashMap;
 use std::net::IpAddr;
+use std::num::NonZeroUsize;
 
 use crate::mathutil::rot2d;
 use crate::ws::{StkTungsteniteServerConfig, StkTungsteniteServerPlugin, WsEvent};


@@ 151,10 152,13 @@ fn main() {
 }
 
 fn setup_integration_parameters(mut context: ResMut<RapierContext>) {
-    context.integration_parameters.dt = 1.0 / 60.0;
+    context.integration_parameters.dt = 1.0 / 20.0;
     context.integration_parameters.joint_erp = 0.2;
-    context.integration_parameters.erp = 0.5;
-    //context.integration_parameters.num_solver_iterations = NonZeroUsize::new(16).unwrap();
+    context.integration_parameters.erp = 0.1;
+    //context.integration_parameters.num_solver_iterations = NonZeroUsize::new(1).unwrap();
+    //context.integration_parameters.num_internal_pgs_iterations = 1;
+    context.integration_parameters.max_penetration_correction = 0.5;
+    //context.integration_parameters.switch_to_standard_pgs_solver();
 }
 fn spawn_planets(mut commands: Commands) {
     info!("Spawning planets");

@@ 39,11 39,11 @@
   }*/
 
   function handlewheel(e: WheelEvent) {
-    let delta = e.shiftKey ? 0.01 : 0.1;
+    let delta = e.shiftKey ? 0.95 : 0.8;
     if (e.deltaY < 0) {
-      global.scale += delta;
+      global.scale *= 1/delta;
     } else {
-      global.scale -= delta;
+      global.scale *= delta;
     }
     if (global.scale > 5) {
       global.scale = 5;