bg2e-js 2.3.11 → 2.3.13

package/src/scene/SmoothOrbitCameraController.ts

@@ -1,99 +1,99 @@
-import Component from './Component';
-import OrbitCameraController, { Action, getOrbitAction } from './OrbitCameraController';
-import MouseEvent, {
-    leftMouseButton,
-    middleMouseButton,
-    rightMouseButton
-} from '../app/Bg2MouseEvent';
-import { SpecialKey } from '../app/Bg2KeyboardEvent';
-import { degreesToRadians, lerp, clamp } from '../math/functions';
-import Vec from '../math/Vec';
-import { OrthographicProjectionStrategy } from './Camera';
-import Mat4 from '../math/Mat4';
-
-
-export default class SmoothOrbitCameraController extends OrbitCameraController {
-    _smoothFactor: number;
-    _action: number;
-    _center0?: Vec;
-    _distance0?: number;
-    _pitch0?: number;
-    _yaw0?: number;
-
-    constructor() {
-        super("SmoothOrbitCameraController");
-        this._smoothFactor = 0.009;
-        this._action = Action.NONE;
-    }
-
-    clone(): SmoothOrbitCameraController {
-        const result = new SmoothOrbitCameraController();
-        result.assign(this);
-        return result;
-    }
-
-    assign(other: SmoothOrbitCameraController): void {
-        super.assign(other);
-    }
-
-    willUpdate(delta: number): void {
-        if (this.transform && this.enabled) {
-            const orthoStrategy = this.camera && this.camera.projectionStrategy instanceof OrthographicProjectionStrategy ?
-            this.camera.projectionStrategy : null;
-
-            if (this._mouseButtonPressed) {
-                let displacement = new Vec([0, 0, 0]);
-                if (this._keys[SpecialKey.UP_ARROW]) {
-                    displacement = Vec.Add(displacement, this.transform.matrix.backwardVector);
-                }
-                if (this._keys[SpecialKey.DOWN_ARROW]) {
-                    displacement = Vec.Add(displacement, this.transform.matrix.forwardVector);
-                }
-                if (this._keys[SpecialKey.LEFT_ARROW]) {
-                    displacement = Vec.Add(displacement, this.transform.matrix.leftVector);
-                }
-                if (this._keys[SpecialKey.RIGHT_ARROW]) {
-                    displacement = Vec.Add(displacement, this.transform.matrix.rightVector);
-                }
-                displacement.scale(this._displacementSpeed);
-                this._center = Vec.Add(this._center, displacement);
-            }
-
-            this._center0 = this._center0 ?? Mat4.GetPosition(this.transform.matrix);
-            this._distance0 = this._distance0 ?? Vec.Distance(this._center0, this._center);
-            this._center0 = Vec.Lerp(this._center0, this._center, delta * this._smoothFactor);
-            this._distance0 = lerp(this._distance0, this._distance, delta * this._smoothFactor * 2);
-            this._pitch0 = this._pitch0 ?? this._rotation.x;
-            this._yaw0 = this._yaw0 ?? this._rotation.y;
-
-            this._pitch0 = lerp(this._pitch0, this._rotation.x, delta * this._smoothFactor);
-            this._yaw0 = lerp(this._yaw0, this._rotation.y, delta * this._smoothFactor);
-
-            // Clamp values
-            this._distance = clamp(this._distance, this.minDistance, this.maxDistance);
-            this._distance0 = clamp(this._distance0, this.minDistance, this.maxDistance);
-            this._pitch0 = clamp(this._pitch0, this.minPitch, this.maxPitch);
-            this._rotation.x = clamp(this._rotation.x, this.minPitch, this.maxPitch);
-            const minDisp = new Vec(this.minX, this.minY, this.minZ);
-            const maxDisp = new Vec(this.maxX, this.maxY, this.maxZ);
-            this._center0 = Vec.Clamp(this._center0, minDisp, maxDisp);
-            this._center = Vec.Clamp(this._center, minDisp, maxDisp);
-
-            this.transform.matrix.identity();
-            if (orthoStrategy) {
-                orthoStrategy.viewWidth = this._viewWidth!;
-            }
-            else {
-                this.transform.matrix.translate(0, 0, this._distance0);
-                if (this.camera) {
-                    // Update the camera focus distance to optimize the shadow map rendering
-                    this.camera.focusDistance = this._distance0;
-                }
-            }
-            this.transform.matrix.rotate(degreesToRadians(-this._pitch0), 1, 0, 0)
-                .rotate(degreesToRadians(this._yaw0), 0, 1, 0)
-                .translate(this._center0);
-            
-        }
-    }
-}
+import Component from './Component';
+import OrbitCameraController, { Action, getOrbitAction } from './OrbitCameraController';
+import MouseEvent, {
+    leftMouseButton,
+    middleMouseButton,
+    rightMouseButton
+} from '../app/Bg2MouseEvent';
+import { SpecialKey } from '../app/Bg2KeyboardEvent';
+import { degreesToRadians, lerp, clamp } from '../math/functions';
+import Vec from '../math/Vec';
+import { OrthographicProjectionStrategy } from './Camera';
+import Mat4 from '../math/Mat4';
+
+
+export default class SmoothOrbitCameraController extends OrbitCameraController {
+    _smoothFactor: number;
+    _action: number;
+    _center0?: Vec;
+    _distance0?: number;
+    _pitch0?: number;
+    _yaw0?: number;
+
+    constructor() {
+        super("SmoothOrbitCameraController");
+        this._smoothFactor = 0.009;
+        this._action = Action.NONE;
+    }
+
+    clone(): SmoothOrbitCameraController {
+        const result = new SmoothOrbitCameraController();
+        result.assign(this);
+        return result;
+    }
+
+    assign(other: SmoothOrbitCameraController): void {
+        super.assign(other);
+    }
+
+    willUpdate(delta: number): void {
+        if (this.transform && this.enabled) {
+            const orthoStrategy = this.camera && this.camera.projectionStrategy instanceof OrthographicProjectionStrategy ?
+            this.camera.projectionStrategy : null;
+
+            if (this._mouseButtonPressed) {
+                let displacement = new Vec([0, 0, 0]);
+                if (this._keys[SpecialKey.UP_ARROW]) {
+                    displacement = Vec.Add(displacement, this.transform.matrix.backwardVector);
+                }
+                if (this._keys[SpecialKey.DOWN_ARROW]) {
+                    displacement = Vec.Add(displacement, this.transform.matrix.forwardVector);
+                }
+                if (this._keys[SpecialKey.LEFT_ARROW]) {
+                    displacement = Vec.Add(displacement, this.transform.matrix.leftVector);
+                }
+                if (this._keys[SpecialKey.RIGHT_ARROW]) {
+                    displacement = Vec.Add(displacement, this.transform.matrix.rightVector);
+                }
+                displacement.scale(this._displacementSpeed);
+                this._center = Vec.Add(this._center, displacement);
+            }
+
+            this._center0 = this._center0 ?? Mat4.GetPosition(this.transform.matrix);
+            this._distance0 = this._distance0 ?? Vec.Distance(this._center0, this._center);
+            this._center0 = Vec.Lerp(this._center0, this._center, delta * this._smoothFactor);
+            this._distance0 = lerp(this._distance0, this._distance, delta * this._smoothFactor * 2);
+            this._pitch0 = this._pitch0 ?? this._rotation.x;
+            this._yaw0 = this._yaw0 ?? this._rotation.y;
+
+            this._pitch0 = lerp(this._pitch0, this._rotation.x, delta * this._smoothFactor);
+            this._yaw0 = lerp(this._yaw0, this._rotation.y, delta * this._smoothFactor);
+
+            // Clamp values
+            this._distance = clamp(this._distance, this.minDistance, this.maxDistance);
+            this._distance0 = clamp(this._distance0, this.minDistance, this.maxDistance);
+            this._pitch0 = clamp(this._pitch0, this.minPitch, this.maxPitch);
+            this._rotation.x = clamp(this._rotation.x, this.minPitch, this.maxPitch);
+            const minDisp = new Vec(this.minX, this.minY, this.minZ);
+            const maxDisp = new Vec(this.maxX, this.maxY, this.maxZ);
+            this._center0 = Vec.Clamp(this._center0, minDisp, maxDisp);
+            this._center = Vec.Clamp(this._center, minDisp, maxDisp);
+
+            this.transform.matrix.identity();
+            if (orthoStrategy) {
+                orthoStrategy.viewWidth = this._viewWidth!;
+            }
+            else {
+                this.transform.matrix.translate(0, 0, this._distance0);
+                if (this.camera) {
+                    // Update the camera focus distance to optimize the shadow map rendering
+                    this.camera.focusDistance = this._distance0;
+                }
+            }
+            this.transform.matrix.rotate(degreesToRadians(-this._pitch0), 1, 0, 0)
+                .rotate(degreesToRadians(this._yaw0), 0, 1, 0)
+                .translate(this._center0);
+            
+        }
+    }
+}

