Merge pull request #21 from DD2480-Group-11/fix_spritesheetresource_o…

…bject Fix spritesheetresource object
DD2480-Group-11 · Mar 9, 2021 · dc289ed · dc289ed
2 parents 2163073 + 77ebd3d
commit dc289ed
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/src/de/gurkenlabs/litiengine/graphics/animation/AsepriteHandler.java b/src/de/gurkenlabs/litiengine/graphics/animation/AsepriteHandler.java
@@ -23,6 +23,8 @@
 import de.gurkenlabs.litiengine.graphics.Spritesheet;
 import de.gurkenlabs.litiengine.graphics.animation.Animation;
 import de.gurkenlabs.litiengine.graphics.animation.KeyFrame;
+import de.gurkenlabs.litiengine.resources.Resources;
+import de.gurkenlabs.litiengine.resources.SpritesheetResource;
 
 /**
  * Offers an interface to import Aseprite JSON export format.
@@ -189,24 +191,25 @@ public ExportAnimationException(String message) {
      * Creates the json representation of an animation object and returns it.
      * This is the public accesible function and can/should be changed to fit into the UI.
      * 
-     * @param animation the animation object to export
+     * @param spritesheetResource the animation object to export
      */
-    public String exportAnimation(Animation animation){
+    public String exportAnimation(SpritesheetResource spritesheetResource){
 
-        String json = createJson(animation);
+        String json = createJson(spritesheetResource);
         return json;
     }
 
     /**
      * Creates the json representation of an animation object and returns it as a string.
      * 
-     * @param animation animation object to export as json.
+     * @param spritesheetResource spritesheetResource object to export as json.
      * @return the json as a string.
      */
-    private String createJson(Animation animation){
-        Spritesheet spritesheet = animation.getSpritesheet();
-        List<KeyFrame> keyframes = animation.getKeyframes();
-        Frames[] frames = new Frames[keyframes.size()];
+    private String createJson(SpritesheetResource spritesheetResource){
+        Spritesheet spritesheet = Resources.spritesheets().load(spritesheetResource);
+        assert spritesheet != null;
+        int[] keyframes = Resources.spritesheets().getCustomKeyFrameDurations(spritesheet);
+        Frames[] frames = new Frames[keyframes.length];
 
         if(frames.length != spritesheet.getTotalNumberOfSprites()){
             throw new ExportAnimationException("Different dimensions of keyframes and sprites in spritesheet"); 
@@ -238,7 +241,7 @@ private String createJson(Animation animation){
                     put("w", frameWidth);
                     put("h", frameHeight);
                 }};
-                int duration = keyframes.get(i+j).getDuration();
+                int duration = keyframes[i+j];
                 String index = String.valueOf(i+j);
                 frames[i+j] = new Frames("frame " + index, 
                                         frame, 

diff --git a/tests/de/gurkenlabs/litiengine/graphics/animation/AsepriteHandlerTests.java b/tests/de/gurkenlabs/litiengine/graphics/animation/AsepriteHandlerTests.java
@@ -13,6 +13,8 @@
 import de.gurkenlabs.litiengine.graphics.animation.Animation;
 import de.gurkenlabs.litiengine.graphics.animation.AsepriteHandler.ImportAnimationException;
 import de.gurkenlabs.litiengine.resources.ImageFormat;
+import de.gurkenlabs.litiengine.resources.SpritesheetResource;
+
 
 public class AsepriteHandlerTests {
 
@@ -84,9 +86,12 @@ public void exportAnimationTest() {
     BufferedImage image = new BufferedImage(96, 32, BufferedImage.TYPE_4BYTE_ABGR);
     Spritesheet spritesheet = new Spritesheet(image, spritesheetPath, 32, 32);
     Animation animation = new Animation(spritesheet, false, false, 2,2,2);
-
+    int[] keyFrames = animation.getKeyFrameDurations();
+    SpritesheetResource spritesheetResource = new SpritesheetResource(animation.getSpritesheet());
+    spritesheetResource.setKeyframes(keyFrames);
+
     AsepriteHandler aseprite = new AsepriteHandler();
-    String result = aseprite.exportAnimation(animation);
+    String result = aseprite.exportAnimation(spritesheetResource);
     System.out.println(result);
   }
 }