refactor: move color to typescript

Author: hornta

eslint.config.mjs

@@ -161,6 +161,7 @@ export default tseslint.config(
 		rules: {
 			"no-undef": "off",
 			"no-unused-vars": "off",
+			"prefer-template": "error",
 			"@typescript-eslint/no-explicit-any": "off",
 			"@typescript-eslint/ban-ts-comment": "off",
 			"@typescript-eslint/no-dynamic-delete": "off",
@@ -174,8 +175,9 @@ export default tseslint.config(
 				"error",
 				{ allowNumber: true },
 			],
-			"prefer-template": "error",
 			...jsDocConfig.rules,
+			"jsdoc/require-jsdoc": "off",
+			"jsdoc/no-defaults": "off",
 		},
 		languageOptions: {
 			parserOptions: {

packages/examples/src/examples/text/text.ts

@@ -1,13 +1,23 @@
-import { BitmapText, Renderable, Text, Tween, pool, video } from "melonjs";
+import {
+	BitmapText,
+	type Color,
+	Renderable,
+	Text,
+	Tween,
+	getPool,
+	video,
+} from "melonjs";
 
 export class TextTest extends Renderable {
+	color: Color;
+
 	constructor() {
 		super(0, 0, 640, 480);
 
 		this.anchorPoint.set(0, 0);
 
 		// a default white color object
-		this.color = pool.pull("me.Color", 255, 255, 255);
+		this.color = getPool("color").get(255, 255, 255);
 
 		// define a tween to cycle the font color
 		this.tween = new Tween(this.color)
@@ -176,4 +186,8 @@ export class TextTest extends Renderable {
 		this.fancyBFont.textAlign = "left";
 		this.fancyBFont.textBaseline = "top";
 	}
+
+	destroy() {
+		getPool("color").release(this.color);
+	}
 }

packages/melonjs/src/camera/camera2d.js

@@ -16,10 +16,11 @@ import {
 	VIEWPORT_ONRESIZE,
 } from "../system/event.ts";
 import { boundsPool } from "./../physics/bounds.ts";
+import { colorPool } from "../math/color.ts";
 
 /**
  * @import {Bounds} from "./../physics/bounds.ts";
- * @import Color from "./../math/color.js";
+ * @import {Color} from "./../math/color.ts";
  * @import Entity from "./../renderable/entity/entity.js";
  * @import Sprite from "./../renderable/sprite.js";
  * @import NineSliceSprite from "./../renderable/nineslicesprite.js";
@@ -519,7 +520,7 @@ export default class Camera2d extends Renderable {
 	 * });
 	 */
 	fadeOut(color, duration = 1000, onComplete) {
-		this._fadeOut.color = pool.pull("Color").copy(color);
+		this._fadeOut.color = colorPool.get().copy(color);
 		this._fadeOut.tween = pool
 			.pull("Tween", this._fadeOut.color)
 			.to({ alpha: 0.0 }, { duration })
@@ -539,7 +540,7 @@ export default class Camera2d extends Renderable {
 	 * me.game.viewport.fadeIn("#FFFFFF", 75);
 	 */
 	fadeIn(color, duration = 1000, onComplete) {
-		this._fadeIn.color = pool.pull("Color").copy(color);
+		this._fadeIn.color = colorPool.get().copy(color);
 		const _alpha = this._fadeIn.color.alpha;
 		this._fadeIn.color.alpha = 0.0;
 		this._fadeIn.tween = pool
@@ -629,7 +630,7 @@ export default class Camera2d extends Renderable {
 			// remove the tween if over
 			if (this._fadeIn.color.alpha === 1.0) {
 				this._fadeIn.tween = null;
-				pool.push(this._fadeIn.color);
+				colorPool.release(this._fadeIn.color);
 				this._fadeIn.color = null;
 			}
 		}
@@ -646,7 +647,7 @@ export default class Camera2d extends Renderable {
 			// remove the tween if over
 			if (this._fadeOut.color.alpha === 0.0) {
 				this._fadeOut.tween = null;
-				pool.push(this._fadeOut.color);
+				colorPool.release(this._fadeOut.color);
 				this._fadeOut.color = null;
 			}
 		}

packages/melonjs/src/index.js

@@ -2,7 +2,6 @@
 import "./polyfill/index.ts";
 
 // class definition
-import Color from "./math/color.js";
 import Polygon from "./geometries/poly.js";
 import Line from "./geometries/line.js";
 import Ellipse from "./geometries/ellipse.js";
@@ -91,6 +90,7 @@ export { Vector2d } from "./math/vector2d.ts";
 export { Vector3d } from "./math/vector3d.ts";
 export { Matrix2d } from "./math/matrix2d.ts";
 export { Matrix3d } from "./math/matrix3d.ts";
+export { Color } from "./math/color.ts";
 export { Point } from "./geometries/point.ts";
 export { Bounds } from "./physics/bounds.ts";
 export { createObservableVector2d } from "./math/observableVector2d.ts";
@@ -99,7 +99,6 @@ export { getPool } from "./pool.ts";
 
 // export all class definition
 export {
-	Color,
 	Polygon,
 	Line,
 	Ellipse,
@@ -209,7 +208,6 @@ export function boot() {
 	pool.register("me.Trigger", Trigger);
 	pool.register("me.Light2d", Light2d);
 	pool.register("me.Tween", Tween, true);
-	pool.register("me.Color", Color, true);
 	pool.register("me.Particle", Particle, true);
 	pool.register("me.Sprite", Sprite);
 	pool.register("me.NineSliceSprite", NineSliceSprite);
@@ -231,7 +229,6 @@ export function boot() {
 	pool.register("Trigger", Trigger);
 	pool.register("Light2d", Light2d);
 	pool.register("Tween", Tween, true);
-	pool.register("Color", Color, true);
 	pool.register("Particle", Particle, true);
 	pool.register("Sprite", Sprite);
 	pool.register("NineSliceSprite", NineSliceSprite);

packages/melonjs/src/level/tiled/TMXTileMap.js

@@ -14,6 +14,7 @@ import { getNewTMXRenderer } from "./renderer/autodetect.js";
 import { warning } from "../../lang/console.js";
 import { eventEmitter, VIEWPORT_ONRESIZE } from "../../system/event.ts";
 import { vector2dPool } from "../../math/vector2d.ts";
+import { colorPool } from "../../math/color.ts";
 
 /**
  * read the layer Data
@@ -53,7 +54,7 @@ function readImageLayer(map, data, z) {
 				// convert to melonJS color format (note: this should be done earlier when parsing data)
 				tint:
 					typeof data.tintcolor !== "undefined"
-						? pool.pull("Color").parseHex(data.tintcolor, true)
+						? colorPool.get().parseHex(data.tintcolor, true)
 						: undefined,
 				z: z,
 			},
@@ -446,7 +447,7 @@ export default class TMXTileMap {
 				}
 				// convert to melonJS renderable argument name
 				if (typeof settings.tintcolor !== "undefined") {
-					settings.tint = pool.pull("Color");
+					settings.tint = colorPool.get();
 					settings.tint.parseHex(settings.tintcolor, true);
 				}