@configura/babylon-view 1.6.0-iotest.4 → 1.6.1-alpha.2

package/dist/nodes/CfgProductNode.d.ts

@@ -29,7 +29,7 @@ export declare class CfgProductNode extends CfgTransformNode implements Animatab
     private _originalMatrixWithModelTransform;
     private _anchorTarget;
     private _stretchedAnchorPointMatrix;
-    readonly anchorRef: CfgAnchorRef | undefined;
+    anchorRef: CfgAnchorRef | undefined;
     private constructor();
     get cfgClassName(): string;
     destroy(): void;
@@ -40,6 +40,7 @@ export declare class CfgProductNode extends CfgTransformNode implements Animatab
      */
     private scheduleForRemoval;
     isDestroyed(): boolean;
+    private _refreshTransformAndAnchoring;
     /**
      * The passed function is recursively applied on every descendant CfgProductNode in the tree.
      * This node is included. Destroyed products are not included.
@@ -108,7 +109,7 @@ export declare class CfgProductNode extends CfgTransformNode implements Animatab
     setAnchorTarget(anchorTarget: CfgAnchorTargetNode | undefined): void;
     refreshStretch(): void;
     get originalMatrix(): Matrix;
-    protected initTransform(): void;
+    protected refreshTransform(): void;
     _applyDebugSymRoots(symRootPromises: Promise<CfgSymRootNode | undefined>[]): Promise<void>;
     _addDebugMtrlApplication(debugMtrlApplication: CfgMtrlApplication): Promise<void>;
     get boundingBox(): CfgBoundingBox;

package/dist/nodes/CfgProductNode.js

@@ -55,15 +55,10 @@ export class CfgProductNode extends CfgTransformNode {
         // Useful debug tool:
         if (false) {
             window.product = this;
-            console.log(`Use "window.product" to access "${this.key}" product node.`);
+            window[this.key] = this;
+            console.log(`Use "window.product" or 'window["${this.key}"]' to access "${this.key}" product node.`);
         }
-        this.anchorRef = CfgAnchorRef.make(this._product._internal.anchor);
-        const modelTransform = _product.transform;
-        if (modelTransform !== undefined) {
-            const modelSymTransform = modelTransformToSymTransform(modelTransform);
-            this._modelMatrix = symTransformToMatrix(modelSymTransform.transform());
-        }
-        this.initTransform();
+        this._refreshTransformAndAnchoring();
     }
     static make(renderEnvironment, product) {
         return new this(renderEnvironment, product);
@@ -92,6 +87,16 @@ export class CfgProductNode extends CfgTransformNode {
     isDestroyed() {
         return this._destroyed;
     }
+    _refreshTransformAndAnchoring() {
+        const product = this._product._internal;
+        const modelTransform = product.transform;
+        if (modelTransform !== undefined) {
+            const modelSymTransform = modelTransformToSymTransform(modelTransform);
+            this._modelMatrix = symTransformToMatrix(modelSymTransform.transform());
+        }
+        this.anchorRef = CfgAnchorRef.make(product.anchor);
+        this.refreshTransform();
+    }
     /**
      * This function will apply either of tree passed functions on the additional products/ in the
      * passed CfgProduct and the additional products in the CfgProductNode.
@@ -223,6 +228,7 @@ export class CfgProductNode extends CfgTransformNode {
                     additionalProductLoadPromises.push(additionalProductNode.loadGeo(coordinatorWithMeta));
                 },
                 both: (_additionalProduct, additionalProductNode) => {
+                    additionalProductNode._refreshTransformAndAnchoring();
                     additionalProductLoadPromises.push(additionalProductNode.loadGeo(coordinatorWithMeta));
                 },
             });
@@ -380,8 +386,7 @@ export class CfgProductNode extends CfgTransformNode {
         const updated = updatedStretchedAnchorPointMatrix(this.anchorRef, this._anchorTarget, this._stretchedAnchorPointMatrix, true);
         if (updated !== undefined) {
             this._stretchedAnchorPointMatrix = updated;
-            this._originalMatrixWithModelTransform = undefined; // Reset the matrix
-            this.initTransform();
+            this.refreshTransform();
         }
         // anchoredToAnchors is sorted so that anchors always are before what
         // is anchored to them. That way we know that if we refreshStretch on
@@ -413,7 +418,8 @@ export class CfgProductNode extends CfgTransformNode {
         }
         return this._originalMatrixWithModelTransform;
     }
-    initTransform() {
+    refreshTransform() {
+        this._originalMatrixWithModelTransform = undefined; // Reset the matrix
         this.setPreTransformMatrix(this.originalMatrix);
     }
     _applyDebugSymRoots(symRootPromises) {

package/dist/utilities/CfgBoundingBox.d.ts

@@ -8,7 +8,7 @@ export declare class CfgBoundingBox {
      */
     private _isEmpty;
     reConstruct(minimum: Vector3, maximum: Vector3): CfgBoundingBox;
-    copyFrom(otherBoundingBox: CfgBoundingBox): CfgBoundingBox;
+    copyFrom(source: CfgBoundingBox): CfgBoundingBox;
     clone(): CfgBoundingBox;
     get center(): Vector3;
     translate(vec: Vector3): CfgBoundingBox;

package/dist/utilities/CfgBoundingBox.js

@@ -15,9 +15,9 @@ export class CfgBoundingBox {
         this._isEmpty = false;
         return this;
     }
-    copyFrom(otherBoundingBox) {
-        this.reConstruct(otherBoundingBox.minimum, otherBoundingBox.maximum);
-        this._isEmpty = otherBoundingBox.isEmpty;
+    copyFrom(source) {
+        this.reConstruct(source.minimum, source.maximum);
+        this._isEmpty = source.isEmpty;
         return this;
     }
     clone() {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@configura/babylon-view",
-	"version": "1.6.0-iotest.4",
+	"version": "1.6.1-alpha.2",
 	"license": "Apache-2.0",
 	"type": "module",
 	"main": "dist/index.js",
@@ -16,16 +16,16 @@
 	},
 	"dependencies": {
 		"@babylonjs/core": "4.2.0",
-		"@configura/web-core": "1.6.0-iotest.4",
-		"@configura/web-utilities": "1.6.0-iotest.4"
+		"@configura/web-core": "1.6.1-alpha.2",
+		"@configura/web-utilities": "1.6.1-alpha.2"
 	},
 	"devDependencies": {
-		"@configura/web-api": "1.6.0-iotest.4",
+		"@configura/web-api": "1.6.1-alpha.2",
 		"del-cli": "^3.0.0",
 		"typescript": "4.2"
 	},
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "d6eb7775e09c974d24dc5f44c97a26d4d42c3c68"
+	"gitHead": "e4b98f07293de3363e402a343194a9931d00732a"
 }