@sapui5/sap.ui.vbm 1.124.0 → 1.126.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.ui.vbm",
-  "version": "1.124.0",
+  "version": "1.126.0",
   "description": "SAPUI5 Library sap.ui.vbm",
   "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
   "author": "SAP SE (https://www.sap.com)",

package/src/sap/ui/vbm/.library

@@ -3,7 +3,7 @@
 	<name>sap.ui.vbm</name>
 	<vendor>SAP SE</vendor>
 	<copyright>SAP UI development toolkit for HTML5 (SAPUI5) (c) Copyright 2009-2012 SAP AG. All rights reserved</copyright>
-	<version>1.124.0</version>
+	<version>1.126.0</version>
 
 	<documentation>SAP UI library: sap.ui.vbm</documentation>
 
@@ -22,6 +22,13 @@
 	</dependencies>
 
 	<appData>
+		<manifest xmlns="http://www.sap.com/ui5/buildext/manifest">
+			<sap.ui5>
+				<library>
+					<i18n>i18n/messagebundle.properties</i18n>
+				</library>
+			</sap.ui5>
+		</manifest>
 		<!-- package name for selenium -->
 		<selenium xmlns="http://www.sap.com/ui5/buildext/selenium"
 			package="com.sap.ui5.selenium.vbm"

package/src/sap/ui/vbm/Adapter.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @param {string} [sId] id for the new control, generated automatically if no id is given
 	 * @param {object} [mSettings] initial settings for the new object
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.126.0
 	 * @extends sap.ui.core.Element
 	 * @constructor
 	 * @public

package/src/sap/ui/vbm/Adapter3D.js

