add image cache manager

opencombat/gui/actor.py

@@ -14,7 +14,7 @@ from opencombat.gui.animation import ANIMATION_CRAWL
 from opencombat.gui.animation import ANIMATION_WALK
 from opencombat.gui.const import POSITION_MAN_STAND_UP
 from opencombat.gui.const import POSITION_MAN_CRAWLING
-from opencombat.gui.image import TileImageCache
+from opencombat.gui.image import TileImageCacheManager
 from opencombat.gui.weapon import RIFFLE
 from opencombat.gui.weapon import WeaponImageApplier
 
@@ -43,11 +43,8 @@ class BaseActor(Actor):
         self.firing_change_image_gap = 0.05  # seconds
         self.firing_images_cache = {}  # type: TODO
 
-        self.default_image_path = image_path
-
-        self.image_cache = TileImageCache(self, self.config)
-        self.image_cache.build()
-        pass
+    def get_image_cache_manager(self) -> TileImageCacheManager:
+        return TileImageCacheManager(self, self.config)
 
     @property
     def mode(self) -> str:

opencombat/gui/image.py

@@ -1,21 +1,19 @@
 # coding: utf-8
-import io
 import typing
 
 from PIL import Image
 from synergine2.config import Config
-from synergine2_cocos2d.actor import Actor
 from synergine2_cocos2d.util import PathManager
+from synergine2_xyz.image import ImageCache
+from synergine2_xyz.image import ImageCacheManager
 
 from opencombat.exception import UnknownAnimationIndex
 
+if typing.TYPE_CHECKING:
+    from opencombat.gui.actor import BaseActor
 
-class ImageCache(object):
-    def __init__(self) -> None:
-        self.cache = {}
 
-
-class FiringCache(ImageCache):
+class FiringImageCache(ImageCache):
     def add(
         self,
         mode: str,
@@ -44,28 +42,14 @@ class FiringCache(ImageCache):
             )
 
 
-class ImageCache(object):
-    # FIXME: Move into synergine
-    def __init__(
-        self,
-        actor: Actor,
-        config: Config,
-    ) -> None:
-        self.config = config
-        self.actor = actor
-
-    def build(self) -> None:
-        pass
-
-
-class TileImageCache(ImageCache):
+class TileImageCacheManager(ImageCacheManager):
     def __init__(
         self,
-        actor: Actor,
+        actor: 'BaseActor',
         config: Config,
     ) -> None:
         super().__init__(actor, config)
-        self.firing_cache = FiringCache()
+        self.firing_cache = FiringImageCache()
         from opencombat.gui.actor import BaseActor
         self.actor = typing.cast(BaseActor, self.actor)
         self.path_manager = PathManager(