react-native-cesium 1.2.2 → 1.2.4

package/android/src/main/cpp/CesiumBridgeAndroid.h

@@ -1,25 +1,40 @@
 #pragma once
 
+#include <atomic>
 #include <jni.h>
 #include <memory>
 #include <string>
 
-#include "engine/CameraTargetState.hpp"
+#include "engine/CameraIntegrator.hpp"
 #include "engine/CesiumEngine.hpp"
 #include "engine/MetricsAggregator.hpp"
 
+struct ANativeWindow;
+
 namespace reactnativecesium {
 class VulkanBackend;
 struct FrameResult;
 } // namespace reactnativecesium
 
-// Thin Android shell. All cross-platform logic (camera demand state +
-// smoothing, FPS / metrics aggregation, credit HTML stripping) lives in
-// shared C++ next to CesiumEngine. This class only owns:
+// Thin Android shell. All cross-platform logic (per-DoF camera integrator,
+// FPS / metrics aggregation, credit HTML stripping) lives in shared C++ next
+// to CesiumEngine. This class only owns:
 //   - the JNI/window surface,
 //   - the Vulkan backend instance, and
 //   - the EngineConfig snapshot mirrored from JS props.
 struct CesiumBridgeAndroid {
+  CesiumBridgeAndroid() = default;
+  // Defensive: if Kotlin ever forgets to call shutdown() before destroy() the
+  // destructor still tears down the engine and releases the ANativeWindow
+  // reference acquired in init(), preventing native handle / SQLite handle
+  // leaks.
+  ~CesiumBridgeAndroid();
+
+  CesiumBridgeAndroid(const CesiumBridgeAndroid&) = delete;
+  CesiumBridgeAndroid& operator=(const CesiumBridgeAndroid&) = delete;
+  CesiumBridgeAndroid(CesiumBridgeAndroid&&) = delete;
+  CesiumBridgeAndroid& operator=(CesiumBridgeAndroid&&) = delete;
+
   void init(JNIEnv* env, jobject surface, int width, int height,
             const std::string& cacheDir, const std::string& cacertPath);
   void shutdown();
@@ -28,12 +43,20 @@ struct CesiumBridgeAndroid {
 
   void updateIonAccessToken(const std::string& token, int64_t assetId);
   void updateImageryAssetId(int64_t assetId);
-  void updateCamera(double lat, double lon, double alt,
-                    double heading, double pitch, double roll);
-  void updateCameraQuaternion(double lat, double lon, double alt,
-                              double heading, double pitch, double roll,
-                              double qw, double qx, double qy, double qz);
+
+  // ── Per-DoF camera demand setters ──────────────────────────────────────
+  void setPosition(double lat, double lon);
+  void setAltitude(double alt);
+  void setHeading(double headingDeg);
+  void setAttitude(double pitchDeg, double rollDeg);
+  void setViewCorrection(double qw, double qx, double qy, double qz);
+  void teleport(double lat, double lon, double alt,
+                double heading, double pitch, double roll, double vfov);
+
   void setVerticalFovDeg(double degrees);
+  void setRateCaps(double yawDegSec, double pitchDegSec, double rollDegSec,
+                   double climbMps, double groundMps);
+
   void setMaximumScreenSpaceError(double v);
   void setMaximumSimultaneousTileLoads(int32_t v);
   void setLoadingDescendantLimit(int32_t v);
@@ -56,16 +79,27 @@ struct CesiumBridgeAndroid {
 
   void markNeedsRender();
   bool shouldRenderNextFrame();
-  void renderFrame(double dt);
-
-  // Camera readback
-  double readCameraLatitude();
-  double readCameraLongitude();
-  double readCameraAltitude();
-  double readCameraHeading();
-  double readCameraPitch();
-  double readCameraRoll();
-  double readVerticalFovDeg();
+  // Wall-clock seconds (steady_clock), used by the integrator to extrapolate
+  // every DoF forward to the time we are about to render.
+  void renderFrame(double nowSeconds);
+
+  // Actual camera readback (post-integration; what was rendered).
+  double readActualLatitude();
+  double readActualLongitude();
+  double readActualAltitude();
+  double readActualHeading();
+  double readActualPitch();
+  double readActualRoll();
+  double readActualVerticalFovDeg();
+  // Demand camera readback (what the consumer last asked for).
+  double readDemandLatitude();
+  double readDemandLongitude();
+  double readDemandAltitude();
+  double readDemandHeading();
+  double readDemandPitch();
+  double readDemandRoll();
+  double readDemandVerticalFovDeg();
+
   double readViewCorrectionW();
   double readViewCorrectionX();
   double readViewCorrectionY();
@@ -85,20 +119,29 @@ struct CesiumBridgeAndroid {
 
 private:
   void buildEngine();
-  // Push the current `config_` state to the live engine (runtime-mutable
-  // fields go through tileset_->getOptions(); token/asset id changes force
-  // a tileset rebuild).
+  // Push the current `config_` state to the live engine.
   void applyEngineConfig();
 
-  std::unique_ptr<reactnativecesium::VulkanBackend> vulkanBackend_;
-  std::unique_ptr<reactnativecesium::CesiumEngine>  engine_;
-  std::unique_ptr<reactnativecesium::FrameResult>   frameResult_;
+  std::unique_ptr<reactnativecesium::VulkanBackend>     vulkanBackend_;
+  std::unique_ptr<reactnativecesium::CesiumEngine>      engine_;
+  std::unique_ptr<reactnativecesium::FrameResult>       frameResult_;
+  std::unique_ptr<reactnativecesium::CameraIntegrator>  integrator_;
+
+  // ANativeWindow* acquired via ANativeWindow_fromSurface in init(). The
+  // bridge owns one strong reference and must release it in shutdown() once
+  // the Vulkan backend (which renders into it) is gone. Leaving this dangling
+  // leaks one ANativeWindow per view create/destroy cycle.
+  ANativeWindow*                                        nativeWindow_ = nullptr;
 
   int  viewportWidth_  = 0;
   int  viewportHeight_ = 0;
   bool initialized_    = false;
 
-  reactnativecesium::EngineConfig config_;
-  reactnativecesium::CameraTargetState target_;
+  // Force-render flag — set on every demand change so the render loop knows
+  // to dispatch at least one frame.
+  std::atomic<bool> forceRender_{true};
+
+  reactnativecesium::EngineConfig      config_;
   reactnativecesium::MetricsAggregator metrics_;
+  double                               lastTickSeconds_ = 0.0;
 };

package/android/src/main/java/com/margelo/nitro/reactnativecesium/CesiumBridgeJNI.kt

@@ -23,22 +23,25 @@ class CesiumBridgeJNI {
   fun resize(w: Int, h: Int) = nativeResize(nativePtr, w, h)
   fun updateIonAccessToken(token: String, assetId: Long) = nativeUpdateIonAccessToken(nativePtr, token, assetId)
   fun updateImageryAssetId(assetId: Long) = nativeUpdateImageryAssetId(nativePtr, assetId)
-  fun updateCamera(lat: Double, lon: Double, alt: Double, heading: Double, pitch: Double, roll: Double) =
-    nativeUpdateCamera(nativePtr, lat, lon, alt, heading, pitch, roll)
-
-  fun updateCameraQuaternion(
-    lat: Double,
-    lon: Double,
-    alt: Double,
-    heading: Double,
-    pitch: Double,
-    roll: Double,
-    qw: Double,
-    qx: Double,
-    qy: Double,
-    qz: Double,
-  ) = nativeUpdateCameraQuaternion(nativePtr, lat, lon, alt, heading, pitch, roll, qw, qx, qy, qz)
+
+  // ── Per-DoF camera setters ───────────────────────────────────────────────
+  fun setPosition(lat: Double, lon: Double) = nativeSetPosition(nativePtr, lat, lon)
+  fun setAltitude(alt: Double) = nativeSetAltitude(nativePtr, alt)
+  fun setHeading(headingDeg: Double) = nativeSetHeading(nativePtr, headingDeg)
+  fun setAttitude(pitchDeg: Double, rollDeg: Double) = nativeSetAttitude(nativePtr, pitchDeg, rollDeg)
+  fun setViewCorrection(qw: Double, qx: Double, qy: Double, qz: Double) =
+    nativeSetViewCorrection(nativePtr, qw, qx, qy, qz)
+  fun teleport(
+    lat: Double, lon: Double, alt: Double,
+    heading: Double, pitch: Double, roll: Double, vfov: Double,
+  ) = nativeTeleport(nativePtr, lat, lon, alt, heading, pitch, roll, vfov)
+
   fun setVerticalFovDeg(deg: Double) = nativeSetVerticalFovDeg(nativePtr, deg)
+  fun setRateCaps(
+    yawDegSec: Double, pitchDegSec: Double, rollDegSec: Double,
+    climbMps: Double, groundMps: Double,
+  ) = nativeSetRateCaps(nativePtr, yawDegSec, pitchDegSec, rollDegSec, climbMps, groundMps)
+
   fun setMaxSSE(v: Double) = nativeSetMaxSSE(nativePtr, v)
   fun setMaxSimLoads(v: Int) = nativeSetMaxSimLoads(nativePtr, v)
   fun setLoadDescLim(v: Int) = nativeSetLoadDescLim(nativePtr, v)
@@ -46,15 +49,25 @@ class CesiumBridgeJNI {
 
   fun markNeedsRender() = nativeMarkNeedsRender(nativePtr)
   fun shouldRenderNextFrame(): Boolean = nativeShouldRenderNextFrame(nativePtr)
-  fun renderFrame(dt: Double) = nativeRenderFrame(nativePtr, dt)
+  fun renderFrame(nowSeconds: Double) = nativeRenderFrame(nativePtr, nowSeconds)
 
-  fun getCameraLat(): Double = nativeGetCameraLat(nativePtr)
-  fun getCameraLon(): Double = nativeGetCameraLon(nativePtr)
-  fun getCameraAlt(): Double = nativeGetCameraAlt(nativePtr)
-  fun getCameraHeading(): Double = nativeGetCameraHeading(nativePtr)
-  fun getCameraPitch(): Double = nativeGetCameraPitch(nativePtr)
-  fun getCameraRoll(): Double = nativeGetCameraRoll(nativePtr)
-  fun getVerticalFovDeg(): Double = nativeGetVerticalFovDeg(nativePtr)
+  // ── Actual camera readback ───────────────────────────────────────────────
+  fun getActualLatitude(): Double = nativeGetActualLatitude(nativePtr)
+  fun getActualLongitude(): Double = nativeGetActualLongitude(nativePtr)
+  fun getActualAltitude(): Double = nativeGetActualAltitude(nativePtr)
+  fun getActualHeading(): Double = nativeGetActualHeading(nativePtr)
+  fun getActualPitch(): Double = nativeGetActualPitch(nativePtr)
+  fun getActualRoll(): Double = nativeGetActualRoll(nativePtr)
+  fun getActualVerticalFovDeg(): Double = nativeGetActualVerticalFovDeg(nativePtr)
+
+  // ── Demand camera readback ───────────────────────────────────────────────
+  fun getDemandLatitude(): Double = nativeGetDemandLatitude(nativePtr)
+  fun getDemandLongitude(): Double = nativeGetDemandLongitude(nativePtr)
+  fun getDemandAltitude(): Double = nativeGetDemandAltitude(nativePtr)
+  fun getDemandHeading(): Double = nativeGetDemandHeading(nativePtr)
+  fun getDemandPitch(): Double = nativeGetDemandPitch(nativePtr)
+  fun getDemandRoll(): Double = nativeGetDemandRoll(nativePtr)
+  fun getDemandVerticalFovDeg(): Double = nativeGetDemandVerticalFovDeg(nativePtr)
 
   fun getViewCorrectionW(): Double = nativeGetViewCorrectionW(nativePtr)
   fun getViewCorrectionX(): Double = nativeGetViewCorrectionX(nativePtr)
@@ -91,35 +104,46 @@ class CesiumBridgeJNI {
   private external fun nativeResize(ptr: Long, w: Int, h: Int)
   private external fun nativeUpdateIonAccessToken(ptr: Long, token: String, assetId: Long)
   private external fun nativeUpdateImageryAssetId(ptr: Long, assetId: Long)
-  private external fun nativeUpdateCamera(ptr: Long, lat: Double, lon: Double, alt: Double, heading: Double, pitch: Double, roll: Double)
-  private external fun nativeUpdateCameraQuaternion(
-    ptr: Long,
-    lat: Double,
-    lon: Double,
-    alt: Double,
-    heading: Double,
-    pitch: Double,
-    roll: Double,
-    qw: Double,
-    qx: Double,
-    qy: Double,
-    qz: Double,
+
+  private external fun nativeSetPosition(ptr: Long, lat: Double, lon: Double)
+  private external fun nativeSetAltitude(ptr: Long, alt: Double)
+  private external fun nativeSetHeading(ptr: Long, headingDeg: Double)
+  private external fun nativeSetAttitude(ptr: Long, pitchDeg: Double, rollDeg: Double)
+  private external fun nativeSetViewCorrection(ptr: Long, qw: Double, qx: Double, qy: Double, qz: Double)
+  private external fun nativeTeleport(
+    ptr: Long, lat: Double, lon: Double, alt: Double,
+    heading: Double, pitch: Double, roll: Double, vfov: Double,
   )
+
   private external fun nativeSetVerticalFovDeg(ptr: Long, deg: Double)
+  private external fun nativeSetRateCaps(
+    ptr: Long, yawDegSec: Double, pitchDegSec: Double, rollDegSec: Double,
+    climbMps: Double, groundMps: Double,
+  )
   private external fun nativeSetMaxSSE(ptr: Long, v: Double)
   private external fun nativeSetMaxSimLoads(ptr: Long, v: Int)
   private external fun nativeSetLoadDescLim(ptr: Long, v: Int)
   private external fun nativeSetMsaa(ptr: Long, v: Int)
   private external fun nativeMarkNeedsRender(ptr: Long)
   private external fun nativeShouldRenderNextFrame(ptr: Long): Boolean
-  private external fun nativeRenderFrame(ptr: Long, dt: Double)
-  private external fun nativeGetCameraLat(ptr: Long): Double
-  private external fun nativeGetCameraLon(ptr: Long): Double
-  private external fun nativeGetCameraAlt(ptr: Long): Double
-  private external fun nativeGetCameraHeading(ptr: Long): Double
-  private external fun nativeGetCameraPitch(ptr: Long): Double
-  private external fun nativeGetCameraRoll(ptr: Long): Double
-  private external fun nativeGetVerticalFovDeg(ptr: Long): Double
+  private external fun nativeRenderFrame(ptr: Long, nowSeconds: Double)
+
+  private external fun nativeGetActualLatitude(ptr: Long): Double
+  private external fun nativeGetActualLongitude(ptr: Long): Double
+  private external fun nativeGetActualAltitude(ptr: Long): Double
+  private external fun nativeGetActualHeading(ptr: Long): Double
+  private external fun nativeGetActualPitch(ptr: Long): Double
+  private external fun nativeGetActualRoll(ptr: Long): Double
+  private external fun nativeGetActualVerticalFovDeg(ptr: Long): Double
+
+  private external fun nativeGetDemandLatitude(ptr: Long): Double
+  private external fun nativeGetDemandLongitude(ptr: Long): Double
+  private external fun nativeGetDemandAltitude(ptr: Long): Double
+  private external fun nativeGetDemandHeading(ptr: Long): Double
+  private external fun nativeGetDemandPitch(ptr: Long): Double
+  private external fun nativeGetDemandRoll(ptr: Long): Double
+  private external fun nativeGetDemandVerticalFovDeg(ptr: Long): Double
+
   private external fun nativeGetViewCorrectionW(ptr: Long): Double
   private external fun nativeGetViewCorrectionX(ptr: Long): Double
   private external fun nativeGetViewCorrectionY(ptr: Long): Double