@sapui5/sap.ui.vk 1.138.0 → 1.139.0

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

@@ -35,7 +35,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @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.138.0
+	 * @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.138.0
+	 * @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.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.threejs.Billboard
 	 * @alias sap.ui.vk.threejs.Callout
 	 */

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.138.0
+	 * @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.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.ContentManager
 	 * @alias sap.ui.vk.threejs.ContentManager
 	 * @since 1.50.0
@@ -361,7 +361,7 @@ sap.ui.define([
 
 		if (contentResource.getSource()) {
 			// Try one of default loaders.
-			var sourceType = contentResource.getSourceType().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.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.base.ManagedObject
 	 * @alias sap.ui.vk.threejs.DetailView
 	 */

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

@@ -8,11 +8,9 @@
 // Provides the HighlightPlayer class.
 sap.ui.define([
 	"sap/ui/base/Object",
-	"../thirdparty/three",
 	"../HighlightDisplayState"
 ], function(
 	BaseObject,
-	THREE,
 	HighlightDisplayState
 ) {
 	"use strict";
@@ -24,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.base.Object
 	 * @alias sap.ui.vk.threejs.HighlightPlayer
 	 */
@@ -85,7 +83,7 @@ sap.ui.define([
 			var hiddenNodes = [];
 			nodesInfo.nodes.forEach(function(node) {
 				while (node) {
-					if (!node.visible) {
+					if (!vsm.getVisibilityState(node)) {
 						vsm.setVisibilityState(node, true, false);
 						hiddenNodes.push(node);
 					}
@@ -109,14 +107,12 @@ sap.ui.define([
 		this._highlightsNodesMap.forEach(function(nodesInfo, highlight) {
 			const res = highlight.evaluate(this._timeElapsed / 1000.0);
 
-			nodesInfo.nodes.forEach(function(node) {
-				if (res.color != null) {
-					node._vkSetHighlightColor(res.color);
-				}
-				if (res.opacity != null) {
-					node._vkSetOpacity(res.opacity);
-				}
-			});
+			if (res.color != null) {
+				this._viewStateManager.setNodesHighlightColor(nodesInfo.nodes, res.isCompleted ? null : res.color);
+			}
+			if (res.opacity != null) {
+				this._viewStateManager.setOpacity(nodesInfo.nodes, res.isCompleted ? null : res.opacity);
+			}
 
 			if (res.isCompleted) {
 				if (highlight.isFadeOut() && nodesInfo.hiddenNodes !== undefined) {
@@ -141,22 +137,18 @@ sap.ui.define([
 	};
 
 	/*
-	Play highlight
+	Stop highlight
 	 */
 	HighlightPlayer.prototype.stop = function(time) {
 		this._timeElapsed = 0;
 		this._startTime = 0;
 		var that = this;
 		this._highlightsNodesMap.forEach(function(nodesInfo, highlight) {
-			var nodes = nodesInfo.nodes;
-			for (var ni = 0; ni < nodes.length; ni++) {
-				var node = nodes[ni];
-				node._vkSetHighlightColor(undefined);
-				node._vkSetOpacity(undefined);
-			}
+			that._viewStateManager.setNodesHighlightColor(nodesInfo.nodes, null);
+			that._viewStateManager.setOpacity(nodesInfo.nodes, null);
 
-			if (highlight.isFadeOut() && nodes.hiddenNodes != undefined) {
-				that._viewStateManager.setVisibilityState(nodes.hiddenNodes, false, false);
+			if (highlight.isFadeOut() && nodesInfo.hiddenNodes != undefined) {
+				that._viewStateManager.setVisibilityState(nodesInfo.hiddenNodes, false, false);
 			}
 		});
 
@@ -166,7 +158,7 @@ sap.ui.define([
 	};
 
 	/*
-	Play highlight
+	Pause highlight
 	 */
 	HighlightPlayer.prototype.pause = function(time) {
 		if (this._state === HighlightDisplayState.stopped) {

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

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @class Provides the interface for the material.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.Material
 	 * @alias sap.ui.vk.threejs.Material
 	 * @since 1.60.0

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

@@ -55,7 +55,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.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.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.NodeProxy
 	 * @alias sap.ui.vk.threejs.NodeProxy
 	 */
@@ -170,7 +170,8 @@ sap.ui.define([
 	};
 
 	NodeProxy.prototype.getOpacity = function() {
-		return this._object3D.userData.opacity;
+		const vsm = this._nodeHierarchy.getScene().getViewStateManager();
+		return vsm?.getOpacity(this._object3D) ?? this._object3D.userData.opacity;
 	};
 
 	NodeProxy.prototype.setOpacity = function(value) {
@@ -178,14 +179,15 @@ sap.ui.define([
 		if (vsManager) {
 			vsManager.setOpacity(this._object3D, value);
 		} else {
-			this._object3D._vkSetOpacity(value);
+			this._object3D.userData.opacity = value;
 		}
 		this.setProperty("opacity", value, true);
 		return this;
 	};
 
 	NodeProxy.prototype.getTintColorABGR = function() {
-		return this._object3D.userData.tintColor;
+		const vsm = this._nodeHierarchy.getScene().getViewStateManager();
+		return vsm?._getTintColorABGR(this._object3D) ?? this._object3D.userData.tintColor;
 	};
 
 	NodeProxy.prototype.setTintColorABGR = function(value) {
@@ -193,7 +195,7 @@ sap.ui.define([
 		if (vsManager) {
 			vsManager.setTintColor(this._object3D, value);
 		} else {
-			this._object3D._vkSetTintColor(value);
+			this._object3D.userData.tintColor = value;
 		}
 		this.setProperty("tintColorABGR", value, true);
 		this.setProperty("tintColor", colorToCSSColor(abgrToColor(value)), true);
@@ -201,7 +203,7 @@ sap.ui.define([
 	};
 
 	NodeProxy.prototype.getTintColor = function() {
-		return colorToCSSColor(abgrToColor(this._object3D.userData.tintColor));
+		return colorToCSSColor(abgrToColor(this.getTintColorABGR()));
 	};
 
 	NodeProxy.prototype.setTintColor = function(value) {
@@ -211,7 +213,7 @@ sap.ui.define([
 		if (vsManager) {
 			vsManager.setTintColor(this._object3D, abgr);
 		} else {
-			this._object3D._vkSetTintColor(abgr);
+			this._object3D.userData.tintColor = abgr;
 		}
 		this.setProperty("tintColorABGR", abgr, true);
 		this.setProperty("tintColor", value, true);
@@ -258,8 +260,6 @@ sap.ui.define([
 				nodeRef.material = materialRef;
 				materialRef.userData.materialUsed++;
 				delete nodeRef.userData.originalMaterial;
-
-				nodeRef._vkUpdateMaterialColorAndOpacity();
 			}
 		};
 
@@ -343,7 +343,6 @@ sap.ui.define([
 		var materialRef = (typeof material.getMaterialRef === "function") ? material.getMaterialRef() : material;
 		if (this._object3D.userData.originalMaterial && this._object3D.userData.originalMaterial === materialToReplaceRef) {
 			this._object3D.userData.originalMaterial = materialRef;
-			this._object3D._vkUpdateMaterialColorAndOpacity();
 		} else if (this._object3D.material && this._object3D.material === materialToReplaceRef) {
 			this._object3D.material = materialRef;
 		}
@@ -359,7 +358,6 @@ sap.ui.define([
 		this._object3D.children.forEach(function(child) {
 			if (child && child.userData.originalMaterial && child.userData.originalMaterial === materialToReplaceRef) {
 				child.userData.originalMaterial = materialRef;
-				child._vkUpdateMaterialColorAndOpacity();
 			} else if (child && child.material && child.material === materialToReplaceRef) {
 				child.material = materialRef;
 			}

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

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

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

@@ -17,9 +17,7 @@ sap.ui.define([
 ) {
 	"use strict";
 
-	var OutlineRenderer = function(outlineWidth) {
-		this._outlineWidth = outlineWidth;
-
+	var OutlineRenderer = function() {
 		this._copyMaterial = new THREE.MeshBasicMaterial({ transparent: true, fog: false });
 		this._maskMaterial = new THREE.MeshBasicMaterial({ side: THREE.DoubleSide, fog: false });
 
@@ -96,11 +94,7 @@ sap.ui.define([
 		this._screenMesh = new THREE.Mesh(new THREE.PlaneGeometry(2, 2));
 	};
 
-	OutlineRenderer.prototype.setOutlineWidth = function(width) {
-		this._outlineWidth = width;
-	};
-
-	OutlineRenderer.prototype.render = function(renderer, scene, camera, selectedObjects, outlineColor, joints) {
+	OutlineRenderer.prototype.render = function(renderer, scene, camera, selectedObjects, outlineColor, outlineWidth, joints) {
 		if (!selectedObjects || !selectedObjects.length) {
 			return;
 		}
@@ -210,11 +204,11 @@ sap.ui.define([
 		renderer.setRenderTarget(rt2);
 		renderer.render(this._screenMesh, this._screenCamera);
 		// expand outline
-		if (this._outlineWidth > 1) {
+		if (outlineWidth > 1) {
 			material = this._expandMaterial;
 			material.uniforms.offset.value = offset;
 			this._screenMesh.material = material;
-			for (i = 1; i < this._outlineWidth; i++) {
+			for (i = 1; i < outlineWidth; i++) {
 				var rt = rt1;
 				rt1 = rt2;
 				rt2 = rt;

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.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,7 +26,7 @@ sap.ui.define([
 	 * @abstract
 	 * @private
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @alias sap.ui.vk.threejs.PointCloudGroup
 	 */
 	const PointCloudGroup = function(settings) {

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

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @param {THREE.Scene} scene The three.js scene object.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.Scene
 	 * @alias sap.ui.vk.threejs.Scene
 	 */
@@ -795,7 +795,6 @@ sap.ui.define([
 
 		// apply highlighting on the updated material
 		userData.originalMaterial = null;
-		node._vkUpdateMaterialColorAndOpacity();
 	}
 
 	function restoreMeshMaterial(node) {
@@ -806,28 +805,15 @@ sap.ui.define([
 
 			// apply highlighting on the updated material
 			userData.originalMaterial = null;
-			node._vkUpdateMaterialColorAndOpacity();
 		}
 	}
 
 	Scene.prototype._createOutlineGeometry = function(renderMode) {
 		if (this._scene) {
-			// var totalCount = 0, count = 0, time1 = Date.now();
-			// this._scene._vkTraverseMeshNodes(function(node) {
-			// 	if (!node.isOutline) {
-			// 		totalCount += 1;
-			// 	}
-			// });
-			// console.log("!!!", totalCount);
 			this._scene._vkTraverseMeshNodes(function(node) {
 				if (node.isOutline) {
 					node.visible = true;
 				} else {
-					// count += 1;
-					// if (count % 100 === 0) {
-					// 	console.log(count * 100 / totalCount, (Date.now() - time1) * 1e-3);
-					// }
-
 					if (!node.hasOutline) {// create outline
 						const isThickLines = this._illustrationLineWidth > 0.0;
 						_addOutlineGeometry(node, isThickLines, isThickLines ? this._outlineThickMaterial : this._outlineMaterial, this._outlineGeometryToNodes);

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

@@ -104,7 +104,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 */
 	var SceneBuilder = function(rootNode, contentResource, resolve, reject) {
 		this._rootNode = rootNode;
@@ -1491,7 +1491,6 @@ sap.ui.define([
 		child.material = material;
 		child.userData.materialId = materialId;
 		delete child.userData.originalMaterial;
-		child._vkUpdateMaterialColorAndOpacity();
 		if (child.material !== material) {
 			TotaraUtils.pushElementIntoMapArray(this._materialClones, materialId, child.material);
 		}
@@ -1519,7 +1518,6 @@ sap.ui.define([
 	function applyNodeOpacityToSubmeshMaterial(submesh, materialClones) {
 		if (submesh.material) {
 			var prevMaterial = submesh.material;
-			submesh._vkUpdateMaterialOpacity();
 			if (submesh.material !== prevMaterial) {
 				TotaraUtils.pushElementIntoMapArray(materialClones, submesh.material.userData.materialId, submesh.material);
 			}
@@ -4311,7 +4309,6 @@ sap.ui.define([
 				const nodeUserData = node.userData;
 				if (groupInfo.items?.length > 0) {
 					node.material ??= new THREE.MeshPhongMaterial(); // assign material to be able to select/highlight this node
-					node._vkSetOpacity(nodeUserData.opacity);
 
 					nodeUserData.pointCloudGroupId = groupInfo.id;
 					nodeUserData.pcgBoundingBox ??= new THREE.Box3();

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

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @class Provides the interface for the material.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.Texture
 	 * @alias sap.ui.vk.threejs.Texture
 	 * @since 1.60.0