@sapui5/sap.ui.vk 1.138.0 → 1.139.0

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.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.base.ManagedObject
 	 * @alias sap.ui.vk.threejs.Thrustline
 	 */