diff --git a/src/fighter/baked_animation/asset_baking.rs b/src/fighter/baked_animation/asset_baking.rs index a4a5be8..d78a7ea 100644 --- a/src/fighter/baked_animation/asset_baking.rs +++ b/src/fighter/baked_animation/asset_baking.rs @@ -1,8 +1,8 @@ use super::{ BAKED_ANIMATION_FPS, - fixed_transform::FixedMat4, runtime::{BakedAnimationClip, BakedFighterAnimations}, }; +use crate::math::fixed_transform::FixedMat4; use crate::fighter::{animation::AnimKind, manifest::FighterManifest}; use bevy::{ asset::{ diff --git a/src/fighter/baked_animation/mod.rs b/src/fighter/baked_animation/mod.rs index 18818f7..1f2551a 100644 --- a/src/fighter/baked_animation/mod.rs +++ b/src/fighter/baked_animation/mod.rs @@ -1,12 +1,11 @@ //! Deterministic, fighter-local skeletal animation samples for gameplay and rendering. mod asset_baking; -mod fixed_transform; mod runtime; mod visual_binding; pub use asset_baking::BakedAnimationPlugin; -pub use fixed_transform::FixedMat4; +pub use crate::math::fixed_transform::FixedMat4; pub use runtime::{ BakedAnimationClip, BakedFighterAnimations, FighterBoneIndexMap, FighterBoneMatrices, update_fighter_bone_matrices, diff --git a/src/fighter/baked_animation/runtime.rs b/src/fighter/baked_animation/runtime.rs index 8ec3d95..82fa42e 100644 --- a/src/fighter/baked_animation/runtime.rs +++ b/src/fighter/baked_animation/runtime.rs @@ -3,7 +3,8 @@ use std::collections::HashMap; use bevy::prelude::*; use serde::{Deserialize, Serialize}; -use super::{BAKED_ANIMATION_FPS, fixed_transform::FixedMat4}; +use super::{BAKED_ANIMATION_FPS}; + use crate::{ fighter::{ Fighter, @@ -12,6 +13,7 @@ use crate::{ visual::FighterAnimations, }, math::int::FGi32, + math::fixed_transform::FixedMat4 }; #[derive(Clone, Debug, Serialize, Deserialize)] diff --git a/src/fighter/baked_animation/fixed_transform.rs b/src/math/fixed_transform.rs similarity index 98% rename from src/fighter/baked_animation/fixed_transform.rs rename to src/math/fixed_transform.rs index 35dfb80..3fc07b1 100644 --- a/src/fighter/baked_animation/fixed_transform.rs +++ b/src/math/fixed_transform.rs @@ -23,7 +23,7 @@ impl FixedMat4 { ], }; - pub(super) fn from_mat4(matrix: Mat4) -> io::Result { + pub fn from_mat4(matrix: Mat4) -> io::Result { let values = matrix.to_cols_array(); let mut cols = [[FGi32::ZERO; 4]; 4]; for (index, value) in values.into_iter().enumerate() { diff --git a/src/math/mod.rs b/src/math/mod.rs index 37e9cbd..6f49641 100644 --- a/src/math/mod.rs +++ b/src/math/mod.rs @@ -1,4 +1,5 @@ pub mod int; pub mod segment; pub mod vec; +pub mod fixed_transform; pub mod vec3;