package/src/scene/Transform.ts

@@ -1,73 +1,73 @@
-import Component from './Component';
-import Node from './Node';
-import Mat4 from "../math/Mat4";
-import NodeVisitor from './NodeVisitor';
-
-export class TransformVisitor extends NodeVisitor {
-    _matrix: Mat4;
-
-    constructor() {
-        super();
-        this._matrix = Mat4.MakeIdentity();
-    }
-
-    get matrix(): Mat4 {
-        return this._matrix;
-    }
-
-    visit(node: any): void {
-        if (node.transform) {
-            this._matrix = Mat4.Mult(this._matrix, node.transform.matrix);
-        }
-    }
-}
-
-export default class Transform extends Component {
-    static GetWorldMatrix(node: Node | Component): Mat4 {
-        if (node instanceof Component) {
-            node = node.node;
-        }
-        const visitor = new TransformVisitor();
-        node.acceptReverse(visitor);
-        return visitor.matrix;
-    }
-
-    _matrix: Mat4;
-
-    constructor(mat: Mat4 = Mat4.MakeIdentity()) {
-        super("Transform");
-        this._matrix = mat;
-    }
-
-    get matrix(): Mat4 { return this._matrix; }
-    set matrix(m: Mat4) { this._matrix = m; }
-
-    clone(): Transform {
-        const result = new Transform();
-        result.assign(this);
-        return result;
-    }
-
-    assign(other: Transform): void {
-        this._matrix = new Mat4(other.matrix);
-    }
-
-    async deserialize(sceneData: any, loader: any): Promise<void> {
-        if (Array.isArray(sceneData.transformMatrix) && sceneData.transformMatrix.length === 16) {
-            this._matrix.assign(sceneData.transformMatrix);
-        }
-        else {
-            console.warn("Transform.deserialize(): invalid transformMatrix attribute found in scene data");
-        }
-    }
-
-    async serialize(sceneData: any, writer: any): Promise<void> {
-        await super.serialize(sceneData,writer);
-        throw new Error("Transform.serialice() not implemented");
-    }
-
-    update(delta: number, modelMatrix: Mat4): void {
-        //modelMatrix.mult(this._matrix);
-        modelMatrix.assign(Mat4.Mult(modelMatrix, this._matrix));
-    }
-}
+import Component from './Component';
+import Node from './Node';
+import Mat4 from "../math/Mat4";
+import NodeVisitor from './NodeVisitor';
+
+export class TransformVisitor extends NodeVisitor {
+    _matrix: Mat4;
+
+    constructor() {
+        super();
+        this._matrix = Mat4.MakeIdentity();
+    }
+
+    get matrix(): Mat4 {
+        return this._matrix;
+    }
+
+    visit(node: any): void {
+        if (node.transform) {
+            this._matrix = Mat4.Mult(this._matrix, node.transform.matrix);
+        }
+    }
+}
+
+export default class Transform extends Component {
+    static GetWorldMatrix(node: Node | Component): Mat4 {
+        if (node instanceof Component) {
+            node = node.node;
+        }
+        const visitor = new TransformVisitor();
+        node.acceptReverse(visitor);
+        return visitor.matrix;
+    }
+
+    _matrix: Mat4;
+
+    constructor(mat: Mat4 = Mat4.MakeIdentity()) {
+        super("Transform");
+        this._matrix = mat;
+    }
+
+    get matrix(): Mat4 { return this._matrix; }
+    set matrix(m: Mat4) { this._matrix = m; }
+
+    clone(): Transform {
+        const result = new Transform();
+        result.assign(this);
+        return result;
+    }
+
+    assign(other: Transform): void {
+        this._matrix = new Mat4(other.matrix);
+    }
+
+    async deserialize(sceneData: any, loader: any): Promise<void> {
+        if (Array.isArray(sceneData.transformMatrix) && sceneData.transformMatrix.length === 16) {
+            this._matrix.assign(sceneData.transformMatrix);
+        }
+        else {
+            console.warn("Transform.deserialize(): invalid transformMatrix attribute found in scene data");
+        }
+    }
+
+    async serialize(sceneData: any, writer: any): Promise<void> {
+        await super.serialize(sceneData,writer);
+        throw new Error("Transform.serialice() not implemented");
+    }
+
+    update(delta: number, modelMatrix: Mat4): void {
+        //modelMatrix.mult(this._matrix);
+        modelMatrix.assign(Mat4.Mult(modelMatrix, this._matrix));
+    }
+}

