Fix a regression on "animation by index" action when the index is not…

… an integer (#6498)

GDJS/Runtime/SpriteAnimator.ts

@@ -2,19 +2,19 @@ namespace gdjs {
   /** Represents a point in a coordinate system. */
   export type SpritePoint = {
     /** X position of the point. */
-    x: number;
+    x: float;
     /** Y position of the point. */
-    y: number;
+    y: float;
   };
 
   /** Represents a custom point in a frame. */
   export type SpriteCustomPointData = {
     /** Name of the point. */
     name: string;
     /** X position of the point. */
-    x: number;
+    x: float;
     /** Y position of the point. */
-    y: number;
+    y: float;
   };
 
   /** Represents the center point in a frame. */
@@ -24,9 +24,9 @@ namespace gdjs {
     /** Is the center automatically computed? */
     automatic: boolean;
     /** X position of the point. */
-    x: number;
+    x: float;
     /** Y position of the point. */
-    y: number;
+    y: float;
   };
 
   /** Represents a {@link gdjs.SpriteAnimationFrame}. */
@@ -48,7 +48,7 @@ namespace gdjs {
   /** Represents the data of a {@link gdjs.SpriteAnimationDirection}. */
   export type SpriteDirectionData = {
     /** Time between each frame, in seconds. */
-    timeBetweenFrames: number;
+    timeBetweenFrames: float;
     /** Is the animation looping? */
     looping: boolean;
     /** The list of frames. */
@@ -186,7 +186,7 @@ namespace gdjs {
    * Represents a direction of an animation of a {@link gdjs.SpriteRuntimeObject}.
    */
   export class SpriteAnimationDirection<T> {
-    timeBetweenFrames: number;
+    timeBetweenFrames: float;
     loop: boolean;
     frames: SpriteAnimationFrame<T>[] = [];
 
@@ -450,12 +450,13 @@ namespace gdjs {
       this._onFrameChange = callback;
     }
 
-    getAnimationIndex(): number {
+    getAnimationIndex(): integer {
       return this._currentAnimation;
     }
 
-    setAnimationIndex(newAnimation: number): boolean {
-      newAnimation = newAnimation || 0;
+    setAnimationIndex(newAnimation: integer): boolean {
+      // Truncate the index.
+      newAnimation = newAnimation | 0;
       if (
         newAnimation < this._animations.length &&
         this._currentAnimation !== newAnimation &&
@@ -535,7 +536,7 @@ namespace gdjs {
      * Change the current frame displayed by the animation
      * @param newFrameIndex The index of the frame to be displayed
      */
-    setAnimationFrameIndex(newFrameIndex: number): boolean {
+    setAnimationFrameIndex(newFrameIndex: integer): boolean {
       if (
         this._currentAnimation >= this._animations.length ||
         this._currentDirection >=
@@ -564,7 +565,7 @@ namespace gdjs {
      * Get the index of the current frame displayed by the animation
      * @return newFrame The index of the frame being displayed
      */
-    getAnimationFrameIndex(): number {
+    getAnimationFrameIndex(): integer {
       return this._currentFrameIndex;
     }
 
@@ -601,7 +602,7 @@ namespace gdjs {
       return direction.frames.length * direction.timeBetweenFrames;
     }
 
-    getAnimationFrameCount(): number {
+    getAnimationFrameCount(): integer {
       if (this._currentAnimation >= this._animations.length) {
         return 0;
       }
@@ -617,7 +618,7 @@ namespace gdjs {
      * @param The new angle (or direction index) to be applied
      * @deprecated
      */
-    setDirectionOrAngle(oldValue: float, newValue: float): number | null {
+    setDirectionOrAngle(oldValue: float, newValue: float): float | null {
       if (this._currentAnimation >= this._animations.length) {
         return null;
       }

GDJS/Runtime/spriteruntimeobject.ts

@@ -26,9 +26,9 @@ namespace gdjs {
       gdjs.Animatable,
       gdjs.OpacityHandler {
     _animator: gdjs.SpriteAnimator<any>;
-    _scaleX: number = 1;
-    _scaleY: number = 1;
-    _blendMode: number = 0;
+    _scaleX: float = 1;
+    _scaleY: float = 1;
+    _blendMode: integer = 0;
     _flippedX: boolean = false;
     _flippedY: boolean = false;
     opacity: float = 255;
@@ -220,11 +220,11 @@ namespace gdjs {
      * @param newAnimation The index of the new animation to be played
      * @deprecated Use `setAnimationIndex` instead
      */
-    setAnimation(newAnimation: number): void {
+    setAnimation(newAnimation: integer): void {
       this.setAnimationIndex(newAnimation);
     }
 
-    setAnimationIndex(newAnimation: number): void {
+    setAnimationIndex(newAnimation: integer): void {
       const hasAnimationChanged = this._animator.setAnimationIndex(
         newAnimation
       );
@@ -253,11 +253,11 @@ namespace gdjs {
      * @return The index of the new animation being played
      * @deprecated Use `getAnimationIndex` instead
      */
-    getAnimation(): number {
+    getAnimation(): integer {
       return this.getAnimationIndex();
     }
 
-    getAnimationIndex(): number {
+    getAnimationIndex(): integer {
       return this._animator.getAnimationIndex();
     }
 
@@ -308,7 +308,7 @@ namespace gdjs {
      * Get the index of the current frame displayed by the animation
      * @return newFrame The index of the frame being displayed
      */
-    getAnimationFrame(): number {
+    getAnimationFrame(): integer {
       return this._animator.getAnimationFrameIndex();
     }
 
@@ -324,11 +324,11 @@ namespace gdjs {
       }
     }
 
-    getAnimationDuration(): number {
+    getAnimationDuration(): float {
       return this._animator.getAnimationDuration();
     }
 
-    getAnimationFrameCount(): number {
+    getAnimationFrameCount(): integer {
       return this._animator.getAnimationFrameCount();
     }
 
@@ -454,7 +454,7 @@ namespace gdjs {
      * @param result Array that will be updated with the result
      * (x and y position of the point in global coordinates).
      */
-    private _transformToGlobal(x: float, y: float, result: number[]) {
+    private _transformToGlobal(x: float, y: float, result: float[]) {
       const animationFrame = this._animator.getCurrentFrame() as SpriteAnimationFrame<
         any
       >;
@@ -656,7 +656,7 @@ namespace gdjs {
       this._renderer.updateOpacity();
     }
 
-    getOpacity(): number {
+    getOpacity(): float {
       return this.opacity;
     }