Added limping and zombie walk animations.
parent
2cedbf5e1a
commit
038f07de0a
|
@ -1,5 +1,7 @@
|
||||||
.*.swp
|
.*.swp
|
||||||
|
|
||||||
|
*.fbx
|
||||||
|
*blend1
|
||||||
*CMakeFiles/**
|
*CMakeFiles/**
|
||||||
/.idea
|
/.idea
|
||||||
/scratch*
|
/scratch*
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -201,6 +201,8 @@ int main() {
|
||||||
skinned_mesh.LoadAnimation("../media/Walking-loop.ozz");
|
skinned_mesh.LoadAnimation("../media/Walking-loop.ozz");
|
||||||
skinned_mesh.LoadAnimation("../media/RunningSlow-loop.ozz");
|
skinned_mesh.LoadAnimation("../media/RunningSlow-loop.ozz");
|
||||||
skinned_mesh.LoadAnimation("../media/RunningFast-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);
|
skinned_mesh.SetCurrentAnimation(0);
|
||||||
|
|
||||||
AnimationController animation_controller (&skinned_mesh);
|
AnimationController animation_controller (&skinned_mesh);
|
||||||
|
@ -408,7 +410,7 @@ int main() {
|
||||||
skinned_mesh.DrawDebugUi();
|
skinned_mesh.DrawDebugUi();
|
||||||
animation_controller.DrawDebugUi();
|
animation_controller.DrawDebugUi();
|
||||||
|
|
||||||
animation_controller.Update(state.time.frame);
|
animation_controller.UpdateTime(state.time.frame);
|
||||||
animation_controller.Evaluate();
|
animation_controller.Evaluate();
|
||||||
|
|
||||||
sgl_defaults();
|
sgl_defaults();
|
||||||
|
|
Loading…
Reference in New Issue