package/src/scene/index.ts

@@ -1,61 +1,61 @@
-
-
-import DrawableComponent from "./Drawable";
-import TransformComponent from "./Transform";
-import ChainComponent from "./Chain";
-import {
-    InputChainJoint as InputChainJointComponent,
-    OutputChainJoint as OutputChainJointComponent } from "./ChainJoint";
-import LightComponent from "./LightComponent";
-import CameraComponent, {
-    OpticalProjectionStrategy,
-    PerspectiveProjectionStrategy,
-    ProjectionStrategy
-} from "./Camera";
-import OrbitCameraControllerComponent from "./OrbitCameraController";
-import SmoothOrbitCameraControllerComponent from "./SmoothOrbitCameraController";
-import EnvironmentComponent from "./EnvironmentComponent";
-import Component, { registerComponent } from "./Component";
-import Node from "./Node";
-import NodeVisitor from "./NodeVisitor";
-import FindNodeVisitor from "./FindNodeVisitor";
-
-export const registerComponents = () => {
-    registerComponent("Drawable", DrawableComponent);
-    registerComponent("Transform", TransformComponent);
-
-    // Retrocompatibility: the light is registered with both "Light" and "LightComponent" names, but only "LightComponent" should be used in the future
-    registerComponent("Light", LightComponent);
-    registerComponent("LightComponent", LightComponent);
-    
-    registerComponent("Chain", ChainComponent);
-    registerComponent("InputChainJoint", InputChainJointComponent);
-    registerComponent("OutputChainJoint", OutputChainJointComponent);
-    registerComponent("Camera", CameraComponent);
-    registerComponent("OrbitCameraController", OrbitCameraControllerComponent);
-    registerComponent("SmoothOrbitCameraController", SmoothOrbitCameraControllerComponent);
-    registerComponent("Environment", EnvironmentComponent);
-    // TODO: Register more components
-}
-
-export default {
-    Component,
-    DrawableComponent,
-    TransformComponent,
-    ChainComponent,
-    InputChainJointComponent,
-    OutputChainJointComponent,
-    LightComponent,
-    CameraComponent,
-    OpticalProjectionStrategy,
-    PerspectiveProjectionStrategy,
-    ProjectionStrategy,
-    OrbitCameraControllerComponent,
-    SmoothOrbitCameraControllerComponent,
-    EnvironmentComponent,
-    registerComponents,
-    registerComponent,
-    Node,
-    NodeVisitor,
-    FindNodeVisitor
+
+
+import DrawableComponent from "./Drawable";
+import TransformComponent from "./Transform";
+import ChainComponent from "./Chain";
+import {
+    InputChainJoint as InputChainJointComponent,
+    OutputChainJoint as OutputChainJointComponent } from "./ChainJoint";
+import LightComponent from "./LightComponent";
+import CameraComponent, {
+    OpticalProjectionStrategy,
+    PerspectiveProjectionStrategy,
+    ProjectionStrategy
+} from "./Camera";
+import OrbitCameraControllerComponent from "./OrbitCameraController";
+import SmoothOrbitCameraControllerComponent from "./SmoothOrbitCameraController";
+import EnvironmentComponent from "./EnvironmentComponent";
+import Component, { registerComponent } from "./Component";
+import Node from "./Node";
+import NodeVisitor from "./NodeVisitor";
+import FindNodeVisitor from "./FindNodeVisitor";
+
+export const registerComponents = () => {
+    registerComponent("Drawable", DrawableComponent);
+    registerComponent("Transform", TransformComponent);
+
+    // Retrocompatibility: the light is registered with both "Light" and "LightComponent" names, but only "LightComponent" should be used in the future
+    registerComponent("Light", LightComponent);
+    registerComponent("LightComponent", LightComponent);
+    
+    registerComponent("Chain", ChainComponent);
+    registerComponent("InputChainJoint", InputChainJointComponent);
+    registerComponent("OutputChainJoint", OutputChainJointComponent);
+    registerComponent("Camera", CameraComponent);
+    registerComponent("OrbitCameraController", OrbitCameraControllerComponent);
+    registerComponent("SmoothOrbitCameraController", SmoothOrbitCameraControllerComponent);
+    registerComponent("Environment", EnvironmentComponent);
+    // TODO: Register more components
+}
+
+export default {
+    Component,
+    DrawableComponent,
+    TransformComponent,
+    ChainComponent,
+    InputChainJointComponent,
+    OutputChainJointComponent,
+    LightComponent,
+    CameraComponent,
+    OpticalProjectionStrategy,
+    PerspectiveProjectionStrategy,
+    ProjectionStrategy,
+    OrbitCameraControllerComponent,
+    SmoothOrbitCameraControllerComponent,
+    EnvironmentComponent,
+    registerComponents,
+    registerComponent,
+    Node,
+    NodeVisitor,
+    FindNodeVisitor
 }