react-native-cesium 1.2.5 → 1.2.7

package/cpp/engine/CameraIntegrator.cpp

@@ -15,6 +15,10 @@ namespace {
 // isolation without linking CesiumGeospatial. Matches Ellipsoid::WGS84.
 inline constexpr double kEarthMeanRadiusM = 6371008.7714150595;
 
+// Hard ceiling on altitude (metres MSL). Enforced on both the demand and the
+// running estimate so no code path can push the camera above this value.
+inline constexpr double kMaxAltMeters = 100'000.0;
+
 inline double shortAngleDeltaDeg(double from, double to) {
   return std::fmod(to - from + 540.0, 360.0) - 180.0;
 }
@@ -105,7 +109,8 @@ void CameraIntegrator::updateAlphaBeta(
   s.tLastMeas = tz;
 }
 
-void CameraIntegrator::extrapolate(AlphaBeta& s, TimePoint now, double maxRateAbs) {
+void CameraIntegrator::extrapolate(
+    AlphaBeta& s, TimePoint now, double maxRateAbs, double demand) {
   double dt = std::chrono::duration<double>(now - s.tState).count();
   if (dt <= 0.0) {
     s.tState = now;
@@ -121,9 +126,14 @@ void CameraIntegrator::extrapolate(AlphaBeta& s, TimePoint now, double maxRateAb
   // grace window and the decay τ scale with the EWMA of inter-arrival times
   // so a 60 Hz worklet bleeds in ~50 ms while a 1 Hz GPS glide is left
   // alone between fixes.
+  //
+  // silence and grace are hoisted out of the block so the demand-pull term
+  // below can reuse them without a second chrono subtraction.
+  double silence = -1.0; // negative sentinel: "no measurement seen yet"
+  double grace   = 0.0;
   if (s.tLastMeas.time_since_epoch().count() > 0) {
-    const double silence = std::chrono::duration<double>(now - s.tLastMeas).count();
-    const double grace   = tunables::kVelocitySilenceGraceFactor * s.meanIntervalSec;
+    silence = std::chrono::duration<double>(now - s.tLastMeas).count();
+    grace   = tunables::kVelocitySilenceGraceFactor * s.meanIntervalSec;
     if (silence > grace) {
       const double tau = tunables::kVelocityBleedTauFactor * s.meanIntervalSec;
       if (tau > 1.0e-6) {
@@ -139,6 +149,16 @@ void CameraIntegrator::extrapolate(AlphaBeta& s, TimePoint now, double maxRateAb
   }
   s.value += s.velocity * dt;
   s.tState = now;
+
+  // Demand pull — guarantees convergence to the last demanded value for
+  // one-shot API calls (e.g. setAltitude from a button tap). Active only
+  // when measurements have stopped (silence > grace); continuous gesture or
+  // sensor streams always deliver a new update before the grace window
+  // expires, so this term is never active for them.
+  if (silence > grace && tunables::kDemandPullTauSec > 1.0e-6) {
+    s.value += (1.0 - std::exp(-dt / tunables::kDemandPullTauSec))
+               * (demand - s.value);
+  }
 }
 
 // ── Demand setters ────────────────────────────────────────────────────────
@@ -172,6 +192,7 @@ void CameraIntegrator::setAltitude(double altitudeMeters) {
     return;
   }
 
+  altitudeMeters = std::min(altitudeMeters, kMaxAltMeters);
   updateAlphaBeta(alt_, altitudeMeters, now,
                   tunables::kAlphaAlt, tunables::kBetaAlt, false);
   demand_.altitude = altitudeMeters;
@@ -285,16 +306,17 @@ CameraParams CameraIntegrator::step() {
     latLonCapDegSec = glm::degrees(groundCap / kEarthMeanRadiusM);
   }
 
-  extrapolate(lat_,   now, latLonCapDegSec);
-  extrapolate(lon_,   now, latLonCapDegSec);
-  extrapolate(alt_,   now, climbCap);
-  extrapolate(hdg_,   now, yawCap);
-  extrapolate(pitch_, now, pitchCap);
-  extrapolate(roll_,  now, rollCap);
-  extrapolate(vfov_,  now, 0.0); // no velocity term anyway
+  extrapolate(lat_,   now, latLonCapDegSec, demand_.latitude);
+  extrapolate(lon_,   now, latLonCapDegSec, demand_.longitude);
+  extrapolate(alt_,   now, climbCap,        demand_.altitude);
+  extrapolate(hdg_,   now, yawCap,          demand_.heading);
+  extrapolate(pitch_, now, pitchCap,        demand_.pitch);
+  extrapolate(roll_,  now, rollCap,         demand_.roll);
+  extrapolate(vfov_,  now, 0.0,             demand_.verticalFov);
 
   hdg_.value = wrap360(hdg_.value);
   lat_.value = std::clamp(lat_.value, -90.0, 90.0);
+  alt_.value = std::min(alt_.value, kMaxAltMeters);
   // Longitude is allowed to drift over ±180; consumers usually want the raw
   // continuous value for short-arc maths and the camera transform doesn't
   // care.

package/cpp/engine/CameraIntegrator.hpp

@@ -124,7 +124,7 @@ private:
   // Advance the running estimate to `now`, clamp velocity to `maxRateAbs`
   // (per second; 0 = uncapped). For angles, the resulting value is also
   // normalised to its canonical range by the caller as needed.
-  static void extrapolate(AlphaBeta& s, TimePoint now, double maxRateAbs);
+  static void extrapolate(AlphaBeta& s, TimePoint now, double maxRateAbs, double demand);
 
   mutable std::mutex mutex_;
 

package/cpp/engine/EngineTunables.hpp

@@ -69,8 +69,8 @@ inline constexpr int32_t kDefaultLoadingDescendantLimit       = 20;
 inline constexpr double kAlphaPos    = 0.6;   inline constexpr double kBetaPos    = 0.05;
 inline constexpr double kAlphaAlt    = 0.6;   inline constexpr double kBetaAlt    = 0.05;
 inline constexpr double kAlphaHdg    = 0.55;  inline constexpr double kBetaHdg    = 0.05;
-inline constexpr double kAlphaPitch  = 0.5;   inline constexpr double kBetaPitch  = 0.05;
-inline constexpr double kAlphaRoll   = 0.5;   inline constexpr double kBetaRoll   = 0.05;
+inline constexpr double kAlphaPitch  = 0.75;  inline constexpr double kBetaPitch  = 0.05;
+inline constexpr double kAlphaRoll   = 0.75;  inline constexpr double kBetaRoll   = 0.05;
 inline constexpr double kAlphaVfov     = 0.4;   // no velocity term
 inline constexpr double kAlphaViewCorr = 0.5;   // SLERP toward target
 
@@ -118,6 +118,13 @@ inline constexpr double kVelocityBleedTauFactor     = 2.0;
 // EWMA blend coefficient for the inter-arrival mean. Higher = faster adapt
 // to cadence changes (e.g. user switches from gesture to sparse GPS feed).
 inline constexpr double kIntervalEwmaAlpha          = 0.3;
+// Demand-pull time constant (seconds). When measurements have stopped
+// arriving (silence > grace), the actual value is gently pulled toward
+// the last demand at this rate. This guarantees convergence for one-shot
+// API calls (e.g. setAltitude from a button) without affecting continuous
+// sensor or gesture streams — those always deliver a new measurement before
+// the grace window expires, so this term is never active. 0 = disabled.
+inline constexpr double kDemandPullTauSec           = 0.8;
 
 // Optional outlier rejection (off if 0). When > 0, a single measurement whose
 // residual against the predicted state exceeds the threshold is dropped (and

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-cesium",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "description": "Experimental Cesium rendering for React Native via Nitro (iOS/Metal today; Android planned)",
   "main": "./lib/commonjs/index.js",
   "module": "./lib/module/index.js",