@sapui5/sap.ui.vbm 1.96.1 → 1.96.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/sap/ui/vbm/.library +1 -1
- package/src/sap/ui/vbm/Adapter.js +2 -2
- package/src/sap/ui/vbm/Adapter3D.js +5 -2
- package/src/sap/ui/vbm/AnalyticMap.js +1 -1
- package/src/sap/ui/vbm/AnalyticMapRenderer.js +1 -1
- package/src/sap/ui/vbm/Area.js +1 -1
- package/src/sap/ui/vbm/Areas.js +1 -1
- package/src/sap/ui/vbm/Box.js +1 -1
- package/src/sap/ui/vbm/Boxes.js +1 -1
- package/src/sap/ui/vbm/Circle.js +1 -1
- package/src/sap/ui/vbm/Circles.js +1 -1
- package/src/sap/ui/vbm/Cluster.js +1 -1
- package/src/sap/ui/vbm/ClusterBase.js +3 -3
- package/src/sap/ui/vbm/ClusterContainer.js +1 -1
- package/src/sap/ui/vbm/ClusterDistance.js +1 -1
- package/src/sap/ui/vbm/ClusterGrid.js +1 -1
- package/src/sap/ui/vbm/ClusterRenderer.js +1 -1
- package/src/sap/ui/vbm/ClusterTree.js +1 -1
- package/src/sap/ui/vbm/Container.js +1 -1
- package/src/sap/ui/vbm/Containers.js +1 -1
- package/src/sap/ui/vbm/DragSource.js +1 -1
- package/src/sap/ui/vbm/DropTarget.js +1 -1
- package/src/sap/ui/vbm/Feature.js +1 -1
- package/src/sap/ui/vbm/FeatureCollection.js +1 -1
- package/src/sap/ui/vbm/GeoCircle.js +1 -1
- package/src/sap/ui/vbm/GeoCircles.js +1 -1
- package/src/sap/ui/vbm/GeoJsonLayer.js +1 -1
- package/src/sap/ui/vbm/GeoMap.js +1 -1
- package/src/sap/ui/vbm/GeoMapRenderer.js +1 -1
- package/src/sap/ui/vbm/HeatPoint.js +1 -1
- package/src/sap/ui/vbm/Heatmap.js +1 -1
- package/src/sap/ui/vbm/Legend.js +1 -1
- package/src/sap/ui/vbm/LegendItem.js +1 -1
- package/src/sap/ui/vbm/Pie.js +1 -1
- package/src/sap/ui/vbm/PieItem.js +1 -1
- package/src/sap/ui/vbm/Pies.js +1 -1
- package/src/sap/ui/vbm/Region.js +1 -1
- package/src/sap/ui/vbm/Resource.js +1 -1
- package/src/sap/ui/vbm/Route.js +1 -1
- package/src/sap/ui/vbm/Routes.js +1 -1
- package/src/sap/ui/vbm/Spot.js +1 -1
- package/src/sap/ui/vbm/Spots.js +1 -1
- package/src/sap/ui/vbm/VBI.js +1 -1
- package/src/sap/ui/vbm/VBIRenderer.js +1 -1
- package/src/sap/ui/vbm/Viewport.js +8 -3
- package/src/sap/ui/vbm/ViewportRenderer.js +1 -1
- package/src/sap/ui/vbm/VoAbstract.js +1 -1
- package/src/sap/ui/vbm/VoAggregation.js +1 -1
- package/src/sap/ui/vbm/VoBase.js +1 -1
- package/src/sap/ui/vbm/adapter3d/ModelHandler.js +26 -15
- package/src/sap/ui/vbm/adapter3d/ObjectFactory.js +2 -2
- package/src/sap/ui/vbm/adapter3d/PolygonHandler.js +32 -26
- package/src/sap/ui/vbm/adapter3d/SceneBuilder.js +14 -3
- package/src/sap/ui/vbm/adapter3d/Utilities.js +1 -1
- package/src/sap/ui/vbm/adapter3d/VBIJSONParser.js +2 -2
- package/src/sap/ui/vbm/lib/sapactions.js +1 -1
- package/src/sap/ui/vbm/lib/sapautomations.js +1 -1
- package/src/sap/ui/vbm/lib/sapconfig.js +1 -1
- package/src/sap/ui/vbm/lib/sapdataprovider.js +1 -1
- package/src/sap/ui/vbm/lib/sapevents.js +1 -1
- package/src/sap/ui/vbm/lib/sapgeolocation.js +1 -1
- package/src/sap/ui/vbm/lib/sapgeomath.js +1 -1
- package/src/sap/ui/vbm/lib/sapgeotool.js +1 -1
- package/src/sap/ui/vbm/lib/sapheatmap.js +1 -1
- package/src/sap/ui/vbm/lib/saplabels.js +1 -1
- package/src/sap/ui/vbm/lib/saplassotrack.js +1 -1
- package/src/sap/ui/vbm/lib/sapmaplayer.js +1 -1
- package/src/sap/ui/vbm/lib/sapmapmanager.js +1 -1
- package/src/sap/ui/vbm/lib/sapmapprovider.js +1 -1
- package/src/sap/ui/vbm/lib/sapnavigation.js +1 -1
- package/src/sap/ui/vbm/lib/sapparsing.js +1 -1
- package/src/sap/ui/vbm/lib/sappositioning.js +1 -1
- package/src/sap/ui/vbm/lib/sapprojection.js +1 -1
- package/src/sap/ui/vbm/lib/saprecttrack.js +1 -1
- package/src/sap/ui/vbm/lib/sapresources.js +1 -1
- package/src/sap/ui/vbm/lib/sapscale.js +1 -1
- package/src/sap/ui/vbm/lib/sapscene.js +19 -13
- package/src/sap/ui/vbm/lib/saputilities.js +6 -1
- package/src/sap/ui/vbm/lib/sapvbcluster.js +1 -1
- package/src/sap/ui/vbm/lib/sapvbi.js +1 -1
- package/src/sap/ui/vbm/lib/sapvbicontext.js +1 -1
- package/src/sap/ui/vbm/lib/sapvbmenu.js +1 -1
- package/src/sap/ui/vbm/lib/sapvobase.js +2 -2
- package/src/sap/ui/vbm/lib/sapvoutils.js +1 -1
- package/src/sap/ui/vbm/lib/sapwindow.js +1 -1
- package/src/sap/ui/vbm/library.js +3 -3
- package/src/sap/ui/vbm/themes/base/library.source.less +1 -1
- package/src/sap/ui/vbm/themes/sap_belize/library.source.less +1 -1
- package/src/sap/ui/vbm/themes/sap_belize_hcb/AnalyticMap.less +4 -0
- package/src/sap/ui/vbm/themes/sap_belize_hcb/VBI.less +96 -0
- package/src/sap/ui/vbm/themes/sap_belize_hcb/library.source.less +5 -2
- package/src/sap/ui/vbm/themes/sap_belize_hcw/library.source.less +1 -1
- package/src/sap/ui/vbm/themes/sap_belize_plus/library.source.less +1 -1
- package/src/sap/ui/vbm/themes/sap_bluecrystal/library.source.less +1 -1
- package/src/sap/ui/vbm/themes/sap_fiori_3/library.source.less +1 -1
- package/src/sap/ui/vbm/themes/sap_fiori_3_dark/library.source.less +1 -1
- package/src/sap/ui/vbm/themes/sap_fiori_3_hcb/AnalyticMap.less +4 -0
- package/src/sap/ui/vbm/themes/sap_fiori_3_hcb/VBI.less +96 -0
- package/src/sap/ui/vbm/themes/sap_fiori_3_hcb/library.source.less +4 -1
- package/src/sap/ui/vbm/themes/sap_fiori_3_hcw/library.source.less +1 -1
- package/src/sap/ui/vbm/themes/sap_hcb/library.source.less +1 -1
- package/src/sap/ui/vbm/themes/sap_horizon/library.source.less +1 -1
package/package.json
CHANGED
package/src/sap/ui/vbm/.library
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
<name>sap.ui.vbm</name>
|
|
4
4
|
<vendor>SAP SE</vendor>
|
|
5
5
|
<copyright>SAP UI development toolkit for HTML5 (SAPUI5) (c) Copyright 2009-2012 SAP AG. All rights reserved</copyright>
|
|
6
|
-
<version>1.96.
|
|
6
|
+
<version>1.96.5</version>
|
|
7
7
|
|
|
8
8
|
<documentation>SAP UI library: sap.ui.vbm</documentation>
|
|
9
9
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/*
|
|
2
2
|
* ! SAPUI5
|
|
3
|
-
* (c) Copyright 2009-
|
|
3
|
+
* (c) Copyright 2009-2022 SAP SE. All rights reserved.
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
6
|
// Provides class sap.ui.vbm.Adapter
|
|
@@ -23,7 +23,7 @@ sap.ui.define([
|
|
|
23
23
|
* @param {string} [sId] id for the new control, generated automatically if no id is given
|
|
24
24
|
* @param {object} [mSettings] initial settings for the new object
|
|
25
25
|
* @author SAP SE
|
|
26
|
-
* @version 1.96.
|
|
26
|
+
* @version 1.96.5
|
|
27
27
|
* @extends sap.ui.core.Element
|
|
28
28
|
* @constructor
|
|
29
29
|
* @public
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/*
|
|
2
2
|
* ! SAPUI5
|
|
3
|
-
* (c) Copyright 2009-
|
|
3
|
+
* (c) Copyright 2009-2022 SAP SE. All rights reserved.
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
6
|
// Provides class sap.ui.vbm.Adapter3D
|
|
@@ -42,7 +42,7 @@ sap.ui.define([
|
|
|
42
42
|
* @param {string} [sId] id for the new control, generated automatically if no id is given
|
|
43
43
|
* @param {object} [mSettings] initial settings for the new object
|
|
44
44
|
* @author SAP SE
|
|
45
|
-
* @version 1.96.
|
|
45
|
+
* @version 1.96.5
|
|
46
46
|
* @extends sap.ui.core.Element
|
|
47
47
|
* @constructor
|
|
48
48
|
* @public
|
|
@@ -247,7 +247,10 @@ sap.ui.define([
|
|
|
247
247
|
this._parser = null;
|
|
248
248
|
}
|
|
249
249
|
|
|
250
|
+
this._detail = null;
|
|
250
251
|
this._context = null;
|
|
252
|
+
this._raycaster = null;
|
|
253
|
+
this._hoverInstance = null;
|
|
251
254
|
|
|
252
255
|
if (basePrototype.exit) {
|
|
253
256
|
basePrototype.exit.call(this);
|
package/src/sap/ui/vbm/Area.js
CHANGED
package/src/sap/ui/vbm/Areas.js
CHANGED
package/src/sap/ui/vbm/Box.js
CHANGED
package/src/sap/ui/vbm/Boxes.js
CHANGED
package/src/sap/ui/vbm/Circle.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/*
|
|
2
2
|
* ! SAPUI5
|
|
3
|
-
* (c) Copyright 2009-
|
|
3
|
+
* (c) Copyright 2009-2022 SAP SE. All rights reserved.
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
6
|
// Provides control sap.ui.vbm.ClusterBase.
|
|
@@ -125,7 +125,7 @@ sap.ui.define([
|
|
|
125
125
|
clusterVos: {
|
|
126
126
|
type: "sap.ui.core.Control",
|
|
127
127
|
multiple: true,
|
|
128
|
-
|
|
128
|
+
visibility: "hidden",
|
|
129
129
|
singularName: "clusterVo"
|
|
130
130
|
},
|
|
131
131
|
/**
|
|
@@ -134,7 +134,7 @@ sap.ui.define([
|
|
|
134
134
|
clusterContainers: {
|
|
135
135
|
type: "sap.ui.vbm.ClusterContainer",
|
|
136
136
|
multiple: true,
|
|
137
|
-
|
|
137
|
+
visibility: "hidden",
|
|
138
138
|
singularName: "clusterContainer"
|
|
139
139
|
}
|
|
140
140
|
|
package/src/sap/ui/vbm/GeoMap.js
CHANGED
package/src/sap/ui/vbm/Legend.js
CHANGED
package/src/sap/ui/vbm/Pie.js
CHANGED
package/src/sap/ui/vbm/Pies.js
CHANGED
package/src/sap/ui/vbm/Region.js
CHANGED
package/src/sap/ui/vbm/Route.js
CHANGED
package/src/sap/ui/vbm/Routes.js
CHANGED
package/src/sap/ui/vbm/Spot.js
CHANGED
package/src/sap/ui/vbm/Spots.js
CHANGED
package/src/sap/ui/vbm/VBI.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/*
|
|
2
2
|
* ! SAPUI5
|
|
3
|
-
* (c) Copyright 2009-
|
|
3
|
+
* (c) Copyright 2009-2022 SAP SE. All rights reserved.
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
6
|
sap.ui.define([
|
|
@@ -24,7 +24,7 @@ sap.ui.define([
|
|
|
24
24
|
*
|
|
25
25
|
* @public
|
|
26
26
|
* @author SAP SE
|
|
27
|
-
* @version 1.96.
|
|
27
|
+
* @version 1.96.5
|
|
28
28
|
* @extends sap.ui.core.Control
|
|
29
29
|
* @alias sap.ui.vbm.Viewport
|
|
30
30
|
*/
|
|
@@ -190,9 +190,14 @@ sap.ui.define([
|
|
|
190
190
|
}
|
|
191
191
|
this._stopRenderLoop();
|
|
192
192
|
|
|
193
|
+
this._cameraController.dispose();
|
|
194
|
+
this._cameraController = null;
|
|
195
|
+
|
|
196
|
+
this._renderer.dispose();
|
|
197
|
+
this._renderer = null;
|
|
198
|
+
|
|
193
199
|
this._scene = null;
|
|
194
200
|
this._camera = null;
|
|
195
|
-
this._renderer = null;
|
|
196
201
|
|
|
197
202
|
if (basePrototype.exit) {
|
|
198
203
|
basePrototype.exit.call(this);
|
package/src/sap/ui/vbm/VoBase.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/*
|
|
2
2
|
* ! SAPUI5
|
|
3
|
-
* (c) Copyright 2009-
|
|
3
|
+
* (c) Copyright 2009-2022 SAP SE. All rights reserved.
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
6
|
// Provides class sap.ui.vbm.adapter3d.ModelHandler
|
|
@@ -30,9 +30,9 @@ sap.ui.define([
|
|
|
30
30
|
*
|
|
31
31
|
* @private
|
|
32
32
|
* @author SAP SE
|
|
33
|
-
* @version 1.96.
|
|
33
|
+
* @version 1.96.5
|
|
34
34
|
* @alias sap.ui.vbm.adapter3d.ModelHandler
|
|
35
|
-
*/
|
|
35
|
+
*/
|
|
36
36
|
var ModelHandler = BaseObject.extend("sap.ui.vbm.adapter3d.ModelHandler", /** @lends sap.ui.vbm.adapter3d.ModelHandler.prototype */ {
|
|
37
37
|
|
|
38
38
|
constructor: function(resources, textures, scene, root) {
|
|
@@ -95,11 +95,14 @@ sap.ui.define([
|
|
|
95
95
|
this._textures = null;
|
|
96
96
|
this._scene = null;
|
|
97
97
|
this._root = null;
|
|
98
|
+
this._hotInstance = null;
|
|
98
99
|
|
|
99
100
|
// destroy 'meta' meshes
|
|
100
|
-
this._meshes.forEach(function(
|
|
101
|
-
|
|
102
|
-
|
|
101
|
+
this._meshes.forEach(function(array) {
|
|
102
|
+
array.forEach(function(item) {
|
|
103
|
+
item.objects3D.forEach(function(object) {
|
|
104
|
+
this._deleteObject3D(object);
|
|
105
|
+
}, this);
|
|
103
106
|
}, this);
|
|
104
107
|
}, this);
|
|
105
108
|
|
|
@@ -109,15 +112,23 @@ sap.ui.define([
|
|
|
109
112
|
subRef(instance.texture);
|
|
110
113
|
}
|
|
111
114
|
});
|
|
112
|
-
|
|
115
|
+
|
|
113
116
|
// destroy models
|
|
114
117
|
this._models.forEach(function(model, resource) {
|
|
115
118
|
this._deleteModel(model);
|
|
116
119
|
}, this);
|
|
117
120
|
|
|
118
121
|
this._meshes.clear();
|
|
122
|
+
this._meshes = null;
|
|
123
|
+
|
|
119
124
|
this._instances.clear();
|
|
125
|
+
this._instances = null;
|
|
126
|
+
|
|
120
127
|
this._models.clear();
|
|
128
|
+
this._models = null;
|
|
129
|
+
|
|
130
|
+
this._glTFLoader = null;
|
|
131
|
+
this._colladaLoader = null;
|
|
121
132
|
|
|
122
133
|
BaseObject.prototype.destroy.call(this);
|
|
123
134
|
};
|
|
@@ -147,7 +158,7 @@ sap.ui.define([
|
|
|
147
158
|
* @param {object} instance Model instance.
|
|
148
159
|
* @public
|
|
149
160
|
*/
|
|
150
|
-
ModelHandler.prototype.updateInstance = function(instance) {
|
|
161
|
+
ModelHandler.prototype.updateInstance = function(instance) {
|
|
151
162
|
var data = this._instances.get(instance), update = false, hot = this._hotInstance && this._hotInstance === instance;
|
|
152
163
|
if (data) {
|
|
153
164
|
var normalized = Utilities.toBoolean(instance.normalize);
|
|
@@ -186,7 +197,7 @@ sap.ui.define([
|
|
|
186
197
|
}
|
|
187
198
|
update = true;
|
|
188
199
|
}
|
|
189
|
-
|
|
200
|
+
|
|
190
201
|
// when model normalization changed -> update model properties -> reset instance model matrices
|
|
191
202
|
if (propertyChanged(instance, ["normalize", "model"])) {
|
|
192
203
|
this._updateModel(data.model, normalized);
|
|
@@ -218,9 +229,9 @@ sap.ui.define([
|
|
|
218
229
|
if (data.matrices.length === 0) {
|
|
219
230
|
var world = this._root.matrixWorld.clone(); // start from the _root
|
|
220
231
|
world.multiply(data.world); // apply instance world matrix
|
|
221
|
-
|
|
232
|
+
|
|
222
233
|
// if instance normalized -> apply normalized model root matrix as otherwise (non normalized case) model root has identity matrix
|
|
223
|
-
if (normalized) {
|
|
234
|
+
if (normalized) {
|
|
224
235
|
world.multiply(data.model.normalized.world);
|
|
225
236
|
}
|
|
226
237
|
// apply individual mesh matrices from the model at last
|
|
@@ -254,7 +265,7 @@ sap.ui.define([
|
|
|
254
265
|
this._instances.delete(instance);
|
|
255
266
|
this._removeInstanceFromMesh(data);
|
|
256
267
|
instance._last = {}; // reset all LRU variables at once
|
|
257
|
-
|
|
268
|
+
|
|
258
269
|
if (data.model) {
|
|
259
270
|
subRef(data.model); // model can be null if removing 'broken' instance
|
|
260
271
|
}
|
|
@@ -429,7 +440,7 @@ sap.ui.define([
|
|
|
429
440
|
ModelHandler.prototype._postprocess = function(model, content) {
|
|
430
441
|
// mirror on Z axis entire collada root which is effectively the same as collada processing with baking transformations and inverting Z coordinates in ActiveX
|
|
431
442
|
model.scene.scale.set(1,1,-1);
|
|
432
|
-
|
|
443
|
+
|
|
433
444
|
var meshes = [], materials = new Set(), marked = "_sapUsed";
|
|
434
445
|
// collect meshes only + calculate world matrix, mark used materials & maps
|
|
435
446
|
model.scene.traverse(function(object) {
|
|
@@ -559,7 +570,7 @@ sap.ui.define([
|
|
|
559
570
|
// remove instanced mesh from scene
|
|
560
571
|
if (object.parent) {
|
|
561
572
|
object.parent.remove(object);
|
|
562
|
-
}
|
|
573
|
+
}
|
|
563
574
|
// geometries are shared -> cannot dispose
|
|
564
575
|
Utilities.toArray(object.material).forEach(function(material) {
|
|
565
576
|
material.dispose(); // materials are cloned -> can be disposed, maps are shared -> don't touch, cannot be disposes
|
|
@@ -583,7 +594,7 @@ sap.ui.define([
|
|
|
583
594
|
// target has to be added to _root to mimic original model and must have same world matrix as original model
|
|
584
595
|
// so we calculate world matrix for target which will be under _root and not under _scene as instance mesh
|
|
585
596
|
var world = data.world.clone(); // use instance world as starting point
|
|
586
|
-
if (data.model.normalized) {
|
|
597
|
+
if (data.model.normalized) {
|
|
587
598
|
world.multiply(data.model.normalized.world);
|
|
588
599
|
}
|
|
589
600
|
world.multiply(data.model.root.children[0].matrixWorld);
|