@sapui5/sap.ui.vk 1.136.1 → 1.139.0

package/src/sap/ui/vk/svg/SceneBuilder.js

@@ -66,7 +66,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.139.0
 	 */
 	var SceneBuilder = function(rootNode, contentResource, resolve, reject) {
 		this._rootNode = rootNode;
@@ -160,6 +160,9 @@ sap.ui.define([
 
 		if (vkScene) {
 			this._vkScene = vkScene;
+			if (this._sceneMetadata) {
+				this._vkScene.setSceneMetadata(this._sceneMetadata);
+			}
 		}
 		return this;
 	};
@@ -895,7 +898,6 @@ sap.ui.define([
 			fillStyle: geometry.isPolyline ? null : { colour: material.color },
 			subelement: true
 		});
-		path.uid += "-g";
 		node.add(path);
 
 		TotaraUtils.pushElementIntoMapArray(this._materialNodesMap, materialId, path);
@@ -981,7 +983,6 @@ sap.ui.define([
 
 		this._resetCurrentScene(sceneId);
 		var node = this._nodes.get(nodeId);
-		node.uid += "-p";
 
 		var shapes = parametricContent.shapes;
 		if (shapes) {
@@ -1077,7 +1078,6 @@ sap.ui.define([
 
 		if (shape) {
 			shape.userData.po = parametricContent;
-			shape.uid += "-s";
 			if (parametricContent.materialID) {
 				TotaraUtils.pushElementIntoMapArray(this._materialNodesMap, parametricContent.materialID, shape);
 			}
@@ -1395,5 +1395,13 @@ sap.ui.define([
 		return undefined;
 	};
 
+	SceneBuilder.prototype.setSceneMetadata = function(metadata) {
+		if (this._vkScene) {
+			this._vkScene.setSceneMetadata(metadata);
+		} else {
+			this._sceneMetadata = metadata;
+		}
+	};
+
 	return SceneBuilder;
 });

package/src/sap/ui/vk/svg/ViewStateManager.js

@@ -49,7 +49,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new ViewStateManager object.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.ViewStateManagerBase
 	 * @alias sap.ui.vk.svg.ViewStateManager
 	 * @since 1.80.0
@@ -354,7 +354,7 @@ sap.ui.define([
 						// Force visibility by traversing ancestor nodes and make them visible
 						var node = nodeRef.parent;
 						while (node) {
-							node.visible = true;
+							node.setVisible(mask, true);
 							node = node.parent;
 						}
 					}

package/src/sap/ui/vk/svg/Viewport.js

@@ -32,6 +32,7 @@ sap.ui.define([
 	"../colorToABGR",
 	"../abgrToColor",
 	"./MiniMap",
+	"./Element",
 	"sap/m/Dialog",
 	"sap/base/Log",
 	"sap/base/i18n/Localization"
@@ -61,6 +62,7 @@ sap.ui.define([
 	colorToABGR,
 	abgrToColor,
 	MiniMap,
+	ElementSVG,
 	Dialog,
 	Log,
 	Localization
@@ -74,7 +76,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.ViewportBase
 	 * @alias sap.ui.vk.svg.Viewport
 	 */
@@ -127,6 +129,13 @@ sap.ui.define([
 		}
 	});
 
+	const EcadLayerZone = {
+		Top: "Top",
+		Inner: "Inner",
+		Bottom: "Bottom",
+		Unknown: ""
+	};
+
 	var basePrototype = Viewport.getMetadata().getParent().getClass().prototype;
 
 	Viewport.prototype.init = function() {
@@ -216,6 +225,11 @@ sap.ui.define([
 		this._currentViewIndex = 0;
 		this._currentView = null;
 
+		this._pcbRotateAngle = 0.0; // ECAD, to rotate board
+		this._pcbVisibleSurface = EcadLayerZone.Unknown;
+		this._topElements = [];    // ECAD, elements from all top layers
+		this._bottomElements = []; // ECAD, elements from all bottom layers
+
 		vkCore.getEventBus().subscribe("sap.ui.vk", "viewStateApplied", this._onViewStateApplied, this);
 
 		Localization.attachChange(this._onLocalizationChanged.bind(this));
@@ -379,6 +393,15 @@ sap.ui.define([
 		if (scene) {
 			this.setCamera(new OrthographicCamera());
 
+			if (this.isECAD()) {
+				// get layer zone info from scene metadata
+				const zones = this._extractLayersZone();
+				// find elements belong to top & bottom layers
+				this._topElements = [];
+				this._bottomElements = [];
+				this._scanTree(zones, this._scene.getRootElement());
+			}
+
 			/**
 			 * Viewport gets invalidated only when a node is created that needs content to be downloaded (in ContentLoadingFinished event handler)
 			 * But when creating an image out of annotation, the annotation is downloaded only the first (reused every other time)
@@ -556,10 +579,18 @@ sap.ui.define([
 		}
 		var node = this.hitTest(x, y, true);
 
+		if (this.isECAD() && node) {
+			const element = this.findElement(node);
+			if (element == null) {
+				return this; // nothing found, must be ECAD orphan node
+			}
+			node = element;
+		}
+
 		if (!isDoubleClick) {
 			this.tapObject(node);
 
-			if (node !== null) {
+			if (node != null) {
 				this.fireNodeClicked({ nodeRef: node, x: x, y: y }, true, true);
 			}
 		} else if (!this.getFreezeCamera()) {
@@ -586,8 +617,21 @@ sap.ui.define([
 		var parameters = {
 			picked: nodeRef ? [nodeRef] : []
 		};
+
 		this.fireNodesPicked(parameters);
 
+		// if ECAD scene then include all children
+		if (this.isECAD() && nodeRef) {
+			const include = (ref) => {
+				if (ref != null) {
+					parameters.picked.push(ref);
+					ref.children.forEach(include);
+				}
+			};
+			parameters.picked = [];
+			include(nodeRef);
+		}
+
 		if (this.getSelectionMode() === SelectionMode.Exclusive) {
 			this.exclusiveSelectionHandler(parameters.picked);
 		} else if (this.getSelectionMode() === SelectionMode.Sticky) {
@@ -693,8 +737,26 @@ sap.ui.define([
 			rect = this._camera._transformRect(rect);
 			var selection = new Set();
 			this._scene.getRootElement()._findRectElementsRecursive(selection, rect, vsm._mask);
+
+			if (this.isECAD() && selection.size !== 0) {
+				const output = new Set();
+				const include = (ref, output) => {
+					if (ref != null) {
+						output.add(ref);
+						ref.children.forEach((child) => include(child, output));
+					}
+				};
+				selection.forEach(ref => {
+					const element = this.findElement(ref);
+					if (element != null) {
+						include(element, output);
+					}
+				});
+				return Array.from(output);
+			}
 			return Array.from(selection);
 		}
+
 		return [];
 	};
 
@@ -756,6 +818,12 @@ sap.ui.define([
 					}
 				}, this);
 			}
+			// when scene is available & content has been loaded -> proceed with initial view
+			if (this.isECAD()) {
+				this._pcbVisibleSurface = EcadLayerZone.Bottom;
+				// do the flip to make top layers elements visible without mirroring
+				this.flipPcb(true);
+			}
 
 			if (event && (!this._camera._initialZoom || this._camera._initialZoom === -1)) {
 				// this block should be called only once after loading all the content, if there is no camera information in the initial view
@@ -1685,5 +1753,127 @@ sap.ui.define([
 		return screenPos;
 	};
 
+	Viewport.prototype.isECAD = function() {
+		return this._scene?.isECADScene() ?? false;
+	};
+
+	Viewport.prototype._extractMetadata = function(metadata) {
+		if (metadata.length != undefined) {
+			const map = new Map();
+			metadata.forEach(function(entry) {
+				if (entry.category === "ecad") {
+					map.set(entry.tag, entry.value);
+				}
+			});
+			return map;
+		}
+		return null;
+	};
+
+	Viewport.prototype._extractLayersZone = function() {
+		const zones = new Map();
+		const metadata = this._scene.getSceneMetadata();
+		const layers = metadata.find((el) => el.category === "ecad" && el.tag === "Layers");
+
+		if (layers) {
+			const list = layers.value.split("|");
+			list.forEach(function(name) {
+				const zone = metadata.find((el) => el.category === name && el.tag === "Zone");
+				zones.set(name, zone ? zone.value : EcadLayerZone.Unknown);
+			}, this);
+		}
+		return zones;
+	};
+
+	Viewport.prototype._scanTree = function(zones, nodeRef) {
+		const metadata = this._extractMetadata(nodeRef.userData.metadata || {});
+		if (metadata) {
+			const layer = metadata.get("layer");
+			if (layer) {
+				const zone = zones.get(layer);
+				switch (zone) {
+					case EcadLayerZone.Top:
+						this._topElements.push(nodeRef);
+						break;
+					case EcadLayerZone.Bottom:
+						this._bottomElements.push(nodeRef);
+						break;
+					default:
+						break;
+				}
+				return; // don't go further down the hierarchy
+			}
+		}
+		nodeRef.children.forEach(this._scanTree.bind(this, zones));
+	};
+
+	function makeRotateMatrix(x) {
+		const sin = Math.sin(x);
+		const cos = Math.cos(x);
+		return [cos, -sin, sin, cos, 0, 0];
+	}
+	Viewport.prototype._setRootTransform = function() {
+		const rotate = makeRotateMatrix(this._pcbRotateAngle);
+		const reflect = [this._pcbVisibleSurface === EcadLayerZone.Top ? 1 : -1, 0, 0, 1, 0, 0];
+		const root = this._scene.getRootElement();
+		root.setMatrix(ElementSVG._multiplyMatrices(reflect, rotate));
+	};
+
+	Viewport.prototype.findElement = function(ref) {
+		while (ref != null) {
+			const metadata = this._extractMetadata(ref.userData.metadata ?? {});
+
+			if (metadata?.has("type")) {
+				return ref;
+			}
+			ref = ref.parent;
+		}
+		return null;
+	};
+
+	Viewport.prototype.rotatePcbCW = function() {
+		if (this.isECAD()) {
+			this._pcbRotateAngle += this._pcbVisibleSurface === EcadLayerZone.Top
+				? -Math.PI / 2
+				: Math.PI / 2;
+			this._setRootTransform();
+			this.zoomTo(ZoomTo.Visible);
+		}
+	};
+
+	Viewport.prototype.rotatePcbCCW = function() {
+		if (this.isECAD()) {
+			this._pcbRotateAngle += this._pcbVisibleSurface === EcadLayerZone.Top
+				? Math.PI / 2
+				: -Math.PI / 2;
+			this._setRootTransform();
+			this.zoomTo(ZoomTo.Visible);
+		}
+	};
+
+	Viewport.prototype.flipPcb = function(skipReflect) {
+		if (this.isECAD() && this._viewStateManager) {
+			this._pcbVisibleSurface = (this._pcbVisibleSurface === EcadLayerZone.Top ? EcadLayerZone.Bottom : EcadLayerZone.Top);
+
+			if (!skipReflect) {
+				this._setRootTransform();
+				this.zoomTo(ZoomTo.Visible);
+			}
+			// hide everything first
+			this._viewStateManager.setVisibilityState(this._scene.getRootElement(), false, true, true);
+			// show elements from top or bottom layers
+			switch (this._pcbVisibleSurface) {
+				case EcadLayerZone.Top:
+					this._viewStateManager.setVisibilityState(this._topElements, true, true, true);
+					break;
+				case EcadLayerZone.Bottom:
+					this._viewStateManager.setVisibilityState(this._bottomElements, true, true, true);
+					break;
+				default:
+					break;
+			}
+		}
+	};
+
 	return Viewport;
 });

package/src/sap/ui/vk/themes/base/library.source.less

@@ -10,7 +10,7 @@
 
 @font-face {
 	font-family: 'vk-icons';
-	src: url('fonts/SAP-VE-icons-regular-v1.4.woff2') format('woff2');
+	src: url('fonts/SAP-VE-icons-regular-v1.8.woff2') format('woff2');
 	font-weight: normal;
 	font-style: normal;
 }

package/src/sap/ui/vk/themes/sap_belize_base/library.source.less

@@ -10,7 +10,7 @@
 
 @font-face {
 	font-family: 'vk-icons';
-	src: url('../base/fonts/SAP-VE-icons-regular-v1.4.woff2') format('woff2');
+	src: url('../base/fonts/SAP-VE-icons-regular-v1.8.woff2') format('woff2');
 	font-weight: normal;
 	font-style: normal;
 }

package/src/sap/ui/vk/themes/sap_bluecrystal_base/library.source.less

@@ -10,7 +10,7 @@
 
 @font-face {
 	font-family: 'vk-icons';
-	src: url('../base/fonts/SAP-VE-icons-regular-v1.4.woff2') format('woff2');
+	src: url('../base/fonts/SAP-VE-icons-regular-v1.8.woff2') format('woff2');
 	font-weight: normal;
 	font-style: normal;
 }

package/src/sap/ui/vk/themes/sap_hcb/library.source.less

@@ -18,7 +18,7 @@
 
 @font-face {
 	font-family: 'vk-icons';
-	src: url('../base/fonts/SAP-VE-icons-regular-v1.4.woff2') format('woff2');
+	src: url('../base/fonts/SAP-VE-icons-regular-v1.8.woff2') format('woff2');
 	font-weight: normal;
 	font-style: normal;
 }

package/src/sap/ui/vk/themes/sap_horizon/library.source.less

@@ -8,8 +8,3 @@
 @import "../base/library.source.less";
 @import "../../../../../sap/ui/core/themes/sap_horizon/base.less";
 @import "../../../../../sap/ui/core/themes/sap_horizon/global.less";
-
-@font-face {
-	font-family: 'vk-icons';
-	src: url('../base/fonts/SAP-VE-icons-bold-v1.4.woff2') format('woff2');
-}

package/src/sap/ui/vk/themes/sap_horizon_dark/library.source.less

@@ -8,8 +8,3 @@
 @import "../base/library.source.less";
 @import "../../../../../sap/ui/core/themes/sap_horizon_dark/base.less";
 @import "../../../../../sap/ui/core/themes/sap_horizon_dark/global.less";
-
-@font-face {
-	font-family: 'vk-icons';
-	src: url('../base/fonts/SAP-VE-icons-bold-v1.4.woff2') format('woff2');
-}

package/src/sap/ui/vk/themes/sap_horizon_hcb/library.source.less

@@ -8,8 +8,3 @@
 @import "../base/library.source.less";
 @import "../../../../../sap/ui/core/themes/sap_horizon_hcb/base.less";
 @import "../../../../../sap/ui/core/themes/sap_horizon_hcb/global.less";
-
-@font-face {
-	font-family: 'vk-icons';
-	src: url('../base/fonts/SAP-VE-icons-bold-v1.4.woff2') format('woff2');
-}

package/src/sap/ui/vk/themes/sap_horizon_hcw/library.source.less

@@ -8,8 +8,3 @@
 @import "../base/library.source.less";
 @import "../../../../../sap/ui/core/themes/sap_horizon_hcw/base.less";
 @import "../../../../../sap/ui/core/themes/sap_horizon_hcw/global.less";
-
-@font-face {
-	font-family: 'vk-icons';
-	src: url('../base/fonts/SAP-VE-icons-bold-v1.4.woff2') format('woff2');
-}

package/src/sap/ui/vk/thirdparty/pdf.worker.js

@@ -54306,7 +54306,7 @@ class PDFDocument {
     if (PDF_VERSION_REGEXP.test(version)) {
       this._version = version;
     } else {
-      warn(`Invalid PDF header version: 1.136.1`);
+      warn(`Invalid PDF header version: 1.139.0`);
     }
   }
   parseStartXRef() {

package/src/sap/ui/vk/threejs/AnimationHelper.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.139.0
 	 */
 	var AnimationHelper = function() {
 	};

package/src/sap/ui/vk/threejs/BaseNodeProxy.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.BaseNodeProxy
 	 * @implements sap.ui.base.Poolable
 	 * @alias sap.ui.vk.threejs.BaseNodeProxy

package/src/sap/ui/vk/threejs/Billboard.js

@@ -39,7 +39,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.139.0
 	 * @extends sap.ui.base.ManagedObject
 	 * @alias sap.ui.vk.threejs.Billboard
 	 */
@@ -305,9 +305,19 @@ sap.ui.define([
 		return this;
 	};
 
-	Billboard.prototype.setTexture = function(value) {
-		this.setProperty("texture", value, true);
-		this._billboard.material.map = value;
+	Billboard.prototype.setTexture = function(texture) {
+		this.setProperty("texture", texture, true);
+
+		const material = this._billboard.material;
+		material.map = texture;
+		material.needsUpdate = true;
+		material.visible = true;
+		const prototypeMaterial = material.userData.prototypeMaterial;
+		if (prototypeMaterial) {
+			prototypeMaterial.map = texture;
+			prototypeMaterial.needsUpdate = true;
+			prototypeMaterial.visible = true;
+		}
 		return this;
 	};
 
@@ -1047,9 +1057,7 @@ sap.ui.define([
 
 		var texture = new THREE.CanvasTexture(canvas);
 		texture.magFilter = THREE.NearestFilter;
-		this._billboard.material.map = texture;
-		this._billboard.material.needsUpdate = true;
-		this._billboard.material.visible = true;
+		this.setTexture(texture);
 	};
 
 	var pos4 = new THREE.Vector4(),
@@ -1166,7 +1174,7 @@ sap.ui.define([
 		this.updateMatrixWorld(true); // update children matrices
 	};
 
-	Billboard.prototype._billboardViewUpdate = function(renderer, camera, viewportSize, backgroundProjection) {
+	Billboard.prototype._billboardViewUpdate = function(renderer, camera, viewportSize, backgroundProjection, viewStateManager) {
 		if (!this.visible) {
 			return;
 		}
@@ -1176,9 +1184,13 @@ sap.ui.define([
 		this.quaternion.copy(quat); // no onChangeCallback overhead with variable quat
 
 		if (this._vkGetNodeContentType() === NodeContentType.Symbol) {
-			if (backgroundProjection === undefined) {// not spherical or planar
-				var cameraDirection = new THREE.Vector3().setFromMatrixColumn(camera.matrixWorld, 2);
-				this._vkSetOpacity(Math.max(cameraDirection.dot(this.userData.direction), 0) * 0.8 + 0.2);
+			if (viewStateManager != null && backgroundProjection !== undefined) {
+				let opacity = viewStateManager._computeWorldOpacity(this);
+				if (backgroundProjection) { // spherical or planar (if backgroundProjection is null then this is a special case for Viewport.getObjectImageEx)
+					const cameraDirection = new THREE.Vector3().setFromMatrixColumn(camera.matrixWorld, 2);
+					opacity *= Math.max(cameraDirection.dot(this.userData.direction), 0) * 0.8 + 0.2;
+				}
+				this._vkSetOpacityRecursive(opacity);
 			}
 
 			// calculate symbol scale in navigation scene

package/src/sap/ui/vk/threejs/Callout.js

@@ -39,7 +39,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.threejs.Billboard
 	 * @alias sap.ui.vk.threejs.Callout
 	 */
@@ -152,6 +152,16 @@ sap.ui.define([
 
 		// set billboard scale
 		var scale = pos4.w * 2 / (viewportSize.x * camera.projectionMatrix.elements[0]);
+		const outputSettings = renderer.userData?.outputSettings;
+		if (outputSettings) {
+			const outputDPI = 72; // ignore outputSettings.dpi as VEA ignores DPI setting and always uses 72 DPI
+			const mmToInch = 1 / 25.4; // 1 inch = 25.4 mm
+			const pointToPixel = 4 / 3; // 1 inch = 72 points(common for older screens) = 96 pixels(standard web displays), so 1 point = 96 / 72 pixels = 4 / 3 pixels
+			const mmToPixels = mmToInch * outputDPI * pointToPixel; // convert mm to pixels (mm -> inches -> points -> pixels)
+			const outputWidth = outputSettings.width * mmToPixels;
+			const outputHeight = outputSettings.height * mmToPixels;
+			scale *= Math.min(viewportSize.x / outputWidth, viewportSize.y / outputHeight);
+		}
 		this._billboard.scale.set(scale * this._width, scale * this._height, 1);
 
 		// add per pixel alignment to the billboard

package/src/sap/ui/vk/threejs/ContentDeliveryService.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @class Provides a class to communicate with content delivery service.
 	 * @private
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.139.0
 	 * @extends sap.ui.base.ManagedObject
 	 * @alias sap.ui.vk.threejs.ContentDeliveryService
 	 */

package/src/sap/ui/vk/threejs/ContentManager.js

@@ -112,7 +112,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new ContentManager object.
 	 * @protected
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.ContentManager
 	 * @alias sap.ui.vk.threejs.ContentManager
 	 * @since 1.50.0
@@ -305,6 +305,7 @@ sap.ui.define([
 						scene.backgroundBottomColor = value.backgroundBottomColor; // hex color or undefined
 						scene.renderMode = value.renderMode; // sap.ui.vk.RenderMode or undefined
 						scene.upAxis = value.upAxis; // (0 = +X, 1 = -X, 2 = +Y, 3 = -Y, 4 = +Z, 5 = -Z)
+						scene.outputSettings = value.outputSettings;
 					}
 				}
 
@@ -360,7 +361,7 @@ sap.ui.define([
 
 		if (contentResource.getSource()) {
 			// Try one of default loaders.
-			const sourceType = contentResource.getEffectiveSourceType().toLowerCase();
+			var sourceType = contentResource.getEffectiveSourceType().toLowerCase();
 
 			var that = this;
 			switch (sourceType) {

package/src/sap/ui/vk/threejs/DetailView.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.139.0
 	 * @extends sap.ui.base.ManagedObject
 	 * @alias sap.ui.vk.threejs.DetailView
 	 */