define getSpriteScale on drawable, use in _calculateSpriteMatrix

Author: towerofnix

src/Renderer.ts

@@ -59,8 +59,6 @@ export default class Renderer {
   private _drawables: WeakMap<Sprite | Stage, Drawable>;
   private _skins: WeakMap<object, Skin>;
 
-  private _warnedBadSize: WeakSet<Sprite | Stage>;
-
   private _currentShader: Shader | null;
   private _currentFramebuffer: WebGLFramebuffer | null;
   private _screenSpaceScale: number;
@@ -89,8 +87,6 @@ export default class Renderer {
     this._drawables = new WeakMap();
     this._skins = new WeakMap();
 
-    this._warnedBadSize = new WeakSet();
-
     this._currentShader = null;
     this._currentFramebuffer = null;
     this._screenSpaceScale = 1;
@@ -504,34 +500,6 @@ export default class Renderer {
     this.gl.drawArrays(this.gl.TRIANGLES, 0, 6);
   }
 
-  private _getSpriteScale(sprite: Sprite | Stage): number {
-    if ("size" in sprite) {
-      if (typeof sprite.size !== "number") {
-        if (!this._warnedBadSize.has(sprite)) {
-          console.warn(
-            `Expected a number, sprite ${
-              sprite.constructor.name
-            } size is ${typeof sprite.size}. Treating as 100%.`
-          );
-          this._warnedBadSize.add(sprite);
-        }
-        return 1;
-      } else if (isNaN(sprite.size)) {
-        if (!this._warnedBadSize.has(sprite)) {
-          console.warn(
-            `Expected a number, sprite ${sprite.constructor.name} size is NaN. Treating as 100%.`
-          );
-          this._warnedBadSize.add(sprite);
-        }
-        return 1;
-      } else {
-        return sprite.size / 100;
-      }
-    } else {
-      return 1;
-    }
-  }
-
   private renderSprite(
     sprite: Sprite | Stage,
     options: RenderSpriteOptions
@@ -540,7 +508,7 @@ export default class Renderer {
       this._getSkin(sprite.costume),
       options.drawMode,
       this._getDrawable(sprite).getMatrix(),
-      this._getSpriteScale(sprite),
+      this._getDrawable(sprite).getSpriteScale(),
       sprite.effects,
       options.effectMask,
       options.colorMask,

src/renderer/Drawable.ts

@@ -88,10 +88,14 @@ export default class Drawable {
   private _tightBoundingBox: Rectangle;
   private _convexHullMatrixDiff: SpriteTransformDiff;
 
+  private _warnedBadSize: boolean;
+
   public constructor(renderer: Renderer, sprite: Sprite | Stage) {
     this._renderer = renderer;
     this._sprite = sprite;
 
+    this._warnedBadSize = false;
+
     // Transformation matrix for the sprite.
     this._matrix = Matrix.create();
     // Track when the sprite's transform changes so we can recalculate the
@@ -345,7 +349,7 @@ export default class Drawable {
         }
       }
 
-      const spriteScale = spr.size / 100;
+      const spriteScale = this.getSpriteScale();
       Matrix.scale(m, m, spriteScale, spriteScale);
     }
 
@@ -379,4 +383,29 @@ export default class Drawable {
 
     return this._matrix;
   }
+
+  public getSpriteScale(): number {
+    if ("size" in this._sprite) {
+      const { size } = this._sprite;
+      if (typeof size !== "number") {
+        this._warnBadSize(typeof size);
+        return 1;
+      } else if (isNaN(size)) {
+        this._warnBadSize("NaN");
+        return 1;
+      } else {
+        return size / 100;
+      }
+    } else {
+      return 1;
+    }
+  }
+
+  private _warnBadSize(description: string): void {
+    if (!this._warnedBadSize) {
+      const { name } = this._sprite.constructor;
+      console.warn(`Expected a number, sprite ${name} size is ${description}. Treating as 100%.`);
+      this._warnedBadSize = true;
+    }
+  }
 }