diff --git a/Cargo.lock b/Cargo.lock index 7af09affa..8468dfdc1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1103,6 +1103,15 @@ dependencies = [ "thiserror 2.0.21", ] +[[package]] +name = "craft-cms" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=5c0fc062b4ae518fc2736a7f489a4c4e8222e883#5c0fc062b4ae518fc2736a7f489a4c4e8222e883" +dependencies = [ + "md-5", + "rayon", +] + [[package]] name = "craft-doc" version = "0.1.0" @@ -1661,6 +1670,7 @@ name = "effectcraft-effects" version = "0.24.1" dependencies = [ "chrono", + "craft-cms", "effectcraft-color", "effectcraft-geom", "effectcraft-keyframe", @@ -4063,6 +4073,16 @@ dependencies = [ "rawpointer", ] +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest", +] + [[package]] name = "memchr" version = "2.8.3" diff --git a/crates/effects/Cargo.toml b/crates/effects/Cargo.toml index bb26d3127..14b062e5f 100644 --- a/crates/effects/Cargo.toml +++ b/crates/effects/Cargo.toml @@ -10,6 +10,7 @@ rust-version.workspace = true workspace = true [dependencies] +craft-cms = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5c0fc062b4ae518fc2736a7f489a4c4e8222e883" } effectcraft-geom = { workspace = true } effectcraft-color = { workspace = true } effectcraft-keyframe = { workspace = true } diff --git a/crates/effects/src/ocio/lut.rs b/crates/effects/src/ocio/lut.rs index daa584278..15018ccd2 100644 --- a/crates/effects/src/ocio/lut.rs +++ b/crates/effects/src/ocio/lut.rs @@ -18,18 +18,8 @@ pub enum FileXform { /// Parse a Sony Imageworks `.spimtx` matrix: three rows of four numbers, three matrix columns /// and an offset in 16-bit code values (รท 65535). pub fn parse_spimtx(text: &str) -> Option { - let v: Vec = text.split_whitespace().map(|t| t.parse().ok()).collect::>()?; - if v.len() != 12 || v.iter().any(|x| !x.is_finite()) { - return None; - } - let mut m = [0.0; 16]; - let mut offset = [0.0; 4]; - for (r, row) in v.as_chunks::<4>().0.iter().enumerate() { - m[r * 4..r * 4 + 3].copy_from_slice(&row[..3]); - offset[r] = row[3] / 65535.0; - } - m[15] = 1.0; - Some(FileXform::Matrix { m, offset }) + let value = craft_cms::sony_lut::parse_spimtx(text)?; + Some(FileXform::Matrix { m: value.matrix, offset: value.offset }) } /// Parse a Sony Imageworks `.spi1d` 1D LUT: `From `, `Length `, `Components @@ -73,30 +63,8 @@ pub fn parse_spi1d(text: &str) -> Option { /// Parse a Sony Imageworks `.spi3d` lattice: `SPILUT 1.0`, `3 3`, the sizes, then one /// `r g b R G B` line per lattice point (indices, then the colour). pub fn parse_spi3d(text: &str) -> Option { - let mut lines = text.lines().map(str::trim).filter(|l| !l.is_empty()); - if !lines.next()?.starts_with("SPILUT") { - return None; - } - lines.next()?; - let size: Vec = lines.next()?.split_whitespace().map(|t| t.parse().ok()).collect::>()?; - let n = *size.first()?; - if size.len() != 3 || size.iter().any(|s| *s != n) || !(2..=MAX_LATTICE).contains(&n) { - return None; - } - let mut d3 = vec![[0.0f32; 3]; n * n * n]; - let mut seen = 0usize; - for line in lines { - let v: Vec<&str> = line.split_whitespace().collect(); - let [r, g, b, cr, cg, cb] = v.as_slice() else { return None }; - let (r, g, b): (usize, usize, usize) = (r.parse().ok()?, g.parse().ok()?, b.parse().ok()?); - if r >= n || g >= n || b >= n { - return None; - } - // Our lattice is red fastest. - *d3.get_mut(r + g * n + b * n * n)? = [cr.parse().ok()?, cg.parse().ok()?, cb.parse().ok()?]; - seen += 1; - } - (seen == n * n * n).then_some(Lut { n1: 0, d1: vec![], n3: n, d3, dmin: [0.0; 3], dmax: [1.0; 3] }) + let value = craft_cms::sony_lut::parse_spi3d(text)?; + Some(Lut { n1: 0, d1: vec![], n3: value.size, d3: value.values, dmin: [0.0; 3], dmax: [1.0; 3] }) } /// Parse an Autodesk `.3dl` lattice (integers, blue fastest; an optional input-mesh line). diff --git a/crates/effects/src/ocio/tests.rs b/crates/effects/src/ocio/tests.rs index ea2423043..177108735 100644 --- a/crates/effects/src/ocio/tests.rs +++ b/crates/effects/src/ocio/tests.rs @@ -120,6 +120,13 @@ fn spi_files_parse() { for (r, g, b) in (0..8).map(|i| (i & 1, (i >> 1) & 1, i >> 2)) { spi3d += &format!("{r} {g} {b} {} {} {}\n", r as f32 * 0.5, g, b); } + let lattice = parse_spi3d(&spi3d).unwrap(); + assert_eq!(lattice.n1, 0); + assert!(lattice.d1.is_empty()); + assert_eq!(lattice.n3, 2); + assert_eq!(lattice.dmin, [0.0; 3]); + assert_eq!(lattice.dmax, [1.0; 3]); + assert!(parse_spimtx("1 0 0 0 0 1 0 0 0 0 1 0 extra").is_none()); let x = parse_file(&spi3d, "spi3d").unwrap(); let o = x.apply([1.0, 0.5, 0.25], 1, false, ""); assert!((o[0] - 0.5).abs() < 1e-6 && (o[1] - 0.5).abs() < 1e-6 && (o[2] - 0.25).abs() < 1e-6, "{o:?}");