fmt

README.md

@@ -6,7 +6,8 @@ Rust parser for source engine model files (`.mdl`, `.vtx`, `.vvd`)
 
 ## Examples
 
-All examples require the `.mdl`, `.vvd` and `.dx90.vtx` to be next to each other and TF2 to be installed to load the texture data from.
+All examples require the `.mdl`, `.vvd` and `.dx90.vtx` to be next to each other
+and TF2 to be installed to load the texture data from.
 
 ## Viewer
 

examples/parse.rs

@@ -1,6 +1,7 @@
 use cgmath::Matrix4;
 use std::env::args;
 use std::fs;
+use std::hint::black_box;
 use std::path::PathBuf;
 use vmdl::mdl::Mdl;
 use vmdl::vtx::Vtx;
@@ -19,36 +20,29 @@ fn main() -> Result<(), vmdl::ModelError> {
     let data = fs::read(path.with_extension("vvd"))?;
     let vvd = Vvd::read(&data)?;
 
-    for bone in &mdl.bones {
-        println!(
-            "{}: from {} at\n\t{:?}\n\t{:?}\n\t{:?}\n\t{:?}",
-            bone.name, bone.parent, bone.rot, bone.rot_scale, bone.quaternion, bone.pose_to_bone
-        );
-    }
-
-    dbg!(Matrix4::from(mdl.bones[1].pose_to_bone.clone()));
-
-    // for animation_desc in &mdl.local_animations {
+    // for bone in &mdl.bones {
     //     println!(
-    //         "{}: {} frames at {}fps",
-    //         animation_desc.name, animation_desc.frame_count, animation_desc.fps,
+    //         "{}: from {} at\n\t{:?}\n\t{:?}\n\t{:?}\n\t{:?}",
+    //         bone.name, bone.parent, bone.rot, bone.rot_scale, bone.quaternion, bone.pose_to_bone
     //     );
-    //     for animation in &animation_desc.animations {
-    //         println!(
-    //             "\tbone {:.2} frame 0:\n\t\trot: {:?}\n\t\tpos: {:?}",
-    //             animation.bone,
-    //             animation.rotation(0),
-    //             animation.position(0),
-    //         );
-    //         println!(
-    //             "\tbone {:.2} frame 1:\n\t\trot: {:?}\n\t\tpos: {:?}",
-    //             animation.bone,
-    //             animation.rotation(10),
-    //             animation.position(10),
-    //         );
-    //     }
     // }
 
+    for animation_desc in mdl.local_animations.iter() {
+        println!(
+            "{}: {} frames at {}fps",
+            animation_desc.name, animation_desc.frame_count, animation_desc.fps,
+        );
+        for animation in &animation_desc.animations.first() {
+            dbg!(animation.flags);
+            println!(
+                "\tbone {:.2} frame 0:\n\t\ttrans: {:?}\n\t\tpos: {:?}",
+                animation.bone,
+                animation.rotation(0),
+                animation.translation(0),
+            );
+        }
+    }
+
     let model = Model::from_parts(mdl, vtx, vvd);
 
     let _ = model;

fuzz/flake.nix

@@ -4,22 +4,19 @@
     nixpkgs.url = "nixpkgs/release-22.11";
   };
 
-  outputs =
-    { self
-    , nixpkgs
-    , utils
-    ,
-    }:
-    utils.lib.eachDefaultSystem (system:
-    let
+  outputs = {
+    self,
+    nixpkgs,
+    utils,
+  }:
+    utils.lib.eachDefaultSystem (system: let
       pkgs = (import nixpkgs) {
         inherit system;
       };
-    in
-    rec {
+    in rec {
       # `nix develop`
       devShell = pkgs.mkShell {
-        nativeBuildInputs = with pkgs; [ rustup cargo-edit cargo-fuzz ];
+        nativeBuildInputs = with pkgs; [rustup cargo-edit cargo-fuzz];
       };
     });
 }

src/mdl/raw/animation.rs

@@ -94,6 +94,7 @@ impl ReadRelative<'_> for AnimationDescription {
     type Header = AnimationDescriptionHeader;
 
     fn read(data: &[u8], header: Self::Header) -> Result<Self, ModelError> {
+        dbg!(header);
         let mut animations = Vec::with_capacity(1);
         let mut offset = header.animation_index as usize;
         loop {
@@ -186,6 +187,7 @@ impl ReadableRelative for ValueHeader {}
 fn read_animation_values(
     frame: usize,
     animation_value_pointers: AnimationValuePointers,
+    debug: bool,
 ) -> Result<[f32; 3], ModelError> {
     let [x, y, z] = animation_value_pointers
         .offsets
@@ -194,7 +196,10 @@ fn read_animation_values(
                 Ok(0)
             } else {
                 let values: FrameValues = read_single(animation_value_pointers.data, offset)?;
-                Ok(values.get(frame as u8)?)
+                if debug {
+                    println!("frame {frame}");
+                }
+                Ok(values.get(frame as u8, debug)?)
             }
         });
     let [x, y, z] = [x?, y?, z?];
@@ -279,7 +284,6 @@ impl From<Quaternion64> for RotationData {
 
 impl From<Vec<RadianEuler>> for RotationData {
     fn from(value: Vec<RadianEuler>) -> Self {
-        // axis get fixed up when applying the scale
         RotationData::Animated(value)
     }
 }
@@ -292,6 +296,7 @@ impl RotationData {
             RotationData::Animated(values) => values
                 .get(frame)
                 .copied()
+                .inspect(|v| println!("{:?}", v))
                 .unwrap_or_else(|| values.last().copied().unwrap_or_default())
                 .into(),
             RotationData::None => Quaternion::default(),
@@ -408,6 +413,7 @@ fn read_animation(
         offset: header_offset,
     })?;
     let header = <AnimationHeader as Readable>::read(data)?;
+    dbg!(header);
 
     let offset = size_of::<AnimationHeader>();
 
@@ -417,8 +423,9 @@ fn read_animation(
         RotationData::from(read_single::<Quaternion64, _>(data, offset)?)
     } else if header.flags.contains(AnimationFlags::STUDIO_ANIM_ANIMROT) {
         let pointers: AnimationValuePointers = read_single(data, offset)?;
+        println!("bone: {}", header.bone);
         let values: Vec<RadianEuler> = (0..frames)
-            .map(|frame| read_animation_values(frame, pointers))
+            .map(|frame| read_animation_values(frame, pointers, header.bone == 0))
             .map_ok(|[pitch, yaw, roll]| RadianEuler { pitch, yaw, roll })
             .collect::<Result<_, ModelError>>()?;
         RotationData::from(values)
@@ -432,7 +439,7 @@ fn read_animation(
     } else if header.flags.contains(AnimationFlags::STUDIO_ANIM_ANIMPOS) {
         let pointers: AnimationValuePointers = read_single(data, position_offset)?;
         let values = (0..frames)
-            .map(|frame| read_animation_values(frame, pointers))
+            .map(|frame| read_animation_values(frame, pointers, false))
             .map_ok(Vector::from)
             .collect::<Result<_, ModelError>>()?;
         PositionData::PositionValues(values)