@sapui5/sap.ui.vk 1.136.1 → 1.139.0

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.136.1
+	 * @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,10 +31,10 @@ sap.ui.define([
 	 * @class Provides the interface for the material.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.139.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.
+	 * @since 1.60.0
 	 */
 	var Material = MaterialBase.extend("sap.ui.vk.threejs.Material", /** @lends sap.ui.vk.three.Material.prototype */ {
 		metadata: {

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

@@ -55,7 +55,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @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.136.1
+	 * @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.136.1
+	 * @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.136.1
+	 * @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.136.1
+	 * @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.136.1
+	 * @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.136.1
+	 * @version 1.139.0
 	 */
 	var SceneBuilder = function(rootNode, contentResource, resolve, reject) {
 		this._rootNode = rootNode;
@@ -236,6 +236,8 @@ sap.ui.define([
 			backgroundTopColor: info.backgroundTopColor,
 			backgroundBottomColor: info.backgroundBottomColor,
 			upAxis: info.upAxis, // (0 = +X, 1 = -X, 2 = +Y, 3 = -Y, 4 = +Z, 5 = -Z)
+			dimension: info.dimension,
+			outputSettings: info.showPaperFrame ? info.outputSettings : null,
 			// renderMode: renderModes[info.renderMethod],
 			contentResource: this._contentResource,
 			builder: this
@@ -270,6 +272,9 @@ sap.ui.define([
 
 		if (vkScene) {
 			this._vkScene = vkScene;
+			if (this._sceneMetadata) {
+				this._vkScene.setSceneMetadata(this._sceneMetadata);
+			}
 		}
 		return this;
 	};
@@ -1486,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);
 		}
@@ -1514,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);
 			}
@@ -3678,6 +3681,9 @@ sap.ui.define([
 
 		view.renderMode = renderModes[viewInfo.renderMethod] ?? RenderMode.Default;
 		view.dimension = viewInfo.dimension;
+		if (viewInfo.showPaperFrame) {
+			view.outputSettings = viewInfo.outputSettings;
+		}
 		view.query = viewInfo.query;
 		view.metadata = viewInfo.metadata;
 		view.veids = viewInfo.veids;
@@ -4303,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();
@@ -4496,5 +4501,13 @@ sap.ui.define([
 		markerNodes.set(newMarkerNodeId, { coordinateSpace: this._vkScene.PoiCoordinateSpaces.ReferenceNodeSpace });
 	};
 
+	SceneBuilder.prototype.setSceneMetadata = function(metadata) {
+		if (this._vkScene) {
+			this._vkScene.setSceneMetadata(metadata);
+		} else {
+			this._sceneMetadata = metadata;
+		}
+	};
+
 	return SceneBuilder;
 });

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

@@ -21,10 +21,10 @@ sap.ui.define([
 	 * @class Provides the interface for the material.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.Texture
 	 * @alias sap.ui.vk.threejs.Texture
-	 * @experimental Since 1.60.0 This class is experimental and might be modified or removed in future versions.
+	 * @since 1.60.0
 	 */
 	var Texture = TextureBase.extend("sap.ui.vk.threejs.Texture", /** @lends sap.ui.vk.three.Texture.prototype */ {
 		metadata: {

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

@@ -41,182 +41,16 @@ sap.ui.define([
 		}
 	};
 
-	THREE.Object3D.prototype._vkSetHighlightColor = function(colorABGR) {
-		this._vkTraverseNodeGeometry(function(node) {
-			node.userData.highlightingColor = colorABGR;
-			node._vkUpdateMaterialColorAndOpacity();
-		});
-	};
-
-	THREE.Object3D.prototype._vkSetTintColor = function(tintColorABGR) {
-		this._vkTraverseNodeGeometry(function(node) {
-			node.userData.tintColor = tintColorABGR;
-			node._vkUpdateMaterialColorAndOpacity();
-		});
-	};
-
-	THREE.Object3D.prototype._vkSetOpacity = function(opacity, joints) {
-		this.userData.opacity = opacity;
-		var nodeJointMap;
-		var parentJointsMap;
-		if (joints) {
-			nodeJointMap = new Map();
-			parentJointsMap = new Map();
-			joints.forEach(function(joint) {
-				if (!joint.node || !joint.parent) {
-					return;
-				}
-				nodeJointMap.set(joint.node, joint);
-				if (joint.parent) {
-					var jointsArray = parentJointsMap.get(joint.parent);
-					if (!jointsArray) {
-						jointsArray = [];
-					}
-					jointsArray.push(joint);
-					parentJointsMap.set(joint.parent, jointsArray);
-				}
-			});
-		}
-		this._vkTraverseNodes(function(node) {
-			node._vkUpdateMaterialOpacity(nodeJointMap);
-		}, nodeJointMap, parentJointsMap);
-	};
-
-	THREE.Object3D.prototype._vkUpdateMaterialColorAndOpacity = function() {
-		if (!this.material || !this.material.color) {
-			return;
-		}
-
-		var userData = this.userData;
-		userData.blendColor = null;
-
-		if (userData.originalMaterial) {
-			this.material.color.copy(userData.originalMaterial.color); // diffuse color, may be multiplied by material.map
-			this.material.emissive?.copy(userData.originalMaterial.emissive);
-			this.material.specular?.copy(userData.originalMaterial.specular);
-		}
-
-		if (userData.highlightColor !== undefined || userData.tintColor !== undefined || userData.highlightingColor !== undefined) {
-			if (!userData.originalMaterial) {
-				// The original material might be shared with other objects, so assign it to
-				// userData.originalMaterial and replace the own material with cloned one.
-				userData.originalMaterial = this.material;
-				this.material = this.material.clone();
-			}
-
-			const color = new THREE.Vector4(0, 0, 0, 0);
-
-			if (userData.highlightingColor !== undefined) { // highlighting animation of the view (HighlightPlayer)
-				color.fromArray(userData.highlightingColor);
-			}
-
-			if (userData.tintColor !== undefined) { // tinting (ViewStateManangert)
-				const c = abgrToColor(userData.tintColor);
-				color.lerp(new THREE.Vector4(c.red / 255.0, c.green / 255.0, c.blue / 255.0, 1), c.alpha);
-			}
-
-			if (userData.highlightColor !== undefined) { // selection (ViewStateManangert)
-				const c = abgrToColor(userData.highlightColor);
-				color.lerp(new THREE.Vector4(c.red / 255.0, c.green / 255.0, c.blue / 255.0, 1), c.alpha);
-			}
-
-			if (color.w > 0) {
-				userData.blendColor = color.toArray();
-
-				const blendColor = new THREE.Color(color.x, color.y, color.z);
-				this.material.color.lerp(blendColor, color.w);
-				this.material.emissive?.lerp(blendColor, color.w * 0.5);
-				this.material.specular?.multiplyScalar(1 - 0.75 * color.w); // reduce specular as it may overexpose the highlighting
-			}
-		}
-
-		this._vkUpdateMaterialOpacity();
-	};
-
-	THREE.Object3D.prototype._vkUpdateMaterialOpacity = function(nodeJointMap) {
-		if (!this.material) {
-			return;
-		}
-
-		var userData = this.userData;
-
-		if (userData.originalMaterial) {
-			this.material.opacity = userData.originalMaterial.opacity;
-			this.material.transparent = userData.originalMaterial.transparent;
-		}
-
-		var opacity = 1.0;
-
-		var hasOpacity = false;
-		let renderMethod;
-
-		var obj3D = this; // eslint-disable-line consistent-this
-		do {
-			renderMethod ??= obj3D.userData.renderMethod;
-
-			var currentOpacity = null, joint = null;
-			if (nodeJointMap) {
-				joint = nodeJointMap.get(obj3D);
+	THREE.Object3D.prototype._vkSetOpacityRecursive = function(opacity) { // used only to change the opacity of Symbols depending on the camera direction
+		this.traverseVisible(function(child) {
+			if (child.material) {
+				child.material.opacity = opacity;
+				child.material.transparent = opacity < 1.0;
 			}
-
-			if (joint && joint.opacity != null) {
-				currentOpacity = joint.opacity;
-			} else if (obj3D.userData.opacity !== undefined && obj3D.userData.opacity !== 1) {
-				currentOpacity = obj3D.userData.opacity;
-			}
-
-			var offsetOpacity = 1;
-			if (joint && joint.opacity != null && obj3D.userData && obj3D.userData.offsetOpacity != null) {
-				offsetOpacity = obj3D.userData.offsetOpacity;
-			}
-
-			if (currentOpacity != null) {
-				opacity *= currentOpacity;
-				opacity *= offsetOpacity;
-				hasOpacity = true;
-			}
-
-			if (joint && joint.parent) {
-				obj3D = joint.parent;
-				continue;
-			}
-
-			obj3D = obj3D.parent;
-		} while (obj3D);
-
-		if (renderMethod === 2) { // TRANSPARENT
-			opacity *= 0.5;
-			hasOpacity = true;
-		}
-
-		if (hasOpacity || this.renderOrder > 0) {
-			if (!userData.originalMaterial) {
-				userData.originalMaterial = this.material;
-				this.material = this.material.clone();
-				if (this.isMesh && !this.geometry.getAttribute("normal")) {
-					// Make three.js material double-sided if geometry does not have normals defined
-					this.material.side = THREE.DoubleSide;
-					this.material.userData.originalMaterialSide = THREE.DoubleSide;
-				}
-			}
-
-			if (this.renderOrder > 0 && !this.isOutline) {
-				this.material.depthTest = false;
-				this.material.transparent = true; // enable z-sorting
-			}
-
-			if (this.material.opacity) {
-				this.material.opacity *= opacity;
-				var materialIsTransparent = userData.originalMaterial.transparent || this.material.opacity < 1;
-				if (materialIsTransparent !== this.material.transparent) {
-					this.material.transparent = materialIsTransparent;
-					this.material.needsUpdate = true; // three.js needs to update shaders for this material
-				}
-			}
-		}
+		});
 	};
 
-	THREE.Object3D.prototype._vkGetTotalOpacity = function(joints) {
+	THREE.Object3D.prototype._vkGetTotalOpacity = function(joints, vsm) {
 		var nodeJointMap;
 		if (joints) {
 			nodeJointMap = new Map();
@@ -241,6 +75,8 @@ sap.ui.define([
 
 			if (joint && joint.opacity != null) {
 				currentOpacity = joint.opacity;
+			} else if (vsm) {
+				currentOpacity = vsm._getOpacity(obj3D);
 			} else if (obj3D.userData && obj3D.userData.opacity !== undefined) {
 				currentOpacity = obj3D.userData.opacity;
 			}
@@ -268,7 +104,7 @@ sap.ui.define([
 	};
 
 	THREE.Object3D.prototype._vkTraverseMeshNodes = function(callback) {
-		if (this._vkUpdate !== undefined || this.isDetailView) {
+		if (this._vkUpdate !== undefined || this.isDetailView || this.userData.nodeContentType === NodeContentType.PMI) {
 			return;
 		}
 

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

@@ -455,29 +455,18 @@ sap.ui.define([
 				// '0' - hidden, '1' - draw as cluster, '2' - render by three js, '3' - cluster with custom color
 				if (!cluster.isPoints && (ud.initialMaterialId !== ud.materialId
 					|| node.renderOrder != 0
-					|| ud.blendColor != null
+					|| ud.customMaterial
 					|| ud.defaultMaterial // defaultMaterial is used for Outline objects
 					|| node.material.transparent === true)) {
 
 					scratch8[3] = 2; // render using threejs standard rendering
 					cluster.additionalRenderables.push(node);
-				} else if (ud.highlightColor || ud.tintColor) {
-					// custom diffuse and hardcoded specular+emissive
-					var ce = node.material.emissive;
-					var cs = node.material.specular;
-					// todo: no need to check if emissive === 0.0235 and then put its values into scratch8[]
-					// this will need an update in threejs shaders
-					if (ce.r === 0.0235 && ce.g === 0.0235 && ce.b === 0.0235
-						&& cs.r === 0.0602 && cs.g === 0.0602 && cs.b === 0.0602) {
-						ce = node.material.color;
-						scratch8[0] = 255 * ce.r;
-						scratch8[1] = 255 * ce.g;
-						scratch8[2] = 255 * ce.b;
-						scratch8[3] = 3; // cluster render + patch color
-					} else {
-						scratch8[3] = 2; // render using threejs standard rendering
-						cluster.additionalRenderables.push(node);
-					}
+				} else if (ud.customMaterial && node.material.userData.customColor) { // point cloud with highlighting/tinting
+					const ce = node.material.color;
+					scratch8[0] = 255 * ce.r;
+					scratch8[1] = 255 * ce.g;
+					scratch8[2] = 255 * ce.b;
+					scratch8[3] = 3; // cluster render + patch color
 				} else {
 					scratch8[3] = 1; // cluster render
 				}

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

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