@sapui5/sap.ui.vk 1.136.0 → 1.136.2

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

@@ -66,7 +66,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.136.0
+	 * @version 1.136.2
 	 */
 	var SceneBuilder = function(rootNode, contentResource, resolve, reject) {
 		this._rootNode = rootNode;
@@ -122,14 +122,42 @@ sap.ui.define([
 	 */
 	SceneBuilder.prototype.setScene = function(info) {
 		this._yIndex = 1; // VDS4 file geometry data
-		this._rootNode.matrix[3] = info.upAxis === 2 ? -1 : 1; // (0 = +X, 1 = -X, 2 = +Y, 3 = -Y, 4 = +Z, 5 = -Z)
-		var camera = this._cameras.get(info.cameraId);
+		this._rootNode.matrix[3] = info.upAxis === 2 || info.upAxis === 4 ? -1 : 1; // (0 = +X, 1 = -X, 2 = +Y, 3 = -Y, 4 = +Z, 5 = -Z)
+		const camera = this._cameras.get(info.cameraId);
+		const outputSettings = info.outputSettings;
+		if (outputSettings && camera) {
+			// update line width in materials if coordinate space is in device/paper units
+			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 outputSize = Math.min(outputSettings.width, outputSettings.height) * mmToPixels;
+			const mediumViewportSize = 1024; // medium viewport size in pixels
+
+			this._materialMap.forEach(function(material) {
+				if (material.lineStyle.widthCoordinateSpace === 3) { // sap::ve::core::Material::CoordinateSpace::NormalizedViewport
+					// 2D viewport space (x and y values range from -1.0 to 1.0, the origin representing the center of view)
+					material.lineWidth = material.lineStyle.width * mediumViewportSize * 0.5; // 1024 is a medium viewport size in pixels
+					material.lineStyle.widthCoordinateSpace = 0; // convert to screen space
+				} else if (material.lineStyle.widthCoordinateSpace === 4) { // sap::ve::core::Material::CoordinateSpace::Device (device/paper units)
+					if (!info.showPaperSpace) {
+						// this mode has a weird behavior in VE Author, the line thickness is measured in weird units that are converted
+						// to pixels (doesn't depend on the zoom factor), but it depends on the viewport size
+						material.lineWidth = material.lineStyle.width * mediumViewportSize / outputSize;
+						material.lineStyle.widthCoordinateSpace = 0; // convert to screen space
+					}
+					// material.lineWidth = material.lineStyle.width / (outputSize * camera._initialZoom);
+				}
+			});
+		}
+
 		Log.info("setScene", JSON.stringify(info), camera);
 		this._resolve?.({
 			node: this._rootNode,
-			camera: camera,
+			camera,
 			backgroundTopColor: info.backgroundTopColor,
 			backgroundBottomColor: info.backgroundBottomColor,
+			outputSettings,
 			contentResource: this._contentResource,
 			builder: this
 		});
@@ -739,7 +767,7 @@ sap.ui.define([
 		}
 
 		userData.treeNode = nodeInfo;
-		node.setVisible(1, nodeInfo.visible ? nodeInfo.visible : true);
+		node.setVisible(1, nodeInfo.visible ?? true);
 
 		if (nodeInfo.visualisable === false) {
 			userData.skipIt = true; // Don't display this node in scene tree

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.0
+	 * @version 1.136.2
 	 * @extends sap.ui.vk.ViewStateManagerBase
 	 * @alias sap.ui.vk.svg.ViewStateManager
 	 * @since 1.80.0

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

@@ -74,7 +74,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.136.0
+	 * @version 1.136.2
 	 * @extends sap.ui.vk.ViewportBase
 	 * @alias sap.ui.vk.svg.Viewport
 	 */

package/src/sap/ui/vk/themes/base/DrawerToolbar.less

@@ -85,3 +85,11 @@
 .vboxCollapsed {
 	height: 0px;
 }
+
+.sapVizKitViewport .sapUiVkFullScreenDrawerToolbarButton .sapUiIcon::before {
+	content: "\e166"; // sap-icon://full-screen
+}
+
+.sapVizKitViewport:fullscreen .sapUiVkFullScreenDrawerToolbarButton .sapUiIcon::before {
+	content: "\e1f5"; // sap-icon://exit-full-screen
+}

package/src/sap/ui/vk/themes/base/Viewer.less

@@ -13,17 +13,6 @@
 	visibility: hidden !important;
 }
 
-.sapVizKitViewerFullScreen {
-	width: 100% !important;
-	height: 100% !important;
-	margin: 0 !important;
-	padding: 0 !important;
-	top: 0;
-	left: 0;
-	position: fixed !important;
-	z-index: 10;
-}
-
 .sapVizKitViewer .sapUiVizKitLayout {
 	position: absolute;
 	width: 100%;
@@ -44,4 +33,12 @@
 	z-index: 10;
 	width: 100%;
 	bottom: 0;
-}
+}
+
+.sapVizKitViewer .sapUiVkFullScreenToolbarButton .sapUiIcon::before {
+	content: "\e166"; // sap-icon://full-screen
+}
+
+.sapVizKitViewer:fullscreen .sapUiVkFullScreenToolbarButton .sapUiIcon::before {
+	content: "\e1f5"; // sap-icon://exit-full-screen
+}

package/src/sap/ui/vk/themes/sap_belize_base/Viewer.less

@@ -13,17 +13,6 @@
 	visibility: hidden !important;
 }
 
-.sapVizKitViewerFullScreen {
-	width: 100% !important;
-	height: 100% !important;
-	margin: 0 !important;
-	padding: 0 !important;
-	top: 0;
-	left: 0;
-	position: fixed !important;
-	z-index: 10;
-}
-
 .sapVizKitViewer .sapUiVizKitLayout {
 	position: absolute;
 	width: 100%;
@@ -44,4 +33,4 @@
 	z-index: 10;
 	width: 100%;
 	bottom: 0;
-}
+}

package/src/sap/ui/vk/themes/sap_bluecrystal_base/Viewer.less

@@ -13,17 +13,6 @@
 	visibility: hidden !important;
 }
 
-.sapVizKitViewerFullScreen {
-	width: 100% !important;
-	height: 100% !important;
-	margin: 0 !important;
-	padding: 0 !important;
-	top: 0;
-	left: 0;
-	position: fixed !important;
-	z-index: 10;
-}
-
 .sapVizKitViewer .sapUiVizKitLayout {
 	position: absolute;
 	width: 100%;
@@ -44,4 +33,4 @@
 	z-index: 10;
 	width: 100%;
 	bottom: 0;
-}
+}

package/src/sap/ui/vk/themes/sap_hcb/base_Viewer.less

@@ -13,17 +13,6 @@
 	visibility: hidden !important;
 }
 
-.sapVizKitViewerFullScreen {
-	width: 100% !important;
-	height: 100% !important;
-	margin: 0 !important;
-	padding: 0 !important;
-	top: 0;
-	left: 0;
-	position: fixed !important;
-	z-index: 10;
-}
-
 .sapVizKitViewer .sapUiVizKitLayout {
 	position: absolute;
 	width: 100%;
@@ -44,4 +33,4 @@
 	z-index: 10;
 	width: 100%;
 	bottom: 0;
-}
+}

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.0`);
+      warn(`Invalid PDF header version: 1.136.2`);
     }
   }
   parseStartXRef() {