Merge #308

308: Apply Assets to Animation r=pathunstrom a=astronouth7303

Depends on #306

Part of #147

Co-authored-by: Jamie Bliss <jamie@ivyleav.es>

ppb/features/animation.py

@@ -5,6 +5,7 @@
 """
 import time
 import re
+import ppb
 
 FILE_PATTERN = re.compile(r'\{(\d+)\.\.(\d+)\}')
 
@@ -65,7 +66,7 @@ def _compile_filename(self):
             self._filename,
         )
         self._frames = [
-            template.format(n)
+            ppb.Image(template.format(n))
             for n in range(start, end + 1)
         ]
 
@@ -108,11 +109,11 @@ def current_frame(self):
         else:
             return self._paused_frame
 
-    def __str__(self):
+    def load(self):
         """
         Get the current frame path.
         """
-        return self._frames[self.current_frame]
+        return self._frames[self.current_frame].load()
 
     # This is so that if you assign an Animation to a class, instances will get
     # their own copy, so their animations run independently.

tests/test_animation.py

@@ -13,21 +13,19 @@ class FakeAnimation(Animation):
 
     anim = FakeAnimation("{2..5}", 1)
 
+    assert [f.name for f in anim._frames] == ["2", "3", "4", "5"]
+
     time = 0
     assert anim.current_frame == 0
-    assert str(anim) == '2'
 
     time = 1
     assert anim.current_frame == 1
-    assert str(anim) == '3'
 
     time = 3
     assert anim.current_frame == 3
-    assert str(anim) == '5'
 
     time = 4
     assert anim.current_frame == 0
-    assert str(anim) == '2'
 
 
 def test_pause():
@@ -42,26 +40,28 @@ class FakeAnimation(Animation):
 
     anim = FakeAnimation("{0..9}", 1)
 
+    assert [f.name for f in anim._frames] == ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"]
+
     time = 0
-    assert str(anim) == '0'
+    assert anim.current_frame == 0
 
     time = 5
-    assert str(anim) == '5'
+    assert anim.current_frame == 5
 
     anim.pause()
-    assert str(anim) == '5'
+    assert anim.current_frame == 5
 
     time = 12
-    assert str(anim) == '5'
+    assert anim.current_frame == 5
 
     anim.unpause()
-    assert str(anim) == '5'
+    assert anim.current_frame == 5
 
     time = 16
-    assert str(anim) == '9'
+    assert anim.current_frame == 9
 
     time = 18
-    assert str(anim) == '1'
+    assert anim.current_frame == 1
 
 
 def test_filename():
@@ -76,14 +76,11 @@ class FakeAnimation(Animation):
 
     anim = FakeAnimation("spam{0..9}", 1)
 
-    time = 0
-    assert str(anim) == 'spam0'
-
-    time = 5
-    assert str(anim) == 'spam5'
+    assert [f.name for f in anim._frames] == [
+        "spam0", "spam1", "spam2", "spam3", "spam4", "spam5", "spam6", "spam7", "spam8", "spam9",
+    ]
 
     anim.filename = 'eggs{0..4}'
-    assert str(anim) == 'eggs0'
-
-    time = 7
-    assert str(anim) == 'eggs2'
+    assert [f.name for f in anim._frames] == [
+        "eggs0", "eggs1", "eggs2", "eggs3", "eggs4",
+    ]