@sapui5/sap.ui.vk 1.134.0 → 1.136.0

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

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new ContentManager object.
 	 * @private
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @extends sap.ui.vk.ContentManager
 	 * @alias sap.ui.vk.pdf.ContentManager
 	 * @since 1.123.0

package/src/sap/ui/vk/pdf/PageGallery.js

@@ -426,6 +426,9 @@ sap.ui.define([
 	};
 
 	PageGallery.prototype.onBeforeRendering = function() {
+		this._intersectionObserver?.disconnect();
+		this._intersectionObserver = null;
+
 		this._unsubscribeFromEvents();
 	};
 
@@ -463,11 +466,6 @@ sap.ui.define([
 		this._subscribeToEvents();
 	};
 
-	PageGallery.prototype.onBeforeRendering = function() {
-		this._intersectionObserver?.disconnect();
-		this._intersectionObserver = null;
-	};
-
 	PageGallery.prototype._intersectionObserverCallback = function(entries) {
 		const pages = this._getPagesControl().getItems();
 		const visiblePages = this._visiblePages;

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

@@ -64,7 +64,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.vk.ViewportBase
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @constructor
 	 * @public
 	 * @alias sap.ui.vk.pdf.Viewport

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

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

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

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @class Provides a class to communicate with content delivery service.
 	 * @private
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @extends sap.ui.base.ManagedObject
 	 * @alias sap.ui.vk.svg.ContentDeliveryService
 	 */
@@ -359,6 +359,7 @@ sap.ui.define([
 			includeBackground: contentResource.getIncludeBackground(),
 			includeHidden: contentResource.getIncludeHidden(),
 			includeParametric: contentResource.getIncludeParametric(),
+			includeMetadata: contentResource.getIncludeMetadata(),
 			includeUsageId: contentResource.getIncludeUsageId(),
 			metadataFilter: contentResource.getMetadataFilter(),
 			pushPMI: contentResource.getPushPMI(),

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

@@ -45,7 +45,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new ContentManager object.
 	 * @protected
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @extends sap.ui.vk.ContentManager
 	 * @alias sap.ui.vk.svg.ContentManager
 	 * @since 1.80.0
@@ -234,6 +234,7 @@ sap.ui.define([
 			includeBackground: contentResource.getIncludeBackground(),
 			includeHidden: contentResource.getIncludeHidden(),
 			includeParametric: true,
+			includeMetadata: contentResource.getIncludeMetadata(),
 			includeUsageId: contentResource.getIncludeUsageId(),
 			metadataFilter: contentResource.getMetadataFilter(),
 			pushPMI: true,

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

@@ -40,7 +40,7 @@ sap.ui.define([
 	 *                                            If omitted, duplicated hotspots must be placed at a small offset from the original.
 	 * @param {sap.ui.vk.svg.Viewport} viewport Viewport to determine duplicate hotspot offset if transformationMatrix not specified.
 	 * @returns {sap.ui.vk.svg.Element[]} Duplicated hotspots in a form can be passed to the backend service.
-	 * @experimental
+	 * @experimental Since 1.81.0 This class is experimental and might be modified or removed in future versions.
 	 * @public
 	 */
 	HotspotHelper.prototype.duplicateHotspot = function(hotspots, parentNode, transformationMatrix, viewport) {
@@ -80,7 +80,6 @@ sap.ui.define([
 	 * A better solution would be updating the data in the backend service.
 	 *
 	 * @param {sap.ui.vk.svg.Element} hotspotNode Hotspot object to update.
-	 * @experimental
 	 * @private
 	 */
 	HotspotHelper.prototype.updateHotspot = function(hotspotNode) {
@@ -140,7 +139,6 @@ sap.ui.define([
 	 * @returns {any} object contains the follow fields
 	 *          {any} <code>nodeRef</code> Merged hotspot node reference
 	 *          {any} <code>request</code> Merged hotspots in a form can be passed to the backend service
-	 * @experimental
 	 * @public
 	 */
 	HotspotHelper.prototype.mergeHotspots = function(scene, hotspots) {
@@ -267,7 +265,7 @@ sap.ui.define([
 	 * @returns {any} object contains the follow fields
 	 *          {any} <code>nodeRef</code> Merged node reference
 	 *          {any} <code>request</code> Merged nodes in a form can be passed to the backend service
-	 * @experimental
+	 * @experimental Since 1.81.0 This class is experimental and might be modified or removed in future versions.
 	 * @public
 	 */
 	HotspotHelper.prototype.mergeElements = function(nodeHierarchy, nodes) {

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

@@ -55,7 +55,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @extends sap.ui.vk.NodeHierarchy
 	 * @alias sap.ui.vk.svg.NodeHierarchy
 	 */

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

@@ -36,7 +36,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @extends sap.ui.vk.NodeProxy
 	 * @alias sap.ui.vk.svg.NodeProxy
 	 */

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

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @extends sap.ui.vk.OrthographicCamera
 	 * @alias sap.ui.vk.svg.OrthographicCamera
 	 * @since 1.80.0

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

@@ -26,7 +26,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @extends sap.ui.vk.Scene
 	 * @alias sap.ui.vk.svg.Scene
 	 */

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

@@ -66,8 +66,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.134.0
-	 * @experimental Since 1.81.0 This class is experimental and might be modified or removed in future versions.
+	 * @version 1.136.0
 	 */
 	var SceneBuilder = function(rootNode, contentResource, resolve, reject) {
 		this._rootNode = rootNode;

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.134.0
+	 * @version 1.136.0
 	 * @extends sap.ui.vk.ViewStateManagerBase
 	 * @alias sap.ui.vk.svg.ViewStateManager
 	 * @since 1.80.0
@@ -1142,7 +1142,6 @@ sap.ui.define([
 	 * @see {@link sap.ui.vk.AnimationSequence.setJoint} for joint definition
 	 * @returns {this} <code>this</code> to allow method chaining.
 	 *
-	 * @experimental Since 1.71.0 This class is experimental and might be modified or removed in future versions.
 	 * @private
 	 */
 	ViewStateManager.prototype.setJoints = function(joints, playback) {

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

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

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

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

@@ -35,8 +35,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.134.0
-	 * @experimental Since 1.60.0 This class is experimental and might be modified or removed in future versions.
+	 * @version 1.136.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.134.0
+	 * @version 1.136.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,10 +39,9 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @extends sap.ui.base.ManagedObject
 	 * @alias sap.ui.vk.threejs.Billboard
-	 * @experimental Since 1.60.0 This class is experimental and might be modified or removed in future versions.
 	 */
 	var Billboard = BaseObject.extend("sap.ui.vk.threejs.Billboard", /** @lends sap.ui.vk.threejs.Billboard.prototype */ {
 		metadata: {
@@ -154,7 +153,7 @@ sap.ui.define([
 			BaseObject.prototype.init.call(this);
 		}
 
-		var material = new THREE.MeshBasicMaterial({
+		var material = new THREE.MeshPhongMaterial({
 			depthTest: false,
 			depthWrite: false,
 			transparent: true,

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

@@ -39,10 +39,9 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @extends sap.ui.vk.threejs.Billboard
 	 * @alias sap.ui.vk.threejs.Callout
-	 * @experimental Since 1.60.0 This class is experimental and might be modified or removed in future versions.
 	 */
 	var Callout = Billboard.extend("sap.ui.vk.threejs.Callout", /** @lends sap.ui.vk.threejs.Callout.prototype */ {
 		metadata: {

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.134.0
+	 * @version 1.136.0
 	 * @extends sap.ui.base.ManagedObject
 	 * @alias sap.ui.vk.threejs.ContentDeliveryService
 	 */
@@ -370,6 +370,7 @@ sap.ui.define([
 			includeBackground: contentResource.getIncludeBackground(),
 			includeHidden: contentResource.getIncludeHidden(),
 			includeParametric: contentResource.getIncludeParametric(),
+			includeMetadata: contentResource.getIncludeMetadata(),
 			includeUsageId: contentResource.getIncludeUsageId(),
 			metadataFilter: contentResource.getMetadataFilter(),
 			pushPMI: contentResource.getPushPMI(),

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.134.0
+	 * @version 1.136.0
 	 * @extends sap.ui.vk.ContentManager
 	 * @alias sap.ui.vk.threejs.ContentManager
 	 * @since 1.50.0

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

@@ -33,10 +33,9 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @extends sap.ui.base.ManagedObject
 	 * @alias sap.ui.vk.threejs.DetailView
-	 * @experimental Since 1.60.0 This class is experimental and might be modified or removed in future versions.
 	 */
 	var DetailView = BaseObject.extend("sap.ui.vk.threejs.DetailView", /** @lends sap.ui.vk.threejs.DetailView.prototype */ {
 		metadata: {

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

@@ -24,10 +24,9 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @extends sap.ui.base.Object
 	 * @alias sap.ui.vk.threejs.HighlightPlayer
-	 * @experimental Since 1.67.0 This class is experimental and might be modified or removed in future versions.
 	 */
 	var HighlightPlayer = BaseObject.extend("sap.ui.vk.threejs.HighlightPlayer", /** @lends sap.ui.vk.three.HighlightPlayer.prototype */ {
 
@@ -106,38 +105,32 @@ sap.ui.define([
 		}
 		this._timeElapsed = time - this._startTime;
 
-		var that = this;
-
 		var completedHighlights = [];
 		this._highlightsNodesMap.forEach(function(nodesInfo, highlight) {
-			var resColor = highlight.getColour(that._timeElapsed / 1000.0);
-			var nodes = nodesInfo.nodes, ni;
-			if (resColor !== undefined) {
-				for (ni = 0; ni < nodes.length; ni++) {
-					nodes[ni]._vkSetHighlightColor(resColor.colour);
-				}
-			}
+			const res = highlight.evaluate(this._timeElapsed / 1000.0);
 
-			var resOpacity = highlight.getOpacity(that._timeElapsed / 1000.0);
-			if (resOpacity !== undefined) {
-				for (ni = 0; ni < nodes.length; ni++) {
-					nodes[ni]._vkSetOpacity(resOpacity.opacity);
+			nodesInfo.nodes.forEach(function(node) {
+				if (res.color != null) {
+					node._vkSetHighlightColor(res.color);
 				}
-
-				if (resOpacity.isCompleted && highlight.isFadeOut() && nodesInfo.hiddenNodes !== undefined) {
-					that._viewStateManager.setVisibilityState(nodesInfo.hiddenNodes, false, false);
+				if (res.opacity != null) {
+					node._vkSetOpacity(res.opacity);
 				}
-			}
+			});
 
-			if ((resColor === undefined || resColor.isCompleted) && (resOpacity === undefined || resOpacity.isCompleted)) {
-				completedHighlights.push(highlight);
+			if (res.isCompleted) {
+				if (highlight.isFadeOut() && nodesInfo.hiddenNodes !== undefined) {
+					this._viewStateManager.setVisibilityState(nodesInfo.hiddenNodes, false, false);
+				}
+				if (highlight.isFadeInOut()) {
+					completedHighlights.push(highlight);
+				}
 			}
-
-		});
+		}, this);
 
 		completedHighlights.forEach(function(highlight) {
-			that._highlightsNodesMap.delete(highlight);
-		});
+			this._highlightsNodesMap.delete(highlight);
+		}, this);
 
 		if (this._highlightsNodesMap.size === 0) {
 			this._state = HighlightDisplayState.stopped;

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

@@ -28,13 +28,10 @@ sap.ui.define([
 	/**
 	 * Constructor for a new Material.
 	 *
-	 *
 	 * @class Provides the interface for the material.
-	 *
-	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @extends sap.ui.vk.Material
 	 * @alias sap.ui.vk.threejs.Material
 	 * @experimental Since 1.60.0 This class is experimental and might be modified or removed in future versions.

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

@@ -55,7 +55,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @extends sap.ui.vk.NodeHierarchy
 	 * @alias sap.ui.vk.threejs.NodeHierarchy
 	 */

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

@@ -42,7 +42,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @extends sap.ui.vk.NodeProxy
 	 * @alias sap.ui.vk.threejs.NodeProxy
 	 */
@@ -252,33 +252,14 @@ sap.ui.define([
 			}
 
 			if (nodeRef.material !== undefined) {
-				if (nodeRef.userData.highlightColor !== undefined) {
-					if (nodeRef.userData.originalMaterial.side) {
-						materialRef.side = nodeRef.userData.originalMaterial.side;
-					}
-					nodeRef.userData.originalMaterial = materialRef;
-					materialRef.userData.materialUsed++;
-
-					nodeRef.material = materialRef.clone();
-					var c = abgrToColor(nodeRef.userData.highlightColor);
-					nodeRef.material.color.lerp(new THREE.Color(c.red / 255.0, c.green / 255.0, c.blue / 255.0), c.alpha);
-					// when highlightColor = 0: total transparent, so do not change original emissive and specular
-					if (materialRef.userData.defaultHighlightingEmissive && nodeRef.userData.highlightColor !== 0) {
-						nodeRef.material.emissive.copy(materialRef.userData.defaultHighlightingEmissive);
-					}
-					if (materialRef.userData.defaultHighlightingSpecular && nodeRef.userData.highlightColor !== 0) {
-						nodeRef.material.specular.copy(materialRef.userData.defaultHighlightingSpecular);
-					}
-				} else {
-					if (nodeRef.material.side) {
-						materialRef.side = nodeRef.material.side;
-					}
-					nodeRef.material = materialRef;
-					materialRef.userData.materialUsed++;
-					delete nodeRef.userData.originalMaterial;
+				if (nodeRef.material.side) {
+					materialRef.side = nodeRef.material.side;
 				}
+				nodeRef.material = materialRef;
+				materialRef.userData.materialUsed++;
+				delete nodeRef.userData.originalMaterial;
 
-				nodeRef._vkUpdateMaterialOpacity(); // todo: probably should be _vkUpdateMaterialColorAndOpacity, not _vkUpdateMaterialOpacity
+				nodeRef._vkUpdateMaterialColorAndOpacity();
 			}
 		};
 

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @extends sap.ui.vk.OrthographicCamera
 	 * @alias sap.ui.vk.threejs.OrthographicCamera
 	 * @since 1.52.0

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

@@ -27,7 +27,7 @@ sap.ui.define([
 		},
 
 		generateBox: function(boxJson, material) {
-			const mesh = new THREE.Mesh(new THREE.BoxGeometry(boxJson.width, boxJson.length, boxJson.height), material || undefined);
+			const mesh = new THREE.Mesh(new THREE.BoxGeometry(boxJson.length, boxJson.width, boxJson.height), material || undefined);
 			mesh.name = "box";
 			return mesh;
 		},

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @extends sap.ui.vk.PerspectiveCamera
 	 * @alias sap.ui.vk.threejs.PerspectiveCamera
 	 * @since 1.52.0

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

@@ -26,9 +26,8 @@ sap.ui.define([
 	 * @abstract
 	 * @private
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @alias sap.ui.vk.threejs.PointCloudGroup
-	 * @experimental Since 1.118.0 This class is experimental and might be modified or removed in future versions.
 	 */
 	const PointCloudGroup = function(settings) {
 		this._position = new THREE.Vector3();

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

@@ -13,7 +13,7 @@ sap.ui.define([
 ) {
 	"use strict";
 
-	function PolylineGeometry() {
+	function PolylineGeometry(outlineGeometry = null) {
 		var _this = new THREE.InstancedBufferGeometry();
 
 		Object.setPrototypeOf(_this, PolylineGeometry.prototype);
@@ -28,6 +28,34 @@ sap.ui.define([
 		_this.setAttribute("position", new THREE.Float32BufferAttribute(positions, 3));
 		_this.setAttribute("uv", new THREE.Float32BufferAttribute(uvs, 2));
 
+		const positionAttribute = outlineGeometry ? outlineGeometry.getAttribute("position") : null;
+		if (positionAttribute && positionAttribute.count > 0) {
+			const normal1 = outlineGeometry.getAttribute("normal1").array;
+			const normal2 = outlineGeometry.getAttribute("normal2").array;
+			const positions = [];
+			const vertexCount = positionAttribute.count;
+			const pa = positionAttribute.array;
+			for (let i = 0; i < vertexCount; ++i) {
+				positions.push(new THREE.Vector3(pa[i * 3], pa[i * 3 + 1], pa[i * 3 + 2]));
+			}
+
+			const edgeCount = vertexCount / 2;
+			const indices = [];
+			const normals = new Float32Array(6 * edgeCount);
+			for (let j = 0; j < edgeCount; ++j) {
+				indices.push(j * 2);
+				indices.push(j * 2 + 1);
+				normals[j * 6] = normal1[j * 6];
+				normals[j * 6 + 1] = normal1[j * 6 + 1];
+				normals[j * 6 + 2] = normal1[j * 6 + 2];
+				normals[j * 6 + 3] = normal2[j * 6];
+				normals[j * 6 + 4] = normal2[j * 6 + 1];
+				normals[j * 6 + 5] = normal2[j * 6 + 2];
+			}
+
+			_this.setVertices(positions, indices, normals);
+		}
+
 		return _this;
 	}