diff --git a/src/cockpitCloudEffects.js b/src/cockpitCloudEffects.js index c9117b7d3..5eb7d1271 100644 --- a/src/cockpitCloudEffects.js +++ b/src/cockpitCloudEffects.js @@ -1,5 +1,6 @@ import { applicationServices } from './services/application.js'; -import * as Cesium from 'cesium'; +import { toRadians } from './geo/vector.js'; +import { findCamera } from './render/rendererOf.js'; import { greatCircleMeters } from './geoDistance.js'; import { deriveWeatherEffectProfile, @@ -327,15 +328,14 @@ class CockpitCloudEffectsController { } cameraPoint() { - const cartographic = this.viewer?.camera?.positionCartographic; - if (!cartographic) return null; - const latitude = Cesium.Math.toDegrees(cartographic.latitude); - const longitude = Cesium.Math.toDegrees(cartographic.longitude); + const pose = this.viewer ? findCamera(this.viewer)?.pose() : null; + if (!pose) return null; + const { lat: latitude, lon: longitude } = pose; if (![latitude, longitude].every(Number.isFinite)) return null; return { latitude, longitude, - altitudeM: Math.max(0, Number(cartographic.height) || 0), + altitudeM: Math.max(0, Number(pose.height) || 0), }; } @@ -528,7 +528,7 @@ class CockpitCloudEffectsController { render(timeSec) { const gl = this.gl; if (!gl || !this.program || !this.locations) return; - const windRadians = Cesium.Math.toRadians(this.windDirectionDeg); + const windRadians = toRadians(this.windDirectionDeg); const windScale = 0.008 + this.windStrength * 0.022; gl.useProgram(this.program); gl.uniform2f( diff --git a/src/render/cesiumAllowList.json b/src/render/cesiumAllowList.json index ff766d960..98739ecdd 100644 --- a/src/render/cesiumAllowList.json +++ b/src/render/cesiumAllowList.json @@ -4,7 +4,6 @@ "src/app/embed.js", "src/app/scene.js", "src/app/viewer.js", - "src/cockpitCloudEffects.js", "src/cyberSonarGpu.js", "src/cyberSonarScene.js", "src/data/geoImportPins.js",