@sapui5/sap.ui.vbm 1.103.0 → 1.104.0

package/src/sap/ui/vbm/adapter3d/ModelHandler.js

@@ -29,9 +29,9 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.104.0
 	 * @alias sap.ui.vbm.adapter3d.ModelHandler
-	 */	
+	 */
 	var ModelHandler = BaseObject.extend("sap.ui.vbm.adapter3d.ModelHandler", /** @lends sap.ui.vbm.adapter3d.ModelHandler.prototype */ {
 
 		constructor: function(resources, textures, scene, root) {
@@ -94,11 +94,14 @@ sap.ui.define([
 		this._textures = null;
 		this._scene = null;
 		this._root = null;
+		this._hotInstance = null;
 
 		// destroy 'meta' meshes
-		this._meshes.forEach(function(mesh) {
-			mesh.objects3D.forEach(function(object) {
-				this._deleteObject3D(object);
+		this._meshes.forEach(function(array) {
+			array.forEach(function(item) {
+				item.objects3D.forEach(function(object) {
+					this._deleteObject3D(object);
+				}, this);
 			}, this);
 		}, this);
 
@@ -108,15 +111,23 @@ sap.ui.define([
 				subRef(instance.texture);
 			}
 		});
-		
+
 		// destroy models
 		this._models.forEach(function(model, resource) {
 			this._deleteModel(model);
 		}, this);
 
 		this._meshes.clear();
+		this._meshes = null;
+
 		this._instances.clear();
+		this._instances = null;
+
 		this._models.clear();
+		this._models = null;
+
+		this._glTFLoader = null;
+		this._colladaLoader = null;
 
 		BaseObject.prototype.destroy.call(this);
 	};
@@ -146,7 +157,7 @@ sap.ui.define([
 	 * @param {object} instance Model instance.
 	 * @public
 	 */
-	ModelHandler.prototype.updateInstance = function(instance) { 
+	ModelHandler.prototype.updateInstance = function(instance) {
 		var data = this._instances.get(instance), update = false, hot = this._hotInstance && this._hotInstance === instance;
 		if (data) {
 			var normalized = Utilities.toBoolean(instance.normalize);
@@ -185,7 +196,7 @@ sap.ui.define([
 				}
 				update = true;
 			}
-			
+
 			// when model normalization changed -> update model properties -> reset instance model matrices
 			if (propertyChanged(instance, ["normalize", "model"])) {
 				this._updateModel(data.model, normalized);
@@ -217,9 +228,9 @@ sap.ui.define([
 			if (data.matrices.length === 0) {
 				var world = this._root.matrixWorld.clone(); // start from the _root
 				world.multiply(data.world); // apply instance world matrix
-				
+
 				// if instance normalized -> apply normalized model root matrix as otherwise (non normalized case) model root has identity matrix
-				if (normalized) { 
+				if (normalized) {
 					world.multiply(data.model.normalized.world);
 				}
 				// apply individual mesh matrices from the model at last
@@ -253,7 +264,7 @@ sap.ui.define([
 			this._instances.delete(instance);
 			this._removeInstanceFromMesh(data);
 			instance._last = {}; // reset all LRU variables at once
-			
+
 			if (data.model) {
 				subRef(data.model); // model can be null if removing 'broken' instance
 			}
@@ -428,7 +439,7 @@ sap.ui.define([
 	ModelHandler.prototype._postprocess = function(model, content) {
 		// mirror on Z axis entire collada root which is effectively the same as collada processing with baking transformations and inverting Z coordinates in ActiveX
 		model.scene.scale.set(1,1,-1);
-		
+
 		var meshes = [], materials = new Set(), marked = "_sapUsed";
 		// collect meshes only + calculate world matrix, mark used materials & maps
 		model.scene.traverse(function(object) {
@@ -558,7 +569,7 @@ sap.ui.define([
 			// remove instanced mesh from scene
 			if (object.parent) {
 				object.parent.remove(object);
-			}			
+			}
 			// geometries are shared -> cannot dispose
 			Utilities.toArray(object.material).forEach(function(material) {
 				material.dispose(); // materials are cloned -> can be disposed, maps are shared -> don't touch, cannot be disposes
@@ -582,7 +593,7 @@ sap.ui.define([
 			// target has to be added to _root to mimic original model and must have same world matrix as original model
 			// so we calculate world matrix for target which will be under _root and not under _scene as instance mesh
 			var world = data.world.clone(); // use instance world as starting point
-			if (data.model.normalized) { 
+			if (data.model.normalized) {
 				world.multiply(data.model.normalized.world);
 			}
 			world.multiply(data.model.root.children[0].matrixWorld);

package/src/sap/ui/vbm/adapter3d/ObjectFactory.js

@@ -377,7 +377,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.104.0
 	 * @alias sap.ui.vbm.adapter3d.ObjectFactory
 	 */
 	var ObjectFactory = BaseObject.extend("sap.ui.vbm.adapter3d.ObjectFactory", /** @lends sap.ui.vbm.adapter3d.ObjectFactory.prototype */ {});

package/src/sap/ui/vbm/adapter3d/PolygonHandler.js

@@ -32,9 +32,9 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.104.0
 	 * @alias sap.ui.vbm.adapter3d.PolygonHandler
-	 */	
+	 */
 	var PolygonHandler = BaseObject.extend("sap.ui.vbm.adapter3d.PolygonHandler", /** @lends sap.ui.vbm.adapter3d.PolygonHandler.prototype */ {
 
 		constructor: function(root) {
@@ -97,7 +97,7 @@ sap.ui.define([
 	PolygonHandler.prototype.destroy = function() {
 		// Reset references to shared objects.
 		this._root = null;
-		this._instances.clear();
+		this._hotInstance = null;
 
 		// destroy 'meta' meshes
 		this._meshes.forEach(function(key, array) {
@@ -112,10 +112,16 @@ sap.ui.define([
 				this._deleteObject3D(border.object3D);
 			}, this);
 		}, this);
-		
+
 		// clear
+		this._instances.clear();
+		this._instances = null;
+
 		this._meshes.clear();
+		this._meshes = null;
+
 		this._borders.clear();
+		this._borders = null;
 
 		BaseObject.prototype.destroy.call(this);
 	};
@@ -135,11 +141,11 @@ sap.ui.define([
 
 	/**
 	 * Adds polygon instance to polygon handler.
-	 * 
+	 *
 	 * @param {object} instance Polygon instance.
 	 * @public
 	 */
-	PolygonHandler.prototype.addInstance = function(instance) { 
+	PolygonHandler.prototype.addInstance = function(instance) {
 		this._instances.set(instance, {
 			instance : instance,
 			indices: [],
@@ -159,11 +165,11 @@ sap.ui.define([
 
 	/**
 	 * Updates polygon instance in polygon handler
-	 * 
+	 *
 	 * @param {object} instance Polygon instance.
 	 * @public
 	 */
-	PolygonHandler.prototype.updateInstance = function(instance) { 
+	PolygonHandler.prototype.updateInstance = function(instance) {
 		var data = this._instances.get(instance), updateMesh = false, updateBorder = false;
 		if (data) {
 			// position, rotation, scale [mandatory attributes] when change -> recalculate matrix
@@ -186,7 +192,7 @@ sap.ui.define([
 			}
 
 			// if any property which affects polygon color changed -> check if polygon color actually changed
-			// then update polygon color and remove polygon from current 'meta' mesh if it exists 
+			// then update polygon color and remove polygon from current 'meta' mesh if it exists
 			// and put it into another 'meta' mesh according to polygon updated color
 			// color, selectColor, VB:s [mandatory attributes]
 			if (propertyChanged(instance, ["color", "selectColor", "VB:s"])) {
@@ -327,13 +333,13 @@ sap.ui.define([
 					// create 3 or 2 groups, depends on where hot instance geometry is within 'meta' mesh geometry
 					geometry.addGroup(range.start, data.indices.length, 1); // use hot material with index #1
 
-					if (range.start !== 0) { 
+					if (range.start !== 0) {
 						geometry.addGroup(0, range.start, 0); // use original material with index #0
 					}
 					if (range.start + data.indices.length < geometry.index.count) {
 						geometry.addGroup(range.start + data.indices.length, geometry.index.count - range.start - data.indices.length, 0); // use original material with index #0
 					}
-				} 
+				}
 			}
 			if (data.border) { // apply hover on polygon border geometry
 				material = data.border.material;
@@ -363,13 +369,13 @@ sap.ui.define([
 					var vertexCount = data.lines.length/3;
 					geometry.addGroup(range.start, vertexCount, 1); // use hot material with index #1
 
-					if (range.start !== 0) { 
+					if (range.start !== 0) {
 						geometry.addGroup(0, range.start, 0); // use original material with index #0
 					}
 					if (range.start + vertexCount < positions.count) {
 						geometry.addGroup(range.start + vertexCount, positions.count - range.start - vertexCount, 0); // use original material with index #0
 					}
-				} 
+				}
 			}
 		} else {
 			Log.error("Unable to find polygon instance data", "", thisModule);
@@ -428,7 +434,7 @@ sap.ui.define([
 
 	/**
 	 * Updates 'meta' meshes requested for rebuild by combining geometry of all instances with the same color into one mesh.
-	 * 
+	 *
 	 * @returns {boolean} True if hot instance 'meta' mesh has been recreated.
 	 * @private
 	 */
@@ -439,11 +445,11 @@ sap.ui.define([
 			for (var i = 0; i < array.length;) {
 				if (array[i].dirty) {
 					var j, instance, base, indices = [], vertices = [], normals = [], data = array[i];
-					
+
 					this._deleteObject3D(data.object3D);
 					data.object3D = null;
 					data.hitInfo.length = 0; // erase hitInfo
-	
+
 					data.instances.forEach(function(range, key) {
 						instance = key; // to access instance outside forEach
 
@@ -479,24 +485,24 @@ sap.ui.define([
 
 					if (indices.length) {
 						var geometry = new THREE.BufferGeometry();
-					
+
 						geometry.setIndex(indices);
 						geometry.setAttribute("position", new THREE.Float32BufferAttribute(vertices, 3));
 						geometry.setAttribute("normal", new THREE.Float32BufferAttribute(normals, 3));
 						geometry.computeBoundingBox(); // needed for ray casting
 						geometry.computeBoundingSphere(); // needed for ray casting
-						
+
 						var material = createMaterial(true);
 						material.color.copy(instance.color.rgb);
 						material.opacity = instance.color.opacity;
 						material.transparent = material.opacity < 1;
 						material.needsUpdate = true;
-		
+
 						data.object3D = new THREE.Mesh(geometry, material);
 						data.object3D.matrixAutoUpdate = false;
 						data.object3D.layers.set(0); // put it to layer #0 to enable raycasting
 						this._root.add(data.object3D);
-	
+
 						data.object3D._instanceHitTest = this._instanceHitTest.bind(data); // helper function to return instance based on hit test info
 						data.triangleCount = indices.length/3; // update triangle count on full rebuild
 					}
@@ -527,7 +533,7 @@ sap.ui.define([
 
 	/**
 	 * Updates 'meta' borders requested for rebuild by combining geometry of all instances with the same color into one mesh.
-	 * 
+	 *
 	 * @returns {boolean} True if hot instance 'meta' border has been recreated.
 	 * @private
 	 */
@@ -565,13 +571,13 @@ sap.ui.define([
 						var geometry = new THREE.BufferGeometry();
 						geometry.setAttribute("position", new THREE.Float32BufferAttribute(vertices, 3));
 						geometry.computeBoundingBox();
-		
+
 						var material = createLineMaterial();
 						material.color.copy(instance.colorBorder.rgb);
 						material.opacity = instance.colorBorder.opacity;
 						material.transparent = material.opacity < 1;
 						material.needsUpdate = true;
-		
+
 						data.object3D = new THREE.LineSegments(geometry, material);
 						data.object3D.matrixAutoUpdate = false;
 						data.object3D.layers.set(1); // put it to layer #1 to disable hit test
@@ -739,10 +745,10 @@ sap.ui.define([
 		if (object) {
 			if (object.parent) {
 				object.parent.remove(object);
-			}			
+			}
 			if (object.geometry) {
 				object.geometry.dispose();
-			}		
+			}
 			Utilities.toArray(object.material).forEach(function(material) {
 				material.dispose(); // no maps to dispose
 			});

package/src/sap/ui/vbm/adapter3d/SceneBuilder.js

@@ -46,7 +46,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.104.0
 	 * @alias sap.ui.vbm.adapter3d.SceneBuilder
 	 */
 	var SceneBuilder = BaseObject.extend("sap.ui.vbm.adapter3d.SceneBuilder", /** @lends sap.ui.vbm.adapter3d.SceneBuilder.prototype */ {
@@ -72,9 +72,12 @@ sap.ui.define([
 			// Decal helper object
 			this._decalHelper = null;
 
-			// instance key -> instance map, for targeted objects like Decal
+			// instance key -> instance, for targeted objects like Decal
 			this._targets = new Map();
 
+			// instance -> list of Decal instances targeted it
+			this._instanceDecals = new Map();
+
 			// Cached objects. THREE.Texture is reference countable.
 			this._textures = new Map(); //texture name -> THREE.Texture
 
@@ -103,9 +106,11 @@ sap.ui.define([
 		this._scene = null;
 		this._viewport = null;
 		this._context = null;
+		this._hotInstance = null;
+
 
 		if (this._box4) {
-			this._box.dispose();
+			this._box4.dispose();
 		}
 		if (this._box6) {
 			this._box6.dispose();
@@ -121,15 +126,25 @@ sap.ui.define([
 			this._decalHelper.material.dispose();
 			this._decalHelper.geometry.dispose();
 			this._scene.remove(this._decalHelper);
+			this._decalHelper = null;
 		}
 
 		this._polygonHandler.destroy();
+		this._polygonHandler = null;
+
 		this._modelHandler.destroy();
+		this._modelHandler = null;
 
 		this._textures.forEach(function(texture) {
 			texture.dispose();
 		});
 
+		this._targets.clear();
+		this._targets = null;
+
+		this._instanceDecals.clear();
+		this._instanceDecals = null;
+
 		BaseObject.prototype.destroy.call(this);
 	};
 
@@ -468,17 +483,10 @@ sap.ui.define([
 			this._polygonHandler.addInstance(instance);
 		} else if (instance.isModel) {
 			this._modelHandler.addInstance(instance);
-		} else if (instance.isBox || instance.isCylinder) {
-			// common part for Box & Cylinder
-			instance.object3D = new THREE.Group();
-			instance.object3D.matrixAutoUpdate = false;
-			this._root.add(instance.object3D);
-			// assign instance type specific properties
-			if (instance.isBox) {
-				this._assignBoxProperties(instance);
-			} else {
-				this._assignCylinderProperties(instance);
-			}
+		} else if (instance.isBox) {
+			this._assignBoxProperties(instance);
+		} else if (instance.isCylinder) {
+			this._assignCylinderProperties(instance);
 		} else if (instance.isDecal) {
 			if (decals) {
 				decals.push(instance); // first pass -> keep decal for the second pass
@@ -507,7 +515,7 @@ sap.ui.define([
 			if (decals) {
 				decals.push(instance); // first pass -> keep decal for the second pass
 			} else {
-				this._assignDecalProperties(instance); // second padd -> update decal
+				this._assignDecalProperties(instance); // second pass -> update decal
 			}
 		} else {
 			Log.error("Unable to update instance: instance type is unknown", "", thisModule);
@@ -528,6 +536,16 @@ sap.ui.define([
 				this._deleteObject3D(instance.object3D);
 				instance.object3D = null;
 				instance._last = {}; // reset all LRU variables at once
+
+				// update (instance <-> decals) map if decal has target
+				if (instance.isDecal && instance.target) {
+					var target = this._targets.get(instance.target);
+					if (target) {
+						this._instanceDecals.get(target).delete(instance);
+					} else {
+						Log.error("Unable to remove decal from (instance <-> decals) map", "", thisModule);
+					}
+				}
 			} else {
 				Log.error("Unable to remove instance: object3D is missing", "", thisModule);
 			}
@@ -595,7 +613,7 @@ sap.ui.define([
 	};
 
 	SceneBuilder.prototype._assignBoxProperties = function(instance, hot) {
-		var box = instance.object3D.children.length === 0 ? null : instance.object3D.children[0];
+		var box = instance.object3D || null;
 
 		// geometry has to be created initially or recreated when 'texture6' changed
 		if (!box || propertyChanged(instance, "texture6")) {
@@ -610,7 +628,8 @@ sap.ui.define([
 				box.matrixAutoUpdate = false;
 				box.layers.set(0); // put it to layer #0 to enable raycasting
 				box._sapInstance = instance; // keep reference to instance
-				instance.object3D.add(box);
+				this._root.add(box);
+				instance.object3D = box;
 			}
 		}
 
@@ -622,7 +641,7 @@ sap.ui.define([
 	};
 
 	SceneBuilder.prototype._assignCylinderProperties = function(instance, hot) {
-		var material, updateTextureCap = false, open = toBoolean(instance.isOpen), cylinder = instance.object3D.children.length === 0 ? null : instance.object3D.children[0];
+		var material, updateTextureCap = false, open = toBoolean(instance.isOpen), cylinder = instance.object3D || null;
 
 		// geometry has to be created initially or recreated when 'isOpen' changed
 		if (!cylinder || propertyChanged(instance, "isOpen")) {
@@ -666,7 +685,8 @@ sap.ui.define([
 				cylinder.matrixAutoUpdate = false;
 				cylinder.layers.set(0); // put it to layer #0 to enable raycasting
 				cylinder._sapInstance = instance; // keep reference to instance
-				instance.object3D.add(cylinder);
+				this._root.add(cylinder);
+				instance.object3D = cylinder;
 			}
 		}
 
@@ -692,14 +712,14 @@ sap.ui.define([
 		}
 
 		// update cylinder properties after processing is done
-		updateProperty(instance, ["isOpen", "testureCap"]);
+		updateProperty(instance, ["isOpen", "textureCap"]);
 
 		// handle common properties
 		this._assignProperties(instance, hot);
 	};
 
 	SceneBuilder.prototype._assignProperties = function(instance, hot) {
-		var color, material, mesh = instance.object3D.children[0];
+		var color, material, mesh = instance.object3D;
 
 		if (propertyChanged(instance, "texture")) {
 			material = Array.isArray(mesh.material) ? mesh.material[0] : mesh.material;
@@ -756,22 +776,23 @@ sap.ui.define([
 			}
 		}
 
-		// when normalize property changed -> perform object node normalization or reset it's transformation to default
-		if (propertyChanged(instance, "normalize")) {
+		// if any of the following properties changed -> recalculate transform matrix & normalize matrix -> decompose it and assign to the mesh
+		if (propertyChanged(instance, ["pos", "rot", "scale", "normalize"])) {
+			var normalizeMatrix = new Matrix4(), transformMatrix = new Matrix4();
 			if (toBoolean(instance.normalize)) {
-				Utilities.normalizeObject3D(mesh);
-				mesh.updateMatrix(); // important to update local TM once transformation attributes have changed
-			} else {
 				mesh.position.set(0, 0, 0);
 				mesh.rotation.set(0, 0, 0);
 				mesh.scale.set(1, 1, 1);
+				mesh.updateMatrix();
+				// reset local transform first as it affects normalization
+				Utilities.normalizeObject3D(mesh, normalizeMatrix);
 			}
-		}
+			Utilities.getInstanceMatrix(instance, transformMatrix);
+
+			transformMatrix.multiply(normalizeMatrix);
+			transformMatrix.decompose(mesh.position, mesh.quaternion, mesh.scale);
 
-		// position, rotation, scale [mandatory attributes] when change -> recalculate transformation & update matrix
-		if (propertyChanged(instance, ["pos", "rot", "scale"])) {
-			Utilities.getInstanceTransform(instance, instance.object3D.position, instance.object3D.rotation, instance.object3D.scale);
-			instance.object3D.updateMatrix(); // important to update local TM once transformation attributes have changed
+			mesh.updateMatrix(); // important to update local TM once transformation attributes have changed
 		}
 
 		// update properties after processing is done
@@ -831,6 +852,21 @@ sap.ui.define([
 			}
 		}
 
+		// update (instance <-> decals) map
+		if (propertyChanged(instance, "target")) {
+			var targetInstance = this._targets.get(instance._last.target);
+			if (targetInstance) {
+				this._instanceDecals.get(targetInstance).delete(instance);
+			}
+			targetInstance = this._targets.get(instance.target);
+			if (targetInstance) {
+				if (!this._instanceDecals.has(targetInstance)) {
+					this._instanceDecals.set(targetInstance, new Set());
+				}
+				this._instanceDecals.get(targetInstance).add(instance);
+			}
+		}
+
 		// update properties after processing is done
 		updateProperty(instance, ["position", "direction", "size", "rotation", "target", "texture", "text", "planeOrigin", "planeNormal"]);
 	};
@@ -1019,7 +1055,7 @@ sap.ui.define([
 			var target = this._targets.get(instance.target);
 			if (target) {
 				if (target.isBox || target.isCylinder) {
-					return target.object3D.children[0]; // object3d is a group node, where its first child is actual mesh
+					return target.object3D;
 				} else if (target.isPolygon) {
 					return this._polygonHandler.getTarget(target);
 				} else if (target.isModel) {
@@ -1055,8 +1091,16 @@ sap.ui.define([
 	SceneBuilder.prototype._updateInstanceKeys = function(instance) {
 		var value = this._getInstanceKeys(instance);
 		if (value) {
-			this._targets.set(value.key, instance);
-			this._targets.set(value.group, instance);
+			if (value.key !== instance._last.key) {
+				this._targets.delete(instance._last.key);
+				this._targets.delete(instance._last.group);
+
+				this._targets.set(value.key, instance);
+				this._targets.set(value.group, instance);
+
+				instance._last.key = value.key;
+				instance._last.group = value.group;
+			}
 		}
 	};
 

package/src/sap/ui/vbm/adapter3d/Utilities.js

@@ -80,13 +80,13 @@ sap.ui.define([
 	};
 
 	// from threeJS to VB vector (convert from Right Handed [GL] to Left Handed [DX] coordinate system)
-	Utilities.threeJsToVb = function(point) {
-		return new Vector3(-point.x, point.z, -point.y);
+	Utilities.threeJsToVb = function(point, out) {
+		return out ? out.set(-point.x, point.z, -point.y) : new Vector3(-point.x, point.z, -point.y);
 	};
 
 	// from VB to ThreeJS vector (convert from Left Handed [DX] to Right Handed [GL] coordinate system)
-	Utilities.vbToThreeJs = function(point) {
-		return new Vector3(-point.x, -point.z, point.y);
+	Utilities.vbToThreeJs = function(point, out) {
+		return out ? out.set(-point.x, -point.z, point.y) : new Vector3(-point.x, -point.z, point.y);
 	};
 
 	Utilities.toColor = (function() {
@@ -550,5 +550,16 @@ sap.ui.define([
 		return undefined;
 	};
 
+	/**
+	* Function checks whether channel is enabled in layers object
+	*
+	* @param {THREE.Layers} layers The Layers object
+	* @param {number} channel The channel number to test
+	* @returns {boolean} True if channel is enabled in Layers objects or false otherwise
+	*/
+	Utilities.layersEnabled = function(layers, channel) {
+		return (layers.mask & ( 1 << channel | 0 ) ) !== 0;
+	};
+
 	return Utilities;
 });