bruce-cesium 2.5.7 → 2.5.9
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/dist/bruce-cesium.es5.js +24 -18
- package/dist/bruce-cesium.es5.js.map +1 -1
- package/dist/bruce-cesium.umd.js +23 -17
- package/dist/bruce-cesium.umd.js.map +1 -1
- package/dist/lib/bruce-cesium.js +1 -1
- package/dist/lib/rendering/entity-render-engine.js +16 -6
- package/dist/lib/rendering/entity-render-engine.js.map +1 -1
- package/dist/lib/utils/view-utils.js +6 -10
- package/dist/lib/utils/view-utils.js.map +1 -1
- package/dist/types/bruce-cesium.d.ts +1 -1
- package/package.json +2 -2
package/dist/bruce-cesium.umd.js
CHANGED
|
@@ -2111,7 +2111,7 @@
|
|
|
2111
2111
|
(function (Point) {
|
|
2112
2112
|
function Render(params) {
|
|
2113
2113
|
return __awaiter(this, void 0, void 0, function () {
|
|
2114
|
-
var entity, style, type, cEntity, siblings, iconUrlRows, icon, iconUrl, res, e_4, iconScale, heightRef, radius, bFill, cFill, outline, cOutline, outlineWidth, outlineHeight, bOutline, fillHeight, exHeightRef, pos, bColor, cColor, size, heightRef;
|
|
2114
|
+
var entity, style, type, cEntity, siblings, iconUrlRows, icon, iconUrl, res, e_4, iconScale, disableDepthTest, heightRef, radius, bFill, cFill, outline, cOutline, outlineWidth, outlineHeight, bOutline, fillHeight, exHeightRef, pos, bColor, cColor, size, heightRef;
|
|
2115
2115
|
return __generator(this, function (_a) {
|
|
2116
2116
|
switch (_a.label) {
|
|
2117
2117
|
case 0:
|
|
@@ -2173,6 +2173,7 @@
|
|
|
2173
2173
|
if (!iconScale && iconScale != 0) {
|
|
2174
2174
|
iconScale = 1;
|
|
2175
2175
|
}
|
|
2176
|
+
disableDepthTest = Boolean(style.renderOnTop);
|
|
2176
2177
|
if (iconScale > 0) {
|
|
2177
2178
|
heightRef = getHeightRef(style);
|
|
2178
2179
|
cEntity = new Cesium.Entity({
|
|
@@ -2182,6 +2183,7 @@
|
|
|
2182
2183
|
image: iconUrl,
|
|
2183
2184
|
heightReference: getHeightRef(style),
|
|
2184
2185
|
scale: iconScale,
|
|
2186
|
+
disableDepthTestDistance: disableDepthTest ? Number.POSITIVE_INFINITY : undefined,
|
|
2185
2187
|
distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance),
|
|
2186
2188
|
// Would be great once we have a setting for this.
|
|
2187
2189
|
// translucencyByDistance: getTranslucencyByDistance(params.minDistance, params.maxDistance),
|
|
@@ -2437,12 +2439,16 @@
|
|
|
2437
2439
|
if (units != "px" && units != "m") {
|
|
2438
2440
|
units = "px";
|
|
2439
2441
|
}
|
|
2442
|
+
var classification = Cesium.ClassificationType.TERRAIN;
|
|
2443
|
+
if (style.drapeOver == "ALL") {
|
|
2444
|
+
classification = Cesium.ClassificationType.BOTH;
|
|
2445
|
+
}
|
|
2440
2446
|
var cEntity = new Cesium.Entity({
|
|
2441
2447
|
polyline: units == "px" ? {
|
|
2442
2448
|
positions: posses,
|
|
2443
2449
|
material: cColor,
|
|
2444
2450
|
width: width,
|
|
2445
|
-
classificationType:
|
|
2451
|
+
classificationType: classification,
|
|
2446
2452
|
arcType: Cesium.ArcType.GEODESIC,
|
|
2447
2453
|
zIndex: getZIndex(style, entity, params.tags),
|
|
2448
2454
|
clampToGround: heightRef == Cesium.HeightReference.CLAMP_TO_GROUND,
|
|
@@ -2452,7 +2458,7 @@
|
|
|
2452
2458
|
positions: posses,
|
|
2453
2459
|
material: cColor,
|
|
2454
2460
|
width: width,
|
|
2455
|
-
classificationType:
|
|
2461
|
+
classificationType: classification,
|
|
2456
2462
|
heightReference: heightRef,
|
|
2457
2463
|
zIndex: getZIndex(style, entity, params.tags),
|
|
2458
2464
|
distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance, width),
|
|
@@ -2580,6 +2586,10 @@
|
|
|
2580
2586
|
});
|
|
2581
2587
|
var zIndex = getZIndex(style, entity, params.tags);
|
|
2582
2588
|
var size = getSizeOfPolygonEntity(entity);
|
|
2589
|
+
var classification = Cesium.ClassificationType.TERRAIN;
|
|
2590
|
+
if (style.drapeOver == "ALL") {
|
|
2591
|
+
classification = Cesium.ClassificationType.BOTH;
|
|
2592
|
+
}
|
|
2583
2593
|
var cEntity = new Cesium.Entity({
|
|
2584
2594
|
polygon: {
|
|
2585
2595
|
hierarchy: new Cesium.PolygonHierarchy(posses, holePosses.map(function (x) { return new Cesium.PolygonHierarchy(x); })),
|
|
@@ -2588,7 +2598,7 @@
|
|
|
2588
2598
|
extrudedHeightReference: extrusion.exHeightRef,
|
|
2589
2599
|
shadows: Cesium.ShadowMode.ENABLED,
|
|
2590
2600
|
heightReference: heightRef,
|
|
2591
|
-
classificationType:
|
|
2601
|
+
classificationType: classification,
|
|
2592
2602
|
perPositionHeight: heightRef == Cesium.HeightReference.CLAMP_TO_GROUND ? false : true,
|
|
2593
2603
|
zIndex: zIndex,
|
|
2594
2604
|
distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance, size, true)
|
|
@@ -2646,7 +2656,7 @@
|
|
|
2646
2656
|
fill: true,
|
|
2647
2657
|
zIndex: zIndex + 1,
|
|
2648
2658
|
cornerType: Cesium.CornerType.MITERED,
|
|
2649
|
-
classificationType:
|
|
2659
|
+
classificationType: classification,
|
|
2650
2660
|
distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance, width),
|
|
2651
2661
|
shadows: Cesium.ShadowMode.ENABLED
|
|
2652
2662
|
},
|
|
@@ -2677,7 +2687,7 @@
|
|
|
2677
2687
|
fill: true,
|
|
2678
2688
|
zIndex: zIndex + 1,
|
|
2679
2689
|
cornerType: Cesium.CornerType.MITERED,
|
|
2680
|
-
classificationType:
|
|
2690
|
+
classificationType: classification,
|
|
2681
2691
|
distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance, width),
|
|
2682
2692
|
shadows: Cesium.ShadowMode.ENABLED,
|
|
2683
2693
|
},
|
|
@@ -11194,24 +11204,20 @@
|
|
|
11194
11204
|
return;
|
|
11195
11205
|
}
|
|
11196
11206
|
if (status) {
|
|
11197
|
-
scene.screenSpaceCameraController.
|
|
11207
|
+
scene.screenSpaceCameraController.enableInputs = false;
|
|
11198
11208
|
scene.screenSpaceCameraController.enableTranslate = false;
|
|
11199
|
-
scene.screenSpaceCameraController.
|
|
11200
|
-
scene.screenSpaceCameraController.enableLook = false;
|
|
11209
|
+
scene.screenSpaceCameraController.enableZoom = false;
|
|
11201
11210
|
scene.screenSpaceCameraController.enableRotate = false;
|
|
11202
|
-
scene.screenSpaceCameraController.
|
|
11203
|
-
scene.screenSpaceCameraController.minimumCollisionTerrainHeight = 1000;
|
|
11211
|
+
scene.screenSpaceCameraController.enableTilt = false;
|
|
11204
11212
|
}
|
|
11205
11213
|
else {
|
|
11206
|
-
scene.screenSpaceCameraController.
|
|
11207
|
-
scene.screenSpaceCameraController.minimumCollisionTerrainHeight = 1000;
|
|
11208
|
-
scene.screenSpaceCameraController.enableRotate = true;
|
|
11214
|
+
scene.screenSpaceCameraController.enableInputs = true;
|
|
11209
11215
|
scene.screenSpaceCameraController.enableTranslate = true;
|
|
11216
|
+
scene.screenSpaceCameraController.enableZoom = true;
|
|
11217
|
+
scene.screenSpaceCameraController.enableRotate = true;
|
|
11210
11218
|
if (!ViewUtils.Get2dStatus({ viewer: viewer })) {
|
|
11211
11219
|
scene.screenSpaceCameraController.enableTilt = true;
|
|
11212
11220
|
}
|
|
11213
|
-
scene.screenSpaceCameraController.enableLook = true;
|
|
11214
|
-
scene.screenSpaceCameraController.enableRotate = true;
|
|
11215
11221
|
}
|
|
11216
11222
|
viewer.scene.requestRender();
|
|
11217
11223
|
}
|
|
@@ -14960,7 +14966,7 @@
|
|
|
14960
14966
|
ViewerUtils.CreateWidgets = CreateWidgets;
|
|
14961
14967
|
})(exports.ViewerUtils || (exports.ViewerUtils = {}));
|
|
14962
14968
|
|
|
14963
|
-
var VERSION$1 = "2.5.
|
|
14969
|
+
var VERSION$1 = "2.5.9";
|
|
14964
14970
|
|
|
14965
14971
|
exports.VERSION = VERSION$1;
|
|
14966
14972
|
exports.CesiumViewMonitor = CesiumViewMonitor;
|