@scratch/scratch-render 12.1.0-login-from-editor → 12.1.0-membership-program

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scratch/scratch-render",
-  "version": "12.1.0-login-from-editor",
+  "version": "12.1.0-membership-program",
   "description": "WebGL Renderer for Scratch 3.0",
   "author": "Massachusetts Institute of Technology",
   "license": "AGPL-3.0-only",
@@ -18,13 +18,15 @@
   },
   "files": [
     "dist",
-    "src"
+    "src",
+    "LICENSE",
+    "TRADEMARK"
   ],
   "scripts": {
     "build": "webpack --progress && npm run docs",
     "clean": "rimraf dist playground",
     "docs": "jsdoc -c .jsdoc.json",
-    "lint": "eslint .",
+    "lint": "eslint",
     "prepublish": "npm run build",
     "prepublish-watch": "npm run watch",
     "start": "webpack-dev-server",
@@ -44,7 +46,7 @@
     "iOS >= 8"
   ],
   "dependencies": {
-    "@scratch/scratch-svg-renderer": "12.1.0-login-from-editor",
+    "@scratch/scratch-svg-renderer": "12.1.0-membership-program",
     "grapheme-breaker": "0.3.2",
     "hull.js": "0.2.10",
     "ify-loader": "1.1.0",
@@ -57,29 +59,28 @@
     "scratch-render-fonts": "^1.0.0"
   },
   "devDependencies": {
-    "@babel/core": "7.28.4",
-    "@babel/eslint-parser": "7.28.4",
+    "@babel/core": "7.28.5",
     "@babel/polyfill": "7.12.1",
-    "@babel/preset-env": "7.28.3",
-    "@scratch/scratch-vm": "12.1.0-login-from-editor",
+    "@babel/preset-env": "7.28.5",
+    "@scratch/scratch-vm": "12.1.0-membership-program",
     "babel-loader": "9.2.1",
     "copy-webpack-plugin": "6.4.1",
     "docdash": "0.4.0",
-    "eslint": "8.57.1",
-    "eslint-config-scratch": "9.0.9",
+    "eslint": "9.39.1",
+    "eslint-config-scratch": "12.0.38",
     "gh-pages": "1.2.0",
-    "html-webpack-plugin": "5.6.4",
+    "globals": "16.5.0",
+    "html-webpack-plugin": "5.6.5",
     "jsdoc": "3.6.11",
-    "json": "9.0.6",
-    "playwright-chromium": "1.56.0",
-    "scratch-render-fonts": "1.0.238",
-    "scratch-semantic-release-config": "3.0.0",
-    "scratch-storage": "4.1.11",
+    "playwright-chromium": "1.57.0",
+    "scratch-render-fonts": "1.0.252",
+    "scratch-semantic-release-config": "4.0.0",
+    "scratch-storage": "5.0.10",
     "scratch-webpack-configuration": "3.1.0",
     "semantic-release": "19.0.5",
-    "tap": "21.1.1",
+    "tap": "21.4.0",
     "terser-webpack-plugin": "5.3.14",
-    "webpack": "5.102.1",
+    "webpack": "5.103.0",
     "webpack-cli": "5.1.4",
     "webpack-dev-server": "5.2.2"
   }

package/src/BitmapSkin.js

