Merge pull request #181 from Davidster/upgrade_deps

Upgrade deps

Cargo.toml

@@ -21,21 +21,22 @@ winit = { version = "0.29", git = "https://github.com/iced-rs/winit.git", rev =
 ikari = { version = "0.0.1", path = "./ikari", default-features = false }
 log = "0.4"
 wgpu = { version = "0.19", features = ["trace"] }
-wgpu-profiler = "0.16.1"
+wgpu-profiler = "0.16.2"
 anyhow = { version = "1.0", features = ["backtrace"] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { version = "0.11", default-features = false, features = [
   "auto-color",
   "humantime",
 ] }
-profiling = "1.0.11"
+profiling = "=1.0.14"
 image = { version = "0.24", default-features = false, features = [
   "hdr",
   "jpeg",
+  "png",
 ] }
-gltf = "1.3"
+gltf = "1.4"
 pico-args = "0.5.0"
-lazy_static = "1.4"
-glam = { version = "0.24.1", features = ["approx", "bytemuck"] }
+lazy_static = "1.5"
+glam = { version = "0.28", features = ["approx", "bytemuck"] }
 rand = { version = "0.8", features = ["small_rng"] }
 pollster = "0.3"
 
@@ -55,7 +56,7 @@ web-sys = { version = "0.3.64", features = [
   "ReadableStreamDefaultReader",
   "HtmlCollection",
 ] }
-wasm-bindgen = { version = "0.2.87", features = ["serde-serialize"] }
+wasm-bindgen = { version = "0.2.92", features = ["serde-serialize"] }
 wasm-bindgen-futures = "0.4.42"
 
 iced = { version = "0.12", features = ["canvas"] }

build_web/Cargo.toml

@@ -11,12 +11,9 @@ path = "src/main.rs"
 
 [dependencies]
 anyhow.workspace = true
-arboard = "3.2.1"
+arboard = "3.4.0"
 pico-args.workspace = true
-wasm-bindgen-cli-support = "0.2.87"
-warp = "0.3.5"
+wasm-bindgen-cli-support = "0.2.92"
+warp = "0.3.7"
 tokio = { version = "1", features = ["full"] }
-env_logger = { version = "0.10", default-features = false, features = [
-  "auto-color",
-  "humantime",
-] }
+env_logger.workspace = true

clikari/Cargo.toml

@@ -23,4 +23,4 @@ pico-args.workspace = true
 lazy_static.workspace = true
 threadpool = "1.8.1"
 num_cpus = "1.16.0"
-walkdir = "2.3.3"
+walkdir = "2.5.0"

example_game/Cargo.toml

@@ -36,10 +36,10 @@ image.workspace = true
 iced.workspace = true
 iced_wgpu.workspace = true
 iced_winit.workspace = true
-tracing-tracy = { version = "0.10.3", optional = true }
+tracing-tracy = { version = "0.10.5", optional = true }
 
 plotters-iced = "0.10.0"
-plotters = { version = "0.3.5", default-features = false, features = [
+plotters = { version = "0.3.6", default-features = false, features = [
   "line_series",
 ] }
 

ikari/Cargo.toml

@@ -21,18 +21,18 @@ audio = ["oddio", "cpal", "symphonia"]
 
 [dependencies]
 bytemuck = { version = "1", features = ["derive"] }
-half = { version = "2.3.1", features = ["serde"] }
+half = { version = "2.4.1", features = ["serde"] }
 pollster.workspace = true
 twox-hash = "1.6"
 lazy_static.workspace = true
-smallvec = { version = "1.11", features = ["union", "const_generics"] }
+smallvec = { version = "1.13", features = ["union", "const_generics"] }
 anyhow.workspace = true
-chrono = { version = "0.4.28", default-features = false, features = [
+chrono = { version = "0.4.38", default-features = false, features = [
     "std",
     "wasmbind",
     "clock",
 ] }
-web-time = "1.0.0"
+web-time = "1.1.0"
 async-std = "1.12.0"
 
 # log
@@ -56,7 +56,7 @@ winit.workspace = true
 
 # math
 rand.workspace = true
-rapier3d-f64 = "0.17.2"
+rapier3d-f64 = "0.21"
 glam.workspace = true
 approx = "0.5"
 
@@ -74,31 +74,31 @@ iced.workspace = true
 iced_wgpu.workspace = true
 iced_winit.workspace = true
 
-wasm_thread = { version = "0.2.0", features = ["es_modules"] }
+wasm_thread = { version = "0.3", features = ["es_modules"] }
 futures-intrusive = "0.5.0"
-rmp-serde = "1.1.2"
-serde = "1.0.188"
-miniz_oxide = "0.7.1"
-byte-unit = "4.0.19"
+rmp-serde = "1.3.0"
+serde = "1.0.204"
+miniz_oxide = "0.7.4"
+byte-unit = "5.1"
 bitvec = "1.0.1"
-base64 = "0.21.7"
+base64 = "0.22"
 urlencoding = "2.1.3"
 size = "0.4.1"
-bevy_mikktspace = "0.13.0"
+bevy_mikktspace = "0.14"
 gloo-net = "0.5.0"
 spin = { version = "0.9.8", default-features = false, features = [
     "spin_mutex",
 ] }
 spin_sleep = "1.2.0"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-basis-universal = "0.3.0"
+basis-universal = "0.3.1"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 js-sys = "0.3.64"
 wasm-bindgen-futures.workspace = true
 web-sys.workspace = true
-getrandom = { version = "0.2.10", features = ["js"] }
+getrandom = { version = "0.2.15", features = ["js"] }
 wasm-bindgen.workspace = true
 cpal = { git = "https://github.com/RustAudio/cpal.git", rev = "6c3d11b8f6af5c6202278560860a8c565162fd51", optional = true, features = [
     "wasm-bindgen",

ikari/src/physics.rs

@@ -11,7 +11,7 @@ pub struct PhysicsState {
     pub integration_parameters: IntegrationParameters,
     pub physics_pipeline: PhysicsPipeline,
     pub island_manager: IslandManager,
-    pub broad_phase: BroadPhase,
+    pub broad_phase: DefaultBroadPhase,
     pub narrow_phase: NarrowPhase,
     pub rigid_body_set: RigidBodySet,
     pub collider_set: ColliderSet,
@@ -31,7 +31,7 @@ impl PhysicsState {
             integration_parameters: IntegrationParameters::default(),
             physics_pipeline: PhysicsPipeline::new(),
             island_manager: IslandManager::new(),
-            broad_phase: BroadPhase::new(),
+            broad_phase: DefaultBroadPhase::new(),
             narrow_phase: NarrowPhase::new(),
             rigid_body_set: RigidBodySet::new(),
             collider_set: ColliderSet::new(),
@@ -63,8 +63,7 @@ impl PhysicsState {
             &(),
         );
 
-        self.query_pipeline
-            .update(&self.rigid_body_set, &self.collider_set);
+        self.query_pipeline.update(&self.collider_set);
     }
 
     pub fn remove_rigid_body(&mut self, rigid_body_handle: RigidBodyHandle) {

ikari/src/renderer.rs

@@ -4857,9 +4857,9 @@ impl Renderer {
         }
 
         let fmt_bytes = |bytes: usize| {
-            byte_unit::Byte::from_bytes(bytes as u128)
-                .get_appropriate_unit(false)
-                .to_string()
+            byte_unit::Byte::from_u128(bytes as u128)
+                .map(|byte| byte.get_appropriate_unit(byte_unit::UnitType::Decimal).to_string())
+                .unwrap_or_else(|| format!("{bytes} bytes"))
         };
         log::debug!(
             "Memory usage:\n  Instance buffers: {}\n  Index buffers: {}\n  Vertex buffers: {}",

ikari/src/transform.rs

@@ -102,7 +102,7 @@ impl Transform {
         let (_scale, rotation, position) = self.to_scale_rotation_translation();
         Isometry::from_parts(
             Translation::from(position.as_dvec3().to_array()),
-            UnitQuaternion::from_quaternion(Quaternion::from(rotation.as_f64().to_array())),
+            UnitQuaternion::from_quaternion(Quaternion::from(rotation.as_dquat().to_array())),
         )
     }