Use chrono::duration for animation frame durations.

tests/animation.cpp

@@ -5,9 +5,13 @@
 #include "config.hpp"
 #include <iostream>
 #include <memory>
+#include <chrono>
+#include <thread>
+#include "rand.hpp"
 
 using namespace components;
 using namespace textures;
+using namespace std::chrono_literals;
 
 struct Sheet {
   int width{0};
@@ -18,7 +22,7 @@ struct Sheet {
 
 struct Sequence {
   std::vector<size_t> frames{};
-  std::vector<float> durations{};
+  std::vector<std::chrono::milliseconds> durations{};
   size_t current{0};
   int loop_count{0};
   size_t frame_count{frames.size()};
@@ -80,14 +84,13 @@ class Animate2 {
     }
 
     // replaces step
-    void update() {
+    void update_frame() {
       dbc::check(playing, "attempt to update animation that's not playing");
       dbc::check($sequence.frame_count == $sequence.frames.size(), "frame_count doesn't match frame.size()");
 
-      auto secs = $sequence.timer.getElapsedTime().asSeconds();
       auto duration = $sequence.durations[$sequence.current];
 
-      if(secs >= duration) {
+      if($sequence.timer.getElapsedTime() >= duration) {
         $sequence.timer.restart();
         $sequence.current++;
       }
@@ -99,6 +102,10 @@ class Animate2 {
 
       dbc::check($sequence.current < $sequence.frame_count, "current frame out of frames.size()");
     }
+
+    void update() {
+      update_frame();
+    }
 };
 
 Animate2 crafter() {
@@ -111,7 +118,7 @@ Animate2 crafter() {
 
   Sequence sequence{
     .frames{0,1},
-      .durations{0.01f,0.03f}
+      .durations{Random::milliseconds(1, 100), Random::milliseconds(1, 100)}
   };
 
   REQUIRE(sequence.frame_count == sequence.frames.size());
@@ -136,9 +143,12 @@ Animate2 crafter() {
 
 void PLAY_TEST(Animate2 &anim) {
   anim.play();
+
   while(anim.playing) {
     anim.update();
+    std::this_thread::sleep_for(Random::milliseconds(1, 100));
   }
+
   REQUIRE(anim.playing == false);
 }
 
@@ -194,10 +204,29 @@ TEST_CASE("new animation system", "[animation-new]") {
   };
 }
 
-TEST_CASE("easing functions in animate2", "[animation-new]") {
+TEST_CASE("apply animation works", "[animation-new]") {
+  return;
+
+  textures::init();
+  animation::init();
+
+  auto blanket = textures::get_sprite("ritual_crafting_area");
+  sf::Vector2f pos{0,0};
   auto anim = crafter();
+
+  anim.play();
+  while(anim.playing) {
+    anim.update();
+    anim.apply(*blanket.sprite, pos);
+  }
+
+  REQUIRE(anim.playing == false);
+  REQUIRE(blanket.sprite->getPosition() != sf::Vector2f{0,0});
+  REQUIRE(pos != sf::Vector2f{0,0});
 }
 
+
+
 TEST_CASE("animation easing tests", "[animation]") {
   Animation anim;