react-native-cesium 1.0.1 → 1.0.4

package/nitrogen/generated/ios/swift/HybridCesiumViewSpec_cxx.swift

@@ -283,6 +283,36 @@ open class HybridCesiumViewSpec_cxx {
     }
   }
   
+  @inline(__always)
+  public final func setCameraQuaternion(camera: CameraState, viewCorrection: Quaternion) -> bridge.Result_void_ {
+    do {
+      try self.__implementation.setCameraQuaternion(camera: camera, viewCorrection: viewCorrection)
+      return bridge.create_Result_void_()
+    } catch (let __error) {
+      let __exceptionPtr = __error.toCpp()
+      return bridge.create_Result_void_(__exceptionPtr)
+    }
+  }
+  
+  @inline(__always)
+  public final func getViewCorrection() -> bridge.Result_std__shared_ptr_Promise_Quaternion___ {
+    do {
+      let __result = try self.__implementation.getViewCorrection()
+      let __resultCpp = { () -> bridge.std__shared_ptr_Promise_Quaternion__ in
+        let __promise = bridge.create_std__shared_ptr_Promise_Quaternion__()
+        let __promiseHolder = bridge.wrap_std__shared_ptr_Promise_Quaternion__(__promise)
+        __result
+          .then({ __result in __promiseHolder.resolve(__result) })
+          .catch({ __error in __promiseHolder.reject(__error.toCpp()) })
+        return __promise
+      }()
+      return bridge.create_Result_std__shared_ptr_Promise_Quaternion___(__resultCpp)
+    } catch (let __error) {
+      let __exceptionPtr = __error.toCpp()
+      return bridge.create_Result_std__shared_ptr_Promise_Quaternion___(__exceptionPtr)
+    }
+  }
+  
   public final func getView() -> UnsafeMutableRawPointer {
     return Unmanaged.passRetained(__implementation.view).toOpaque()
   }

package/nitrogen/generated/ios/swift/Quaternion.swift

@@ -0,0 +1,44 @@
+///
+/// Quaternion.swift
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+import NitroModules
+
+/**
+ * Represents an instance of `Quaternion`, backed by a C++ struct.
+ */
+public typealias Quaternion = margelo.nitro.reactnativecesium.Quaternion
+
+public extension Quaternion {
+  private typealias bridge = margelo.nitro.reactnativecesium.bridge.swift
+
+  /**
+   * Create a new instance of `Quaternion`.
+   */
+  init(w: Double, x: Double, y: Double, z: Double) {
+    self.init(w, x, y, z)
+  }
+
+  @inline(__always)
+  var w: Double {
+    return self.__w
+  }
+  
+  @inline(__always)
+  var x: Double {
+    return self.__x
+  }
+  
+  @inline(__always)
+  var y: Double {
+    return self.__y
+  }
+  
+  @inline(__always)
+  var z: Double {
+    return self.__z
+  }
+}

package/nitrogen/generated/shared/c++/HybridCesiumViewSpec.cpp

@@ -36,6 +36,8 @@ namespace margelo::nitro::reactnativecesium {
       prototype.registerHybridSetter("onMetrics", &HybridCesiumViewSpec::setOnMetrics);
       prototype.registerHybridMethod("getCameraState", &HybridCesiumViewSpec::getCameraState);
       prototype.registerHybridMethod("setCamera", &HybridCesiumViewSpec::setCamera);
+      prototype.registerHybridMethod("setCameraQuaternion", &HybridCesiumViewSpec::setCameraQuaternion);
+      prototype.registerHybridMethod("getViewCorrection", &HybridCesiumViewSpec::getViewCorrection);
     });
   }
 

package/nitrogen/generated/shared/c++/HybridCesiumViewSpec.hpp

@@ -17,6 +17,8 @@
 namespace margelo::nitro::reactnativecesium { struct CameraState; }
 // Forward declaration of `CesiumMetrics` to properly resolve imports.
 namespace margelo::nitro::reactnativecesium { struct CesiumMetrics; }
+// Forward declaration of `Quaternion` to properly resolve imports.
+namespace margelo::nitro::reactnativecesium { struct Quaternion; }
 
 #include <string>
 #include "CameraState.hpp"
@@ -24,6 +26,7 @@ namespace margelo::nitro::reactnativecesium { struct CesiumMetrics; }
 #include <functional>
 #include <optional>
 #include <NitroModules/Promise.hpp>
