diff --git a/src/model_physics.rs b/src/model_physics.rs index 543580d..d3967d8 100644 --- a/src/model_physics.rs +++ b/src/model_physics.rs @@ -173,12 +173,12 @@ pub enum MinkowskiFace{ } pub struct MinkowskiMesh<'a>{ - mesh0:&'a VirtualMesh<'a>, - mesh1:&'a VirtualMesh<'a>, + mesh0:&'a TransformedMesh<'a>, + mesh1:&'a TransformedMesh<'a>, } impl MinkowskiMesh<'_>{ - pub fn minkowski_sum<'a>(mesh0:&'a VirtualMesh,mesh1:&'a VirtualMesh)->MinkowskiMesh<'a>{ + pub fn minkowski_sum<'a>(mesh0:&'a TransformedMesh,mesh1:&'a TransformedMesh)->MinkowskiMesh<'a>{ MinkowskiMesh{ mesh0, mesh1, diff --git a/src/physics.rs b/src/physics.rs index be486aa..9626a60 100644 --- a/src/physics.rs +++ b/src/physics.rs @@ -1,7 +1,7 @@ use crate::zeroes::zeroes2; use crate::instruction::{InstructionEmitter,InstructionConsumer,TimedInstruction}; use crate::integer::{Time,Planar64,Planar64Vec3,Planar64Mat3,Angle32,Ratio64,Ratio64Vec2}; -use crate::model_physics::{PhysicsMesh,VirtualMesh,MinkowskiMesh}; +use crate::model_physics::{PhysicsMesh,TransformedMesh,MinkowskiMesh}; #[derive(Debug)] pub enum PhysicsInstruction { @@ -643,8 +643,8 @@ impl PhysicsModel{ crate::model::CollisionAttributes::Decoration=>None, } } - pub fn mesh<'a>(&self,meshes:&Vec)->VirtualMesh<'a>{ - VirtualMesh{ + pub fn mesh<'a>(&self,meshes:&Vec)->TransformedMesh<'a>{ + TransformedMesh{ mesh:&meshes[self.mesh_id], transform:&self.transform, normal_transform:&self.normal_transform,