react-native-cesium 1.2.13 → 1.2.14

package/cpp/engine/CameraIntegrator.cpp

@@ -147,7 +147,17 @@ void CameraIntegrator::extrapolate(
   if (maxRateAbs > 0.0) {
     s.velocity = clampAbs(s.velocity, maxRateAbs);
   }
-  s.value += s.velocity * dt;
+
+  // While measurements are still arriving (gesture / sensor stream), advance
+  // along the learned velocity for smooth inter-frame motion. Once they stop
+  // (fling decay finished, finger lifted), do not coast on that velocity —
+  // only demand-pull toward the last set value. Coasting past demand is what
+  // users perceive as the camera "springing back" after a fling.
+  const bool measurementsStopped =
+      silence > grace && s.tLastMeas.time_since_epoch().count() > 0;
+  if (!measurementsStopped) {
+    s.value += s.velocity * dt;
+  }
   s.tState = now;
 
   // Demand pull — guarantees convergence to the last demanded value for
@@ -155,7 +165,7 @@ void CameraIntegrator::extrapolate(
   // 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) {
+  if (measurementsStopped && tunables::kDemandPullTauSec > 1.0e-6) {
     s.value += (1.0 - std::exp(-dt / tunables::kDemandPullTauSec))
                * (demand - s.value);
   }
@@ -193,8 +203,20 @@ void CameraIntegrator::setAltitude(double altitudeMeters) {
   }
 
   altitudeMeters = std::min(altitudeMeters, kMaxAltMeters);
+  
+  // Adaptive alpha based on altitude error magnitude:
+  // - Large changes (pinch gesture, cliffs) → fast (α ≈ 0.7)
+  // - Small changes (gentle terrain) → smooth (α ≈ 0.3)
+  const double error = std::abs(altitudeMeters - alt_.value);
+  constexpr double kMinAlpha = 0.3;   // Smooth for small changes
+  constexpr double kMaxAlpha = 0.7;   // Fast for large changes
+  constexpr double kErrorScale = 20.0; // 20m error → max alpha
+  
+  const double adaptiveAlpha = kMinAlpha + (kMaxAlpha - kMinAlpha) * 
+                               std::min(error / kErrorScale, 1.0);
+  
   updateAlphaBeta(alt_, altitudeMeters, now,
-                  tunables::kAlphaAlt, tunables::kBetaAlt, false);
+                  adaptiveAlpha, tunables::kBetaAlt, false);
   demand_.altitude = altitudeMeters;
 }
 

package/ios/CesiumBridge.mm

@@ -383,9 +383,10 @@
     // `nowSeconds` is still used below for the FPS-EMA dt only.
     auto actual = _integrator->step();
 
-    // ── Terrain floor clamp ───────────────────────────────────────────────
-    // Simple collision detection: if camera goes below terrain + offset, snap it up.
-    // Equivalent to CesiumJS's preRender terrain clamping.
+    // ── Terrain floor following using integrator's alpha-beta smoothing ───
+    // Set demand altitude to terrain floor, let the integrator's alpha-beta
+    // tracker smoothly interpolate. The tracker already provides adaptive
+    // exponential easing (alpha=0.6, beta=0.05 in EngineTunables.hpp).
     const float minAbove = _engine->getConfig().minAltitudeAboveTerrain;
     if (minAbove > 0.0f && _engine->terrainFloorKnown()) {
       const double geoidN =
@@ -394,9 +395,17 @@
       const double floorMsl = floorEllipsoid - geoidN;
       const double minMsl = floorMsl + static_cast<double>(minAbove);
 
-      // Simple clamp: if below minimum, snap to minimum
+      // Continuously update demand to follow terrain
+      const double demandAlt = _integrator->getDemand().altitude;
+      if (demandAlt <= 0.0) {
+        _integrator->setAltitude(minMsl);
+        actual = _integrator->getActual();
+      }
+      
+      // Safety floor: hard clamp if already below terrain (shouldn't happen with look-ahead)
       if (actual.altitude < minMsl) {
-        actual.altitude = minMsl;
+        _integrator->clampActualAltitude(minMsl);
+        actual = _integrator->getActual();
       }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-cesium",
-  "version": "1.2.13",
+  "version": "1.2.14",
   "description": "Experimental Cesium rendering for React Native via Nitro",
   "main": "./lib/commonjs/index.js",
   "module": "./lib/module/index.js",
@@ -64,7 +64,7 @@
     "node": ">=18"
   },
   "dependencies": {
-    "react-native-nitro-modules": "^0.35.7"
+    "react-native-nitro-modules": "^0.35.9"
   },
   "publishConfig": {
     "access": "public",
@@ -77,7 +77,7 @@
     "@types/jest": "^29.5.14",
     "@types/react": "19.2.14",
     "conventional-changelog-conventionalcommits": "^9.3.1",
-    "nitrogen": "0.35.7",
+    "nitrogen": "0.35.9",
     "react": "19.2.3",
     "react-native": "0.85.3",
     "react-native-builder-bob": "^0.41.0",

package/scripts/cesium/config.mjs

@@ -5,4 +5,4 @@
  */
 
 /** Git tag of CesiumGS/cesium-native to clone and build. */
-export const CESIUM_NATIVE_REF = 'v0.60.0'
+export const CESIUM_NATIVE_REF = 'v0.61.0'