@gg-web-engine/core 0.0.18 → 0.0.20

package/dist/base/inputs/mouse.input.js

@@ -1,15 +1,6 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { Input } from './input';
-import { BehaviorSubject, filter, fromEvent, NEVER, Subject, takeUntil } from 'rxjs';
-import { map, pairwise, switchMap } from 'rxjs/operators';
+import { BehaviorSubject, filter, finalize, fromEvent, NEVER, share, Subject, takeUntil } from 'rxjs';
+import { map, pairwise, switchMap, tap } from 'rxjs/operators';
 import { Pnt2 } from '../math/point2';
 const DEFAULT_MOUSE_INPUT_OPTIONS = {
     pointerLock: false,
@@ -50,10 +41,13 @@ export class MouseInput extends Input {
      */
     constructor(options = {}) {
         super();
+        /**
+         An observable of the wheel scrolling.
+         */
+        this._wheel$ = null;
         this._delta$ = new Subject();
-        this._position$ = new BehaviorSubject({ x: 0, y: 0 });
+        this._position$ = new BehaviorSubject(Pnt2.O);
         this._multiTouchPositions$ = new BehaviorSubject([]);
-        this._wheel$ = new Subject();
         this.stopped$ = new Subject();
         this._state$ = new BehaviorSubject(MouseInputState.NONE);
         this.options = Object.assign(Object.assign({}, DEFAULT_MOUSE_INPUT_OPTIONS), options);
@@ -82,11 +76,11 @@ export class MouseInput extends Input {
     get position$() {
         return this._position$.asObservable();
     }
-    /**
-     An observable of the wheel scrolling.
-     */
     get wheel$() {
-        return this._wheel$.asObservable();
+        if (!this._wheel$) {
+            this._wheel$ = fromEvent(this._element, 'wheel', { passive: false }).pipe(takeUntil(this.stopped$), finalize(() => (this._wheel$ = null)), tap(e => e.preventDefault()), map(e => e.deltaY), share());
+        }
+        return this._wheel$;
     }
     get isPointerLocked() {
         return !!document.pointerLockElement;
@@ -102,7 +96,7 @@ export class MouseInput extends Input {
     }
     get twoTouchGestureDelta$() {
         return this.state$.pipe(switchMap((s) => s == MouseInputState.DRAG_TOUCH_TWO_FINGERS ? this.multiTouchPositions$ : NEVER), map((p) => p.map(v => ({ x: v.x, y: v.y }))), pairwise(), filter(([prev, cur]) => prev.length > 1 && cur.length > 1), map(([prev, cur]) => ({
-            centerPointDelta: Pnt2.sub(Pnt2.scalarMult(cur.reduce((p, c) => Pnt2.add(p, c), { x: 0, y: 0 }), 1 / cur.length), Pnt2.scalarMult(prev.reduce((p, c) => Pnt2.add(p, c), { x: 0, y: 0 }), 1 / cur.length)),
+            centerPointDelta: Pnt2.sub(Pnt2.scalarMult(cur.reduce((p, c) => Pnt2.add(p, c), Pnt2.O), 1 / cur.length), Pnt2.scalarMult(prev.reduce((p, c) => Pnt2.add(p, c), Pnt2.O), 1 / cur.length)),
             angleDelta: Pnt2.angle(cur[1], cur[0]) - Pnt2.angle(prev[1], prev[0]),
             distanceDelta: Pnt2.dist(cur[1], cur[0]) - Pnt2.dist(prev[1], prev[0]),
         })));
@@ -111,90 +105,82 @@ export class MouseInput extends Input {
         return this.options.canvas || window;
     }
     startInternal() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.options.canvas) {
-                this.options.canvas.style.touchAction = 'none';
-            }
-            this._state$.next(MouseInputState.NONE);
-            const mouseButtonStateMap = [
-                MouseInputState.DRAG,
-                MouseInputState.DRAG_MIDDLE_BUTTON,
-                MouseInputState.DRAG_RIGHT_BUTTON,
-            ];
-            const pointerLengthsStateMap = [MouseInputState.NONE, MouseInputState.DRAG, MouseInputState.DRAG_TOUCH_TWO_FINGERS];
-            const pointers = [];
-            const pointerPositions = {};
-            fromEvent(this._element, 'mousemove')
-                .pipe(takeUntil(this.stopped$))
-                .subscribe((event) => {
-                this._delta$.next({ x: event.movementX, y: event.movementY });
-            });
-            fromEvent(this._element, 'pointermove')
-                .pipe(takeUntil(this.stopped$))
-                .subscribe((event) => {
-                if (event instanceof PointerEvent) {
-                    if (event.pointerType === 'touch') {
-                        pointerPositions[event.pointerId] = { x: event.pageX, y: event.pageY };
-                    }
-                    const newPosition = { x: event.pageX, y: event.pageY };
-                    this._position$.next(newPosition);
-                    this._multiTouchPositions$.next(Object.values(pointerPositions));
+        if (this.options.canvas) {
+            this.options.canvas.style.touchAction = 'none';
+        }
+        this._state$.next(MouseInputState.NONE);
+        const mouseButtonStateMap = [
+            MouseInputState.DRAG,
+            MouseInputState.DRAG_MIDDLE_BUTTON,
+            MouseInputState.DRAG_RIGHT_BUTTON,
+        ];
+        const pointerLengthsStateMap = [MouseInputState.NONE, MouseInputState.DRAG, MouseInputState.DRAG_TOUCH_TWO_FINGERS];
+        const pointers = [];
+        const pointerPositions = {};
+        fromEvent(this._element, 'mousemove')
+            .pipe(takeUntil(this.stopped$))
+            .subscribe((event) => {
+            this._delta$.next({ x: event.movementX, y: event.movementY });
+        });
+        fromEvent(this._element, 'pointermove')
+            .pipe(takeUntil(this.stopped$))
+            .subscribe((event) => {
+            if (event instanceof PointerEvent) {
+                if (event.pointerType === 'touch') {
+                    pointerPositions[event.pointerId] = { x: event.pageX, y: event.pageY };
                 }
-                else {
-                    this._position$.next({ x: event.clientX, y: event.clientY });
+                const newPosition = { x: event.pageX, y: event.pageY };
+                this._position$.next(newPosition);
+                this._multiTouchPositions$.next(Object.values(pointerPositions));
+            }
+            else {
+                this._position$.next({ x: event.clientX, y: event.clientY });
+            }
+            this._delta$.next({ x: event.movementX, y: event.movementY });
+        });
+        if (!MouseInput.isTouchDevice() && this.options.pointerLock && this.options.canvas) {
+            this.options.canvas.addEventListener('click', this.canvasClickListener);
+        }
+        const onPointerUp = (event) => {
+            delete pointerPositions[event.pointerId];
+            for (let i = 0; i < pointers.length; i++) {
+                if (pointers[i].pointerId == event.pointerId) {
+                    pointers.splice(i, 1);
+                    break;
                 }
-                this._delta$.next({ x: event.movementX, y: event.movementY });
-            });
-            if (!MouseInput.isTouchDevice() && this.options.pointerLock && this.options.canvas) {
-                this.options.canvas.addEventListener('click', this.canvasClickListener);
             }
-            const onPointerUp = (event) => {
-                delete pointerPositions[event.pointerId];
-                for (let i = 0; i < pointers.length; i++) {
-                    if (pointers[i].pointerId == event.pointerId) {
-                        pointers.splice(i, 1);
-                        break;
-                    }
+            if (pointers.length === 0) {
+                if (this.options.canvas) {
+                    this.options.canvas.releasePointerCapture(event.pointerId);
                 }
-                if (pointers.length === 0) {
-                    if (this.options.canvas) {
-                        this.options.canvas.releasePointerCapture(event.pointerId);
-                    }
-                    this._element.removeEventListener('pointerup', onPointerUp);
-                    this._element.removeEventListener('pointercancel', onPointerUp);
+                this._element.removeEventListener('pointerup', onPointerUp);
+                this._element.removeEventListener('pointercancel', onPointerUp);
+            }
+            this._state$.next(pointerLengthsStateMap[Math.min(pointers.length, 2)]);
+        };
+        fromEvent(this._element, 'pointerdown')
+            .pipe(takeUntil(this.stopped$))
+            .subscribe((event) => {
+            if (pointers.length === 0) {
+                if (this.options.canvas) {
+                    this.options.canvas.setPointerCapture(event.pointerId);
                 }
+                this._element.addEventListener('pointerup', onPointerUp);
+                this._element.addEventListener('pointercancel', onPointerUp);
+            }
+            pointers.push(event);
+            if (event.pointerType === 'touch') {
+                pointerPositions[event.pointerId] = { x: event.pageX, y: event.pageY };
                 this._state$.next(pointerLengthsStateMap[Math.min(pointers.length, 2)]);
-            };
-            fromEvent(this._element, 'pointerdown')
-                .pipe(takeUntil(this.stopped$))
-                .subscribe((event) => {
-                if (pointers.length === 0) {
-                    if (this.options.canvas) {
-                        this.options.canvas.setPointerCapture(event.pointerId);
-                    }
-                    this._element.addEventListener('pointerup', onPointerUp);
-                    this._element.addEventListener('pointercancel', onPointerUp);
-                }
-                pointers.push(event);
-                if (event.pointerType === 'touch') {
-                    pointerPositions[event.pointerId] = { x: event.pageX, y: event.pageY };
-                    this._state$.next(pointerLengthsStateMap[Math.min(pointers.length, 2)]);
-                }
-                else {
-                    this._state$.next(mouseButtonStateMap[event.button] || MouseInputState.NONE);
-                }
-            });
-            fromEvent(this._element, 'contextmenu')
-                .pipe(takeUntil(this.stopped$))
-                .subscribe(event => {
-                event.preventDefault();
-            });
-            fromEvent(this._element, 'wheel', { passive: false })
-                .pipe(takeUntil(this.stopped$))
-                .subscribe(e => {
-                e.preventDefault();
-                this._wheel$.next(e.deltaY);
-            });
+            }
+            else {
+                this._state$.next(mouseButtonStateMap[event.button] || MouseInputState.NONE);
+            }
+        });
+        fromEvent(this._element, 'contextmenu')
+            .pipe(takeUntil(this.stopped$))
+            .subscribe(event => {
+            event.preventDefault();
         });
     }
     /**
@@ -202,13 +188,11 @@ export class MouseInput extends Input {
      @param {boolean} [unlockPointer=true] - Whether to exit pointer lock.
      */
     stopInternal(unlockPointer = true) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.stopped$.next();
-            if (unlockPointer && !!this.options.canvas) {
-                this.options.canvas.removeEventListener('click', this.canvasClickListener);
-                document.exitPointerLock();
-            }
-        });
+        this.stopped$.next();
+        if (unlockPointer && !!this.options.canvas) {
+            this.options.canvas.removeEventListener('click', this.canvasClickListener);
+            document.exitPointerLock();
+        }
     }
     /**
      Request pointer lock on the canvas element.

package/dist/base/math/point2.d.ts

@@ -1,11 +1,19 @@
 import { Point2 } from '../models/points';
 export declare class Pnt2 {
+    /** empty vector */
+    static get O(): Point2;
+    /** basis X vector */
+    static get X(): Point2;
+    /** basis Y vector */
+    static get Y(): Point2;
     /** clone point */
     static clone(p: Point2): Point2;
     /** add point b to point a */
     static add(a: Point2, b: Point2): Point2;
     /** subtract point b from point a */
     static sub(a: Point2, b: Point2): Point2;
+    /** average point between a and b */
+    static avg(a: Point2, b: Point2): Point2;
     /** calculate vector length (squared) */
     static lenSq(v: Point2): number;
     /** calculate vector length */

package/dist/base/math/point2.js

@@ -1,4 +1,16 @@
 export class Pnt2 {
+    /** empty vector */
+    static get O() {
+        return { x: 0, y: 0 };
+    }
+    /** basis X vector */
+    static get X() {
+        return { x: 1, y: 0 };
+    }
+    /** basis Y vector */
+    static get Y() {
+        return { x: 0, y: 1 };
+    }
     /** clone point */
     static clone(p) {
         return { x: p.x, y: p.y };
@@ -11,6 +23,10 @@ export class Pnt2 {
     static sub(a, b) {
         return { x: a.x - b.x, y: a.y - b.y };
     }
+    /** average point between a and b */
+    static avg(a, b) {
+        return { x: (a.x + b.x) / 2, y: (a.y + b.y) / 2 };
+    }
     /** calculate vector length (squared) */
     static lenSq(v) {
         return v.x * v.x + v.y * v.y;
@@ -25,7 +41,7 @@ export class Pnt2 {
     }
     /** normalize */
     static norm(p) {
-        const length = Math.sqrt(p.x ** 2 + p.y ** 2);
+        const length = Pnt2.len(p);
         return {
             x: p.x / length,
             y: p.y / length,

package/dist/base/math/point3.d.ts

@@ -1,11 +1,21 @@
 import { Point3, Point4, Spherical } from '../models/points';
 export declare class Pnt3 {
+    /** empty vector */
+    static get O(): Point3;
+    /** basis X vector */
+    static get X(): Point3;
+    /** basis Y vector */
+    static get Y(): Point3;
+    /** basis Z vector */
+    static get Z(): Point3;
     /** clone point */
     static clone(p: Point3): Point3;
     /** add point b to point a */
     static add(a: Point3, b: Point3): Point3;
     /** subtract point b from point a */
     static sub(a: Point3, b: Point3): Point3;
+    /** average point between a and b */
+    static avg(a: Point3, b: Point3): Point3;
     /** calculate vector length (squared) */
     static lenSq(v: Point3): number;
     /** calculate vector length */

package/dist/base/math/point3.js

@@ -1,5 +1,21 @@
 import { Qtrn } from './quaternion';
 export class Pnt3 {
+    /** empty vector */
+    static get O() {
+        return { x: 0, y: 0, z: 0 };
+    }
+    /** basis X vector */
+    static get X() {
+        return { x: 1, y: 0, z: 0 };
+    }
+    /** basis Y vector */
+    static get Y() {
+        return { x: 0, y: 1, z: 0 };
+    }
+    /** basis Z vector */
+    static get Z() {
+        return { x: 0, y: 0, z: 1 };
+    }
     /** clone point */
     static clone(p) {
         return { x: p.x, y: p.y, z: p.z };
@@ -12,6 +28,10 @@ export class Pnt3 {
     static sub(a, b) {
         return { x: a.x - b.x, y: a.y - b.y, z: a.z - b.z };
     }
+    /** average point between a and b */
+    static avg(a, b) {
+        return { x: (a.x + b.x) / 2, y: (a.y + b.y) / 2, z: (a.z + b.z) / 2 };
+    }
     /** calculate vector length (squared) */
     static lenSq(v) {
         return v.x * v.x + v.y * v.y + v.z * v.z;
@@ -36,7 +56,7 @@ export class Pnt3 {
     }
     /** normalize */
     static norm(p) {
-        const length = Math.sqrt(p.x ** 2 + p.y ** 2 + p.z ** 2);
+        const length = Pnt3.len(p);
         if (length === 0) {
             return p;
         }

package/dist/base/math/quaternion.d.ts

@@ -10,6 +10,8 @@ import { Point3, Point4 } from '../models/points';
  * Euler angles (such as gimbal lock).
  */
 export declare class Qtrn {
+    /** empty rotation */
+    static get O(): Point4;
     /**
      * Returns a new quaternion instance with the same values as the given quaternion object.
      * @param q The Point4 object to clone.
@@ -89,7 +91,7 @@ export declare class Qtrn {
      * @param up - The up direction of the object
      * @returns A new quaternion representing the rotation required to face towards the target point.
      */
-    static lookAt(eye: Point3, target: Point3, up: Point3): Point4;
+    static lookAt(eye: Point3, target: Point3, up?: Point3): Point4;
     /**
      * Returns a quaternion that represents the input quaternion, rotated around provided axis vector by provided angle.
      * Assumes that axis vector is already normalized

package/dist/base/math/quaternion.js

@@ -11,6 +11,10 @@ import { Mtrx4 } from './matrix4';
  * Euler angles (such as gimbal lock).
  */
 export class Qtrn {
+    /** empty rotation */
+    static get O() {
+        return { x: 0, y: 0, z: 0, w: 1 };
+    }
     /**
      * Returns a new quaternion instance with the same values as the given quaternion object.
      * @param q The Point4 object to clone.
@@ -200,7 +204,7 @@ export class Qtrn {
      * @param up - The up direction of the object
      * @returns A new quaternion representing the rotation required to face towards the target point.
      */
-    static lookAt(eye, target, up) {
+    static lookAt(eye, target, up = Pnt3.Z) {
         return this.fromMatrix4(Mtrx4.lookAt(eye, target, up));
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gg-web-engine/core",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "description": "An attempt to create open source game engine for browser",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -28,12 +28,14 @@
   "homepage": "https://github.com/AndyGura/gg-web-engine#readme",
   "dependencies": {
     "rxjs": "~7.8.0",
-    "stats.js": "^0.17.0"
+    "stats.js": "^0.17.0",
+    "ts-mixer": "^6.0.3"
   },
   "devDependencies": {
     "@types/jest": "^29.5.0",
     "@types/stats.js": "^0.17.0",
     "jest": "^29.5.0",
+    "jest-environment-jsdom": "^29.5.0",
     "prettier": "^2.8.6",
     "ts-jest": "^29.0.5",
     "typescript": "~4.7.2"
@@ -59,6 +61,6 @@
       "<rootDir>/test/"
     ],
     "coverageDirectory": "./coverage",
-    "testEnvironment": "node"
+    "testEnvironment": "jsdom"
   }
 }

package/tsconfig.json

@@ -5,5 +5,5 @@
     "outDir": "./dist/"
   },
   "include": ["*.ts", "**/*.ts"],
-  "exclude": ["**/*.spec.ts", "node_modules", "dist/**/*"]
+  "exclude": ["**/*.spec.ts", "node_modules", "dist/**/*", "test/**/*"]
 }