@gg-web-engine/core 0.0.48 → 0.0.49

package/dist/2d/models/shapes.d.ts

@@ -1,12 +1,14 @@
 import { Point2 } from '../../base';
 import { Body2DOptions } from './body-options';
 export type Shape2DDescriptor = {
+    collisionMargin?: number;
+} & ({
     shape: 'SQUARE';
     dimensions: Point2;
 } | {
     shape: 'CIRCLE';
     radius: number;
-};
+});
 export type BodyShape2DDescriptor = {
     shape: Shape2DDescriptor;
     body: Partial<Body2DOptions>;

package/dist/3d/entities/controllers/input/car-keyboard-handling.controller.d.ts

@@ -12,7 +12,7 @@ export declare class CarKeyboardHandlingController extends IEntity {
     protected readonly keyboard: KeyboardInput;
     protected readonly options: CarKeyboardControllerOptions;
     readonly tickOrder = TickOrder.INPUT_CONTROLLERS;
-    protected readonly directionsInput: DirectionKeyboardInput;
+    readonly directionsInput: DirectionKeyboardInput;
     private _output$;
     get output$(): Observable<CarHandlingOutput>;
     constructor(keyboard: KeyboardInput, options?: CarKeyboardControllerOptions);

package/dist/3d/entities/controllers/input/free-camera.controller.d.ts

@@ -5,24 +5,35 @@ import { Renderer3dEntity } from '../../renderer-3d.entity';
  */
 export type FreeCameraControllerOptions = {
     /**
-     * A keymap for controlling camera movement, where each key corresponds to a movement direction.
+     * A keymap for controlling camera movement, where each key corresponds to a movement direction. 'wasd' by default
      */
     keymap: DirectionKeyboardKeymap;
     /**
-     * Options for configuring camera movement.
+     * The speed of camera movement in meters per second. 20 by default
      */
-    movementOptions: {
-        /**
-         * The speed of camera movement.
-         */
-        speed: number;
-    };
+    cameraLinearSpeed: number;
     /**
-     * Flag to ignore cursor movement if pointer was not locked. By default false
+     * An elasticity factor for camera movement. 0 by default (no elastic motion)
+     */
+    cameraMovementElasticity: number;
+    /**
+     * A linear speed multiplier when user holds shift key. 2.5 by default
+     */
+    cameraBoostMultiplier: number;
+    /**
+     * The speed of camera rotation in radians per 1000px mouse movement. 1 by default
+     */
+    cameraRotationSensitivity: number;
+    /**
+     * An elasticity factor for camera rotation. 0 by default (no elastic motion)
+     */
+    cameraRotationElasticity: number;
+    /**
+     * Flag to ignore cursor movement if pointer was not locked. false by default
      */
     ignoreMouseUnlessPointerLocked: boolean;
     /**
-     * Flag to ignore keyboard events if pointer was not locked. By default false
+     * Flag to ignore keyboard events if pointer was not locked. false by default
      */
     ignoreKeyboardUnlessPointerLocked: boolean;
     /**
@@ -41,11 +52,11 @@ export declare class FreeCameraController extends IEntity {
     /**
      * The mouse input controller used for camera rotation.
      */
-    protected readonly mouseInput: MouseInput;
+    readonly mouseInput: MouseInput;
     /**
      * The keyboard input controller used for camera movement.
      */
-    protected readonly directionsInput: DirectionKeyboardInput;
+    readonly directionsInput: DirectionKeyboardInput;
     /**
      * Creates a new FreeCameraInput instance.
      * @param keyboard The keyboard input controller to use for camera movement.

package/dist/3d/entities/controllers/input/free-camera.controller.js

@@ -7,11 +7,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { combineLatest, filter, takeUntil } from 'rxjs';
-import { DirectionKeyboardInput, IEntity, MouseInput, Pnt2, Pnt3, Qtrn, TickOrder, } from '../../../../base';
+import { BehaviorSubject, combineLatest, filter, takeUntil } from 'rxjs';
+import { DirectionKeyboardInput, ggElastic, IEntity, MouseInput, Pnt2, Pnt3, Qtrn, TickOrder, } from '../../../../base';
+import { map } from 'rxjs/operators';
 const DEFAULT_FREE_CAMERA_CONTROLLER_OPTIONS = {
     keymap: 'wasd',
-    movementOptions: { speed: 0.5 },
+    cameraLinearSpeed: 20,
+    cameraMovementElasticity: 0,
+    cameraBoostMultiplier: 2.5,
+    cameraRotationSensitivity: 1,
+    cameraRotationElasticity: 0,
     mouseOptions: {},
     ignoreMouseUnlessPointerLocked: false,
     ignoreKeyboardUnlessPointerLocked: false,
@@ -33,9 +38,9 @@ export class FreeCameraController extends IEntity {
         this.tickOrder = TickOrder.INPUT_CONTROLLERS;
         this.options = Object.assign(Object.assign({}, DEFAULT_FREE_CAMERA_CONTROLLER_OPTIONS), options);
         if (options.mouseOptions) {
-            this.options.movementOptions = Object.assign(Object.assign({}, DEFAULT_FREE_CAMERA_CONTROLLER_OPTIONS.movementOptions), options.mouseOptions);
+            this.options.mouseOptions = Object.assign(Object.assign({}, DEFAULT_FREE_CAMERA_CONTROLLER_OPTIONS.mouseOptions), options.mouseOptions);
         }
-        this.mouseInput = new MouseInput(options.mouseOptions);
+        this.mouseInput = new MouseInput(this.options.mouseOptions);
         this.directionsInput = new DirectionKeyboardInput(keyboard, this.options.keymap);
     }
     onSpawned(world) {
@@ -45,61 +50,77 @@ export class FreeCameraController extends IEntity {
         return __awaiter(this, void 0, void 0, function* () {
             yield _super.onSpawned.call(this, world);
             // Subscribe to keyboard input for movement controls
-            let controls = { direction: {}, rest: [] };
             const keys = ['KeyE', 'KeyQ'];
             if (this.camera.camera.supportsFov) {
                 keys.push('KeyZ', 'KeyC');
             }
             keys.push('ShiftLeft');
-            this.directionsInput.output$.pipe(takeUntil(this._onRemoved$)).subscribe(d => {
-                controls.direction = d;
-            });
-            combineLatest(keys.map(c => this.keyboard.bind(c)))
-                .pipe(takeUntil(this._onRemoved$))
-                .subscribe((d) => {
-                controls.rest = d;
-            });
-            // Subscribe to mouse input for camera rotation
-            let rotationDelta = Pnt2.O;
-            let isTouchScreen = MouseInput.isTouchDevice();
-            this.mouseInput.delta$
-                .pipe(takeUntil(this._onRemoved$), filter(() => isTouchScreen || !this.options.ignoreMouseUnlessPointerLocked || this.mouseInput.isPointerLocked))
-                .subscribe(delta => {
-                rotationDelta = Pnt2.add(rotationDelta, delta);
-            });
-            // Setup updating camera position and rotation based on input
-            this.camera.tick$.pipe(takeUntil(this._onRemoved$)).subscribe(() => {
-                let c = controls;
-                if (this.options.ignoreKeyboardUnlessPointerLocked && !this.mouseInput.isPointerLocked) {
-                    c = { direction: {}, rest: [false, false, false, false, false] };
+            let controlsObs = combineLatest([this.directionsInput.output$, ...keys.map(c => this.keyboard.bind(c))]).pipe(takeUntil(this._onRemoved$), map(([direction, ...rest]) => {
+                let c = { direction: {}, rest: [] };
+                if (!this.options.ignoreKeyboardUnlessPointerLocked || this.mouseInput.isPointerLocked) {
+                    c = { direction, rest };
                 }
-                let translateVector = Object.assign({}, Pnt3.O);
+                let translate = Object.assign({}, Pnt3.O);
                 const [u, d, zo, zi, speedBoost] = c.rest;
                 if (c.direction.upDown !== undefined)
-                    translateVector.z = c.direction.upDown ? -1 : 1;
+                    translate.z = c.direction.upDown ? -1 : 1;
                 if (c.direction.leftRight !== undefined)
-                    translateVector.x = c.direction.leftRight ? -1 : 1;
+                    translate.x = c.direction.leftRight ? -1 : 1;
                 if (u != d)
-                    translateVector.y = d ? -1 : 1;
+                    translate.y = d ? -1 : 1;
+                let cameraFovInc = 0;
                 if (zo != zi)
-                    this.camera.camera.fov += zo ? 1 : -1;
-                let speed = this.options.movementOptions.speed;
+                    cameraFovInc = zo ? 1 : -1;
+                translate = Pnt3.norm(translate);
                 if (speedBoost) {
-                    speed *= 2.5;
+                    translate = Pnt3.scalarMult(translate, this.options.cameraBoostMultiplier);
                 }
-                this.camera.position = Pnt3.add(this.camera.position, Pnt3.rot(Pnt3.scalarMult(Pnt3.norm(translateVector), speed), this.camera.rotation));
-                if (rotationDelta.x != 0 || rotationDelta.y != 0) {
-                    const spherical = Pnt3.toSpherical(Pnt3.rot({ x: 0, y: 0, z: -1 }, this.camera.rotation));
-                    spherical.theta -= rotationDelta.x / 300;
-                    spherical.phi += rotationDelta.y / 300;
+                return [translate, cameraFovInc];
+            }));
+            if (this.options.cameraMovementElasticity > 0) {
+                controlsObs = controlsObs.pipe(ggElastic(this.camera.tick$, this.options.cameraMovementElasticity, ([at, _], [bt, bf], f) => [Pnt3.lerp(at, bt, f), bf], ([at, af], [bt, bf]) => af == bf && Pnt3.dist(at, bt) < 0.001));
+            }
+            let translateVector = Pnt3.O;
+            let cameraFovInc = 0;
+            controlsObs.subscribe(([t, f]) => {
+                translateVector = t;
+                cameraFovInc = f;
+            });
+            // Subscribe to mouse input for camera rotation
+            const spherical = Pnt3.toSpherical(Pnt3.rot({ x: 0, y: 0, z: -1 }, this.camera.rotation));
+            let isTouchScreen = MouseInput.isTouchDevice();
+            let mouseDelta$ = this.mouseInput.delta$.pipe(takeUntil(this._onRemoved$), filter(() => isTouchScreen || !this.options.ignoreMouseUnlessPointerLocked || this.mouseInput.isPointerLocked));
+            if (this.options.cameraRotationElasticity > 0) {
+                const s$ = new BehaviorSubject(spherical);
+                mouseDelta$.subscribe(delta => {
+                    const s = s$.getValue();
+                    s$.next({
+                        phi: Math.max(0.000001, Math.min(Math.PI - 0.000001, s.phi + (delta.y * this.options.cameraRotationSensitivity) / 1000)),
+                        theta: s.theta - (delta.x * this.options.cameraRotationSensitivity) / 1000,
+                        radius: 1,
+                    });
+                });
+                s$.pipe(takeUntil(this._onRemoved$), ggElastic(this.tick$, this.options.cameraRotationElasticity, (a, b, f) => ({ phi: a.phi + f * (b.phi - a.phi), theta: a.theta + f * (b.theta - a.theta), radius: 1 }), (a, b) => Pnt2.dist({ x: a.phi, y: a.theta }, { x: b.phi, y: b.theta }) < 0.0001)).subscribe(s => {
+                    spherical.theta = s.theta;
+                    spherical.phi = s.phi;
+                });
+            }
+            else {
+                mouseDelta$.subscribe(delta => {
+                    spherical.theta -= (delta.x * this.options.cameraRotationSensitivity) / 1000;
+                    spherical.phi += (delta.y * this.options.cameraRotationSensitivity) / 1000;
                     spherical.phi = Math.max(0.000001, Math.min(Math.PI - 0.000001, spherical.phi));
-                    this.camera.rotation = Qtrn.lookAt(this.camera.position, Pnt3.add(this.camera.position, Pnt3.fromSpherical(spherical)));
-                    rotationDelta = Pnt2.O;
-                }
+                });
+            }
+            // Setup updating camera position and rotation based on input
+            this.camera.tick$.pipe(takeUntil(this._onRemoved$)).subscribe(([_, delta]) => {
+                this.camera.camera.fov += cameraFovInc;
+                this.camera.position = Pnt3.add(this.camera.position, Pnt3.rot(Pnt3.scalarMult(translateVector, (this.options.cameraLinearSpeed * delta) / 1000), this.camera.rotation));
+                this.camera.rotation = Qtrn.lookAt(this.camera.position, Pnt3.add(this.camera.position, Pnt3.fromSpherical(spherical)));
             });
             // start input
-            yield this.mouseInput.start();
-            yield this.directionsInput.start();
+            this.mouseInput.start();
+            this.directionsInput.start();
         });
     }
     onRemoved() {

package/dist/3d/entities/controllers/input/gg-car-keyboard-handling.controller.d.ts

@@ -11,7 +11,7 @@ export declare class GgCarKeyboardHandlingController extends IEntity {
     car: GgCarEntity | null;
     protected readonly options: GgCarKeyboardControllerOptions;
     readonly tickOrder = TickOrder.INPUT_CONTROLLERS;
-    protected readonly carHandlingInput: CarKeyboardHandlingController;
+    readonly carHandlingInput: CarKeyboardHandlingController;
     switchingGearsEnabled: boolean;
     constructor(keyboard: KeyboardInput, car: GgCarEntity | null, options?: GgCarKeyboardControllerOptions);
     onSpawned(world: GgWorld<any, any>): Promise<void>;

package/dist/3d/entities/controllers/input/orbit-camera.controller.d.ts

@@ -1,18 +1,37 @@
 import { GgWorld, IEntity, MouseInput, MouseInputOptions, MutableSpherical, Point3, TickOrder } from '../../../../base';
 import { Renderer3dEntity } from '../../renderer-3d.entity';
 export type OrbitCameraControllerOptions = {
+    /**
+     * Options for configuring mouse input.
+     */
     mouseOptions: Partial<MouseInputOptions>;
+    /**
+     * Orbiting options. false disables orbiting, sensitivity fields are the speed in radians per 1000px mouse movement. 1 by default
+     */
     orbiting: {
         sensitivityX: number;
         sensitivityY: number;
     } | false;
+    /**
+     * An elasticity factor for orbiting. 0 by default (no elastic motion)
+     */
+    orbitingElasticity: number;
+    /**
+     * Zooming options. false disables zooming. Enabled by default
+     */
     zooming: {
         sensitivity: number;
     } | false;
+    /**
+     * Panning options. false disables panning. Enabled by default
+     */
     panning: {
         sensitivityX: number;
         sensitivityY: number;
     } | false;
+    /**
+     * Dollying options. false disables dollying. Enabled by default
+     */
     dollying: {
         sensitivity: number;
     } | false;
@@ -21,7 +40,7 @@ export declare class OrbitCameraController extends IEntity {
     protected readonly camera: Renderer3dEntity;
     readonly tickOrder = TickOrder.INPUT_CONTROLLERS;
     protected readonly options: OrbitCameraControllerOptions;
-    protected readonly mouseInput: MouseInput;
+    readonly mouseInput: MouseInput;
     protected spherical: MutableSpherical;
     target: Point3;
     get radius(): number;

package/dist/3d/entities/controllers/input/orbit-camera.controller.js

@@ -7,12 +7,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { IEntity, MouseInput, MouseInputState, Pnt3, Qtrn, TickOrder, } from '../../../../base';
-import { filter, takeUntil } from 'rxjs';
+import { ggElastic, IEntity, MouseInput, MouseInputState, Pnt2, Pnt3, Qtrn, TickOrder, } from '../../../../base';
+import { BehaviorSubject, filter, takeUntil } from 'rxjs';
 import { map } from 'rxjs/operators';
 const DEFAULT_OPTIONS = {
     mouseOptions: {},
-    orbiting: { sensitivityX: 1, sensitivityY: 1 }, // sensitivity units: rotation degree per 5 pixels movement
+    orbiting: { sensitivityX: 1, sensitivityY: 1 },
+    orbitingElasticity: 0,
     zooming: { sensitivity: 1 },
     panning: { sensitivityX: 1, sensitivityY: 1 },
     dollying: { sensitivity: 1 },
@@ -53,13 +54,29 @@ export class OrbitCameraController extends IEntity {
             yield _super.onSpawned.call(this, world);
             this.spherical = Pnt3.toSpherical(Pnt3.sub(this.camera.position, this.target));
             if (this.options.orbiting) {
-                this.mouseInput.delta$
-                    .pipe(takeUntil(this._onRemoved$), filter(() => this.mouseInput.state == MouseInputState.DRAG))
-                    .subscribe(delta => {
-                    this.spherical.theta -= (delta.x * this.options.orbiting.sensitivityX * Math.PI) / 900;
-                    this.spherical.phi -= (delta.y * this.options.orbiting.sensitivityY * Math.PI) / 900;
-                    this.spherical.phi = Math.max(0.000001, Math.min(Math.PI - 0.000001, this.spherical.phi));
-                });
+                let mouseDelta$ = this.mouseInput.delta$.pipe(takeUntil(this._onRemoved$), filter(() => this.mouseInput.state == MouseInputState.DRAG));
+                if (this.options.orbitingElasticity > 0) {
+                    const s$ = new BehaviorSubject(this.spherical);
+                    mouseDelta$.subscribe(delta => {
+                        const s = s$.getValue();
+                        s$.next({
+                            phi: Math.max(0.000001, Math.min(Math.PI - 0.000001, s.phi - (delta.y * this.options.orbiting.sensitivityY) / 1000)),
+                            theta: s.theta - (delta.x * this.options.orbiting.sensitivityX) / 1000,
+                            radius: 1,
+                        });
+                    });
+                    s$.pipe(takeUntil(this._onRemoved$), ggElastic(this.tick$, this.options.orbitingElasticity, (a, b, f) => ({ phi: a.phi + f * (b.phi - a.phi), theta: a.theta + f * (b.theta - a.theta), radius: 1 }), (a, b) => Pnt2.dist({ x: a.phi, y: a.theta }, { x: b.phi, y: b.theta }) < 0.0001)).subscribe(s => {
+                        this.spherical.theta = s.theta;
+                        this.spherical.phi = s.phi;
+                    });
+                }
+                else {
+                    mouseDelta$.subscribe(delta => {
+                        this.spherical.theta -= (delta.x * this.options.orbiting.sensitivityX) / 1000;
+                        this.spherical.phi -= (delta.y * this.options.orbiting.sensitivityY) / 1000;
+                        this.spherical.phi = Math.max(0.000001, Math.min(Math.PI - 0.000001, this.spherical.phi));
+                    });
+                }
             }
             if (this.options.zooming) {
                 this.mouseInput.wheel$.pipe(takeUntil(this._onRemoved$)).subscribe(delta => {

package/dist/3d/models/shapes.d.ts

@@ -1,6 +1,8 @@
 import { Point2, Point3, Point4 } from '../../base';
 import { Body3DOptions } from './body-options';
 export type Shape3DDescriptor = {
+    collisionMargin?: number;
+} & ({
     shape: 'PLANE';
 } | {
     shape: 'BOX';
@@ -30,7 +32,7 @@ export type Shape3DDescriptor = {
     shape: 'MESH';
     vertices: Point3[];
     faces: [number, number, number][];
-};
+});
 export type Shape3DMeshDescriptor = {
     shape: 'PLANE';
     dimensions?: Point2;

package/dist/base/index.d.ts

@@ -33,4 +33,5 @@ export * from './math/quaternion';
 export * from './math/numbers';
 export * from './math/matrix4';
 export * from './math/splines';
+export * from './pipes/gg-elastic.pipe';
 export * from './gg-world';

package/dist/base/index.js

@@ -33,4 +33,5 @@ export * from './math/quaternion';
 export * from './math/numbers';
 export * from './math/matrix4';
 export * from './math/splines';
+export * from './pipes/gg-elastic.pipe';
 export * from './gg-world';

package/dist/base/inputs/mouse.input.d.ts

@@ -59,6 +59,7 @@ export declare class MouseInput extends IInput<[], [unlockPointer?: boolean]> {
     private _wheel$;
     get wheel$(): Observable<number>;
     get isPointerLocked(): boolean;
+    get isPointerLocked$(): Observable<boolean>;
     private readonly options;
     private _delta$;
     private _position$;

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

@@ -67,6 +67,9 @@ export class MouseInput extends IInput {
     get isPointerLocked() {
         return !!document.pointerLockElement;
     }
+    get isPointerLocked$() {
+        return fromEvent(document, 'pointerlockchange').pipe(map(() => this.isPointerLocked));
+    }
     get state() {
         return this._state$.getValue();
     }

package/dist/base/pipes/gg-elastic.pipe.d.ts

@@ -0,0 +1,5 @@
+import { Observable, OperatorFunction } from 'rxjs';
+export declare function ggElastic<T>(tick$: Observable<[number, number]>, // [elapsed, delta]
+elasticity: number, // Elasticity parameter
+mix: (a: T, b: T, factor: number) => T, // Mixing function
+equals: (a: T, b: T) => boolean): OperatorFunction<T, T>;

package/dist/base/pipes/gg-elastic.pipe.js

@@ -0,0 +1,44 @@
+import { filter, map, scan, switchMap } from 'rxjs';
+export function ggElastic(tick$, // [elapsed, delta]
+elasticity, // Elasticity parameter
+mix, // Mixing function
+equals) {
+    return (source$) => {
+        return source$.pipe(
+        // Track the target value
+        scan((acc, newValue) => {
+            var _a;
+            return ({
+                targetValue: newValue,
+                currentValue: (_a = acc.currentValue) !== null && _a !== void 0 ? _a : newValue, // Initialize to the first value on startup
+                hasReachedTarget: false, // Reset reach status on new target
+            });
+        }, { targetValue: null, currentValue: null, hasReachedTarget: false }), 
+        // Switch to using tick$ for timing, emitting interpolated values with each tick
+        switchMap(state => tick$.pipe(map(([_, delta]) => {
+            if (state.targetValue === null || state.currentValue === null) {
+                return state.currentValue; // If we have no values, output nothing
+            }
+            // Skip processing if we’ve reached the target and stop emitting
+            if (state.hasReachedTarget) {
+                return undefined; // Stop emitting by returning `undefined`
+            }
+            // Adjust factor based on elasticity and delta time
+            const factor = 1 - Math.exp(-delta / elasticity);
+            // Blend halfway towards the target on each tick
+            const newInterpolatedValue = mix(state.currentValue, state.targetValue, factor);
+            // Update the currentValue to the new interpolated position
+            state.currentValue = newInterpolatedValue;
+            // Check if the interpolated value is "close enough" to the target
+            if (equals(newInterpolatedValue, state.targetValue)) {
+                state.hasReachedTarget = true; // Mark as reached
+                return state.targetValue; // Emit exact target value
+            }
+            return newInterpolatedValue;
+        }))), 
+        // Filter out `undefined` emissions (to stop emitting when settled)
+        map(value => (value !== undefined ? value : null)), 
+        // Remove `null` values (after stopping)
+        filter(value => value !== null));
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gg-web-engine/core",
-  "version": "0.0.48",
+  "version": "0.0.49",
   "description": "An attempt to create open source game engine for browser",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",