Fix random animation offset

Author: bitbrain

Diff for: 2d/src/main/java/de/bitbrain/braingdx/graphics/animation/AnimationFrames.java

@@ -16,8 +16,9 @@ public enum Direction {
    private float duration;
    private int resetIndex;
    private float offset;
+   private boolean randomOffset;
 
-   private AnimationFrames(int originX, int originY, Direction direction, Animation.PlayMode playMode, int frames, float duration, int resetIndex, float offset) {
+   private AnimationFrames(int originX, int originY, Direction direction, Animation.PlayMode playMode, int frames, float duration, int resetIndex, float offset, boolean randomOffset) {
       this.originX = originX;
       this.originY = originY;
       this.direction = direction;
@@ -26,12 +27,17 @@ private AnimationFrames(int originX, int originY, Direction direction, Animation
       this.duration = duration;
       this.resetIndex = resetIndex;
       this.offset = offset;
+      this.randomOffset = randomOffset;
    }
 
    public float getOffset() {
       return offset;
    }
 
+   public boolean isRandomOffset() {
+      return randomOffset;
+   }
+
    public void setOriginX(int originX) {
       this.originX = originX;
    }
@@ -101,6 +107,7 @@ public static class AnimationFramesBuilder {
       private float duration = 1f;
       private int resetIndex = 0;
       private float offset = 0;
+      private boolean randomOffset;
 
       private AnimationFramesBuilder() {
 
@@ -143,11 +150,8 @@ public AnimationFramesBuilder offset(float offsetInMilliseconds) {
       }
 
       public AnimationFramesBuilder randomOffset() {
-         if (frames > 0) {
-            return this.offset((float) (Math.random() * (this.duration * this.frames)));
-         } else {
-            return this.offset((float) (Math.random() * (this.duration * 8f)));
-         }
+         randomOffset = true;
+         return this;
       }
 
       public AnimationFrames build() {
@@ -159,7 +163,8 @@ public AnimationFrames build() {
                frames,
                duration,
                resetIndex,
-               offset
+               offset,
+               randomOffset
          );
       }
 

Diff for: 2d/src/main/java/de/bitbrain/braingdx/graphics/animation/AnimationRenderer.java

@@ -115,12 +115,20 @@ private TextureRegion retrieveRegionFor(GameObject object, float delta) {
       Animation<TextureRegion> animation = animationCache.getAnimation(currentAnimationType);
       AnimationFrames frames = config.getFrames(currentAnimationType);
       if (state.stateTime == 0f) {
-         state.stateTime = frames.getOffset();
+         if (frames.isRandomOffset()) {
+            state.stateTime = (float) (Math.random() * (frames.getDuration() * frames.getFrames()));
+         } else {
+            state.stateTime = frames.getOffset();
+         }
       }
       state.stateTime += delta;
       boolean animationEnabled = animationEnabler.isEnabledFor(object);
       if (!animationEnabled) {
-         state.stateTime = frames.getOffset();
+         if (frames.isRandomOffset()) {
+            state.stateTime = (float) (Math.random() * (frames.getDuration() * frames.getFrames()));
+         } else {
+            state.stateTime = frames.getOffset();
+         }
       }
       return animation.getKeyFrame(animationEnabled ? state.stateTime : frames.getDuration() * frames.getResetIndex());
    }

Diff for: CHANGELOG.md

@@ -1,3 +1,7 @@
+# Version 0.6.28
+
+* fix random animation offset
+
 # Version 0.6.27
 
 * improve animation rendering and add offset option