bruce-cesium 0.5.4 → 0.5.5

package/dist/bruce-cesium.es5.js

@@ -436,6 +436,7 @@ function traverseEntity(cEntity, arr) {
     arr.push(cEntity);
 }
 var ORG_OPACITY_KEY = "_org_opacity_";
+var NEW_OPACITY_KEY = "_new_opacity_";
 function getColor(viewer, material) {
     var _a;
     var color;
@@ -462,37 +463,71 @@ function applyOpacityToGraphic(viewer, entity, graphicKey, opacity) {
     }
 }
 function revertAppliedEntityOpacity(viewer, entity) {
-    function processKey(graphicKey) {
-        if (entity[graphicKey]) {
-            var orgOpacity = entity[graphicKey][ORG_OPACITY_KEY];
-            if (orgOpacity != null) {
-                applyOpacityToGraphic(viewer, entity, graphicKey, orgOpacity);
+    entity[NEW_OPACITY_KEY] = null;
+    if (entity instanceof Entity) {
+        var processKey = function (graphicKey) {
+            if (entity[graphicKey]) {
+                var orgOpacity = entity[graphicKey][ORG_OPACITY_KEY];
+                if (orgOpacity != null) {
+                    applyOpacityToGraphic(viewer, entity, graphicKey, orgOpacity);
+                }
                 entity[graphicKey][ORG_OPACITY_KEY] = null;
             }
+        };
+        processKey("polygon");
+        processKey("polyline");
+        processKey("point");
+        processKey("ellipse");
+        processKey("model");
+    }
+    else if (entity instanceof Cesium3DTileFeature) {
+        var orgOpacity = entity[ORG_OPACITY_KEY];
+        if (orgOpacity != null) {
+            var color = entity.color ? entity.color.clone() : new Color();
+            color.alpha = orgOpacity;
+            entity.color = color;
         }
+        entity[ORG_OPACITY_KEY] = null;
     }
-    processKey("polygon");
-    processKey("polyline");
-    processKey("point");
-    processKey("ellipse");
-    processKey("model");
 }
 function applyOpacityToEntity(viewer, opacity, entity) {
-    function processKey(graphicKey) {
-        var _a;
-        if (entity[graphicKey]) {
-            var orgOpacity = entity[graphicKey][ORG_OPACITY_KEY];
-            if (orgOpacity == null) {
-                entity[graphicKey][ORG_OPACITY_KEY] = (_a = getColor(viewer, entity[graphicKey].material)) === null || _a === void 0 ? void 0 : _a.alpha;
+    entity[NEW_OPACITY_KEY] = opacity;
+    if (entity instanceof Entity) {
+        var processKey = function (graphicKey) {
+            var _a;
+            if (entity[graphicKey]) {
+                var orgOpacity = entity[graphicKey][ORG_OPACITY_KEY];
+                if (orgOpacity == null) {
+                    entity[graphicKey][ORG_OPACITY_KEY] = (_a = getColor(viewer, entity[graphicKey].material)) === null || _a === void 0 ? void 0 : _a.alpha;
+                }
+                if (orgOpacity == null) {
+                    orgOpacity = 1;
+                }
+                applyOpacityToGraphic(viewer, entity, graphicKey, opacity * orgOpacity);
             }
-            applyOpacityToGraphic(viewer, entity, graphicKey, opacity);
+        };
+        processKey("polygon");
+        processKey("polyline");
+        processKey("point");
+        processKey("ellipse");
+        processKey("model");
+    }
+    else if (entity instanceof Cesium3DTileFeature) {
+        var orgOpacity = entity[ORG_OPACITY_KEY];
+        if (orgOpacity == null) {
+            entity[ORG_OPACITY_KEY] = entity.color ? entity.color.alpha : 1;
         }
+        if (!orgOpacity) {
+            orgOpacity = 1;
+        }
+        var color = entity.color ? entity.color.clone() : new Color();
+        entity.color.alpha = opacity * orgOpacity;
+        entity.color = color;
     }
-    processKey("polygon");
-    processKey("polyline");
-    processKey("point");
-    processKey("ellipse");
-    processKey("model");
+}
+function findOpacity(entity) {
+    var _a;
+    return (_a = entity[NEW_OPACITY_KEY]) !== null && _a !== void 0 ? _a : 1;
 }
 var EntityUtils;
 (function (EntityUtils) {
@@ -685,6 +720,17 @@ var EntityUtils;
         revertAppliedEntityOpacity(viewer, entity);
     }
     EntityUtils.RevertOpacity = RevertOpacity;
+    /**
+     * Gets opacity of the entity.
+     * This does not count opacity that it was rendered with.
+     * This is the opacity that was set post-rendering.
+     * @param viewer
+     * @param entity
+     */
+    function getOpacity(entity) {
+        return findOpacity(entity);
+    }
+    EntityUtils.getOpacity = getOpacity;
 })(EntityUtils || (EntityUtils = {}));
 
 var RenderManager;
@@ -2121,12 +2167,22 @@ var VisualsRegister;
             }
             (_b = this.onUpdate) === null || _b === void 0 ? void 0 : _b.Trigger({ rego: rego, isAdding: true });
         };
+        /**
+         * Locates a visual corresponding to a given entity id.
+         * If no menu item id is provided, then it will pick the "best" one.
+         * @param entityId
+         * @param menuItemId
+         * @returns
+         */
         Register.prototype.GetRego = function (entityId, menuItemId) {
             var entityRegos = this.rego[entityId];
             if (!entityRegos) {
                 return [];
             }
-            return entityRegos.find(function (r) { return r.menuItemId === menuItemId; });
+            if (menuItemId) {
+                return entityRegos.find(function (r) { return r.menuItemId === menuItemId; });
+            }
+            return entityRegos.find(function (x) { return x.best; });
         };
         Register.prototype.GetRegos = function (entityId) {
             var entityRegos = this.rego[entityId];