@sapui5/sap.ui.vk 1.140.0 → 1.142.0

package/src/sap/ui/vk/tools/RectSelectTool.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] An optional map/JSON object with initial property values, aggregated objects etc. for the new tool instance.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.142.0
 	 * @extends sap.ui.vk.tools.Tool
 	 * @alias sap.ui.vk.tools.RectSelectTool
 	 */

package/src/sap/ui/vk/tools/RedlineTool.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] An optional map/JSON object with initial property values, aggregated objects etc. for the new tool instance.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.142.0
 	 * @extends sap.ui.vk.tools.Tool
 	 * @alias sap.ui.vk.tools.RedlineTool
 	 */

package/src/sap/ui/vk/tools/RedlineToolGizmo.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.vk.tools.Gizmo
 	 *
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.142.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/vk/tools/RotateOrbitTool.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] An optional map/JSON object with initial property values, aggregated objects etc. for the new tool instance.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.142.0
 	 * @extends sap.ui.vk.tools.Tool
 	 * @alias sap.ui.vk.tools.RotateOrbitTool
 	 */

package/src/sap/ui/vk/tools/RotateTool.js

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] An optional map/JSON object with initial property values, aggregated objects etc. for the new tool instance.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.142.0
 	 * @extends sap.ui.vk.tools.Tool
 	 * @alias sap.ui.vk.tools.RotateTool
 	 */

package/src/sap/ui/vk/tools/RotateToolGizmo.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @extends sap.ui.vk.tools.Gizmo
 	 *
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.142.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/vk/tools/RotateTurntableTool.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] An optional map/JSON object with initial property values, aggregated objects etc. for the new tool instance.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.142.0
 	 * @extends sap.ui.vk.tools.Tool
 	 * @alias sap.ui.vk.tools.RotateTurntableTool
 	 */

package/src/sap/ui/vk/tools/ScaleTool.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] An optional map/JSON object with initial property values, aggregated objects etc. for the new tool instance.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.142.0
 	 * @extends sap.ui.vk.tools.Tool
 	 * @alias sap.ui.vk.tools.ScaleTool
 	 */

package/src/sap/ui/vk/tools/ScaleToolGizmo.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @extends sap.ui.vk.tools.Gizmo
 	 *
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.142.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/vk/tools/SceneOrientationTool.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] An optional map/JSON object with initial property values, aggregated objects etc. for the new tool instance.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.142.0
 	 * @extends sap.ui.vk.tools.Tool
 	 * @alias sap.ui.vk.tools.SceneOrientationTool
 	 */

package/src/sap/ui/vk/tools/SceneOrientationToolGizmo.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @extends sap.ui.vk.tools.Gizmo
 	 *
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.142.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/vk/tools/Tool.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @param {object} [oScope] scope An object for resolving string-based type and formatter references in bindings.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.142.0
 	 * @extends sap.ui.core.Element
 	 * @alias sap.ui.vk.tools.Tool
 	 */

package/src/sap/ui/vk/tools/TooltipTool.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] An optional map/JSON object with initial property values, aggregated objects etc. for the new tool instance.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.142.0
 	 * @extends sap.ui.vk.tools.Tool
 	 * @alias sap.ui.vk.tools.TooltipTool
 	 */

package/src/sap/ui/vk/tools/TooltipToolGizmo.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.vk.tools.Gizmo
 	 *
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.142.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/vk/tools/TransformSvgElementTool.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] An optional map/JSON object with initial property values, aggregated objects etc. for the new tool instance.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.142.0
 	 * @extends sap.ui.vk.tools.Tool
 	 * @alias sap.ui.vk.tools.TransformSvgElementTool
 	 */

package/src/sap/ui/vk/tools/TransformSvgElementToolGizmo.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.ui.vk.tools.Gizmo
 	 *
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.142.0
 	 *
 	 * @constructor
 	 * @private
