@sapui5/sap.ui.vbm 1.103.0 → 1.104.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.ui.vbm",
-  "version": "1.103.0",
+  "version": "1.104.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.103.0</version>
+	<version>1.104.0</version>
 
 	<documentation>SAP UI library: sap.ui.vbm</documentation>
 

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.103.0
+	 * @version 1.104.0
 	 * @extends sap.ui.core.Element
 	 * @constructor
 	 * @public

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

@@ -14,6 +14,7 @@ sap.ui.define([
 	"./adapter3d/VBIJSONParser",
 	"./adapter3d/SceneBuilder",
 	"./adapter3d/Utilities",
+	"./adapter3d/DragDropHandler",
 	"sap/m/HBox",
 	"sap/m/VBox",
 	"sap/m/Link",
@@ -24,10 +25,13 @@ sap.ui.define([
 	"sap/base/Log",
 	"jquery.sap.global",
 	"./library"
-], function(Element, Observer, Menu, MenuItem, Popover, Viewport, ObjectFactory, Parser, SceneBuilder, Utilities, HBox, VBox, Link, Button, Text, Image, THREE, Log, jQuery, library) {
+], function(Element, Observer, Menu, MenuItem, Popover, Viewport, ObjectFactory, Parser, SceneBuilder, Utilities, DragDropHandler, HBox, VBox, Link, Button, Text, Image, THREE, Log, jQuery, library) {
 	"use strict";
 
-	var thisModule = "sap.ui.vbm.Adapter3D";
+	var Vector2		= THREE.Vector2;
+	var Vector3		= THREE.Vector3;
+	var toBoolean	= Utilities.toBoolean;
+	var thisModule	= "sap.ui.vbm.Adapter3D";
 
 	// Forward declaration;
 	var viewportEventDelegate;
@@ -41,7 +45,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.103.0
+	 * @version 1.104.0
 	 * @extends sap.ui.core.Element
 	 * @constructor
 	 * @public
@@ -99,6 +103,11 @@ sap.ui.define([
 			// It is populated by VBIJSONParser and consumed by SceneBuilder.
 			resources: new Map(),
 
+			// A map with config names as keys and config value as values.
+			// Both config keys & values are strings.
+			// It is populated by VBIJSONParser and consumed by all classes require access to config section.
+			config: new Map(),
+
 			// An array of data types. See dataTypePrototype and dataTypeAttributePrototype in ObjectFactory.js.
 			dataTypes: [],
 
@@ -182,7 +191,7 @@ sap.ui.define([
 				}
 			},
 
-			//  containes instructions how to setup view when most recent payload contains 3d scene with camera setup instructions
+			// contains instructions how to setup view when most recent payload contains 3d scene with camera setup instructions
 			setupView: undefined
 		};
 
@@ -217,10 +226,15 @@ sap.ui.define([
 			pending: undefined // pending popover, if viewport has not been rendered yet
 		};
 
+		// Ray caster used for detecting hover instance
 		this._raycaster = new THREE.Raycaster();
+
+		// Drag and drop handler
+		this._dragDropHandler = null;
 	};
 
 	Adapter3D.prototype.exit = function() {
+
 		if (this._clickTimerId) {
 			clearTimeout(this._clickTimerId);
 			this._clickTimerId = null;
@@ -236,6 +250,11 @@ sap.ui.define([
 		this._viewportObserver.disconnect();
 		this._viewportObserver = null;
 
+		if (this._dragDropHandler) {
+			this._dragDropHandler.destroy();
+			this._dragDropHandler = null;
+		}
+
 		if (this._sceneBuilder) {
 			this._sceneBuilder.destroy();
 			this._sceneBuilder = null;
@@ -246,7 +265,10 @@ sap.ui.define([
 			this._parser = null;
 		}
 
+		this._detail = null;
 		this._context = null;
+		this._raycaster = null;
+		this._hoverInstance = null;
 
 		if (basePrototype.exit) {
 			basePrototype.exit.call(this);
@@ -282,6 +304,7 @@ sap.ui.define([
 		if (this._viewport) {
 			this._viewportObserver.observe(this._viewport, { destroy: true });
 			this._viewport.addEventDelegate(viewportEventDelegate, this);
+			this._dragDropHandler = new DragDropHandler(this);
 		}
 	};
 
@@ -291,6 +314,9 @@ sap.ui.define([
 	 */
 	Adapter3D.prototype._disconnectViewport = function() {
 		if (this._viewport) {
+			this._dragDropHandler.destroy();
+			this._dragDropHandler = null;
+
 			this._viewport.removeEventDelegate(viewportEventDelegate);
 			// onBeforeRendering unsubscribes from DOM events.
 			viewportEventDelegate.onBeforeRendering.call(this);
@@ -380,15 +406,20 @@ sap.ui.define([
 				}, that);
 			}, that);
 
-			// clear before next update
-			that._context.voQueues.clear();
-			that._context.sceneQueues.clear();
-			that._context.windowQueues.clear();
+			// update drag and drop handler
+			if (that._dragDropHandler) {
+				that._dragDropHandler.update();
+			}
 
 			// scene has changed -> adjust camera clipping planes
 			that._viewport._resetBBox();
 			that._viewport._updateCamera();
 
+			// clear before next update
+			that._context.voQueues.clear();
+			that._context.sceneQueues.clear();
+			that._context.windowQueues.clear();
+
 			that._viewport.setBusy(false);
 		});
 		// return last promise in chain
@@ -473,7 +504,7 @@ sap.ui.define([
 
 	Adapter3D.prototype._openDetailWindow = function(popover, definition) {
 		var pos = definition.pos.split(";");
-		var world = new THREE.Vector3(parseFloat(pos[0]), parseFloat(pos[1]), parseFloat(pos[2]));
+		var world = new Vector3(parseFloat(pos[0]), parseFloat(pos[1]), parseFloat(pos[2]));
 
 		if (!this._viewport.getDomRef()) {
 			if (this._detail.pending) {
@@ -949,7 +980,7 @@ sap.ui.define([
 		var p = event.cursor || this._getXY(event);
 
 		var rect = this._viewport.getDomRef().getBoundingClientRect();
-		var normalizedXY = new THREE.Vector2(p.x / rect.width * 2 - 1, -p.y / rect.height * 2 + 1);
+		var normalizedXY = new Vector2(p.x / rect.width * 2 - 1, -p.y / rect.height * 2 + 1);
 
 		this._raycaster.layers.set(0); // test objects from layer #0 only
 		this._raycaster.setFromCamera(normalizedXY, camera);
@@ -1060,6 +1091,7 @@ sap.ui.define([
 
 		onBeforeRendering: function(event) {
 			if (this._onhoverProxy) {
+				this._viewport.$().off("wheel", this._onhoverProxy);
 				this._viewport.$().off(sap.ui.Device.browser.msie || sap.ui.Device.browser.edge ? "pointermove" : "mousemove", this._onhoverProxy);
 			}
 			if (this._onpointerdownProxy) {
@@ -1074,7 +1106,9 @@ sap.ui.define([
 			if (!this._onhoverProxy) {
 				this._onhoverProxy = viewportEventDelegate.onhover.bind(this);
 			}
+			this._viewport.$().on("wheel", this._onhoverProxy);
 			this._viewport.$().on(sap.ui.Device.browser.msie || sap.ui.Device.browser.edge ? "pointermove" : "mousemove", this._onhoverProxy);
+
 			if (sap.ui.Device.browser.msie || sap.ui.Device.browser.edge) {
 				if (!this._onpointerdownProxy) {
 					this._onpointerdownProxy = viewportEventDelegate.onmousedown.bind(this);
@@ -1169,7 +1203,7 @@ sap.ui.define([
 		var selected = [];
 		var deselected = [];
 		var group = instance.voGroup;
-		var wasSelected = Utilities.toBoolean(instance["VB:s"]);
+		var wasSelected = toBoolean(instance["VB:s"]);
 		var selectedIndex;
 
 		if (action === "select") {

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

@@ -124,7 +124,7 @@ sap.ui.define([
 				clusterVos: {
 					type: "sap.ui.core.Control",
 					multiple: true,
-					visiblity: "hidden",
+					visibility: "hidden",
 					singularName: "clusterVo"
 				},
 				/**
@@ -133,7 +133,7 @@ sap.ui.define([
 				clusterContainers: {
 					type: "sap.ui.vbm.ClusterContainer",
 					multiple: true,
-					visiblity: "hidden",
+					visibility: "hidden",
 					singularName: "clusterContainer"
 				}
 

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.104.0
 	 * @extends sap.ui.core.Control
 	 * @alias sap.ui.vbm.Viewport
 	 */
@@ -189,9 +189,14 @@ sap.ui.define([
 		}
 		this._stopRenderLoop();
 
+		this._cameraController.dispose();
+		this._cameraController = null;
+
+		this._renderer.dispose();
+		this._renderer = null;
+
 		this._scene = null;
 		this._camera = null;
-		this._renderer = null;
 
 		if (basePrototype.exit) {
 			basePrototype.exit.call(this);
@@ -577,7 +582,7 @@ sap.ui.define([
 			// when camera is almost on XZ plane, intersection point could be very far or very close
 			// setting it straight as camera target makes navigation unusable, as either
 			// small mouse movements results in huge move of camera in space (when intersection is far away)
-			// or huge mouse movements result in bearly visible camera move in space (when intersection point is too close)
+			// or huge mouse movements result in barely visible camera move in space (when intersection point is too close)
 			// so don't update camera target in those extreme cases
 			if (THREE.Math.radToDeg(this._camera.position.clone().sub(target).angleTo(normal)) < CAMERA_TARGET_LIMIT) {
 				this._cameraController.target.copy(target);