@sapui5/sap.ui.vk 1.138.0 → 1.139.0

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

@@ -9,6 +9,7 @@
 sap.ui.define([
 	"../Core",
 	"../ViewportBase",
+	"../abgrToColor",
 	"sap/ui/core/Element",
 	"sap/ui/core/ResizeHandler",
 	"sap/ui/events/KeyCodes",
@@ -18,6 +19,7 @@ sap.ui.define([
 	"./ViewportGestureHandler",
 	"./OrthographicCamera",
 	"./PerspectiveCamera",
+	"./OutlineRenderer",
 	"../Messages",
 	"sap/ui/base/ManagedObjectObserver",
 	"../CameraProjectionType",
@@ -37,6 +39,7 @@ sap.ui.define([
 	"../Annotation",
 	"../measurements/Surface",
 	"../NodeContentType",
+	"../SelectionDisplayMode",
 	"sap/base/assert",
 	"sap/base/Log",
 	"../findIndexInArray",
@@ -44,6 +47,7 @@ sap.ui.define([
 ], function(
 	vkCore,
 	ViewportBase,
+	abgrToColor,
 	Element,
 	ResizeHandler,
 	KeyCodes,
@@ -53,6 +57,7 @@ sap.ui.define([
 	ViewportGestureHandler,
 	OrthographicCamera,
 	PerspectiveCamera,
+	OutlineRenderer,
 	Messages,
 	ManagedObjectObserver,
 	CameraProjectionType,
@@ -72,6 +77,7 @@ sap.ui.define([
 	Annotation,
 	MeasurementSurface,
 	NodeContentType,
+	SelectionDisplayMode,
 	assert,
 	Log,
 	findIndexInArray,
@@ -88,7 +94,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.ViewportBase
 	 * @alias sap.ui.vk.threejs.Viewport
 	 */
@@ -219,6 +225,8 @@ sap.ui.define([
 		this._underlayGroup = new THREE.Group();
 		this._overlayGroup = new THREE.Group();
 
+		this._outlineRenderer = new OutlineRenderer(1.0);
+
 		this._showPMI = true;
 
 		this._xrayColor1 = new THREE.Vector4(0, 0.75, 1, 0.45);
@@ -320,6 +328,9 @@ sap.ui.define([
 		this._setContent(null);
 		this.setCamera(null);
 
+		this._outlineRenderer?.dispose();
+		this._outlineRenderer = null;
+
 		this._backgroundCamera = null;
 		this._backgroundMaterial = null;
 		this._backgroundScene = null;
@@ -774,18 +785,14 @@ sap.ui.define([
 		}
 
 		var vsm = this._getViewStateManagerThreeJS();
-		if (vsm && vsm.applyNodeStates) {
-			vsm.applyNodeStates();
-		}
+		vsm?.applyNodeStates?.();
 
 		try {
 			var canvas = this._canvas;
 			return this._hitTester.hitTest(x - canvas.clientLeft, y - canvas.clientTop, canvas.clientWidth, canvas.clientHeight,
 				this._renderer, nativeScene, nativeCamera, this._clippingPlanes, options);
 		} finally {
-			if (vsm && vsm.revertNodeStates) {
-				vsm.revertNodeStates();
-			}
+			vsm?.revertNodeStates?.();
 		}
 	};
 
@@ -1071,7 +1078,7 @@ sap.ui.define([
 		}
 	};
 
-	function _updateDynamicObjects(renderer, camera, scene, viewport) {
+	function _updateDynamicObjects(renderer, camera, scene, viewport, vsm) {
 		var viewportSize = new THREE.Vector2(viewport._width, viewport._height);
 		var backgroundProjection = viewport.getBackgroundProjection();
 		let somethingWasChanged = false;
@@ -1083,7 +1090,7 @@ sap.ui.define([
 			if (root.userData._vkDynamicObjects) {
 				root.userData._vkDynamicObjects.forEach(function(object) {
 					if (object.parent) {
-						object._vkUpdate(renderer, camera, viewportSize, backgroundProjection);
+						object._vkUpdate(renderer, camera, viewportSize, backgroundProjection, vsm);
 						somethingWasChanged = true;
 					}
 				});
@@ -1198,9 +1205,7 @@ sap.ui.define([
 		var timerStart = performance.now();
 		var vsm = this._getViewStateManagerThreeJS();
 
-		if (vsm && vsm.applyNodeStates) {
-			vsm.applyNodeStates();
-		}
+		vsm?.applyNodeStates?.(this.getSelectionDisplayMode() === SelectionDisplayMode.Outline);
 
 		try {
 			renderer.setViewport(0, 0, this._canvas.width / window.devicePixelRatio, this._canvas.height / window.devicePixelRatio);
@@ -1273,7 +1278,7 @@ sap.ui.define([
 			var tools = this.getTools();
 			var i, tool, gizmo, boundingBox;
 
-			const someObjectsWereUpdated = _updateDynamicObjects(renderer, nativeCamera, nativeScene, this);
+			const someObjectsWereUpdated = _updateDynamicObjects(renderer, nativeCamera, nativeScene, this, vsm);
 			const mustUpdateDynamicObjectsAgain = someObjectsWereUpdated && (nativeCamera.near <= 0 || nativeCamera.far <= 0);
 
 			// todo: we need to _updateBoundingBoxes() only if some dynamic objects are currently selected
@@ -1293,6 +1298,12 @@ sap.ui.define([
 				}
 				timerComputeBoundingBoxEnd = performance.now();
 
+				if (mustUpdateDynamicObjectsAgain && boundingBox.isEmpty()) {
+					// If the bounding box is empty, it means that there are no visible objects in the scene currently,
+					// so we use bounding box of all objects in the scene in order to get "good" znear and zfar.
+					boundingBox = currentScene._computeBoundingBox(false, false, true);
+				}
+
 				if (!boundingBox.isEmpty()) {
 					if (nativeCamera.isOrthographicCamera && nativeCamera.zoom <= 0) {
 						this._camera.adjustZoom(boundingBox);
@@ -1316,7 +1327,7 @@ sap.ui.define([
 						// Usually it is fine to use Z near/far computed in previous frame, but it would not work
 						// if Z near and far equal to -1.0 default values for "auto evaluate", so we must
 						// update dynamic objects twice in such case (it happens on view activation only).
-						_updateDynamicObjects(renderer, nativeCamera, nativeScene, this);
+						_updateDynamicObjects(renderer, nativeCamera, nativeScene, this, vsm);
 					}
 
 					// check scene dimension and distance from camera
@@ -1429,8 +1440,12 @@ sap.ui.define([
 
 			_renderDetailViews(renderer, nativeCamera, nativeScene, boundingBox, this._cameraLight);
 
-			if (vsm) {
-				vsm._renderOutline(renderer, nativeScene, nativeCamera);
+			if (vsm?._outlinedNodes.size > 0) {
+				this._renderOutline(nativeScene, nativeCamera, Array.from(vsm._outlinedNodes), vsm._outlineColorABGR, vsm);
+			}
+
+			if (this.getSelectionDisplayMode() === SelectionDisplayMode.Outline && vsm?._selectedNodes.size > 0) {
+				this._renderOutline(nativeScene, nativeCamera, Array.from(vsm._selectedNodes), vsm._highlightColorABGR, vsm);
 			}
 
 			for (i = 0; i < tools.length; i++) { // loop over all oTools
@@ -1482,14 +1497,18 @@ sap.ui.define([
 				+ tail
 			);
 		} finally {
-			if (vsm && vsm.revertNodeStates) {
-				vsm.revertNodeStates();
-			}
+			vsm?.revertNodeStates?.();
 		}
 
 		this.fireFrameRenderingFinished();
 	};
 
+	Viewport.prototype._renderOutline = function(scene, camera, nodes, colorABGR, vsm) {
+		const c = abgrToColor(colorABGR);
+		const color = new THREE.Color(c.red / 255.0, c.green / 255.0, c.blue / 255.0);
+		this._outlineRenderer.render(this._renderer, scene, camera, nodes, color, vsm.getOutlineWidth(), vsm._jointCollection);
+	};
+
 	/**
 	 * Returns viewport content as an image of desired size.
 	 *
@@ -1746,9 +1765,7 @@ sap.ui.define([
 		document.body.appendChild(renderer.domElement);
 
 		var vsm = this._getViewStateManagerThreeJS();
-		if (vsm && vsm.applyNodeStates) {
-			vsm.applyNodeStates();
-		}
+		vsm?.applyNodeStates?.();
 
 		try {
 			if (nodeRefs == null) {
@@ -1781,13 +1798,8 @@ sap.ui.define([
 			var hiddenNodes = [];
 			nodeRefs.forEach(function(nodeRef) {
 				nodeRef.traverseVisible(function(node) {
-					if (node._vkUpdate) {
-						node._vkUpdate(renderer, cameraRef, viewportSize);
+					node._vkUpdate?.(renderer, cameraRef, viewportSize, null, vsm);
 
-						if (node._vkGetNodeContentType() === NodeContentType.Symbol) {// reset symbol opacity
-							node._vkSetOpacity(1);
-						}
-					}
 					if ((!options.includeOverlay && node.userData.renderStage > 0) ||
 						(!options.includeUnderlay && node.userData.renderStage < 0)) {
 						// hide overlay/underlay node
@@ -1846,9 +1858,7 @@ sap.ui.define([
 			scene.remove(lightNode);
 			scene.children = [];
 		} finally {
-			if (vsm && vsm.revertNodeStates) {
-				vsm.revertNodeStates();
-			}
+			vsm?.revertNodeStates?.();
 		}
 
 		var imageData = renderer.getContext().canvas.toDataURL(options.type, options.encoderOptions);

package/src/sap/ui/vk/tools/AnchorPointTool.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] An optional map/JSON object with initial property values, aggregated objects etc. for the new tool instance.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.tools.Tool
 	 * @alias sap.ui.vk.tools.AnchorPointTool
 	 */

package/src/sap/ui/vk/tools/AnchorPointToolGizmo.js

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @extends sap.ui.vk.tools.Gizmo
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/vk/tools/AxisAngleRotationTool.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] An optional map/JSON object with initial property values, aggregated objects etc. for the new tool instance.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.tools.Tool
 	 * @alias sap.ui.vk.tools.AxisAngleRotationTool
 	 */

package/src/sap/ui/vk/tools/AxisAngleRotationToolGizmo.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @extends sap.ui.vk.tools.Gizmo
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/vk/tools/CreateEllipseTool.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] An optional map/JSON object with initial property values, aggregated objects etc. for the new tool instance.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.tools.Tool
 	 * @alias sap.ui.vk.tools.CreateEllipseTool
 	 */

package/src/sap/ui/vk/tools/CreateEllipseToolGizmo.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.vk.tools.CreateParametricGizmo
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/vk/tools/CreateParametricGizmo.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.vk.tools.Gizmo
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/vk/tools/CreatePathTool.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] An optional map/JSON object with initial property values, aggregated objects etc. for the new tool instance.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.tools.Tool
 	 * @alias sap.ui.vk.tools.CreatePathTool
 	 */

package/src/sap/ui/vk/tools/CreatePathToolGizmo.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.ui.vk.tools.CreateParametricGizmo
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/vk/tools/CreateRectangleTool.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] An optional map/JSON object with initial property values, aggregated objects etc. for the new tool instance.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.tools.Tool
 	 * @alias sap.ui.vk.tools.CreateRectangleTool
 	 */

package/src/sap/ui/vk/tools/CreateRectangleToolGizmo.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.vk.tools.CreateParametricGizmo
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/vk/tools/CreateTextTool.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] An optional map/JSON object with initial property values, aggregated objects etc. for the new tool instance.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.tools.Tool
 	 * @alias sap.ui.vk.tools.CreateTextTool
 	 */

package/src/sap/ui/vk/tools/CreateTextToolGizmo.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @extends sap.ui.vk.tools.CreateParametricGizmo
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/vk/tools/CrossSectionTool.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] An optional map/JSON object with initial property values, aggregated objects etc. for the new tool instance.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.tools.Tool
 	 * @alias sap.ui.vk.tools.CrossSectionTool
 	 */

package/src/sap/ui/vk/tools/CrossSectionToolGizmo.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @extends sap.ui.vk.tools.Gizmo
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/vk/tools/DuplicateSvgElementTool.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] An optional map/JSON object with initial property values, aggregated objects etc. for the new tool instance.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.tools.Tool
 	 * @alias sap.ui.vk.tools.DuplicateSvgElementTool
 	 */

package/src/sap/ui/vk/tools/DuplicateSvgElementToolGizmo.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.vk.tools.CreateParametricGizmo
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/vk/tools/ExplodeTool.js

@@ -52,7 +52,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] An optional map/JSON object with initial property values, aggregated objects etc. for the new tool instance.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.tools.Tool
 	 * @alias sap.ui.vk.tools.ExplodeTool
 	 */

package/src/sap/ui/vk/tools/ExplodeToolGizmo.js

@@ -46,7 +46,7 @@ sap.ui.define([
 	 * @extends sap.ui.vk.tools.Gizmo
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/vk/tools/Gizmo.js

@@ -53,7 +53,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/vk/tools/HitTestTool.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] An optional map/JSON object with initial property values, aggregated objects etc. for the new tool instance.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.tools.Tool
 	 * @alias sap.ui.vk.tools.HitTestTool
 	 */

package/src/sap/ui/vk/tools/MoveTool.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] An optional map/JSON object with initial property values, aggregated objects etc. for the new tool instance.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.tools.Tool
 	 * @alias sap.ui.vk.tools.MoveTool
 	 */

package/src/sap/ui/vk/tools/MoveToolGizmo.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @extends sap.ui.vk.tools.Gizmo
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/vk/tools/PointCloudSelectionTool.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] An optional map/JSON object with initial property values, aggregated objects etc. for the new tool instance.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.tools.Tool
 	 * @alias sap.ui.vk.tools.PointCloudSelectionTool
 	 * @since 1.118.0

package/src/sap/ui/vk/tools/PointCloudSelectionToolGizmo.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @extends sap.ui.vk.tools.Gizmo
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/vk/tools/RectSelectTool.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] An optional map/JSON object with initial property values, aggregated objects etc. for the new tool instance.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.tools.Tool
 	 * @alias sap.ui.vk.tools.RectSelectTool
 	 */

package/src/sap/ui/vk/tools/RedlineTool.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] An optional map/JSON object with initial property values, aggregated objects etc. for the new tool instance.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.tools.Tool
 	 * @alias sap.ui.vk.tools.RedlineTool
 	 */

package/src/sap/ui/vk/tools/RedlineToolGizmo.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.vk.tools.Gizmo
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/vk/tools/RotateOrbitTool.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] An optional map/JSON object with initial property values, aggregated objects etc. for the new tool instance.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.tools.Tool
 	 * @alias sap.ui.vk.tools.RotateOrbitTool
 	 */

package/src/sap/ui/vk/tools/RotateTool.js

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] An optional map/JSON object with initial property values, aggregated objects etc. for the new tool instance.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.tools.Tool
 	 * @alias sap.ui.vk.tools.RotateTool
 	 */

package/src/sap/ui/vk/tools/RotateToolGizmo.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @extends sap.ui.vk.tools.Gizmo
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/vk/tools/RotateTurntableTool.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] An optional map/JSON object with initial property values, aggregated objects etc. for the new tool instance.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.tools.Tool
 	 * @alias sap.ui.vk.tools.RotateTurntableTool
 	 */

package/src/sap/ui/vk/tools/ScaleTool.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] An optional map/JSON object with initial property values, aggregated objects etc. for the new tool instance.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.tools.Tool
 	 * @alias sap.ui.vk.tools.ScaleTool
 	 */

package/src/sap/ui/vk/tools/ScaleToolGizmo.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @extends sap.ui.vk.tools.Gizmo
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/vk/tools/SceneOrientationTool.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] An optional map/JSON object with initial property values, aggregated objects etc. for the new tool instance.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.tools.Tool
 	 * @alias sap.ui.vk.tools.SceneOrientationTool
 	 */

package/src/sap/ui/vk/tools/SceneOrientationToolGizmo.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @extends sap.ui.vk.tools.Gizmo
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/vk/tools/Tool.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @param {object} [oScope] scope An object for resolving string-based type and formatter references in bindings.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.core.Element
 	 * @alias sap.ui.vk.tools.Tool
 	 */

package/src/sap/ui/vk/tools/TooltipTool.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] An optional map/JSON object with initial property values, aggregated objects etc. for the new tool instance.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.tools.Tool
 	 * @alias sap.ui.vk.tools.TooltipTool
 	 */

package/src/sap/ui/vk/tools/TooltipToolGizmo.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.vk.tools.Gizmo
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/vk/tools/TooltipToolHandler.js

@@ -22,6 +22,7 @@ sap.ui.define([
 	TooltipToolHandler.prototype.hover = function(event) {
 		const gizmo = this._tool.getGizmo();
 		const viewport = this.getViewport();
+
 		if (gizmo && this._inside(event) && viewport.getScene()) {
 			const absoluteX = event.x, absoluteY = event.y;
 			const x = absoluteX - this._rect.x, y = absoluteY - this._rect.y;
@@ -33,6 +34,10 @@ sap.ui.define([
 					// TODO: Return object should be consistent among all viewports!
 					hitObject = hitObject.object;
 				}
+				if (viewport.isECAD?.() === true) {
+					// return whole element
+					hitObject = viewport.findElement(hitObject);
+				}
 				gizmo.update(x, y, absoluteX, absoluteY, hitObject);
 			};
 

package/src/sap/ui/vk/tools/TransformSvgElementTool.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] An optional map/JSON object with initial property values, aggregated objects etc. for the new tool instance.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.tools.Tool
 	 * @alias sap.ui.vk.tools.TransformSvgElementTool
 	 */

package/src/sap/ui/vk/tools/TransformSvgElementToolGizmo.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.ui.vk.tools.Gizmo
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @private