tirbofish/dropbear · commit
a4fcd53f9d5e9eba3a4506ece2aa11e324f3e2af
wip: dealing with physics-based fix
Signature present but could not be verified.
Unverified
@@ -31,13 +31,13 @@ egui_dock = { git = "https://github.com/enomado/egui_dock", branch = "update-egu egui_extras = { version = "0.34", features = ["all_loaders"] } egui_ltreeview = { git = "https://github.com/LennysLounge/egui_ltreeview", features = ["doc"] } egui_plot = "0.35" -transform-gizmo-egui = { git = "https://github.com/tirbofish/transform-gizmo" } +transform-gizmo-egui = { version = "0.9" } env_logger = "0.11" futures = "0.3" gilrs = "0.11" git2 = { version = "0.20", features = ["vendored-openssl"] } -glam = { version = "0.30", features = ["serde", "mint", "bytemuck", "rkyv", "bytecheck"] } # required to be at 0.30 because of rapier3d not being updated yet +glam = { version = "0.30", features = ["serde", "mint", "bytemuck", "rkyv", "bytechec"] } # required to be at 0.30 because of rapier3d not being updated yet hecs = { version = "0.11", features = ["serde"] } log = "0.4" log-once = "0.4" @@ -1,7 +1,5 @@ use std::sync::Arc; use glam::{Mat4}; -use wgpu::util::DeviceExt; -use dropbear_utils::Dirty; use crate::animation::{MorphTargetInfo, MAX_MORPH_WEIGHTS, MAX_SKINNING_MATRICES}; use crate::buffer::{StorageBuffer, UniformBuffer}; use crate::graphics::SharedGraphicsContext; @@ -165,13 +165,13 @@ impl EntityTransformExt for EntityTransform { let parent_entity = parent_comp.parent(); if let Ok(parent_transform) = world.get::<&EntityTransform>(parent_entity) { - let parent_world = parent_transform.world(); + let parent_synced = parent_transform.sync(); result = Transform { - position: parent_world.position - + parent_world.rotation * (result.position * parent_world.scale), - rotation: parent_world.rotation * result.rotation, - scale: parent_world.scale * result.scale, + position: parent_synced.position + + parent_synced.rotation * (result.position * parent_synced.scale),
Large diffs are not rendered by default. Showing the first 50 of 139 lines. Show full diff