@gg-web-engine/core 0.0.49 → 0.0.57

package/dist/2d/entities/entity-2d.d.ts

@@ -3,8 +3,6 @@ import { IPositionable2d } from '../interfaces/i-positionable-2d';
 import { IRenderable2dEntity } from './i-renderable-2d.entity';
 import { PhysicsTypeDocRepo2D, VisualTypeDocRepo2D } from '../gg-2d-world';
 export declare class Entity2d<VTypeDoc extends VisualTypeDocRepo2D = VisualTypeDocRepo2D, PTypeDoc extends PhysicsTypeDocRepo2D = PhysicsTypeDocRepo2D> extends IRenderable2dEntity<VTypeDoc, PTypeDoc> implements IPositionable2d {
-    readonly object2D: VTypeDoc['displayObject'] | null;
-    readonly objectBody: PTypeDoc['rigidBody'] | null;
     readonly tickOrder = TickOrder.OBJECTS_BINDING;
     private _position;
     get position(): Point2;
@@ -12,10 +10,15 @@ export declare class Entity2d<VTypeDoc extends VisualTypeDocRepo2D = VisualTypeD
     private _rotation;
     get rotation(): number;
     set rotation(value: number);
+    readonly object2D: VTypeDoc['displayObject'] | null;
+    readonly objectBody: PTypeDoc['rigidBody'] | null;
     updateVisibility(): void;
     /**
      * Synchronize physics body transform with entity (and object2d if defined)
      * */
     protected runTransformBinding(objectBody: PTypeDoc['rigidBody'], object2D: VTypeDoc['displayObject'] | null): void;
-    constructor(object2D: VTypeDoc['displayObject'] | null, objectBody: PTypeDoc['rigidBody'] | null);
+    constructor(options: {
+        object2D?: VTypeDoc['displayObject'];
+        objectBody?: PTypeDoc['rigidBody'];
+    });
 }

package/dist/2d/entities/entity-2d.js

@@ -44,29 +44,32 @@ export class Entity2d extends IRenderable2dEntity {
         this._position = pos;
         this._rotation = quat;
     }