@@ -5,7 +5,7 @@ const Skin = require('./Skin');
 class BitmapSkin extends Skin {
     /**
      * Create a new Bitmap Skin.
-     * @extends Skin
+     * @augments Skin
      * @param {!int} id - The ID for this Skin.
      * @param {!RenderWebGL} renderer - The renderer which will use this skin.
      */
@@ -34,7 +34,7 @@ class BitmapSkin extends Skin {
     }
 
     /**
-     * @return {Array<number>} the "native" size, in texels, of this skin.
+     * @returns {Array<number>} the "native" size, in texels, of this skin.
      */
     get size () {
         return [this._textureSize[0] / this._costumeResolution, this._textureSize[1] / this._costumeResolution];
@@ -42,7 +42,7 @@ class BitmapSkin extends Skin {
 
     /**
      * @param {Array<number>} scale - The scaling factors to be used.
-     * @return {WebGLTexture} The GL texture representation of this skin when drawing at the given scale.
+     * @returns {WebGLTexture} The GL texture representation of this skin when drawing at the given scale.
      */
     // eslint-disable-next-line no-unused-vars
     getTexture (scale) {
@@ -52,7 +52,7 @@ class BitmapSkin extends Skin {
     /**
      * Set the contents of this skin to a snapshot of the provided bitmap data.
      * @param {ImageData|HTMLImageElement|HTMLCanvasElement|HTMLVideoElement} bitmapData - new contents for this skin.
-     * @param {int} [costumeResolution=1] - The resolution to use for this bitmap.
+     * @param {int} [costumeResolution] - The resolution to use for this bitmap.
      * @param {Array<number>} [rotationCenter] - Optional rotation center for the bitmap. If not supplied, it will be
      * calculated from the bounding box
      * @fires Skin.event:WasAltered

package/src/Drawable.js

@@ -20,10 +20,9 @@ const FLOATING_POINT_ERROR_ALLOWANCE = 1e-6;
  * internal __isTouchingPosition as a return value, so this should be copied
  * if you ever need to get two local positions and store both.  Requires that
  * the drawable inverseMatrix is up to date.
- *
  * @param {Drawable} drawable The drawable to get the inverse matrix and uniforms from
  * @param {twgl.v3} vec [x,y] scratch space vector
- * @return {twgl.v3} [x,y] texture space float vector - transformed by effects and matrix
+ * @returns {twgl.v3} [x,y] texture space float vector - transformed by effects and matrix
  */
 const getLocalPosition = (drawable, vec) => {
     // Transfrom from world coordinates to Drawable coordinates.
@@ -59,7 +58,7 @@ class Drawable {
      * An object which can be drawn by the renderer.
      * @todo double-buffer all rendering state (position, skin, effects, etc.)
      * @param {!int} id - This Drawable's unique ID.
-     * @constructor
+     * @class
      */
     constructor (id) {
         /** @type {!int} */
@@ -108,9 +107,10 @@ class Drawable {
         this._inverseTransformDirty = true;
         this._visible = true;
 
-        /** A bitmask identifying which effects are currently in use.
+        /**
+         * A bitmask identifying which effects are currently in use.
          * @readonly
-         * @type {int} */
+          @type {int} */
         this.enabledEffects = 0;
 
         /** @todo move convex hull functionality, maybe bounds functionality overall, to Skin classes */
@@ -443,7 +443,7 @@ class Drawable {
 
     /**
      * Whether the Drawable needs convex hull points provided by the renderer.
-     * @return {boolean} True when no convex hull known, or it's dirty.
+     * @returns {boolean} True when no convex hull known, or it's dirty.
      */
     needsConvexHullPoints () {
         return !this._convexHullPoints || this._convexHullDirty || this._convexHullPoints.length === 0;
@@ -481,7 +481,7 @@ class Drawable {
      * The caller is responsible for ensuring this drawable's inverse matrix & its skin's silhouette are up-to-date.
      * @see updateCPURenderAttributes
      * @param {twgl.v3} vec World coordinate vector.
-     * @return {boolean} True if the world position touches the skin.
+     * @returns {boolean} True if the world position touches the skin.
      */
 
     // `updateCPURenderAttributes` sets this Drawable instance's `isTouching` method
@@ -510,7 +510,7 @@ class Drawable {
      * and then finds the minimum box along the axes.
      * Before calling this, ensure the renderer has updated convex hull points.
      * @param {?Rectangle} result optional destination for bounds calculation
-     * @return {!Rectangle} Bounds for a tight box around the Drawable.
+     * @returns {!Rectangle} Bounds for a tight box around the Drawable.
      */
     getBounds (result) {
         if (this.needsConvexHullPoints()) {
@@ -531,7 +531,7 @@ class Drawable {
      * Used for calculating where to position a text bubble.
      * Before calling this, ensure the renderer has updated convex hull points.
      * @param {?Rectangle} result optional destination for bounds calculation
-     * @return {!Rectangle} Bounds for a tight box around a slice of the Drawable.
+     * @returns {!Rectangle} Bounds for a tight box around a slice of the Drawable.
      */
     getBoundsForBubble (result) {
         if (this.needsConvexHullPoints()) {
@@ -558,7 +558,7 @@ class Drawable {
      * `getAABB` returns a much less accurate bounding box, but will be much
      * faster to calculate so may be desired for quick checks/optimizations.
      * @param {?Rectangle} result optional destination for bounds calculation
-     * @return {!Rectangle} Rough axis-aligned bounding box for Drawable.
+     * @returns {!Rectangle} Rough axis-aligned bounding box for Drawable.
      */
     getAABB (result) {
         if (this._transformDirty) {
@@ -575,7 +575,7 @@ class Drawable {
      * I.e., returns the tight bounding box when the convex hull points are already
      * known, but otherwise return the rough AABB of the Drawable.
      * @param {?Rectangle} result optional destination for bounds calculation
-     * @return {!Rectangle} Bounds for the Drawable.
+     * @returns {!Rectangle} Bounds for the Drawable.
      */
     getFastBounds (result) {
         if (!this.needsConvexHullPoints()) {
@@ -588,7 +588,7 @@ class Drawable {
      * Transform all the convex hull points by the current Drawable's
      * transform. This allows us to skip recalculating the convex hull
      * for many Drawable updates, including translation, rotation, scaling.
-     * @return {!Array.<!Array.number>} Array of glPoints which are Array<x, y>
+     * @returns {!Array.<!Array.number>} Array of glPoints which are Array<x, y>
      * @private
      */
     _getTransformedHullPoints () {
@@ -723,7 +723,7 @@ class Drawable {
         const textColor =
         // commenting out to only use nearest for now
         // drawable.skin.useNearest(drawable._scale, drawable) ?
-             drawable.skin._silhouette.colorAtNearest(localPosition, dst);
+            drawable.skin._silhouette.colorAtNearest(localPosition, dst);
         // : drawable.skin._silhouette.colorAtLinear(localPosition, dst);
 
         if (drawable.enabledEffects === 0) return textColor;

package/src/EffectTransform.js

@@ -1,5 +1,5 @@
 /**
- * @fileoverview
+ * @file
  * A utility to transform a texture coordinate to another texture coordinate
  * representing how the shaders apply effects.
  */
@@ -11,13 +11,13 @@ const ShaderManager = require('./ShaderManager');
 
 /**
  * A texture coordinate is between 0 and 1. 0.5 is the center position.
- * @const {number}
+ * @constant {number}
  */
 const CENTER_X = 0.5;
 
 /**
  * A texture coordinate is between 0 and 1. 0.5 is the center position.
- * @const {number}
+ * @constant {number}
  */
 const CENTER_Y = 0.5;
 
@@ -123,7 +123,7 @@ class EffectTransform {
      * @param {Drawable} drawable The drawable whose effects to emulate.
      * @param {twgl.v3} vec The texture coordinate to transform.
      * @param {twgl.v3} dst A place to store the output coordinate.
-     * @return {twgl.v3} dst - The coordinate after being transform by effects.
+     * @returns {twgl.v3} dst - The coordinate after being transform by effects.
      */
     static transformPoint (drawable, vec, dst) {
         twgl.v3.copy(vec, dst);

package/src/PenSkin.js

@@ -17,7 +17,7 @@ const ShaderManager = require('./ShaderManager');
  * @type {PenSkin#PenAttributes}
  * @memberof PenSkin
  * @private
- * @const
+ * @constant
  */
 const DefaultPenAttributes = {
     color4f: [0, 0, 1, 1],
@@ -35,7 +35,7 @@ class PenSkin extends Skin {
      * Create a Skin which implements a Scratch pen layer.
      * @param {int} id - The unique ID for this Skin.
      * @param {RenderWebGL} renderer - The renderer which will use this Skin.
-     * @extends Skin
+     * @augments Skin
      * @listens RenderWebGL#event:NativeSizeChanged
      */
     constructor (id, renderer) {
@@ -110,7 +110,7 @@ class PenSkin extends Skin {
     }
 
     /**
-     * @return {Array<number>} the "native" size, in texels, of this skin. [width, height]
+     * @returns {Array<number>} the "native" size, in texels, of this skin. [width, height]
      */
     get size () {
         return this._size;
@@ -124,7 +124,7 @@ class PenSkin extends Skin {
 
     /**
      * @param {Array<number>} scale The X and Y scaling factors to be used, as percentages of this skin's "native" size.
-     * @return {WebGLTexture} The GL texture representation of this skin when drawing at the given size.
+     * @returns {WebGLTexture} The GL texture representation of this skin when drawing at the given size.
      */
     // eslint-disable-next-line no-unused-vars
     getTexture (scale) {

package/src/Rectangle.js

@@ -3,7 +3,7 @@ class Rectangle {
      * A utility for creating and comparing axis-aligned rectangles.
      * Rectangles are always initialized to the "largest possible rectangle";
      * use one of the init* methods below to set up a particular rectangle.
-     * @constructor
+     * @class
      */
     constructor () {
         this.left = -Infinity;
@@ -84,7 +84,7 @@ class Rectangle {
      * Note that this is a comparison assuming the Rectangle was
      * initialized with Scratch-space bounds or points.
      * @param {!Rectangle} other Rectangle to check if intersecting.
-     * @return {boolean} True if this Rectangle intersects other.
+     * @returns {boolean} True if this Rectangle intersects other.
      */
     intersects (other) {
         return (
@@ -100,7 +100,7 @@ class Rectangle {
      * Note that this is a comparison assuming the Rectangle was
      * initialized with Scratch-space bounds or points.
      * @param {!Rectangle} other Rectangle to check if fully contained.
-     * @return {boolean} True if this Rectangle fully contains other.
+     * @returns {boolean} True if this Rectangle fully contains other.
      */
     contains (other) {
         return (
@@ -177,7 +177,7 @@ class Rectangle {
 
     /**
      * Width of the Rectangle.
-     * @return {number} Width of rectangle.
+     * @returns {number} Width of rectangle.
      */
     get width () {
         return Math.abs(this.left - this.right);
@@ -185,7 +185,7 @@ class Rectangle {
 
     /**
      * Height of the Rectangle.
-     * @return {number} Height of rectangle.
+     * @returns {number} Height of rectangle.
      */
     get height () {
         return Math.abs(this.top - this.bottom);

package/src/RenderConstants.js

@@ -7,14 +7,14 @@
 module.exports = {
     /**
      * The ID value to use for "no item" or when an object has been disposed.
-     * @const {int}
+     * @constant {int}
      */
     ID_NONE: -1,
 
     /**
      * Optimize for fewer than this number of Drawables sharing the same Skin.
      * Going above this may cause middleware warnings or a performance penalty but should otherwise behave correctly.
-     * @const {int}
+     * @constant {int}
      */
     SKIN_SHARE_SOFT_LIMIT: 301,
 
@@ -24,7 +24,6 @@ module.exports = {
     Events: {
         /**
          * NativeSizeChanged event
-         *
          * @event RenderWebGL#event:NativeSizeChanged
          * @type {object}
          * @property {Array<int>} newSize - the new size of the renderer

package/src/RenderWebGL.js

@@ -27,7 +27,7 @@ const __cpuTouchingColorPixelCount = 4e4;
 /**
  * @callback RenderWebGL#idFilterFunc
  * @param {int} drawableID The ID to filter.
- * @return {bool} True if the ID passes the filter, otherwise false.
+ * @returns {bool} True if the ID passes the filter, otherwise false.
  */
 
 /**
@@ -99,7 +99,7 @@ class RenderWebGL extends EventEmitter {
         try {
             // Create the context the same way that the constructor will: attributes may make the difference.
             return !!RenderWebGL._getContext(optCanvas || document.createElement('canvas'));
-        } catch (e) {
+        } catch (e) { // eslint-disable-line no-unused-vars
             return false;
         }
     }
@@ -128,11 +128,11 @@ class RenderWebGL extends EventEmitter {
      * @see RenderWebGL#setStageSize
      * @see RenderWebGL#resize
      * @param {canvas} canvas The canvas to draw onto.
-     * @param {int} [xLeft=-240] The x-coordinate of the left edge.
-     * @param {int} [xRight=240] The x-coordinate of the right edge.
-     * @param {int} [yBottom=-180] The y-coordinate of the bottom edge.
-     * @param {int} [yTop=180] The y-coordinate of the top edge.
-     * @constructor
+     * @param {int} [xLeft] The x-coordinate of the left edge.
+     * @param {int} [xRight] The x-coordinate of the right edge.
+     * @param {int} [yBottom] The y-coordinate of the bottom edge.
+     * @param {int} [yTop] The y-coordinate of the top edge.
+     * @class
      * @listens RenderWebGL#event:NativeSizeChanged
      */
     constructor (canvas, xLeft, xRight, yBottom, yTop) {
@@ -158,7 +158,7 @@ class RenderWebGL extends EventEmitter {
 
         // A list of layer group names in the order they should appear
         // from furthest back to furthest in front.
-        /** @type {Array<String>} */
+        /** @type {Array<string>} */
         this._groupOrdering = [];
 
         /**
@@ -316,7 +316,7 @@ class RenderWebGL extends EventEmitter {
     }
 
     /**
-     * @return {Array<int>} the "native" size of the stage, which is used for pen, query renders, etc.
+     * @returns {Array<int>} the "native" size of the stage, which is used for pen, query renders, etc.
      */
     getNativeSize () {
         return [this._nativeSize[0], this._nativeSize[1]];
@@ -337,7 +337,7 @@ class RenderWebGL extends EventEmitter {
     /**
      * Create a new bitmap skin from a snapshot of the provided bitmap data.
      * @param {ImageData|HTMLImageElement|HTMLCanvasElement|HTMLVideoElement} bitmapData - new contents for this skin.
-     * @param {!int} [costumeResolution=1] - The resolution to use for this bitmap.
+     * @param {!int} [costumeResolution] - The resolution to use for this bitmap.
      * @param {?Array<number>} [rotationCenter] Optional: rotation center of the skin. If not supplied, the center of
      * the skin will be used.
      * @returns {!int} the ID for the new skin.
@@ -578,7 +578,7 @@ class RenderWebGL extends EventEmitter {
      * Returns the position of the given drawableID in the draw list. This is
      * the absolute position irrespective of layer group.
      * @param {number} drawableID The drawable ID to find.
-     * @return {number} The postion of the given drawable ID.
+     * @returns {number} The postion of the given drawable ID.
      */
     getDrawableOrder (drawableID) {
         return this._drawList.indexOf(drawableID);
@@ -598,7 +598,7 @@ class RenderWebGL extends EventEmitter {
      * of the layer group.
      * @param {boolean=} optIsRelative If set, `order` refers to a relative change.
      * @param {number=} optMin If set, order constrained to be at least `optMin`.
-     * @return {?number} New order if changed, or null.
+     * @returns {?number} New order if changed, or null.
      */
     setDrawableOrder (drawableID, order, group, optIsRelative, optMin) {
         if (!group || !Object.prototype.hasOwnProperty.call(this._layerGroups, group)) {
@@ -672,7 +672,7 @@ class RenderWebGL extends EventEmitter {
     /**
      * Get the precise bounds for a Drawable.
      * @param {int} drawableID ID of Drawable to get bounds for.
-     * @return {object} Bounds for a tight box around the Drawable.
+     * @returns {object} Bounds for a tight box around the Drawable.
      */
     getBounds (drawableID) {
         const drawable = this._allDrawables[drawableID];
@@ -705,7 +705,7 @@ class RenderWebGL extends EventEmitter {
      * Get the precise bounds for a Drawable around the top slice.
      * Used for positioning speech bubbles more closely to the sprite.
      * @param {int} drawableID ID of Drawable to get bubble bounds for.
-     * @return {object} Bounds for a tight box around the Drawable top slice.
+     * @returns {object} Bounds for a tight box around the Drawable top slice.
      */
     getBoundsForBubble (drawableID) {
         const drawable = this._allDrawables[drawableID];
@@ -737,7 +737,7 @@ class RenderWebGL extends EventEmitter {
     /**
      * Get the current skin (costume) size of a Drawable.
      * @param {int} drawableID The ID of the Drawable to measure.
-     * @return {Array<number>} Skin size, width and height.
+     * @returns {Array<number>} Skin size, width and height.
      */
     getCurrentSkinSize (drawableID) {
         const drawable = this._allDrawables[drawableID];
@@ -747,7 +747,7 @@ class RenderWebGL extends EventEmitter {
     /**
      * Get the size of a skin by ID.
      * @param {int} skinID The ID of the Skin to measure.
-     * @return {Array<number>} Skin size, width and height.
+     * @returns {Array<number>} Skin size, width and height.
      */
     getSkinSize (skinID) {
         const skin = this._allSkins[skinID];
@@ -757,7 +757,7 @@ class RenderWebGL extends EventEmitter {
     /**
      * Get the rotation center of a skin by ID.
      * @param {int} skinID The ID of the Skin
-     * @return {Array<number>} The rotationCenterX and rotationCenterY
+     * @returns {Array<number>} The rotationCenterX and rotationCenterY
      */
     getSkinRotationCenter (skinID) {
         const skin = this._allSkins[skinID];
@@ -1005,7 +1005,6 @@ class RenderWebGL extends EventEmitter {
      * Convert a client based x/y position on the canvas to a Scratch 3 world space
      * Rectangle.  This creates recangles with a radius to cover selecting multiple
      * scratch pixels with touch / small render areas.
-     *
      * @param {int} centerX The client x coordinate of the picking location.
      * @param {int} centerY The client y coordinate of the picking location.
      * @param {int} [width] The client width of the touch event (optional).
@@ -1041,7 +1040,6 @@ class RenderWebGL extends EventEmitter {
     /**
      * Determine if the drawable is touching a client based x/y.  Helper method for sensing
      * touching mouse-pointer.  Ignores visibility.
-     *
      * @param {int} drawableID The ID of the drawable to check.
      * @param {int} centerX The client x coordinate of the picking location.
      * @param {int} centerY The client y coordinate of the picking location.
@@ -1071,7 +1069,6 @@ class RenderWebGL extends EventEmitter {
 
     /**
      * Determine if the drawable is touching a rectangle.
-     *
      * @param {int} drawableID The ID of the drawable to check.
      * @param {int} left - The left X coordinate of the rectangle.
      * @param {int} top - The top Y coordinate of the rectangle.
@@ -1102,7 +1099,6 @@ class RenderWebGL extends EventEmitter {
 
     /**
      * Determine if the drawable is touching a point in the Scratch coordinate system
-     *
      * @param {int} drawableID The ID of the drawable to check.
      * @param {int} x The x coordinate of the point.
      * @param {int} y The y coordinate of the point.
@@ -1122,7 +1118,6 @@ class RenderWebGL extends EventEmitter {
      * This function will pick all drawables that are visible, unless specific
      * candidate drawable IDs are provided.  Used for determining what is clicked
      * or dragged.  Will not select hidden / ghosted sprites.
-     *
      * @param {int} centerX The client x coordinate of the picking location.
      * @param {int} centerY The client y coordinate of the picking location.
      * @param {int} [touchWidth] The client width of the touch event (optional).
@@ -1200,7 +1195,7 @@ class RenderWebGL extends EventEmitter {
     /**
      * Return a drawable's pixel data and bounds in screen space.
      * @param {int} drawableID The ID of the drawable to get pixel data for
-     * @return {DrawableExtraction} Data about the picked drawable
+     * @returns {DrawableExtraction} Data about the picked drawable
      */
     extractDrawableScreenSpace (drawableID) {
         const drawable = this._allDrawables[drawableID];
@@ -1313,7 +1308,7 @@ class RenderWebGL extends EventEmitter {
      * @param {int} x The client x coordinate of the picking location.
      * @param {int} y The client y coordinate of the picking location.
      * @param {int} radius The client radius to extract pixels with.
-     * @return {?ColorExtraction} Data about the picked color
+     * @returns {?ColorExtraction} Data about the picked color
      */
     extractColor (x, y, radius) {
         this._doExitDrawRegion();
@@ -1373,7 +1368,7 @@ class RenderWebGL extends EventEmitter {
     /**
      * Get the candidate bounding box for a touching query.
      * @param {int} drawableID ID for drawable of query.
-     * @return {?Rectangle} Rectangle bounds for touching query, or null.
+     * @returns {?Rectangle} Rectangle bounds for touching query, or null.
      */
     _touchingBounds (drawableID) {
         const drawable = this._allDrawables[drawableID];
@@ -1402,7 +1397,7 @@ class RenderWebGL extends EventEmitter {
      * could possibly intersect the given bounds.
      * @param {int} drawableID - ID for drawable of query.
      * @param {Array<int>} candidateIDs - Candidates for touching query.
-     * @return {?Array< {id, drawable, intersection} >} Filtered candidates with useful data.
+     * @returns {?Array< {id, drawable, intersection} >} Filtered candidates with useful data.
      */
     _candidatesTouching (drawableID, candidateIDs) {
         const bounds = this._touchingBounds(drawableID);
@@ -1445,7 +1440,7 @@ class RenderWebGL extends EventEmitter {
      * Helper to get the union bounds from a set of candidates returned from the above method
      * @private
      * @param {Array<object>} candidates info from _candidatesTouching
-     * @return {Rectangle} the outer bounding box union
+     * @returns {Rectangle} the outer bounding box union
      */
     _candidatesBounds (candidates) {
         return candidates.reduce((memo, {intersection}) => {
@@ -1569,7 +1564,7 @@ class RenderWebGL extends EventEmitter {
      * Update the position object's x & y members to keep the drawable fenced in view.
      * @param {int} drawableID - The ID of the Drawable to update.
      * @param {Array.<number, number>} position to be fenced - An array of type [x, y]
-     * @return {Array.<number, number>} The fenced position as an array [x, y]
+     * @returns {Array.<number, number>} The fenced position as an array [x, y]
      */
     getFencedPositionOfDrawable (drawableID, position) {
         let x = position[0];
@@ -1749,7 +1744,6 @@ class RenderWebGL extends EventEmitter {
      * region. Since one region may be entered from within another a exit
      * handle can also be registered that is called when a new region is about
      * to be entered to restore a common inbetween state.
-     *
      * @param {any} regionId - id of the region to enter
      * @param {function} enter - handle to call when first entering a region
      * @param {function} exit - handle to call when leaving a region
@@ -1872,7 +1866,7 @@ class RenderWebGL extends EventEmitter {
      * Get the convex hull points for a particular Drawable.
      * To do this, calculate it based on the drawable's Silhouette.
      * @param {int} drawableID The Drawable IDs calculate convex hull for.
-     * @return {Array<Array<number>>} points Convex hull points, as [[x, y], ...]
+     * @returns {Array<Array<number>>} points Convex hull points, as [[x, y], ...]
      */
     _getConvexHullPointsForDrawable (drawableID) {
         const drawable = this._allDrawables[drawableID];
@@ -1890,11 +1884,10 @@ class RenderWebGL extends EventEmitter {
          *
          * The determinant is useful in this case to know if AC is counter-clockwise from AB.
          * A positive value means that AC is counter-clockwise from AB. A negative value means AC is clockwise from AB.
-         *
          * @param {Float32Array} A A 2d vector in space.
          * @param {Float32Array} B A 2d vector in space.
          * @param {Float32Array} C A 2d vector in space.
-         * @return {number} Greater than 0 if counter clockwise, less than if clockwise, 0 if all points are on a line.
+         * @returns {number} Greater than 0 if counter clockwise, less than if clockwise, 0 if all points are on a line.
          */
         const determinant = function (A, B, C) {
             // AB = B - A
@@ -2009,7 +2002,7 @@ class RenderWebGL extends EventEmitter {
      * @param {Array<Drawables>} drawables A list of drawables with the "top most"
      *              drawable at index 0
      * @param {Uint8ClampedArray} dst The color3b space to store the answer in.
-     * @return {Uint8ClampedArray} The dst vector with everything blended down.
+     * @returns {Uint8ClampedArray} The dst vector with everything blended down.
      */
     static sampleColor3b (vec, drawables, dst) {
         dst = dst || new Uint8ClampedArray(3);

package/src/SVGSkin.js

@@ -10,7 +10,7 @@ const MAX_TEXTURE_DIMENSION = 2048;
  * All scaled renderings of the SVG are stored in an array. The 1.0 scale of
  * the SVG is stored at the 8th index. The smallest possible 1 / 256 scale
  * rendering is stored at the 0th index.
- * @const {number}
+ * @constant {number}
  */
 const INDEX_OFFSET = 8;
 
@@ -19,8 +19,8 @@ class SVGSkin extends Skin {
      * Create a new SVG skin.
      * @param {!int} id - The ID for this Skin.
      * @param {!RenderWebGL} renderer - The renderer which will use this skin.
-     * @constructor
-     * @extends Skin
+     * @class
+     * @augments Skin
      */
     constructor (id, renderer) {
         super(id);
@@ -50,9 +50,9 @@ class SVGSkin extends Skin {
         this._largestMIPScale = 0;
 
         /**
-        * Ratio of the size of the SVG and the max size of the WebGL texture
-        * @type {Number}
-        */
+         * Ratio of the size of the SVG and the max size of the WebGL texture
+         * @type {number}
+         */
         this._maxTextureScale = 1;
     }
 
@@ -65,7 +65,7 @@ class SVGSkin extends Skin {
     }
 
     /**
-     * @return {Array<number>} the natural size, in Scratch units, of this skin.
+     * @returns {Array<number>} the natural size, in Scratch units, of this skin.
      */
     get size () {
         return [this._size[0], this._size[1]];
@@ -103,7 +103,7 @@ class SVGSkin extends Skin {
     /**
      * Create a MIP for a given scale.
      * @param {number} scale - The relative size of the MIP
-     * @return {SVGMIP} An object that handles creating and updating SVG textures.
+     * @returns {SVGMIP} An object that handles creating and updating SVG textures.
      */
     createMIP (scale) {
         const [width, height] = this._size;
@@ -153,7 +153,7 @@ class SVGSkin extends Skin {
 
     /**
      * @param {Array<number>} scale - The scaling factors to be used, each in the [0,100] range.
-     * @return {WebGLTexture} The GL texture representation of this skin when drawing at the given scale.
+     * @returns {WebGLTexture} The GL texture representation of this skin when drawing at the given scale.
      */
     getTexture (scale) {
         // The texture only ever gets uniform scale. Take the larger of the two axes.