@configura/babylon-view 1.6.1-alpha.0 → 1.6.1-alpha.4

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

@@ -58,13 +58,7 @@ export class CfgProductNode extends CfgTransformNode {
             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);
@@ -93,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.
@@ -224,6 +228,7 @@ export class CfgProductNode extends CfgTransformNode {
                     additionalProductLoadPromises.push(additionalProductNode.loadGeo(coordinatorWithMeta));
                 },
                 both: (_additionalProduct, additionalProductNode) => {
+                    additionalProductNode._refreshTransformAndAnchoring();
                     additionalProductLoadPromises.push(additionalProductNode.loadGeo(coordinatorWithMeta));
                 },
             });
@@ -378,11 +383,10 @@ export class CfgProductNode extends CfgTransformNode {
         this._anchorTarget = anchorTarget;
     }
     refreshStretch() {
-        const updated = updatedStretchedAnchorPointMatrix(this.anchorRef, this._anchorTarget, this._stretchedAnchorPointMatrix, true);
+        const updated = updatedStretchedAnchorPointMatrix(this.anchorRef, this._anchorTarget, this._stretchedAnchorPointMatrix);
         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
@@ -414,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/nodes/CfgSymRootNode.js

@@ -193,7 +193,7 @@ export class CfgSymRootNode extends CfgSymNode {
     }
     refreshStretch() {
         super.refreshStretch();
-        const updated = updatedStretchedAnchorPointMatrix(this.anchorRef, this._anchorTarget, this._stretchedAnchorPointMatrix, false);
+        const updated = updatedStretchedAnchorPointMatrix(this.anchorRef, this._anchorTarget, this._stretchedAnchorPointMatrix);
         if (updated === undefined) {
             return;
         }

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/dist/utilities/anchor/anchor.d.ts

@@ -45,12 +45,7 @@ export declare function getRawAnchorPoint(anchorTarget: CfgAnchorTargetNode | un
  *
  * Application of anchoring happens from anchor tree root and out, so that originalMatrix of
  * anchorTarget will already have any anchoring and stretch applied.
- *
- * @param ignoreTargetTransformation If true, ignore anchorTarget's originalMatrix. This is a
- * workaround for that CET (as of this writing) somewhat unexpectedly mostly does not apply the
- * transformation when anchoring Additional Products. We have noticed some cases when it actually
- * apply the transform as you would expect. When the bug is solved this should be removed.
  */
-export declare function getStretchedAnchorPointMatrix(anchorRef: CfgAnchorRef | undefined, anchorTarget: CfgAnchorTargetNode | undefined, ignoreTargetTransformation: boolean): Matrix | undefined;
-export declare function updatedStretchedAnchorPointMatrix(anchorRef: CfgAnchorRef | undefined, anchorTarget: CfgAnchorTargetNode | undefined, currentStretchedAnchorPointMatrix: Matrix | undefined, ignoreTargetTransformation: boolean): Matrix | undefined;
+export declare function getStretchedAnchorPointMatrix(anchorRef: CfgAnchorRef | undefined, anchorTarget: CfgAnchorTargetNode | undefined): Matrix | undefined;
+export declare function updatedStretchedAnchorPointMatrix(anchorRef: CfgAnchorRef | undefined, anchorTarget: CfgAnchorTargetNode | undefined, currentStretchedAnchorPointMatrix: Matrix | undefined): Matrix | undefined;
 //# sourceMappingURL=anchor.d.ts.map

package/dist/utilities/anchor/anchor.js

@@ -103,13 +103,8 @@ export function getRawAnchorPoint(anchorTarget, anchorRef) {
  *
  * Application of anchoring happens from anchor tree root and out, so that originalMatrix of
  * anchorTarget will already have any anchoring and stretch applied.
- *
- * @param ignoreTargetTransformation If true, ignore anchorTarget's originalMatrix. This is a
- * workaround for that CET (as of this writing) somewhat unexpectedly mostly does not apply the
- * transformation when anchoring Additional Products. We have noticed some cases when it actually
- * apply the transform as you would expect. When the bug is solved this should be removed.
  */
-export function getStretchedAnchorPointMatrix(anchorRef, anchorTarget, ignoreTargetTransformation) {
+export function getStretchedAnchorPointMatrix(anchorRef, anchorTarget) {
     const rawAnchorPoint = getRawAnchorPoint(anchorTarget, anchorRef);
     if (rawAnchorPoint === undefined || anchorTarget === undefined) {
         return undefined;
@@ -118,15 +113,13 @@ export function getStretchedAnchorPointMatrix(anchorRef, anchorTarget, ignoreTar
     const stretchedAnchorPoint = toStretchedPoint(rawAnchorPoint, anchorTarget.stretchDatas, anchorTarget.cfgProductNode.product.configuration._internal
         .stretchReferenceLengthsByMeasureParamCode);
     // Sometimes, apply the anchorTarget matrix, as if the point was a child to the anchorTarget.
-    const anchorTargetMatrixApplied = ignoreTargetTransformation
-        ? stretchedAnchorPoint
-        : Vector3.TransformCoordinates(stretchedAnchorPoint, anchorTarget.originalMatrix);
+    const anchorTargetMatrixApplied = Vector3.TransformCoordinates(stretchedAnchorPoint, anchorTarget.originalMatrix);
     // We use translation as when we anchor things we do not change their orientation,
     // we only move them to snap to this point
     return Matrix.Identity().setTranslation(anchorTargetMatrixApplied);
 }
-export function updatedStretchedAnchorPointMatrix(anchorRef, anchorTarget, currentStretchedAnchorPointMatrix, ignoreTargetTransformation) {
-    const stretchedAnchorPointMatrix = getStretchedAnchorPointMatrix(anchorRef, anchorTarget, ignoreTargetTransformation);
+export function updatedStretchedAnchorPointMatrix(anchorRef, anchorTarget, currentStretchedAnchorPointMatrix) {
+    const stretchedAnchorPointMatrix = getStretchedAnchorPointMatrix(anchorRef, anchorTarget);
     if (currentStretchedAnchorPointMatrix === undefined &&
         stretchedAnchorPointMatrix === undefined) {
         return undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@configura/babylon-view",
-	"version": "1.6.1-alpha.0",
+	"version": "1.6.1-alpha.4",
 	"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.1-alpha.0",
-		"@configura/web-utilities": "^1.6.1-alpha.0"
+		"@configura/web-core": "1.6.1-alpha.4",
+		"@configura/web-utilities": "1.6.1-alpha.4"
 	},
 	"devDependencies": {
-		"@configura/web-api": "^1.6.1-alpha.0",
+		"@configura/web-api": "1.6.1-alpha.4",
 		"del-cli": "^3.0.0",
 		"typescript": "4.2"
 	},
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "aa99963ec2c2e4ab4ef1795e7ad6204fef31da75"
+	"gitHead": "e4dc2f02eff0ea5b4b69fa14e3ae456f505b3e58"
 }