@@ -224,7 +224,7 @@ sap.ui.define([
 				}
 				nodes.push({
 					node: node, // node reference
-					bbox: node._getBBox(), // oriented bounding box
+					bbox: node._getBBox(null, true), // oriented bounding box
 					position: getPosition(matrix), // local position
 					scale: getScale(matrix), // local scale
 					angle: getAngle(matrix), // local rotation angle
@@ -252,7 +252,7 @@ sap.ui.define([
 		this._nodes.forEach(function(nodeInfo) {
 			var node = nodeInfo.node;
 			nodeInfo.beginWorldMatrix = node._matrixWorld();
-			nodeInfo.bbox = node._getBBox();
+			nodeInfo.bbox = node._getBBox(null, true);
 		});
 		this._eventParameters = null;
 	};

package/src/sap/ui/vk/tools/TransformSvgElementToolHandler.js

@@ -68,7 +68,7 @@ sap.ui.define([
 		for (var ni = 0; ni < nodes.length; ni++) {
 			var nodeInfo = nodes[ni];
 			var node = nodeInfo.node;
-			var bbox = node._getBBox();
+			var bbox = node._getBBox(null, true);
 			if (!bbox) {
 				continue;
 			}

package/src/sap/ui/vk/totara/Command.js

@@ -55,6 +55,7 @@ sap.ui.define([
 		setTextStyle: "setTextStyle",
 		setParametric: "setParametric",
 		setPointCloudGroup: "setPointCloudGroup",
+		setDynamicContent: "setDynamicContent",
 		setScene: "setScene",
 		setPlayback: "setPlayback",
 		setSequence: "setSequence",

package/src/sap/ui/vk/totara/SceneContext.js

@@ -69,6 +69,7 @@ sap.ui.define([
 		this.rootNodeId = null;
 
 		this.parametricNodeMap = new Map(); // parametricId -> [ nodeId ]
+		this.dynamicContentNodeMap = new Map(); // dynamicContentId -> [ nodeId ]
 		this.annotationNodeMap = new Map(); // annotationId -> [ nodeId ]
 		this.leaderLineMaterialIdMap = new Map(); // materialId -> [ leaderLine ]
 		this.imageNoteMaterialIdMap = new Map();  // materialId -> [ annotation ]
@@ -133,7 +134,7 @@ sap.ui.define([
 	SceneContext.prototype.isLoadingFinished = function() {
 		if (!this.requestQueue.isEmpty() || this.requestQueue.isWaitingForContent() ||
 			this.thumbnailViewMap.size > 0 || this.viewThumbnailMap.size > 0 || this.viewAnimatedThumbnailMap.size > 0 ||
-			this.annotationNodeMap.size > 0 || this.parametricNodeMap.size > 0 ||
+			this.annotationNodeMap.size > 0 || this.parametricNodeMap.size > 0 || this.dynamicContentNodeMap.size > 0 ||
 			this.leaderLineMaterialIdMap.size > 0 || this.imageNoteMaterialIdMap.size > 0 ||
 			this.viewIdTreeNodesMap.size > 0 || this.nodeSidsForPartialTree.size > 0) {
 			return false;
@@ -249,6 +250,7 @@ sap.ui.define([
 
 		this.annotationNodeMap = null;
 		this.parametricNodeMap = null;
+		this.dynamicContentNodeMap = null;
 		this.leaderLineMaterialIdMap = null;
 		this.imageNoteMaterialIdMap = null;
 
@@ -470,6 +472,7 @@ sap.ui.define([
 		var parametricId = tNode.parametricId;
 		var meshId = tNode.meshId;
 		const imageId = tNode.imageId;
+		const dynamicContentId = tNode.dynamicContentId;
 		if (parametricId && meshId) {
 			// There are both definitions present, ask SceneBuilder which one to use
 			if (this.sceneBuilder.preferMeshes()) {
@@ -485,6 +488,12 @@ sap.ui.define([
 			} else {
 				this.parametricNodeMap.get(parametricId).push(tNode.sid);
 			}
+		} else if (dynamicContentId) {
+			if (this.dynamicContentNodeMap.get(dynamicContentId) == null) {
+				this.dynamicContentNodeMap.set(dynamicContentId, [tNode.sid]);
+			} else {
+				this.dynamicContentNodeMap.get(dynamicContentId).push(tNode.sid);
+			}
 		} else if (meshId && !this.sceneBuilder.hasMesh(meshId)) {
 			if (this.loader.getSkipLowLODRendering()) {
 				this.requestQueue.geomMeshes.push(meshId, { id: meshId, isInitial: isInitial });
@@ -1295,6 +1304,19 @@ sap.ui.define([
 		this.sceneBuilder.setPointCloudGroups(jsonContent.pointCloudGroups, this.sceneId);
 	};
 
+	SceneContext.prototype.setDynamicContent = function(jsonContent) {
+		for (const dc of jsonContent.dynamicContents) {
+			const dcId = dc.id.toString();
+			const nodeIds = this.dynamicContentNodeMap.get(dcId);
+			if (nodeIds) {
+				this.dynamicContentNodeMap.delete(dcId);
+				for (const nodeId of nodeIds) {
+					this.sceneBuilder.setDynamicContent(nodeId, dc, this.sceneId);
+				}
+			}
+		}
+	};
+
 	// Expected payload:
 	// {
 	//     viewId: "string",

package/src/sap/ui/vk/totara/TotaraLoader.js

@@ -1059,6 +1059,7 @@ sap.ui.define([
 			case Command.setTextStyle: // fall through
 			case Command.setParametric: // fall through
 			case Command.setPointCloudGroup: // fall through
+			case Command.setDynamicContent: // fall through
 
 			case Command.setPlayback: // fall through
 			case Command.setHighlightStyle: // fall through

package/src/sap/ui/vk/totara/TotaraLoaderWorker.js

@@ -554,6 +554,7 @@
 				var markers = json.markers;
 				var images = json.images;
 				const pointCloudGroups = json.pointCloudGroups;
+				const dynamicContents = json.dynamicContents;
 
 				function updateStyleIds(parametric) {
 					// NB: to avoid eslint warnings use `["some_id"]` style.
@@ -600,6 +601,10 @@
 							pointCloudGroup.nodeId = node.sid;
 						}
 
+						if ("dynamicContent" in node && dynamicContents) {
+							node.dynamicContentId = dynamicContents[node.dynamicContent].id;
+						}
+
 						if ("image" in node && images) {
 							const imageInfo = images[node.image];
 							node.imageId = imageInfo.id;
@@ -788,6 +793,17 @@
 					});
 				}
 
+				if (dynamicContents) {
+					commands.push({
+						name: "setDynamicContent",
+						jsonContent: {
+							sceneId: sceneId,
+							dynamicContents: json.dynamicContents
+						},
+						isInitial: isInitial
+					});
+				}
+
 				var animation = json.animation;
 
 				if (animation && animation.sequences && animation.playbacks) {

package/src/sap/ui/vk/totara/TotaraUtils.js

@@ -278,7 +278,8 @@ sap.ui.define([
 		"highlight",
 		"nodes",
 		"markers",
-		"pointCloudGroups"
+		"pointCloudGroups",
+		"dynamicContents"
 	];
 
 	var defaultContentTypes = [
@@ -292,6 +293,7 @@ sap.ui.define([
 		"symbol",
 		"markers",
 		"pointCloudGroup",
+		"dynamicContent",
 		"svg",
 		"unknown"
 	];