wgge 2.0.19 → 2.0.21

package/README.MD

@@ -6,4 +6,5 @@ Change version in `package.json`.
 
 Then run:
 
-    npm publish
+	bin/login.cmd
+    bin/publish.cmd

package/core/model/vector/Vector2.js

@@ -2,10 +2,12 @@ import ObjectModel from "../ObjectModel";
 import Rotation from "./Rotation";
 import NumberHelper from "../../helper/NumberHelper";
 
-export const ZERO_VECTOR2 = new Vector2(0, 0);
-
 export default class Vector2 extends ObjectModel {
+
+	_isVector2 = true;
+
 	x;
+
 	y;
 
 	constructor(x = undefined, y = undefined, persistent = true) {
@@ -25,6 +27,11 @@ export default class Vector2 extends ObjectModel {
 		}
 	}
 
+	static isVector2(v) {
+		if (v === null || v === undefined) return false;
+		return typeof v === 'object' && v._isVector2;
+	}
+
 	distanceTo(v) {
 		return Math.sqrt(Math.pow(this.x - v.x, 2) + Math.pow(this.y - v.y, 2));
 	}
@@ -39,7 +46,7 @@ export default class Vector2 extends ObjectModel {
 	 * @param y Number|undefined
 	 */
 	set(x, y = undefined) {
-		if (y === undefined && typeof x === 'object') {
+		if (y === undefined && Vector2.isVector2(x)) {
 			this.set(x.x, x.y);
 			return;
 		}
@@ -210,3 +217,5 @@ export default class Vector2 extends ObjectModel {
 		return `[${NumberHelper.round(this.x, decimals)},${NumberHelper.round(this.y, decimals)}]`;
 	}
 }
+
+export const ZERO_VECTOR2 = new Vector2(0, 0);

package/core/model/vector/Vector3.js

@@ -1,10 +1,13 @@
 import ModelBase from "../ModelBase";
 
-export const ZERO_VECTOR3 = new Vector3(0, 0, 0);
-
 export default class Vector3 extends ModelBase {
+
+	_isVector3 = true;
+
 	x;
+
 	y;
+
 	z;
 
 	constructor(x = undefined, y = undefined, z = undefined, persistent = true) {
@@ -14,25 +17,25 @@ export default class Vector3 extends ModelBase {
 		this.y = 0;
 		this.z = 0;
 
-		if (y === undefined && typeof x === 'object') {
-			if (x.length === 3) {
-				this.setFromArray(x);
-			} else {
-				this.set(x);
-			}
+		if (y === undefined && Vector3.isVector3(x)) {
+			this.set(x.x, x.y, x.z);
 		} else if (x !== undefined && z !== undefined) {
 			this.set(x, y, z);
 		}
 	}
 
+	static isVector3(v) {
+		if (v === null || v === undefined) return false;
+		return typeof v === 'object' && v._isVector3;
+	}
+
 	equalsTo(v) {
 		return (v) ? this.x === v.x && this.y === v.y && this.z === v.z : false;
 	}
 
 	set(x, y = undefined, z = undefined) {
-		if (y === undefined && typeof x === 'object') {
-			this.set(x.x, x.y, x.z);
-			return;
+		if (y === undefined && Vector3.isVector3(x)) {
+			return this.set(x.x, x.y, x.z);
 		}
 
 		x = Number(x);
@@ -47,6 +50,8 @@ export default class Vector3 extends ModelBase {
 			this.makeDirty();
 			this.triggerEvent('change', {oldValue: old, newValue: this});
 		}
+
+		return this;
 	}
 
 	add(v) {
@@ -89,21 +94,6 @@ export default class Vector3 extends ModelBase {
 		this.setFromArray(state);
 	}
 
-	asRgbColor() {
-		return `rgb(${Math.round(this.x)}, ${Math.round(this.y)}, ${Math.round(this.z)})`;
-	}
-
-	/**
-	 * Components in 0-1 range (three.js style)
-	 * @returns {number}
-	 */
-	asHexColor() {
-		const r = Math.round(Math.min(Math.max(this.x, 0), 1) * 255);
-		const g = Math.round(Math.min(Math.max(this.y, 0), 1) * 255);
-		const b = Math.round(Math.min(Math.max(this.z, 0), 1) * 255);
-		return (r << 16) | (g << 8) | b;
-	}
-
 	size() {
 		return Math.sqrt(Math.pow(this.x, 2) + Math.pow(this.y, 2) + Math.pow(this.z, 2));
 	}
@@ -116,3 +106,5 @@ export default class Vector3 extends ModelBase {
 		return ZERO_VECTOR3;
 	}
 }
+
+export const ZERO_VECTOR3 = new Vector3(0, 0, 0);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wgge",
-	"version": "2.0.19",
+	"version": "2.0.21",
 	"description": "Web GL Game Engine",
 	"main": "index.js",
 	"devDependencies": {

package/bin/deploy.cmd

@@ -1 +0,0 @@
-npm publish