diff options
author | metamuffin <metamuffin@disroot.org> | 2025-01-17 19:27:27 +0100 |
---|---|---|
committer | metamuffin <metamuffin@disroot.org> | 2025-01-17 19:27:27 +0100 |
commit | 1ca762dedcdd6c87086560dd56ab3566b08243d0 (patch) | |
tree | f8380d79dfaafe07a252fbf27f4a22c7a750078b /world/src/physics.rs | |
parent | 7ead3dfc316fb109f8f30eea1aa00eb01a4ce1a6 (diff) | |
download | weareserver-1ca762dedcdd6c87086560dd56ab3566b08243d0.tar weareserver-1ca762dedcdd6c87086560dd56ab3566b08243d0.tar.bz2 weareserver-1ca762dedcdd6c87086560dd56ab3566b08243d0.tar.zst |
remove --z-up flag and fix inherited transform
Diffstat (limited to 'world/src/physics.rs')
-rw-r--r-- | world/src/physics.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/world/src/physics.rs b/world/src/physics.rs index b0c3ae6..37201af 100644 --- a/world/src/physics.rs +++ b/world/src/physics.rs @@ -14,11 +14,11 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -use crate::{Args, mesh::node_transform_to_affine}; use anyhow::{Result, anyhow}; use gltf::{Gltf, Node, buffer::Data, json::Value}; use log::{debug, info}; use weareshared::{ + Affine3A, resources::{CollisionPart, Prefab}, store::ResourceStore, vec3a, @@ -26,11 +26,11 @@ use weareshared::{ pub fn import_physics( gltf: &Gltf, + trans: Affine3A, node: &Node, prefab: &mut Prefab, store: &ResourceStore, buffers: &[Data], - args: &Args, ) -> Result<()> { if let Some(physics) = node .extensions() @@ -73,7 +73,7 @@ pub fn import_physics( ); prefab.collision.push(( - node_transform_to_affine(&node, args), + trans, store.set(&CollisionPart { sh_mesh: Some((store.set(&index)?, store.set(&position)?)), ..Default::default() |