@@ -15,6 +15,8 @@ sap.ui.define([
 	"./adapter3d/SceneBuilder",
 	"./adapter3d/Utilities",
 	"./adapter3d/DragDropHandler",
+	"./adapter3d/RectangleTracker",
+	"./adapter3d/ColladaBounds",
 	"sap/m/HBox",
 	"sap/m/VBox",
 	"sap/m/Link",
@@ -25,7 +27,7 @@ sap.ui.define([
 	"sap/base/Log",
 	"jquery.sap.global",
 	"./library"
-], function(Element, Observer, Menu, MenuItem, Popover, Viewport, ObjectFactory, Parser, SceneBuilder, Utilities, DragDropHandler, HBox, VBox, Link, Button, Text, Image, THREE, Log, jQuery, library) {
+], function(Element, Observer, Menu, MenuItem, Popover, Viewport, ObjectFactory, Parser, SceneBuilder, Utilities, DragDropHandler, RectangleTracker,ColladaBounds, HBox, VBox, Link, Button, Text, Image, THREE, Log, jQuery, library) {
 	"use strict";
 
 	var Vector2		= THREE.Vector2;
@@ -45,7 +47,7 @@ sap.ui.define([
 	 * @param {string} [sId] id for the new control, generated automatically if no id is given
 	 * @param {object} [mSettings] initial settings for the new object
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.126.0
 	 * @extends sap.ui.core.Element
 	 * @constructor
 	 * @public
@@ -231,6 +233,13 @@ sap.ui.define([
 
 		// Drag and drop handler
 		this._dragDropHandler = null;
+
+		this._rectangleTracker = null;
+
+		this._colladaBounds = null;
+
+		
+		// this._lassoTracker = null;
 	};
 
 	Adapter3D.prototype.exit = function() {
@@ -255,6 +264,15 @@ sap.ui.define([
 			this._dragDropHandler = null;
 		}
 
+		if (this._rectangleTracker) {
+			this._rectangleTracker = null;
+		}
+
+		if (this._colladaBounds) {
+			this._colladaBounds.destroy();
+			this._colladaBounds = null;
+		}
+
 		if (this._sceneBuilder) {
 			this._sceneBuilder.destroy();
 			this._sceneBuilder = null;
@@ -308,6 +326,16 @@ sap.ui.define([
 			this._viewportObserver.observe(this._viewport, { destroy: true });
 			this._viewport.addEventDelegate(viewportEventDelegate, this);
 			this._dragDropHandler = new DragDropHandler(this);
+			this._colladaBounds = new ColladaBounds(this);
+			this._rectangleTracker = new RectangleTracker(this);
+			// // this._lassoTracker = new LassoTracker(this);
+			// if(rectangleSelect)
+				
+			// if(lassoSelect && !rectangleSelect)
+			//     {
+			// 		this._lassoSelect = "created";	
+			// 		console.log(this._lassoSelect);
+			// 	}	
 		}
 	};
 
@@ -319,7 +347,9 @@ sap.ui.define([
 		if (this._viewport) {
 			this._dragDropHandler.destroy();
 			this._dragDropHandler = null;
-
+			this._colladaBounds = null;
+            this._rectangleTracker = null;
+			// this._lassoTracker = null;
 			this._viewport.removeEventDelegate(viewportEventDelegate);
 			// onBeforeRendering unsubscribes from DOM events.
 			viewportEventDelegate.onBeforeRendering.call(this);
@@ -393,13 +423,14 @@ sap.ui.define([
 		that._update = that._update
 		.then(function() {
 			that._parser.loadVBIJSON(payload);
+			
 			return that._sceneBuilder.synchronize();
 		})
 		.then(function() {
 			// further processing after scene(s) has been updated
 			that._processAutomation(payload);
 			that._processDetailWindow();
-
+			// that._createCollada(payload);
 			// check if last hover instance is still exist (it may be erased during update)
 			that._context.voQueues.toRemove.forEach(function(instances) {
 				instances.forEach(function(instance) {
@@ -409,11 +440,16 @@ sap.ui.define([
 				}, that);
 			}, that);
 
+
+			if (that._colladaBounds) {
+				that._colladaBounds.initialize();
+			}
+
 			// update drag and drop handler
 			if (that._dragDropHandler) {
 				that._dragDropHandler.update();
 			}
-
+			
 			// scene has changed -> adjust camera clipping planes
 			that._viewport._resetBBox();
 			that._viewport._updateCamera();
@@ -426,9 +462,10 @@ sap.ui.define([
 			that._viewport.setBusy(false);
 		});
 		// return last promise in chain
+		
 		return that._update;
 	};
-
+	
 	Adapter3D.prototype._processDetailWindow = function(payload) {
 		// show first only detail window from toAdd queue
 		// ignore all other detail windows as we can show only one at a time in compare to ActiveX implementation
@@ -935,14 +972,14 @@ sap.ui.define([
 
 	Adapter3D.prototype._handleHover = function(event) {
 		var tooltip;
-		var instance = event.instance || null;
-		Log.trace("hover", "x: " + event.cursor.x + ", y: " + event.cursor.y + ", instance: " + (instance ? instance.id : "") + ", tooltip: " + (instance ? instance.tooltip : ""), thisModule);
-		if (instance) {
-			tooltip = instance.tooltip;
-			if (!tooltip) {
-				tooltip = instance.text;
-			}
-		}
+		var instance = event || null;
+		// Log.trace("hover", "x: " + event.cursor.x + ", y: " + event.cursor.y + ", instance: " + (instance ? instance.id : "") + ", tooltip: " + (instance ? instance.tooltip : ""), thisModule);
+		// if (instance) {
+		// 	tooltip = instance.tooltip;
+		// 	if (!tooltip) {
+		// 		tooltip = instance.text;
+		// 	}
+		// }
 		var domRef = this._viewport.getDomRef();
 		if (domRef) {
 			if (tooltip) {
@@ -961,7 +998,9 @@ sap.ui.define([
 			}.bind(this), 500);
 
 			this._hoverInstance = instance;
-			this._sceneBuilder.updateHotInstance(this._hoverInstance);
+			if (this._sceneBuilder) {
+				this._sceneBuilder.updateHotInstance(this._hoverInstance);
+			}
 		}
 	};
 
@@ -1245,7 +1284,18 @@ sap.ui.define([
 		return {
 			selected: selected,
 			deselected: deselected
+		}
 		};
+
+
+	Adapter3D.prototype.enableRectangularSelection = function() {
+		this._rectangleTracker = new RectangleTracker(this);
+		this._rectangleTracker._createEvent();
+	
+	};
+
+	Adapter3D.prototype.disableRectangularSelection = function() {
+		this._rectangleTracker._destroy();
 	};
 
 	return Adapter3D;

package/src/sap/ui/vbm/AnalyticMap.js

@@ -271,7 +271,7 @@ sap.ui.define([
 		// load the geojson trying different location.............................//
 		// first the explicit path, second abap third the default.................//
 
-		var oData = null, aPathGeoJSON = [], oResponse, sPathGeoJSON = "";
+		var oData = null, aPathGeoJSON = [], sPathGeoJSON = "";
 
 		// build array of URLs to check for source JSON in the prioritized order
 		aPathGeoJSON[0] = AnalyticMap.GeoJSONURL; // explicit specified
@@ -284,11 +284,19 @@ sap.ui.define([
 		for (var mI = 0; mI < 3; ++mI) {
 			sPathGeoJSON = aPathGeoJSON[mI];
 			if (!oData && sPathGeoJSON) {
-				oResponse = jQuery.sap.syncGetJSON(sPathGeoJSON);
-				if (oResponse.statusCode === 200 && oResponse.data && !oResponse.error) {
-					oData = oResponse.data;
-					break;
-				}
+
+				var xhr = new XMLHttpRequest();
+
+				xhr.open("GET", sPathGeoJSON, false); // set 'false' to make it synchronous
+				xhr.send();
+
+				  if (xhr.status === 200) {
+					oData = JSON.parse(xhr.responseText);
+				  } else {
+					// Handle error
+					console.error('An error occurred:', xhr.status, xhr.statusText);
+				  }
+
 				// else: JSON not found under current URL -> try next
 			}
 		}

package/src/sap/ui/vbm/GeoMap.js

@@ -2132,7 +2132,21 @@ sap.ui.define([
 		}
 		if (GeoMap.bEncodedSpotImagesAvailable == false) {
 			var aPathImgJSON = sap.ui.require.toUrl("sap/ui/vbm/themes/base/img/Pin_images.json");
-			var oResponse = jQuery.sap.syncGetJSON(aPathImgJSON);
+			//var oResponse = jQuery.sap.syncGetJSON(aPathImgJSON);
+			var xhr = new XMLHttpRequest();
+
+
+				xhr.open("GET", aPathImgJSON, false); // set 'false' to make it synchronous
+				xhr.send();
+
+				  if (xhr.status === 200) {
+					var oResponse = JSON.parse(xhr.responseText);
+					//oData = oResponse.data;
+				  } else {
+					// Handle error
+					console.error('An error occurred:', xhr.status, xhr.statusText);
+				  }
+
 			GeoMap.bEncodedSpotImageData = oResponse.data;
 			GeoMap.bEncodedSpotImagesAvailable = true;
 		}

package/src/sap/ui/vbm/Viewport.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.126.0
 	 * @extends sap.ui.core.Control
 	 * @alias sap.ui.vbm.Viewport
 	 */

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

@@ -0,0 +1,123 @@
+/*
+ * ! SAP UI development toolkit for HTML5 (SAPUI5) (c) Copyright 2009-2012 SAP AG. All rights reserved
+ */
+
+// Provides class sap.ui.vbm.adapter3d.DragDropHandler
+sap.ui.define([
+	"sap/ui/base/Object",
+	"./Utilities",
+	"./thirdparty/three",
+	"sap/base/Log"
+], function (BaseObject, Utilities, THREE, Log) {
+	"use strict";
+
+	var instances = {}, objects = {};
+	var count = 0;
+
+	/**
+		 * Constructor for a new ColladaBounds.
+		 *
+		 * @class
+		 * Provides a class for creating Bounding Box for Collada Objects.
+		 *
+		 * @private
+		 * @author SAP SE
+		 * @version 1.126.0
+		 * @alias sap.ui.vbm.adapter3d.ColladaBounds
+		 */
+	var ColladaBounds = BaseObject.extend("sap.ui.vbm.adapter3d.ColladaBounds", /** @lends sap.ui.vbm.adapter3d.ColladaBounds.prototype */ {
+
+		constructor: function (adapter) {
+			BaseObject.call(this);
+
+			this._adapter = adapter;                             // fire submit event
+			this._context = adapter._context;                    // access evaluated data
+			this._viewport = adapter._viewport;                  // events
+			this._root = this._viewport._root;
+			this._scene = this._viewport._scene;
+			this._camera = this._viewport._camera;
+			this._cameraControls = this._viewport._cameraController; 
+			this._bbox = new THREE.Box3();
+			this._colladaBoundingBoxes = [];
+			this._adapter._colladaBoundingBoxMesh = [];
+
+		}
+
+	});
+
+
+	ColladaBounds.prototype.initialize = function () {
+		var that = this;
+		this._scene._cm.forEach(function (array, key) {
+			for (var i = 0; i < array.length; i++) {
+				var a = array[i];
+				instances = Array.from(a.instances);
+				objects = Array.from(a.objects3D);
+				count = a.hitInfo[0].matrices.length;
+				that.transform(instances, objects, count);
+			}
+		});
+	};
+
+	ColladaBounds.prototype.transform = function (instances, objects, count) {
+		var i, j, id;
+		var _matrix = new THREE.Matrix4();
+
+		for (j = 0; j < instances.length; j++) {
+			for (i = 0; i < objects.length; i++) {
+				var object = objects[i];
+				var geometry = object.geometry;
+				object.updateMatrixWorld(false, false);
+				if (object.visible && geometry) {
+					if (!geometry.boundingBox) {
+						geometry.computeBoundingBox();
+					}
+					// if instanced mesh -> take all instances into account
+					if (object.isInstancedMesh) {
+						geometry = object.geometry.clone();
+						object.getMatrixAt(j, _matrix);
+						id = instances[j].instance;
+						geometry.applyMatrix4(_matrix);
+						this.createBBoxMeshes(geometry, object, count, id);
+					}
+				}
+			}
+		}
+	};
+
+	ColladaBounds.prototype.createBBoxMeshes = function (geometry, object, count, id) {
+		if (id["VB:c"] == "true" && object.userData._sapInstance != undefined) {
+			var _sapInstance = id;
+			var material = new THREE.MeshBasicMaterial({ color: 0x808080, transparent: true, wireframe: true, opacity: 1, visible: false });
+
+			// Create the mesh using the geometry and material
+			var boundingBoxMesh = new THREE.Mesh(geometry, material);
+			var world = this._root.matrixWorld.clone();
+			boundingBoxMesh.applyMatrix4(world);
+			boundingBoxMesh.scale.set(1, 1, 1);
+			boundingBoxMesh.rotation.set(0, 0, 0);
+			boundingBoxMesh.updateMatrixWorld();
+			boundingBoxMesh.userData = { name: "ColladaBounds", _sapInstance: _sapInstance, id: _sapInstance.id, count: count };
+			this._adapter._colladaBoundingBoxMesh.push(boundingBoxMesh);
+			// Add the bounding box mesh to the scene
+			this._scene.add(boundingBoxMesh);
+
+		}
+	};
+
+	ColladaBounds.prototype._destroy = function () {
+		this._adapter = null;                             // fire submit event
+		this._context = null;                    // access evaluated data
+		this._viewport = null;                  // events
+		this._root = null;
+		this._scene = null;
+		this._camera = null;
+		this._cameraControls =null;
+		this._bbox = null;
+		this._colladaBoundingBoxes = null;
+		this._adapter._colladaBoundingBoxMesh = null;
+	};
+
+	return ColladaBounds;
+})
+

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

@@ -83,7 +83,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.126.0
 	 * @alias sap.ui.vbm.adapter3d.DragDropHandler
 	 */
 	var DragDropHandler = BaseObject.extend("sap.ui.vbm.adapter3d.DragDropHandler", /** @lends sap.ui.vbm.adapter3d.DragDropHandler.prototype */ {

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

@@ -29,7 +29,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.126.0
 	 * @alias sap.ui.vbm.adapter3d.ModelHandler
 	 */
 	var ModelHandler = BaseObject.extend("sap.ui.vbm.adapter3d.ModelHandler", /** @lends sap.ui.vbm.adapter3d.ModelHandler.prototype */ {
@@ -76,6 +76,8 @@ sap.ui.define([
 			// key(instance resource + instance color) -> 'meta' mesh data
 			this._meshes = new Map();
 
+			this._scene._cm = new Map();
+
 			// These objects are created on first use
 			this._colladaLoader = null;
 			this._glTFLoader = null;
@@ -286,7 +288,8 @@ sap.ui.define([
 			for (var i = 0; i < array.length;) {
 				if (array[i].dirty) {
 					var j, instance, index = 0, data = array[i];
-
+					// var _matrix = new THREE.Matrix4();
+					var _matrix = [];
 					// delete current instanced meshes from scene
 					data.objects3D.forEach(function(object) {
 						this._deleteObject3D(object);
@@ -301,10 +304,43 @@ sap.ui.define([
 							mesh.matrixAutoUpdate = false;
 							mesh.layers.set(0); // put it to layer #0 to enable raycasting
 							mesh._instanceHitTest = this._instanceHitTest.bind(data); // helper function to return instance based on hit test info
+							// mesh.userData = {_sapInstance : data.instance};
 							this._scene.add(mesh);
 							data.objects3D.push(mesh);
 						}, this);
 
+						
+						var val = this._meshes.get(key);
+						delete val.model; 
+						this._scene._cm.set(key,val);
+						
+						var _sapInstance = [], matrix = [];
+						data.instances.forEach(function(value) {
+							instance = value.instance;
+							// _matrix = value.world;
+							_matrix = value.matrices.length
+							_sapInstance.push(instance);
+							matrix.push(_matrix);
+						});
+
+						//commmented earlier
+						// data.instances.forEach(function(value){
+						// 	data.objects3D[0].userData = {_sapInstance : _sapInstance ,
+						// 								  matrix : matrix};
+						// })
+
+						data.objects3D.forEach(function(value) {
+							value.userData = {_sapInstance : _sapInstance,
+											   matrix : matrix  
+											};
+						})
+
+						// data.objects3D.forEach(function(value){
+							
+						// 	value.userData = {_sapInstance : _sapInstance,
+						// 					   matrix : matrix};
+						// })
+
 						data.instances.forEach(function(value) {
 							instance = value;
 							data.hitInfo.push(instance);

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

@@ -377,7 +377,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.126.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,7 +32,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.126.0
 	 * @alias sap.ui.vbm.adapter3d.PolygonHandler
 	 */
 	var PolygonHandler = BaseObject.extend("sap.ui.vbm.adapter3d.PolygonHandler", /** @lends sap.ui.vbm.adapter3d.PolygonHandler.prototype */ {