@combeenation/3d-viewer 4.0.0-beta5 → 4.1.0-alpha1

package/src/api/util/babylonHelper.ts

@@ -13,6 +13,7 @@ import { Mesh } from '@babylonjs/core/Meshes/mesh';
 import { TransformNode } from '@babylonjs/core/Meshes/transformNode';
 import { Node } from '@babylonjs/core/node';
 import { Scene } from '@babylonjs/core/scene';
+import { Nullable } from '@babylonjs/core/types';
 import { cloneDeep, get, has, merge } from 'lodash-es';
 import { DottedPath } from '../classes/dottedPath';
 
@@ -98,9 +99,9 @@ const cloneTransformNode = function( node: TransformNode,
 const cloneNodeWithParents = function( node: Node | null ): Node | null {
 	let clone = null;
 	if( node instanceof TransformNode ) {
-		clone = node.clone( node.name, cloneNodeWithParents( node.parent ), true );
+		clone = node.clone( node.name, cloneNodeWithParents( node.parent ) as Nullable<Node>, true );
 	} else if( node instanceof Light ) {
-		clone = node.clone( node.name, cloneNodeWithParents( node.parent ) );
+		clone = node.clone( node.name, cloneNodeWithParents( node.parent ) as Nullable<Node> );
 	} else if( node ) {
 		throw new Error( `Cloning of "${node?.constructor.name}" is not implemented (yet).` );
 	}
@@ -215,56 +216,37 @@ const disableNodeWithParents = function( node: Node ) {
 };
 
 /**
- * Attention: this function mutates the position of a node. Keep in mind that there are dependencies to other
- * functions moving nodes around.
+ * Applies a {@link TransformationDefinition} consecutively to ensure dependencies in positioning etc.
  * @param node
- * @param rotation
+ * @param transformation
  */
-const rotateTransformNode = function( node: TransformNode, rotation: Vector3 ): TransformNode {
-	// remember absolute rotation and reset it before translating
-	if( !has( node.metadata, 'rotation.initial' ) ) {
-		injectNodeMetadata( node, { 'rotation.initial': node.rotationQuaternion?.asArray() }, false );
-	}
-	if( !has( node.metadata, 'rotation.position' ) || get( node.metadata, 'position.dirty' ) ) {
-		let rotationPosition = node.absolutePosition.clone();
-		if( has( node.metadata, 'rotation.offset' ) ) {
-			rotationPosition = rotationPosition.subtract( get( node.metadata, 'rotation.offset' ) as Vector3 );
-		}
-		injectNodeMetadata( node, { 'rotation.position': rotationPosition }, false );
-		injectNodeMetadata( node, { 'position.dirty': false }, false );
-	}
-	node.setAbsolutePosition( get( node.metadata, 'rotation.position' ) );
-	if( node.metadata.rotation ) {
-		node.rotationQuaternion = Quaternion.FromArray( get( node.metadata, 'rotation.initial' ) as [] );
-	}
-	node.rotateAround( Vector3.Zero(), Axis.X, rotation.x );
-	node.rotateAround( Vector3.Zero(), Axis.Y, rotation.y );
-	node.rotateAround( Vector3.Zero(), Axis.Z, rotation.z );
-	node.computeWorldMatrix( true );
-	injectNodeMetadata( node, {
-		'rotation.offset': node.absolutePosition.subtract( get( node.metadata, 'rotation.position' ) as Vector3 )
-	}, false );
-	return node;
-};
-
-/**
- * Attention: this function mutates the position of a node. Keep in mind that there are dependencies to other
- * functions moving nodes around.
- * @param node
- * @param distance
- */
-const moveTransformNode = function( node: TransformNode, distance: Vector3 ): TransformNode {
-	// remember absolute position and reset it before translating
+const transformTransformNode = function( node: TransformNode, transformation: TransformationDefinition ) {
+	// scaling
+	if( !has( node.metadata, 'scaling.initial' ) ) {
+		injectNodeMetadata( node, { 'scaling.initial': node.scaling }, false );
+	}
+	const initialScaling = get( node.metadata, 'scaling.initial' ) as Vector3;
+	node.scaling = initialScaling.multiply( transformation.scaling );
+	// position
 	if( !has( node.metadata, 'position.initial' ) ) {
 		injectNodeMetadata( node, { 'position.initial': node.absolutePosition.clone() }, false );
 	}
-	let position = get( node.metadata, 'position.initial' ) as Vector3;
-	if( has( node.metadata, 'rotation.offset' ) ) {
-		position = position.add( get( node.metadata, 'rotation.offset' ) as Vector3 );
+	const initialPosition = get( node.metadata, 'position.initial' ) as Vector3;
+	node.setAbsolutePosition( initialPosition.add( transformation.position ).multiply( transformation.scaling ) );
+	// rotation
+	if( !has( node.metadata, 'rotation.initial' ) ) {
+		let rotationQuaternion = node.rotationQuaternion;
+		if( !rotationQuaternion ) {
+			rotationQuaternion = Quaternion.RotationYawPitchRoll( node.rotation.x, node.rotation.y, node.rotation.z );
+		}
+		injectNodeMetadata( node, { 'rotation.initial': rotationQuaternion.asArray() }, false );
 	}
-	node.setAbsolutePosition( position.add( distance ) );
-	injectNodeMetadata( node, { 'position.dirty': true }, false );
-	return node;
+	const initialRotationQuaternion = Quaternion.FromArray( get( node.metadata, 'rotation.initial' ) as [] );
+	node.rotationQuaternion = initialRotationQuaternion;
+	node.rotateAround( Vector3.Zero(), Axis.X, transformation.rotation.x );
+	node.rotateAround( Vector3.Zero(), Axis.Y, transformation.rotation.y );
+	node.rotateAround( Vector3.Zero(), Axis.Z, transformation.rotation.z );
+	node.computeWorldMatrix( true );
 };
 
 /**
@@ -536,8 +518,7 @@ export {
 	deactivateTransformNode,
 	enableNodeWithParents,
 	disableNodeWithParents,
-	rotateTransformNode,
-	moveTransformNode,
+	transformTransformNode,
 	setMaterial,
 	setSourceNodeMaterial,
 	setMaterialColor,

package/src/api/util/globalTypes.ts

@@ -79,6 +79,12 @@ type ElementDefinition = {
 	paintables?: PaintableDefinitions
 };
 
+type TransformationDefinition = {
+	scaling: Vector3,
+	position: Vector3,
+	rotation: Vector3
+};
+
 type StructureJson = {
 	/**
 	 * `scene` describes the visualisation of the Babylon `scene` such as the incidence of light and camera position. If a

package/src/dev.ts

@@ -4,7 +4,7 @@ import { set } from 'lodash-es';
 
 import { Emitter, Viewer } from '.';
 
-import { createSpec, beforeBootstrap, afterBootstrap, createUIelements } from '../assets/CB-6062-async-check/main';
+import { createSpec, beforeBootstrap, afterBootstrap, createUIelements } from '../assets/index';
 
 const loadingElement = document.getElementById( 'loading' ) as HTMLDivElement;
 
@@ -22,7 +22,7 @@ document.addEventListener('DOMContentLoaded', main );
 async function main() {
 	const viewer = await bootstrapViewer();
 	// "Export" for console testing...
-	set( window, 'viewerInstance', viewer);
+	set( window, 'viewer', viewer);
 }
 
 async function bootstrapViewer() {