bruce-cesium 3.1.4 → 3.1.6

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { Cartes, ProjectViewTile, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, DelayQueue, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, Bounds, EntityRelationType, BruceEvent, EntityCoords, Api, EntitySource, MenuItem, EntityRelation, ENVIRONMENT, AbstractApi, ProjectViewBookmark, EntityAttachment, EntityAttachmentType, EntityAttribute, ProjectView, ProjectViewLegacyTile, ProgramKey, Camera } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, Primitive, Cesium3DTileFeature, SceneMode, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Model, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, createOsmBuildings, KmlDataSource, OrthographicFrustum, EasingFunction, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, Ion, CesiumInspector, defined, SceneTransforms, EllipsoidGeodesic, sampleTerrainMostDetailed, ColorMaterialProperty, BoundingSphere, GeometryInstance, PolygonPipeline, ScreenSpaceEventHandler, ScreenSpaceEventType, Intersect } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, SceneMode, Entity, Primitive, Cesium3DTileFeature, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Model, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumInspector, defined, Cesium3DTileset, Matrix4, Matrix3, IonResource, Ion, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, ScreenSpaceEventHandler, ScreenSpaceEventType, ColorMaterialProperty, BoundingSphere, GeometryInstance, Intersect } from 'cesium';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -976,7 +976,7 @@ var EntityUtils;
                             });
                         }); };
                         getEntityPositions = function (sample) { return __awaiter(_this, void 0, void 0, function () {
-                            var entityId, entity, tileset, tilesetId, e_1, evaluateRendered, evaluateRecord, renderedPosses, recordPosses, e_2, tSettings, pos3d, alt, alt, heading, pitch, roll, matrix4, offset, m1, hpr, transform, transformedOffset, sphere;
+                            var entityId, entity, tileset, tilesetId, e_1, evaluateRendered, evaluateRecord, renderedPosses, recordPosses, e_2, tSettings, pos3d, alt, alt, heading, pitch, roll, matrix4, offset, m1, hpr, transform, transformedOffset;
                             var _this = this;
                             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
                             return __generator(this, function (_l) {
@@ -1102,7 +1102,7 @@ var EntityUtils;
                                                         posses.push(pos3d_1);
                                                         if (visual.model) {
                                                             modelExt = visual.model;
-                                                            if (modelExt._radius) {
+                                                            if (modelExt._radius && modelExt._radius > -1) {
                                                                 sphere = BoundingSphere.fromPoints([pos3d_1]);
                                                                 sphere.radius = modelExt._radius;
                                                                 spheres.push(sphere);
@@ -1229,7 +1229,7 @@ var EntityUtils;
                                     case 12:
                                         tSettings = tileset === null || tileset === void 0 ? void 0 : tileset.settings;
                                         pos3d = null;
-                                        if (!(((_b = entity === null || entity === void 0 ? void 0 : entity.location) === null || _b === void 0 ? void 0 : _b.longitude) || ((_c = tSettings === null || tSettings === void 0 ? void 0 : tSettings.location) === null || _c === void 0 ? void 0 : _c.longitude))) return [3 /*break*/, 15];
+                                        if (!(((_b = entity === null || entity === void 0 ? void 0 : entity.location) === null || _b === void 0 ? void 0 : _b.longitude) || ((_c = tSettings === null || tSettings === void 0 ? void 0 : tSettings.location) === null || _c === void 0 ? void 0 : _c.longitude))) return [3 /*break*/, 14];
                                         if ((_d = entity === null || entity === void 0 ? void 0 : entity.location) === null || _d === void 0 ? void 0 : _d.longitude) {
                                             alt = +entity.location.altitude;
                                             if (isNaN(alt)) {
@@ -1244,7 +1244,7 @@ var EntityUtils;
                                             }
                                             pos3d = Cartesian3.fromDegrees(+tSettings.location.longitude, +tSettings.location.latitude, alt);
                                         }
-                                        if (!(entity === null || entity === void 0 ? void 0 : entity.worldPosition)) return [3 /*break*/, 15];
+                                        if (!(entity === null || entity === void 0 ? void 0 : entity.worldPosition)) return [3 /*break*/, 14];
                                         heading = 0;
                                         pitch = 0;
                                         roll = 0;
@@ -1295,13 +1295,6 @@ var EntityUtils;
                                         pos3d = _l.sent();
                                         _l.label = 14;
                                     case 14:
-                                        if ((entity === null || entity === void 0 ? void 0 : entity.geometryRadius) && (pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) {
-                                            sphere = BoundingSphere.fromPoints([pos3d]);
-                                            sphere.radius = entity.geometryRadius;
-                                            spheres.push(sphere);
-                                        }
-                                        _l.label = 15;
-                                    case 15:
                                         if (pos3d) {
                                             return [2 /*return*/, [pos3d]];
                                         }
@@ -2108,7 +2101,19 @@ var TERRAIN_HEIGHT_TOLERANCE = 400;
 // Tolerance to use when number of entities is lower than x in the scene.
 var TERRAIN_HEIGHT_TOLERANCE_LOW_COUNT = 30;
 var TERRAIN_HEIGHT_TOLERANCE_LOW_ENTITY_THRESHOLD = 100;
+/**
+ * Returns the terrain height for a given position.
+ * This will not sample most-detailed and instead the current state of the terrain.
+ * TODO: If something is VERY far from the camera, we should just return 0.
+ * @param viewer
+ * @param pos3d
+ * @returns
+ */
 var getTerrainOffset = function (viewer, pos3d) {
+    var _a;
+    if (!((_a = viewer.terrainProvider) === null || _a === void 0 ? void 0 : _a.ready)) {
+        return null;
+    }
     var terrain = ViewUtils.GatherTerrainTile({
         viewer: viewer
     }).terrain;
@@ -2120,8 +2125,8 @@ var getTerrainOffset = function (viewer, pos3d) {
     var keys = Array.from(_terrainCache.Entries());
     var tolerance = viewer.entities.values.length > TERRAIN_HEIGHT_TOLERANCE_LOW_ENTITY_THRESHOLD ? TERRAIN_HEIGHT_TOLERANCE : TERRAIN_HEIGHT_TOLERANCE_LOW_COUNT;
     for (var i = 0; i < keys.length; i++) {
-        var _a = keys[i], key_1 = _a[0], offset_1 = _a[1];
-        var _b = key_1.split("_"), terrainId2 = _b[0], x = _b[1], y = _b[2], z = _b[3];
+        var _b = keys[i], key_1 = _b[0], offset_1 = _b[1];
+        var _c = key_1.split("_"), terrainId2 = _c[0], x = _c[1], y = _c[2], z = _c[3];
         if (terrainId2 != terrainId) {
             continue;
         }
@@ -2177,12 +2182,6 @@ var adjustPos3d = function (viewer, heightRef, pos3d) {
     }
     return newPos3d;
 };
-function getValue(viewer, obj) {
-    if (obj === null || obj === void 0 ? void 0 : obj.getValue) {
-        return obj.getValue(viewer.scene.lastRenderTime);
-    }
-    return obj;
-}
 function isFlatTerrain(viewer) {
     var _a;
     if (!viewer) {
@@ -2192,6 +2191,12 @@ function isFlatTerrain(viewer) {
         viewer: viewer
     }).terrain) === null || _a === void 0 ? void 0 : _a.tilesetId) == ProjectViewTile.EDefaultTerrain.FlatTerrain;
 }
+function getValue(viewer, obj) {
+    if (obj === null || obj === void 0 ? void 0 : obj.getValue) {
+        return obj.getValue(viewer.scene.lastRenderTime);
+    }
+    return obj;
+}
 var boundingSphereCache = new LRUCache(100000);
 function getPositionsFromEntity(viewer, entity) {
     var positions = [];
@@ -2202,7 +2207,6 @@ function getPositionsFromEntity(viewer, entity) {
             return null;
         }
         heightRef = getValue(viewer, entity.billboard.heightReference);
-        pos3d = adjustPos3d(viewer, heightRef, pos3d);
         positions.push(pos3d);
     }
     else if (entity.polyline) {
@@ -2220,8 +2224,7 @@ function getPositionsFromEntity(viewer, entity) {
         }
         heightRef = getValue(viewer, entity.polyline.clampToGround) == false ? HeightReference.NONE : HeightReference.CLAMP_TO_GROUND;
         for (var i = 0; i < posses.length; i++) {
-            var pos3d = adjustPos3d(viewer, heightRef, posses[i]);
-            positions.push(pos3d);
+            positions.push(posses[i]);
         }
     }
     else if (entity.polygon) {
@@ -2240,8 +2243,7 @@ function getPositionsFromEntity(viewer, entity) {
         }
         heightRef = getValue(viewer, entity.polygon.heightReference);
         for (var i = 0; i < posses.length; i++) {
-            var pos3d = adjustPos3d(viewer, heightRef, posses[i]);
-            positions.push(pos3d);
+            positions.push(posses[i]);
         }
     }
     else if (entity.corridor) {
@@ -2259,8 +2261,7 @@ function getPositionsFromEntity(viewer, entity) {
         }
         heightRef = getValue(viewer, entity.corridor.heightReference);
         for (var i = 0; i < posses.length; i++) {
-            var pos3d = adjustPos3d(viewer, heightRef, posses[i]);
-            positions.push(pos3d);
+            positions.push(posses[i]);
         }
     }
     else if (entity.ellipse) {
@@ -2269,7 +2270,6 @@ function getPositionsFromEntity(viewer, entity) {
             return null;
         }
         heightRef = getValue(viewer, entity.ellipse.heightReference);
-        pos3d = adjustPos3d(viewer, heightRef, pos3d);
         positions.push(pos3d);
     }
     else if (entity.model) {
@@ -2278,7 +2278,6 @@ function getPositionsFromEntity(viewer, entity) {
             return null;
         }
         heightRef = getValue(viewer, entity.model.heightReference);
-        pos3d = adjustPos3d(viewer, heightRef, pos3d);
         positions.push(pos3d);
     }
     else if (entity.point) {
@@ -2287,7 +2286,6 @@ function getPositionsFromEntity(viewer, entity) {
             return null;
         }
         heightRef = getValue(viewer, entity.point.heightReference);
-        pos3d = adjustPos3d(viewer, heightRef, pos3d);
         positions.push(pos3d);
     }
     if (!(positions === null || positions === void 0 ? void 0 : positions.length)) {
@@ -2302,19 +2300,21 @@ function getPositionsFromEntity(viewer, entity) {
             positions[i] = Cartographic.toCartesian(carto);
         }
     }
-    return positions;
+    return {
+        positions: positions,
+        heightRef: heightRef
+    };
 }
 function computeBoundingSphereFromPositions(positions) {
     return BoundingSphere.fromPoints(positions);
 }
 function shouldCullEntity(viewer, cEntity) {
-    var _a, _b;
+    var _a, _b, _c;
     var camera = viewer.scene.camera;
     var boundingSphere;
     var terrainId = (_b = (_a = ViewUtils.GatherTerrainTile({
         viewer: viewer
     }).terrain) === null || _a === void 0 ? void 0 : _a.tilesetId) !== null && _b !== void 0 ? _b : ProjectViewTile.EDefaultTerrain.FlatTerrain;
-    var cullSphere;
     var cacheKey = terrainId + cEntity.id;
     var cacheData = boundingSphereCache.Get(cacheKey);
     if (cacheData) {
@@ -2322,17 +2322,20 @@ function shouldCullEntity(viewer, cEntity) {
     }
     else {
         var positions = getPositionsFromEntity(viewer, cEntity);
-        if (positions) {
-            boundingSphere = computeBoundingSphereFromPositions(positions);
+        if ((_c = positions === null || positions === void 0 ? void 0 : positions.positions) === null || _c === void 0 ? void 0 : _c.length) {
+            // Sphere calculated from entity positions.
+            // We will evaluate the visual now to see if the sphere should be counted, for example 3D models might not be loaded yet.
+            var sphere = computeBoundingSphereFromPositions(positions.positions);
+            // If a 3D model is not loaded, we'll avoid caching the sphere data.
             var doNotCache = false;
             if (cEntity.model) {
                 var model = cEntity.model;
                 if (model._radius && !isNaN(model._radius)) {
-                    boundingSphere.radius = Math.max(model._radius, MODEL_MIN_RADIUS);
+                    sphere.radius = Math.max(model._radius, MODEL_MIN_RADIUS);
                 }
                 else {
                     // Unknown size. Ignoring.
-                    boundingSphere = -1;
+                    sphere = null;
                     doNotCache = !model._radiusLoaded;
                 }
             }
@@ -2349,24 +2352,28 @@ function shouldCullEntity(viewer, cEntity) {
                     }
                 }
                 if (radius && !isNaN(radius)) {
-                    boundingSphere.radius = radius;
+                    sphere.radius = radius;
                 }
             }
             // Check for extrusion.
             else if (cEntity.polygon) {
                 var extrusion = getValue(viewer, cEntity.polygon.extrudedHeight);
                 if (extrusion && !isNaN(extrusion)) {
-                    if (!boundingSphere.radius) {
-                        boundingSphere.radius = extrusion;
+                    if (!sphere.radius) {
+                        sphere.radius = extrusion;
                     }
-                    else if (extrusion > boundingSphere.radius / 2) {
-                        boundingSphere.radius = extrusion;
+                    else if (extrusion > sphere.radius / 2) {
+                        sphere.radius = extrusion;
                     }
                 }
             }
             else if (cEntity.point || cEntity.billboard) {
-                boundingSphere.radius = Math.max(boundingSphere.radius, POINT_MIN_RADIUS);
+                sphere.radius = Math.max(sphere.radius, POINT_MIN_RADIUS);
             }
+            boundingSphere = {
+                heightRef: positions.heightRef,
+                sphere: sphere
+            };
             if (!doNotCache) {
                 boundingSphereCache.Set(cacheKey, boundingSphere);
             }
@@ -2375,18 +2382,13 @@ function shouldCullEntity(viewer, cEntity) {
             boundingSphereCache.Set(cacheKey, -1);
         }
     }
-    if (!boundingSphere || boundingSphere == -1) {
+    if (!boundingSphere || boundingSphere == -1 || !boundingSphere.sphere) {
         return false;
     }
+    var adjustedSphere = boundingSphere.sphere.clone();
+    adjustedSphere.center = adjustPos3d(viewer, boundingSphere.heightRef, adjustedSphere.center);
     var cullingVolume = camera.frustum.computeCullingVolume(camera.position, camera.direction, camera.up);
-    var visibility = cullingVolume.computeVisibility(boundingSphere);
-    if (cullSphere) {
-        cullSphere.ellipsoid.material =
-            (visibility == Intersect.INSIDE ||
-                visibility == Intersect.INTERSECTING) ? Color.GREEN.withAlpha(0.1) :
-                Color.RED.withAlpha(0.1);
-        viewer.scene.requestRender();
-    }
+    var visibility = cullingVolume.computeVisibility(adjustedSphere);
     return visibility !== Intersect.INSIDE && visibility !== Intersect.INTERSECTING;
 }
 // Amount of entities to check per interval.
@@ -2452,6 +2454,8 @@ function runCullChecker(register) {
     }
     var viewer = register.Viewer;
     var entityIds = register.GetEntityIds();
+    // We'll use the terrain cache per culler cycle.
+    _terrainCache.Clear();
     checkInterval = setInterval(function () {
         if (viewer.isDestroyed() || !viewer.scene) {
             clearInterval(checkInterval);
@@ -2536,6 +2540,15 @@ var VisualRegisterCuller;
                 (_a = checkQueue.Call) === null || _a === void 0 ? void 0 : _a.call(checkQueue);
             }
         });
+        var terrChangeTimeout = null;
+        var terrChangeRemoval = register.Viewer.scene.terrainProviderChanged.addEventListener(function () {
+            clearTimeout(terrChangeTimeout);
+            terrChangeTimeout = setTimeout(function () {
+                var _a;
+                MarkShouldRecheck(register.Viewer);
+                (_a = checkQueue.Call) === null || _a === void 0 ? void 0 : _a.call(checkQueue);
+            }, 2500);
+        });
         checkQueue.Call();
         return function (params) {
             var uncull = (params || {}).uncull;
@@ -2545,6 +2558,10 @@ var VisualRegisterCuller;
             moveEndRemoval = null;
             updateRemoval === null || updateRemoval === void 0 ? void 0 : updateRemoval();
             updateRemoval = null;
+            terrChangeRemoval === null || terrChangeRemoval === void 0 ? void 0 : terrChangeRemoval();
+            terrChangeRemoval = null;
+            clearTimeout(terrChangeTimeout);
+            terrChangeTimeout = null;
             checkInterval === null || checkInterval === void 0 ? void 0 : checkInterval();
             checkInterval = null;
             checkWaiting = false;
@@ -18735,7 +18752,7 @@ var CesiumViewMonitor;
     CesiumViewMonitor$$1.Monitor = Monitor;
 })(CesiumViewMonitor || (CesiumViewMonitor = {}));
 
-var VERSION$1 = "3.1.4";
+var VERSION$1 = "3.1.6";
 
 export { VERSION$1 as VERSION, CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map