Skip to content

Commit 6e957a7

Browse files
NASA-AMMOS#856 AnimationTool Improvements (NASA-AMMOS#857)
* NASA-AMMOS#856 Fix AnimationTool projection warping * NASA-AMMOS#856 AnimationTool Improvements 1 * #865 AnimationTool Improvements * NASA-AMMOS#856 AnimationTool OffscreenManager fix when no custom projection set * NASA-AMMOS#856 AnimationTool - Cancel animation, retina text size, Z in timestamp
1 parent c1bee39 commit 6e957a7

File tree

10 files changed

+2482
-1030
lines changed

10 files changed

+2482
-1030
lines changed

package-lock.json

Lines changed: 17 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
"@azure/identity": "^4.4.0",
5959
"@babel/runtime": "^7.23.1",
6060
"@eonasdan/tempus-dominus": "^6.2.6",
61+
"@ffmpeg/core": "^0.12.6",
6162
"@ffmpeg/ffmpeg": "^0.12.10",
6263
"@ffmpeg/util": "^0.12.1",
6364
"@mapbox/shp-write": "^0.4.3",

public/ffmpeg/ffmpeg-core.js

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/ffmpeg/ffmpeg-core.wasm

30.6 MB
Binary file not shown.

src/essence/Basics/Globe_/GlobeRenderer.js

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,6 @@ class GlobeRenderer {
389389
*/
390390
addLayer(type, layerConfig) {
391391
if (this.rendererType === 'lithosphere') {
392-
console.log(type, layerConfig)
393392
return this.renderer.addLayer(type, layerConfig)
394393
} else {
395394
return this._addCesiumLayer(type, layerConfig)
@@ -540,8 +539,9 @@ class GlobeRenderer {
540539

541540
// Parse colors with fallbacks
542541
const strokeColor =
543-
Cesium.Color.fromCssColorString(defaultStyle.color || '#ffffff') ||
544-
Cesium.Color.WHITE
542+
Cesium.Color.fromCssColorString(
543+
defaultStyle.color || '#ffffff'
544+
) || Cesium.Color.WHITE
545545
const fillColor =
546546
Cesium.Color.fromCssColorString(
547547
defaultStyle.fillColor || '#ffffff'
@@ -611,15 +611,18 @@ class GlobeRenderer {
611611
defaultStyle.fillOpacity
612612
) || 0.5
613613
entity.polygon.material =
614-
polygonFillColor.withAlpha(polygonOpacity)
614+
polygonFillColor.withAlpha(
615+
polygonOpacity
616+
)
615617
}
616618
if (featureStyle.color) {
617619
const outlineColor =
618620
Cesium.Color.fromCssColorString(
619621
featureStyle.color
620622
)
621623
if (outlineColor) {
622-
entity.polygon.outlineColor = outlineColor
624+
entity.polygon.outlineColor =
625+
outlineColor
623626
}
624627
}
625628
if (featureStyle.weight != null) {
@@ -732,7 +735,11 @@ class GlobeRenderer {
732735
const checkName = orderedLayerNames[i]
733736
const checkLayer = this._layers[checkName]
734737
// Only count visible tile layers
735-
if (checkLayer && checkLayer.type === 'tile' && checkLayer.visible) {
738+
if (
739+
checkLayer &&
740+
checkLayer.type === 'tile' &&
741+
checkLayer.visible
742+
) {
736743
tileBelowCount++
737744
}
738745
}
@@ -898,7 +905,8 @@ class GlobeRenderer {
898905
}
899906

900907
// Add new layer using addImageryProvider (returns ImageryLayer)
901-
const newLayer = this.renderer.imageryLayers.addImageryProvider(newProvider)
908+
const newLayer =
909+
this.renderer.imageryLayers.addImageryProvider(newProvider)
902910
newLayer.alpha = alpha
903911
newLayer.show = show
904912

@@ -1135,10 +1143,7 @@ class GlobeRenderer {
11351143
// Re-add in correct order (bottom to top)
11361144
for (let i = 0; i < visibleTileLayers.length; i++) {
11371145
const { layerInfo } = visibleTileLayers[i]
1138-
const newLayer = this.renderer.imageryLayers.add(
1139-
layerInfo.layer,
1140-
i
1141-
)
1146+
const newLayer = this.renderer.imageryLayers.add(layerInfo.layer, i)
11421147
// Update reference
11431148
if (newLayer) layerInfo.layer = newLayer
11441149
}
@@ -1824,10 +1829,10 @@ class GlobeRenderer {
18241829
_roundCoordinates(coords, precision) {
18251830
if (typeof coords[0] === 'number') {
18261831
// Single coordinate pair [lng, lat]
1827-
return coords.map(c => parseFloat(c.toFixed(precision)))
1832+
return coords.map((c) => parseFloat(c.toFixed(precision)))
18281833
} else {
18291834
// Nested array of coordinates
1830-
return coords.map(c => this._roundCoordinates(c, precision))
1835+
return coords.map((c) => this._roundCoordinates(c, precision))
18311836
}
18321837
}
18331838

0 commit comments

Comments
 (0)