This commit is contained in:
Robin Appelman 2022-12-24 19:26:24 +01:00
commit f4f173c84e
11 changed files with 134 additions and 52 deletions

View file

@ -5,9 +5,10 @@ mod shared;
pub mod vtx;
pub mod vvd;
use crate::mdl::Mdl;
use crate::vtx::Vtx;
use crate::vvd::{Vertex, Vvd};
pub use crate::mdl::Mdl;
pub use crate::vtx::Vtx;
use crate::vvd::Vertex;
pub use crate::vvd::Vvd;
use bytemuck::{pod_read_unaligned, Pod};
pub use error::*;
pub use handle::Handle;

View file

@ -1,12 +1,12 @@
mod raw;
use std::mem::size_of;
pub use raw::header::*;
pub use raw::header2::*;
use std::mem::size_of;
use crate::mdl::raw::{BodyPartHeader, Bone, MeshHeader, ModelHeader};
use crate::{read_indexes, read_relative, FixedString, ModelError, ReadRelative, Readable};
use crate::vvd::Vertex;
use crate::{read_indexes, read_relative, FixedString, ModelError, ReadRelative, Readable};
type Result<T> = std::result::Result<T, ModelError>;
@ -75,7 +75,7 @@ impl ReadRelative for Model {
name: header.name.try_into()?,
ty: header.ty,
bounding_radius: header.bounding_radius,
vertex_offset: header.vertex_index / (size_of::<Vertex>() as i32),
vertex_offset: header.vertex_index / (size_of::<Vertex>() as i32),
})
}
}

View file

@ -1,10 +1,10 @@
use crate::{ModelError, StringError};
use arrayvec::ArrayString;
use bytemuck::{Pod, Zeroable};
use cgmath::Vector3;
use std::fmt;
use std::fmt::{Display, Formatter};
use std::ops::{Add, Mul};
use cgmath::Vector3;
#[derive(Debug, Clone, Copy, Zeroable, Pod)]
#[repr(C)]