-    constructor(object2D, objectBody) {
+    constructor(options) {
         super();
-        this.object2D = object2D;
-        this.objectBody = objectBody;
         this.tickOrder = TickOrder.OBJECTS_BINDING;
         this._position = Pnt2.O;
         this._rotation = 0;
-        if (objectBody) {
-            this.tick$.subscribe(() => {
-                this.runTransformBinding(objectBody, object2D);
-            });
-            this.runTransformBinding(objectBody, object2D);
-            this.name = objectBody.name;
+        this.object2D = null;
+        this.objectBody = null;
+        if (options.objectBody) {
+            this.objectBody = options.objectBody;
+            this.name = this.objectBody.name;
+            this.addComponents(this.objectBody);
         }
-        else if (object2D) {
-            this._position = object2D.position;
-            this._rotation = object2D.rotation;
-            this.name = object2D.name;
+        if (options.object2D) {
+            this.object2D = options.object2D;
+            if (!options.objectBody) {
+                this._position = this.object2D.position;
+                this._rotation = this.object2D.rotation;
+                this.name = this.object2D.name;
+            }
+            this.addComponents(this.object2D);
         }
-        else {
-            throw new Error('Cannot create entity without an object2D and a body');
+        if (this.objectBody) {
+            this.tick$.subscribe(() => {
+                this.runTransformBinding(this.objectBody, this.object2D);
+            });
+            this.runTransformBinding(this.objectBody, this.object2D);
         }
-        objectBody && this.addComponents(objectBody);
-        object2D && this.addComponents(object2D);
     }
 }

package/dist/2d/gg-2d-world.d.ts

@@ -27,4 +27,7 @@ export declare class Gg2dWorld<VTypeDoc extends VisualTypeDocRepo2D = VisualType
     constructor(visualScene: VS, physicsWorld: PW);
     addPrimitiveRigidBody(descr: BodyShape2DDescriptor, position?: Point2, rotation?: number, material?: DisplayObject2dOpts<VTypeDoc['texture']>): Entity2d<VTypeDoc, PTypeDoc>;
     addRenderer(canvas?: HTMLCanvasElement, rendererOptions?: Partial<RendererOptions & VTypeDoc['rendererExtraOpts']>): Renderer2dEntity<VTypeDoc>;
+    protected registerConsoleCommands(ggstatic: {
+        registerConsoleCommand: (world: GgWorld<any, any> | null, command: string, handler: (...args: string[]) => Promise<string>, doc?: string) => void;
+    }): void;
 }

package/dist/2d/gg-2d-world.js

@@ -15,21 +15,12 @@ export class Gg2dWorld extends GgWorld {
         super(visualScene, physicsWorld);
         this.visualScene = visualScene;
         this.physicsWorld = physicsWorld;
-        if (window.ggstatic) {
-            window.ggstatic.registerConsoleCommand(this, 'ph_gravity', (...args) => __awaiter(this, void 0, void 0, function* () {
-                if (args.length == 1) {
-                    args = ['0', args[0]]; // mean Y axis
-                }
-                if (args.length > 0) {
-                    this.physicsWorld.gravity = { x: +args[0], y: +args[1] };
-                }
-                return JSON.stringify(this.physicsWorld.gravity);
-            }), 'args: [float] or [float float]; change 2D world gravity vector. 1 argument means ' +
-                '{x: 0, y: value}, 2 arguments set the whole vector. Default value is "9.82" or "0 9.82"');
-        }
     }
     addPrimitiveRigidBody(descr, position = Pnt2.O, rotation = 0, material = {}) {
-        const entity = new Entity2d(this.visualScene.factory.createPrimitive(descr.shape, material), this.physicsWorld.factory.createRigidBody(descr));
+        const entity = new Entity2d({
+            object2D: this.visualScene.factory.createPrimitive(descr.shape, material),
+            objectBody: this.physicsWorld.factory.createRigidBody(descr),
+        });
         entity.position = position;
         entity.rotation = rotation;
         this.addEntity(entity);
@@ -40,4 +31,21 @@ export class Gg2dWorld extends GgWorld {
         this.addEntity(entity);
         return entity;
     }
+    registerConsoleCommands(ggstatic) {
+        super.registerConsoleCommands(ggstatic);
+        ggstatic.registerConsoleCommand(this, 'gravity', (...args) => __awaiter(this, void 0, void 0, function* () {
+            if (args.length == 1) {
+                args = ['0', args[0]]; // mean Y axis
+            }
+            if (args.length > 0) {
+                if (isNaN(+args[0]) || isNaN(+args[1])) {
+                    throw new Error('Wrong arguments');
+                }
+                this.physicsWorld.gravity = { x: +args[0], y: +args[1] };
+            }
+            return JSON.stringify(this.physicsWorld.gravity);
+        }), 'args: [ ?float, ?float ]; Get or set 2D world gravity vector. 1 argument sets' +
+            ' vector {x: 0, y: value}, 2 arguments sets the whole vector.' +
+            ' Default value is "9.82" or "0 9.82"');
+    }
 }

package/dist/2d/models/body-options.d.ts

@@ -1,7 +1,7 @@
-import { BodyOptions, DebugBodySettings } from '../../base';
+import { BodyOptions, DebugBodySettings, DebugBodyType } from '../../base';
 import { Shape2DDescriptor } from './shapes';
 export interface Body2DOptions extends BodyOptions {
 }
-export type DebugBody2DSettings = DebugBodySettings & {
-    shape: Shape2DDescriptor;
-};
+export declare class DebugBody2DSettings extends DebugBodySettings<Shape2DDescriptor> {
+    constructor(type: DebugBodyType, shape: Shape2DDescriptor, ignoreTransform?: boolean, color?: number | undefined);
+}

package/dist/2d/models/body-options.js

@@ -1 +1,6 @@
-export {};
+import { DebugBodySettings } from '../../base';
+export class DebugBody2DSettings extends DebugBodySettings {
+    constructor(type, shape, ignoreTransform = false, color = undefined) {
+        super(type, shape, ignoreTransform, color);
+    }
+}

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

@@ -1,4 +1,5 @@
-import { DirectionKeyboardInput, DirectionKeyboardKeymap, GgWorld, IEntity, KeyboardInput, MouseInput, MouseInputOptions, TickOrder } from '../../../../base';
+import { Subject } from 'rxjs';
+import { DirectionKeyboardInput, DirectionKeyboardKeymap, GgWorld, IEntity, KeyboardInput, MouseInput, MouseInputOptions, MutableSpherical, Spherical, TickOrder } from '../../../../base';
 import { Renderer3dEntity } from '../../renderer-3d.entity';
 /**
  * Options for configuring a FreeCameraInput controller.
@@ -57,6 +58,12 @@ export declare class FreeCameraController extends IEntity {
      * The keyboard input controller used for camera movement.
      */
     readonly directionsInput: DirectionKeyboardInput;
+    protected _spherical: MutableSpherical;
+    get active(): boolean;
+    set active(value: boolean);
+    get spherical(): Spherical;
+    set spherical(value: Spherical);
+    protected resetMotion$: Subject<void>;
     /**
      * Creates a new FreeCameraInput instance.
      * @param keyboard The keyboard input controller to use for camera movement.
@@ -64,6 +71,7 @@ export declare class FreeCameraController extends IEntity {
      * @param options Optional configuration options for the controller.
      */
     constructor(keyboard: KeyboardInput, camera: Renderer3dEntity, options?: Partial<FreeCameraControllerOptions>);
+    reset(): void;
     onSpawned(world: GgWorld<any, any>): Promise<void>;
     onRemoved(): Promise<void>;
 }

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

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { BehaviorSubject, combineLatest, filter, takeUntil } from 'rxjs';
+import { BehaviorSubject, combineLatest, filter, Subject, 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 = {
@@ -25,6 +25,23 @@ const DEFAULT_FREE_CAMERA_CONTROLLER_OPTIONS = {
  * A controller for a free-moving camera.
  */
 export class FreeCameraController extends IEntity {
+    get active() {
+        return super.active;
+    }
+    set active(value) {
+        if (!super.active && value) {
+            this.reset();
+        }
+        super.active = value;
+    }
+    get spherical() {
+        return this._spherical;
+    }
+    set spherical(value) {
+        this._spherical.phi = Math.max(0.000001, Math.min(Math.PI - 0.000001, value.phi));
+        this._spherical.theta = value.theta;
+        this.resetMotion$.next();
+    }
     /**
      * Creates a new FreeCameraInput instance.
      * @param keyboard The keyboard input controller to use for camera movement.
@@ -36,6 +53,8 @@ export class FreeCameraController extends IEntity {
         this.keyboard = keyboard;
         this.camera = camera;
         this.tickOrder = TickOrder.INPUT_CONTROLLERS;
+        this._spherical = { phi: 0, radius: 1, theta: 0 };
+        this.resetMotion$ = new Subject();
         this.options = Object.assign(Object.assign({}, DEFAULT_FREE_CAMERA_CONTROLLER_OPTIONS), options);
         if (options.mouseOptions) {
             this.options.mouseOptions = Object.assign(Object.assign({}, DEFAULT_FREE_CAMERA_CONTROLLER_OPTIONS.mouseOptions), options.mouseOptions);
@@ -43,12 +62,17 @@ export class FreeCameraController extends IEntity {
         this.mouseInput = new MouseInput(this.options.mouseOptions);
         this.directionsInput = new DirectionKeyboardInput(keyboard, this.options.keymap);
     }
+    reset() {
+        this._spherical = Pnt3.toSpherical(Pnt3.rot({ x: 0, y: 0, z: -1 }, this.camera.rotation));
+        this.resetMotion$.next();
+    }
     onSpawned(world) {
         const _super = Object.create(null, {
             onSpawned: { get: () => super.onSpawned }
         });
         return __awaiter(this, void 0, void 0, function* () {
             yield _super.onSpawned.call(this, world);
+            this._spherical = Pnt3.toSpherical(Pnt3.rot({ x: 0, y: 0, z: -1 }, this.camera.rotation));
             // Subscribe to keyboard input for movement controls
             const keys = ['KeyE', 'KeyQ'];
             if (this.camera.camera.supportsFov) {
@@ -87,11 +111,11 @@ export class FreeCameraController extends IEntity {
                 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));
+            let mouseDelta$ = this.mouseInput.delta$.pipe(takeUntil(this._onRemoved$), filter(() => this.active &&
+                (isTouchScreen || !this.options.ignoreMouseUnlessPointerLocked || this.mouseInput.isPointerLocked)));
             if (this.options.cameraRotationElasticity > 0) {
-                const s$ = new BehaviorSubject(spherical);
+                const s$ = new BehaviorSubject(this._spherical);
                 mouseDelta$.subscribe(delta => {
                     const s = s$.getValue();
                     s$.next({
@@ -100,23 +124,32 @@ export class FreeCameraController extends IEntity {
                         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;
+                const startElasticMotion = () => {
+                    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), takeUntil(this.resetMotion$)).subscribe(s => {
+                        this._spherical.theta = s.theta;
+                        this._spherical.phi = s.phi;
+                    });
+                };
+                this.resetMotion$.pipe(takeUntil(this._onRemoved$)).subscribe(() => {
+                    s$.next(this._spherical);
+                    startElasticMotion();
                 });
+                startElasticMotion();
             }
             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._spherical.theta -= (delta.x * this.options.cameraRotationSensitivity) / 1000;
+                    this._spherical.phi += (delta.y * this.options.cameraRotationSensitivity) / 1000;
+                    this._spherical.phi = Math.max(0.000001, Math.min(Math.PI - 0.000001, this._spherical.phi));
                 });
             }
             // Setup updating camera position and rotation based on input
-            this.camera.tick$.pipe(takeUntil(this._onRemoved$)).subscribe(([_, delta]) => {
+            this.camera.tick$
+                .pipe(takeUntil(this._onRemoved$), filter(() => this.active))
+                .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)));
+                this.camera.rotation = Qtrn.lookAt(this.camera.position, Pnt3.add(this.camera.position, Pnt3.fromSpherical(this._spherical)));
             });
             // start input
             this.mouseInput.start();

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

@@ -1,4 +1,5 @@
-import { GgWorld, IEntity, MouseInput, MouseInputOptions, MutableSpherical, Point3, TickOrder } from '../../../../base';
+import { GgWorld, IEntity, MouseInput, MouseInputOptions, MutableSpherical, Point3, Spherical, TickOrder } from '../../../../base';
+import { Subject } from 'rxjs';
 import { Renderer3dEntity } from '../../renderer-3d.entity';
 export type OrbitCameraControllerOptions = {
     /**
@@ -41,15 +42,15 @@ export declare class OrbitCameraController extends IEntity {
     readonly tickOrder = TickOrder.INPUT_CONTROLLERS;
     protected readonly options: OrbitCameraControllerOptions;
     readonly mouseInput: MouseInput;
-    protected spherical: MutableSpherical;
+    protected _spherical: MutableSpherical;
     target: Point3;
-    get radius(): number;
-    set radius(value: number);
-    get phi(): number;
-    set phi(value: number);
-    get theta(): number;
-    set theta(value: number);
+    get active(): boolean;
+    set active(value: boolean);
+    get spherical(): Spherical;
+    set spherical(value: Spherical);
+    protected resetMotion$: Subject<void>;
     constructor(camera: Renderer3dEntity, options?: Partial<OrbitCameraControllerOptions>);
+    reset(): void;
     onSpawned(world: GgWorld<any, any>): Promise<void>;
     onRemoved(): Promise<void>;
 }

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

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { ggElastic, IEntity, MouseInput, MouseInputState, Pnt2, Pnt3, Qtrn, TickOrder, } from '../../../../base';
-import { BehaviorSubject, filter, takeUntil } from 'rxjs';
+import { BehaviorSubject, filter, Subject, takeUntil } from 'rxjs';
 import { map } from 'rxjs/operators';
 const DEFAULT_OPTIONS = {
     mouseOptions: {},
@@ -19,44 +19,51 @@ const DEFAULT_OPTIONS = {
     dollying: { sensitivity: 1 },
 };
 export class OrbitCameraController extends IEntity {
-    get radius() {
-        return this.spherical.radius;
+    get active() {
+        return super.active;
     }
-    set radius(value) {
-        this.spherical.radius = value;
+    set active(value) {
+        if (!super.active && value) {
+            this.reset();
+        }
+        super.active = value;
     }
-    get phi() {
-        return this.spherical.phi;
+    get spherical() {
+        return this._spherical;
     }
-    set phi(value) {
-        this.spherical.phi = Math.max(0.000001, Math.min(Math.PI - 0.000001, value));
-    }
-    get theta() {
-        return this.spherical.theta;
-    }
-    set theta(value) {
-        this.spherical.theta = value;
+    set spherical(value) {
+        this._spherical.phi = Math.max(0.000001, Math.min(Math.PI - 0.000001, value.phi));
+        this._spherical.theta = value.theta;
+        this._spherical.radius = value.radius;
+        this.resetMotion$.next();
     }
     constructor(camera, options = {}) {
         super();
         this.camera = camera;
         this.tickOrder = TickOrder.INPUT_CONTROLLERS;
-        this.spherical = { phi: 0, radius: 10, theta: 0 };
+        this._spherical = { phi: 0, radius: 10, theta: 0 };
         this.target = Pnt3.O;
+        this.resetMotion$ = new Subject();
         this.options = Object.assign(Object.assign({}, DEFAULT_OPTIONS), options);
         this.mouseInput = new MouseInput(this.options.mouseOptions);
     }
+    reset() {
+        let targetDistance = Pnt3.dist(this.target, this.camera.position);
+        this.target = Pnt3.add(this.camera.position, Pnt3.rot({ x: 0, y: 0, z: -targetDistance }, this.camera.rotation));
+        this._spherical = Pnt3.toSpherical(Pnt3.sub(this.camera.position, this.target));
+        this.resetMotion$.next();
+    }
     onSpawned(world) {
         const _super = Object.create(null, {
             onSpawned: { get: () => super.onSpawned }
         });
         return __awaiter(this, void 0, void 0, function* () {
             yield _super.onSpawned.call(this, world);
-            this.spherical = Pnt3.toSpherical(Pnt3.sub(this.camera.position, this.target));
+            this._spherical = Pnt3.toSpherical(Pnt3.sub(this.camera.position, this.target));
             if (this.options.orbiting) {
-                let mouseDelta$ = this.mouseInput.delta$.pipe(takeUntil(this._onRemoved$), filter(() => this.mouseInput.state == MouseInputState.DRAG));
+                let mouseDelta$ = this.mouseInput.delta$.pipe(takeUntil(this._onRemoved$), filter(() => this.active && this.mouseInput.state == MouseInputState.DRAG));
                 if (this.options.orbitingElasticity > 0) {
-                    const s$ = new BehaviorSubject(this.spherical);
+                    const s$ = new BehaviorSubject(this._spherical);
                     mouseDelta$.subscribe(delta => {
                         const s = s$.getValue();
                         s$.next({
@@ -65,31 +72,38 @@ export class OrbitCameraController extends IEntity {
                             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;
+                    const startElasticMotion = () => {
+                        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), takeUntil(this.resetMotion$)).subscribe(s => {
+                            this._spherical.theta = s.theta;
+                            this._spherical.phi = s.phi;
+                        });
+                    };
+                    this.resetMotion$.pipe(takeUntil(this._onRemoved$)).subscribe(() => {
+                        s$.next(this._spherical);
+                        startElasticMotion();
                     });
+                    startElasticMotion();
                 }
                 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));
+                        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 => {
                     if (delta != 0) {
-                        this.spherical.radius *= Math.pow(0.95, this.options.zooming.sensitivity * (delta > 0 ? -1 : 1));
+                        this._spherical.radius *= Math.pow(0.95, this.options.zooming.sensitivity * (delta > 0 ? -1 : 1));
                     }
                 });
             }
             const performPan = (delta) => {
-                const targetCameraVector = Pnt3.fromSpherical(this.spherical);
+                const targetCameraVector = Pnt3.fromSpherical(this._spherical);
                 const viewUp = Pnt3.rotAround(targetCameraVector, {
-                    x: -Math.sin(this.spherical.theta),
-                    y: Math.cos(this.spherical.theta),
+                    x: -Math.sin(this._spherical.theta),
+                    y: Math.cos(this._spherical.theta),
                     z: 0,
                 }, Math.PI / 2);
                 const viewRight = Pnt3.rotAround(targetCameraVector, Pnt3.norm(viewUp), Math.PI / 2);
@@ -106,14 +120,14 @@ export class OrbitCameraController extends IEntity {
                 this.mouseInput.delta$
                     .pipe(takeUntil(this._onRemoved$), filter(() => this.mouseInput.state == MouseInputState.DRAG_MIDDLE_BUTTON))
                     .subscribe(delta => {
-                    this.spherical.radius *= Math.pow(0.95, (-this.options.dollying.sensitivity * delta.y) / 10);
+                    this._spherical.radius *= Math.pow(0.95, (-this.options.dollying.sensitivity * delta.y) / 10);
                 });
             }
             if (MouseInput.isTouchDevice() && (this.options.dollying || this.options.panning)) {
                 this.mouseInput.twoTouchGestureDelta$.pipe(takeUntil(this._onRemoved$)).subscribe(delta => {
                     // dolly on fingers pitch
                     if (this.options.dollying) {
-                        this.spherical.radius *= Math.pow(0.95, (this.options.dollying.sensitivity * delta.distanceDelta) / 10);
+                        this._spherical.radius *= Math.pow(0.95, (this.options.dollying.sensitivity * delta.distanceDelta) / 10);
                     }
                     // pan on fingers move
                     if (this.options.panning) {
@@ -123,7 +137,7 @@ export class OrbitCameraController extends IEntity {
             }
             // Setup updating camera position and rotation based on input
             this.camera.tick$
-                .pipe(takeUntil(this._onRemoved$), map(() => this.spherical))
+                .pipe(takeUntil(this._onRemoved$), filter(() => this.active), map(() => this._spherical))
                 .subscribe(spherical => {
                 this.camera.position = Pnt3.add(this.target, Pnt3.fromSpherical(spherical));
                 this.camera.rotation = Qtrn.lookAt(this.camera.position, this.target);

package/dist/3d/entities/entity-3d.d.ts

@@ -5,8 +5,6 @@ import { IPositionable3d } from '../interfaces/i-positionable-3d';
 import { IRenderable3dEntity } from './i-renderable-3d.entity';
 import { PhysicsTypeDocRepo3D, VisualTypeDocRepo3D } from '../gg-3d-world';
 export declare class Entity3d<VTypeDoc extends VisualTypeDocRepo3D = VisualTypeDocRepo3D, PTypeDoc extends PhysicsTypeDocRepo3D = PhysicsTypeDocRepo3D> extends IRenderable3dEntity<VTypeDoc, PTypeDoc> implements IPositionable3d {
-    readonly object3D: VTypeDoc['displayObject'] | null;
-    readonly objectBody: PTypeDoc['rigidBody'] | null;
     readonly tickOrder = TickOrder.OBJECTS_BINDING;
     private _position;
     get position(): Point3;
@@ -14,10 +12,15 @@ export declare class Entity3d<VTypeDoc extends VisualTypeDocRepo3D = VisualTypeD
     private _rotation;
     get rotation(): Point4;
     set rotation(value: Point4);
+    readonly object3D: VTypeDoc['displayObject'] | null;
+    readonly objectBody: PTypeDoc['rigidBody'] | null;
     updateVisibility(): void;
     /**
      * Synchronize physics body transform with entity (and mesh if defined)
      * */
     protected runTransformBinding(objectBody: IRigidBody3dComponent, object3D: IDisplayObject3dComponent | null): void;
-    constructor(object3D: VTypeDoc['displayObject'] | null, objectBody?: PTypeDoc['rigidBody'] | null);
+    constructor(options: {
+        object3D?: VTypeDoc['displayObject'] | null;
+        objectBody?: PTypeDoc['rigidBody'] | null;
+    });
 }

package/dist/3d/entities/entity-3d.js

@@ -44,29 +44,32 @@ export class Entity3d extends IRenderable3dEntity {
         this._position = pos;
         this._rotation = quat;
     }
-    constructor(object3D, objectBody = null) {
+    constructor(options) {
         super();
-        this.object3D = object3D;
-        this.objectBody = objectBody;
         this.tickOrder = TickOrder.OBJECTS_BINDING;
         this._position = Pnt3.O;
         this._rotation = Qtrn.O;
-        if (objectBody) {
-            this.tick$.subscribe(() => {
-                this.runTransformBinding(objectBody, object3D);
-            });
-            this.runTransformBinding(objectBody, object3D);
-            this.name = objectBody.name;
+        this.object3D = null;
+        this.objectBody = null;
+        if (options.objectBody) {
+            this.objectBody = options.objectBody;
+            this.name = this.objectBody.name;
+            this.addComponents(this.objectBody);
         }
-        else if (object3D) {
-            this._position = object3D.position;
-            this._rotation = object3D.rotation;
-            this.name = object3D.name;
+        if (options.object3D) {
+            this.object3D = options.object3D;
+            if (!options.objectBody) {
+                this._position = this.object3D.position;
+                this._rotation = this.object3D.rotation;
+                this.name = this.object3D.name;
+            }
+            this.addComponents(this.object3D);
         }
-        else {
-            throw new Error('Cannot create entity without a mesh and a body');
+        if (this.objectBody) {
+            this.tick$.subscribe(() => {
+                this.runTransformBinding(this.objectBody, this.object3D);
+            });
+            this.runTransformBinding(this.objectBody, this.object3D);
         }
-        objectBody && this.addComponents(objectBody);
-        object3D && this.addComponents(object3D);
     }
 }

package/dist/3d/entities/raycast-vehicle-3d.entity.js

@@ -56,7 +56,7 @@ export class RaycastVehicle3dEntity extends Entity3d {
     }
     /** car mesh and physics body direction has to be pointing: y front, z up*/
     constructor(carProperties, chassis3D, vehicleComponent) {
-        super(chassis3D, vehicleComponent);
+        super({ object3D: chassis3D, objectBody: vehicleComponent });
         this.carProperties = carProperties;
         this.chassis3D = chassis3D;
         this.vehicleComponent = vehicleComponent;
@@ -104,9 +104,9 @@ export class RaycastVehicle3dEntity extends Entity3d {
                 this.wheelLocalRotation.push(null);
                 continue;
             }
-            const entity = display.displayObject.clone();
+            const displayObj = display.displayObject.clone();
             if (display.autoScaleMesh) {
-                const boundingBox = Box.expandByPoint(entity.getBoundings(), Pnt3.O);
+                const boundingBox = Box.expandByPoint(displayObj.getBoundings(), Pnt3.O);
                 const scale = Object.assign({}, Pnt3.O);
                 const wheelObjectDirection = display.wheelObjectDirection || 'x';
                 for (const dir of ['x', 'y', 'z']) {
@@ -115,7 +115,7 @@ export class RaycastVehicle3dEntity extends Entity3d {
                         ? options.tyreWidth / (boundingBox.max[dir] - boundingBox.min[dir])
                         : (options.tyreRadius * 2) / (boundingBox.max[dir] - boundingBox.min[dir]);
                 }
-                entity.scale = scale;
+                displayObj.scale = scale;
             }
             const direction = display.wheelObjectDirection || 'x';
             const flip = direction.includes('-') ? options.isLeft : !options.isLeft;
@@ -134,7 +134,7 @@ export class RaycastVehicle3dEntity extends Entity3d {
                 localRotation = { x: 0, y: 0.707107 * (flip ? 1 : -1), z: 0, w: 0.707107 };
             }
             this.wheelLocalRotation.push(localRotation);
-            const wheelEntity = new Entity3d(entity);
+            const wheelEntity = new Entity3d({ object3D: displayObj });
             wheelEntity.name = this.name + '__wheel_' + (options.isFront ? 'f' : 'r') + (options.isLeft ? 'l' : 'r');
             this.wheels.push(wheelEntity);
         }