diff --git a/.gitignore b/.gitignore index ce41685..3c6a1f5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ .*.swp +*.fbx +*blend1 *CMakeFiles/** /.idea /scratch* diff --git a/media/Limping-loop.ozz b/media/Limping-loop.ozz new file mode 100644 index 0000000..917bdf2 Binary files /dev/null and b/media/Limping-loop.ozz differ diff --git a/media/MixamoYBot-skeleton.ozz b/media/MixamoYBot-skeleton.ozz index 6a37ce8..f58c512 100644 Binary files a/media/MixamoYBot-skeleton.ozz and b/media/MixamoYBot-skeleton.ozz differ diff --git a/media/MixamoYBot.blend b/media/MixamoYBot.blend index 537ba50..8757061 100644 Binary files a/media/MixamoYBot.blend and b/media/MixamoYBot.blend differ diff --git a/media/MixamoYBot.glb b/media/MixamoYBot.glb index 8490fef..4b3e1fa 100644 Binary files a/media/MixamoYBot.glb and b/media/MixamoYBot.glb differ diff --git a/media/ZombieWalk-loop.ozz b/media/ZombieWalk-loop.ozz new file mode 100644 index 0000000..1649c32 Binary files /dev/null and b/media/ZombieWalk-loop.ozz differ diff --git a/media/skeleton.ozz b/media/skeleton.ozz index d1f1c95..6a37ce8 100644 Binary files a/media/skeleton.ozz and b/media/skeleton.ozz differ diff --git a/src/main.cc b/src/main.cc index 21791dc..bfd6fd3 100644 --- a/src/main.cc +++ b/src/main.cc @@ -201,6 +201,8 @@ int main() { skinned_mesh.LoadAnimation("../media/Walking-loop.ozz"); skinned_mesh.LoadAnimation("../media/RunningSlow-loop.ozz"); skinned_mesh.LoadAnimation("../media/RunningFast-loop.ozz"); + skinned_mesh.LoadAnimation("../media/Limping-loop.ozz"); + skinned_mesh.LoadAnimation("../media/ZombieWalk-loop.ozz"); skinned_mesh.SetCurrentAnimation(0); AnimationController animation_controller (&skinned_mesh); @@ -408,7 +410,7 @@ int main() { skinned_mesh.DrawDebugUi(); animation_controller.DrawDebugUi(); - animation_controller.Update(state.time.frame); + animation_controller.UpdateTime(state.time.frame); animation_controller.Evaluate(); sgl_defaults();