+#include "Quaternion.hpp"
 
 namespace margelo::nitro::reactnativecesium {
 
@@ -77,6 +80,8 @@ namespace margelo::nitro::reactnativecesium {
       // Methods
       virtual std::shared_ptr<Promise<CameraState>> getCameraState() = 0;
       virtual void setCamera(const CameraState& camera) = 0;
+      virtual void setCameraQuaternion(const CameraState& camera, const Quaternion& viewCorrection) = 0;
+      virtual std::shared_ptr<Promise<Quaternion>> getViewCorrection() = 0;
 
     protected:
       // Hybrid Setup

package/nitrogen/generated/shared/c++/Quaternion.hpp

@@ -0,0 +1,95 @@
+///
+/// Quaternion.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+#pragma once
+
+#if __has_include(<NitroModules/JSIConverter.hpp>)
+#include <NitroModules/JSIConverter.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/NitroDefines.hpp>)
+#include <NitroModules/NitroDefines.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/JSIHelpers.hpp>)
+#include <NitroModules/JSIHelpers.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/PropNameIDCache.hpp>)
+#include <NitroModules/PropNameIDCache.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+
+
+
+
+
+namespace margelo::nitro::reactnativecesium {
+
+  /**
+   * A struct which can be represented as a JavaScript object (Quaternion).
+   */
+  struct Quaternion final {
+  public:
+    double w     SWIFT_PRIVATE;
+    double x     SWIFT_PRIVATE;
+    double y     SWIFT_PRIVATE;
+    double z     SWIFT_PRIVATE;
+
+  public:
+    Quaternion() = default;
+    explicit Quaternion(double w, double x, double y, double z): w(w), x(x), y(y), z(z) {}
+
+  public:
+    friend bool operator==(const Quaternion& lhs, const Quaternion& rhs) = default;
+  };
+
+} // namespace margelo::nitro::reactnativecesium
+
+namespace margelo::nitro {
+
+  // C++ Quaternion <> JS Quaternion (object)
+  template <>
+  struct JSIConverter<margelo::nitro::reactnativecesium::Quaternion> final {
+    static inline margelo::nitro::reactnativecesium::Quaternion fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+      jsi::Object obj = arg.asObject(runtime);
+      return margelo::nitro::reactnativecesium::Quaternion(
+        JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "w"))),
+        JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "x"))),
+        JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "y"))),
+        JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "z")))
+      );
+    }
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::reactnativecesium::Quaternion& arg) {
+      jsi::Object obj(runtime);
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "w"), JSIConverter<double>::toJSI(runtime, arg.w));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "x"), JSIConverter<double>::toJSI(runtime, arg.x));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "y"), JSIConverter<double>::toJSI(runtime, arg.y));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "z"), JSIConverter<double>::toJSI(runtime, arg.z));
+      return obj;
+    }
+    static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
+      if (!value.isObject()) {
+        return false;
+      }
+      jsi::Object obj = value.getObject(runtime);
+      if (!nitro::isPlainObject(runtime, obj)) {
+        return false;
+      }
+      if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "w")))) return false;
+      if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "x")))) return false;
+      if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "y")))) return false;
+      if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "z")))) return false;
+      return true;
+    }
+  };
+
+} // namespace margelo::nitro

package/package.json

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

package/src/index.ts

@@ -4,4 +4,5 @@ export type {
   CesiumMetrics,
   CesiumViewProps,
   CesiumViewMethods,
+  Quaternion,
 } from './specs/cesium-view.nitro'

package/src/specs/cesium-view.nitro.ts

@@ -15,6 +15,17 @@ export interface CameraState {
   verticalFovDeg: number
 }
 
+/**
+ * Unit quaternion (w + xi + yj + zk). Used for camera-space view correction.
+ * Non-unit values are normalized on the native side.
+ */
+export interface Quaternion {
+  w: number
+  x: number
+  y: number
+  z: number
+}
+
 /** Throttled telemetry for dashboards (see `onMetrics` prop). */
 export interface CesiumMetrics {
   fps: number
@@ -44,8 +55,18 @@ export interface CesiumViewProps extends HybridViewProps {
 export interface CesiumViewMethods extends HybridViewMethods {
   /** Returns the current native camera state. */
   getCameraState(): Promise<CameraState>
-  /** Runtime camera control path after the view has been created. */
+  /**
+   * Runtime camera control (heading/pitch/roll + position + VFOV).
+   * Does not change the view-correction quaternion; use `setCameraQuaternion` to set that.
+   */
   setCamera(camera: CameraState): void
+  /**
+   * Same fields as `setCamera`, plus a camera-space rotation applied after HPR
+   * (e.g. boresight / HUD alignment). See README.
+   */
+  setCameraQuaternion(camera: CameraState, viewCorrection: Quaternion): void
+  /** Current view-correction quaternion (identity if never set via `setCameraQuaternion`). */
+  getViewCorrection(): Promise<Quaternion>
 }
 
 export type CesiumView = HybridView<CesiumViewProps, CesiumViewMethods>