eulumdat 0.2.1__tar.gz → 0.2.2__tar.gz

{eulumdat-0.2.1 → eulumdat-0.2.2}/Cargo.lock

@@ -1400,7 +1400,7 @@ dependencies = [
 
 [[package]]
 name = "eulumdat"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "anyhow",
  "approx",
@@ -1409,7 +1409,7 @@ dependencies = [
 
 [[package]]
 name = "eulumdat-cli"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "anyhow",
  "clap",
@@ -1419,7 +1419,7 @@ dependencies = [
 
 [[package]]
 name = "eulumdat-egui"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "anyhow",
  "eframe",
@@ -1434,16 +1434,32 @@ dependencies = [
 
 [[package]]
 name = "eulumdat-ffi"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "eulumdat",
  "thiserror 1.0.69",
  "uniffi",
 ]
 
+[[package]]
+name = "eulumdat-harmonyos-ffi"
+version = "0.2.2"
+dependencies = [
+ "eulumdat",
+ "eulumdat-photweb",
+]
+
+[[package]]
+name = "eulumdat-photweb"
+version = "0.2.2"
+dependencies = [
+ "approx",
+ "eulumdat",
+]
+
 [[package]]
 name = "eulumdat-py"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "eulumdat",
  "pyo3",
@@ -1451,7 +1467,7 @@ dependencies = [
 
 [[package]]
 name = "eulumdat-wasm"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "base64",
  "eulumdat",
@@ -1467,7 +1483,7 @@ dependencies = [
 
 [[package]]
 name = "eulumdat-windows-preview"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "anyhow",
  "embed-resource",
@@ -1523,9 +1539,9 @@ checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844"
 
 [[package]]
 name = "flate2"
-version = "1.1.7"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2152dbcb980c05735e2a651d96011320a949eb31a0c8b38b72645ce97dec676"
+checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"
 dependencies = [
  "crc32fast",
  "miniz_oxide",

{eulumdat-0.2.1 → eulumdat-0.2.2}/Cargo.toml

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.2.1"
+version = "0.2.2"
 edition = "2021"
 authors = ["Holger Trahe <trahe@mac.com>"]
 license = "MIT OR Apache-2.0"
@@ -12,7 +12,7 @@ homepage = "https://github.com/holg/eulumdat-rs"
 
 [workspace.dependencies]
 # Internal crates
-eulumdat = { path = "crates/eulumdat" }
+eulumdat = { path = "crates/eulumdat", version = "0.2.2" }
 
 # Shared dependencies
 anyhow = "1.0"

{eulumdat-0.2.1 → eulumdat-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eulumdat
-Version: 0.2.1
+Version: 0.2.2
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research

{eulumdat-0.2.1 → eulumdat-0.2.2}/crates/eulumdat/src/eulumdat.rs

@@ -361,4 +361,41 @@ impl Eulumdat {
             0.0
         }
     }
+
+    /// Sample intensity at any C and G angle using bilinear interpolation.
+    ///
+    /// This is the key method for generating beam meshes and smooth geometry.
+    /// It handles symmetry automatically and interpolates between stored data points.
+    ///
+    /// # Arguments
+    /// * `c_angle` - C-plane angle in degrees (0-360, will be normalized)
+    /// * `g_angle` - Gamma angle in degrees (0-180, will be clamped)
+    ///
+    /// # Returns
+    /// Interpolated intensity value in cd/klm
+    ///
+    /// # Example
+    /// ```rust,no_run
+    /// use eulumdat::Eulumdat;
+    ///
+    /// let ldt = Eulumdat::from_file("luminaire.ldt")?;
+    ///
+    /// // Sample at exact stored angles
+    /// let intensity = ldt.sample(0.0, 45.0);
+    ///
+    /// // Sample at arbitrary angles (will interpolate)
+    /// let intensity = ldt.sample(22.5, 67.5);
+    ///
+    /// // Generate smooth beam mesh at 5° intervals
+    /// for c in (0..360).step_by(5) {
+    ///     for g in (0..=180).step_by(5) {
+    ///         let intensity = ldt.sample(c as f64, g as f64);
+    ///         // Use intensity for mesh generation...
+    ///     }
+    /// }
+    /// # Ok::<(), Box<dyn std::error::Error>>(())
+    /// ```
+    pub fn sample(&self, c_angle: f64, g_angle: f64) -> f64 {
+        crate::symmetry::SymmetryHandler::get_intensity_at(self, c_angle, g_angle)
+    }
 }

{eulumdat-0.2.1 → eulumdat-0.2.2}/crates/eulumdat/src/symmetry.rs

@@ -342,4 +342,74 @@ mod tests {
         assert!((x - 1.0).abs() < 0.001);
         assert!((y - 0.0).abs() < 0.001);
     }
+
+    #[test]
+    fn test_get_intensity_at_exact_angles() {
+        let ldt = Eulumdat {
+            symmetry: Symmetry::None,
+            c_angles: vec![0.0, 90.0, 180.0, 270.0],
+            g_angles: vec![0.0, 45.0, 90.0],
+            intensities: vec![
+                vec![100.0, 80.0, 50.0], // C0
+                vec![90.0, 70.0, 40.0],  // C90
+                vec![80.0, 60.0, 30.0],  // C180
+                vec![70.0, 50.0, 20.0],  // C270
+            ],
+            ..Default::default()
+        };
+
+        // Test exact angles
+        let i = SymmetryHandler::get_intensity_at(&ldt, 0.0, 0.0);
+        assert!((i - 100.0).abs() < 0.001);
+
+        let i = SymmetryHandler::get_intensity_at(&ldt, 90.0, 45.0);
+        assert!((i - 70.0).abs() < 0.001);
+    }
+
+    #[test]
+    fn test_get_intensity_at_interpolated() {
+        let ldt = Eulumdat {
+            symmetry: Symmetry::None,
+            c_angles: vec![0.0, 90.0],
+            g_angles: vec![0.0, 90.0],
+            intensities: vec![
+                vec![100.0, 0.0], // C0: 100 at nadir, 0 at horizontal
+                vec![100.0, 0.0], // C90: same
+            ],
+            ..Default::default()
+        };
+
+        // Interpolate at G=45 should give ~50 (midpoint)
+        let i = SymmetryHandler::get_intensity_at(&ldt, 0.0, 45.0);
+        assert!((i - 50.0).abs() < 0.001);
+    }
+
+    #[test]
+    fn test_sample_method() {
+        let ldt = Eulumdat {
+            symmetry: Symmetry::BothPlanes,
+            c_angles: vec![0.0, 45.0, 90.0],
+            g_angles: vec![0.0, 30.0, 60.0, 90.0],
+            intensities: vec![
+                vec![100.0, 90.0, 70.0, 40.0], // C0
+                vec![95.0, 85.0, 65.0, 35.0],  // C45
+                vec![90.0, 80.0, 60.0, 30.0],  // C90
+            ],
+            ..Default::default()
+        };
+
+        // Test the sample() convenience method
+        let i = ldt.sample(0.0, 0.0);
+        assert!((i - 100.0).abs() < 0.001);
+
+        // Test symmetry - C180 should mirror C0
+        let i_c0 = ldt.sample(0.0, 30.0);
+        let i_c180 = ldt.sample(180.0, 30.0);
+        assert!((i_c0 - i_c180).abs() < 0.001);
+
+        // Test symmetry - C270 should mirror C90
+        let i_c90 = ldt.sample(90.0, 60.0);
+        let i_c270 = ldt.sample(270.0, 60.0);
+        assert!((i_c90 - i_c270).abs() < 0.001);
+    }
 }

{eulumdat-0.2.1 → eulumdat-0.2.2}/crates/eulumdat-py/Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "eulumdat-py"
-version.workspace = true
-edition.workspace = true
-license.workspace = true
-repository.workspace = true
+version = "0.2.2"  # Must be explicit for maturin (workspace inheritance not supported)
+edition = "2021"
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/holg/eulumdat-rs"
 description = "Python bindings for eulumdat photometric file parsing library"
 readme = "README.md"
 
@@ -12,5 +12,5 @@ name = "eulumdat"
 crate-type = ["cdylib"]
 
 [dependencies]
-eulumdat = { path = "../eulumdat" }
+eulumdat = { path = "../eulumdat", version = "0.2.2" }
 pyo3 = { version = "0.27", features = ["extension-module"] }

{eulumdat-0.2.1 → eulumdat-0.2.2}/crates/eulumdat-py/src/types.rs

@@ -720,6 +720,39 @@ impl Eulumdat {
         self.inner.get_intensity(c_index, g_index)
     }
 
+    /// Sample intensity at any C and G angle using bilinear interpolation.
+    ///
+    /// This method handles symmetry automatically - you can query any angle
+    /// in the full 0-360° C range and 0-180° G range regardless of stored symmetry.
+    ///
+    /// Args:
+    ///     c_angle: C-plane angle in degrees (will be normalized to 0-360)
+    ///     g_angle: Gamma angle in degrees (will be clamped to 0-180)
+    ///
+    /// Returns:
+    ///     Intensity in cd/klm at the specified angle
+    fn sample(&self, c_angle: f64, g_angle: f64) -> f64 {
+        self.inner.sample(c_angle, g_angle)
+    }
+
+    /// Sample normalized intensity (0.0 to 1.0) at any C and G angle.
+    ///
+    /// Returns intensity relative to maximum intensity, useful for visualization.
+    ///
+    /// Args:
+    ///     c_angle: C-plane angle in degrees
+    ///     g_angle: Gamma angle in degrees
+    ///
+    /// Returns:
+    ///     Normalized intensity (0.0 to 1.0)
+    fn sample_normalized(&self, c_angle: f64, g_angle: f64) -> f64 {
+        let max = self.inner.max_intensity();
+        if max <= 0.0 {
+            return 0.0;
+        }
+        self.inner.sample(c_angle, g_angle) / max
+    }
+
     // === Diagram Generation ===
 
     /// Generate a polar diagram SVG.

{eulumdat-0.2.1 → eulumdat-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "eulumdat"
-version = "0.2.1"
+version = "0.2.2"
 description = "Python bindings for eulumdat photometric file parsing library"
 readme = "README.md"
 license = { text = "MIT OR Apache-2.0" }