From 2e4bbc7d6b6290d3cbdf203c48ac0614fc675bea Mon Sep 17 00:00:00 2001
From: Nazari Gonzalez <nazari.nz@gmail.com>
Date: Sat, 25 Jan 2025 17:10:55 +0000
Subject: [PATCH] wip 0.13

---
 CHANGELOG.md                            |   2 +
 Cargo.lock                              | 168 ++++++++++++------------
 Cargo.toml                              |  46 +++----
 crates/notan_app/Cargo.toml             |   2 +-
 crates/notan_glow/src/texture_source.rs |   2 +-
 crates/notan_graphics/Cargo.toml        |   2 +-
 crates/notan_graphics/src/to_file.rs    |   2 +-
 crates/notan_log/Cargo.toml             |   2 +-
 crates/notan_math/Cargo.toml            |   2 +-
 9 files changed, 114 insertions(+), 114 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2557b5c8..247fa40b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## v0.13.0 - UNRELEASED
+
 ## v0.12.1 - 08/06/2024
 
 - Updated EGUI to `0.27`.
diff --git a/Cargo.lock b/Cargo.lock
index 35f36fd4..9a10267d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -256,6 +256,12 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
+[[package]]
+name = "byteorder-lite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
+
 [[package]]
 name = "bytes"
 version = "1.9.0"
@@ -364,21 +370,14 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ecdffb913a326b6c642290a0d0ec8e8d6597291acdc07cc4c9cb4b3635d44cf9"
 
-[[package]]
-name = "color_quant"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
-
 [[package]]
 name = "colored"
-version = "1.9.4"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f741c91823341bebf717d4c71bda820630ce065443b58bd1b7451af008355"
+checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
- "is-terminal",
  "lazy_static",
- "winapi",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -505,9 +504,9 @@ dependencies = [
 
 [[package]]
 name = "crevice_notan"
-version = "0.13.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bb0b2bca5ce777a79dd787fafb8113f2be4f020e4c2468363b473041f2d9b90"
+checksum = "fa848d9c5c9f15eeca0ea015b357fd7b8f0134439c2a4d0ecae39a1ea85162e1"
 dependencies = [
  "bytemuck",
  "crevice_notan-derive",
@@ -517,9 +516,9 @@ dependencies = [
 
 [[package]]
 name = "crevice_notan-derive"
-version = "0.13.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c99d1aa96f6017828f2d26743f8d4fa3a80927a2a169b9c5c5871cfb3b51f30"
+checksum = "d4d871b3b5088a354bd255c573d3eae61be08af5072ed24434213962f8c3d545"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -607,7 +606,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
 dependencies = [
- "libloading 0.7.4",
+ "libloading 0.8.6",
 ]
 
 [[package]]
@@ -616,6 +615,12 @@ version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
 
+[[package]]
+name = "downcast-rs"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea8a8b81cacc08888170eef4d13b775126db426d0b348bee9d18c2c1eaf123cf"
+
 [[package]]
 name = "ecolor"
 version = "0.28.1"
@@ -813,9 +818,9 @@ dependencies = [
 
 [[package]]
 name = "fern"
-version = "0.6.2"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee"
+checksum = "4316185f709b23713e41e3195f90edef7fb00c3ed4adc79769cf09cc762a3b29"
 dependencies = [
  "colored",
  "log",
@@ -837,6 +842,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8"
 
+[[package]]
+name = "foldhash"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
+
 [[package]]
 name = "foreign-types"
 version = "0.3.2"
@@ -1001,9 +1012,9 @@ dependencies = [
 
 [[package]]
 name = "glam"
-version = "0.24.2"
+version = "0.29.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
+checksum = "dc46dd3ec48fdd8e693a98d2b8bafae273a2d54c1de02a2a7e3d57d501f39677"
 dependencies = [
  "bytemuck",
  "mint",
@@ -1143,27 +1154,16 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.5"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 dependencies = [
- "ahash",
  "allocator-api2",
+ "equivalent",
+ "foldhash",
  "serde",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.15.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
-
-[[package]]
-name = "hermit-abi"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
-
 [[package]]
 name = "home"
 version = "0.5.11"
@@ -1314,16 +1314,16 @@ dependencies = [
 
 [[package]]
 name = "image"
-version = "0.24.9"
+version = "0.25.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
+checksum = "cd6f44aed642f18953a158afeb30206f4d50da59fbc66ecb53c66488de73563b"
 dependencies = [
  "bytemuck",
- "byteorder",
- "color_quant",
- "jpeg-decoder",
+ "byteorder-lite",
  "num-traits",
  "png",
+ "zune-core",
+ "zune-jpeg",
 ]
 
 [[package]]
@@ -1333,7 +1333,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.2",
+ "hashbrown",
 ]
 
 [[package]]
@@ -1348,17 +1348,6 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "is-terminal"
-version = "0.4.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e19b23d53f35ce9f56aebc7d1bb4e6ac1e9c0db7ac85c8d1760c04379edced37"
-dependencies = [
- "hermit-abi",
- "libc",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "itertools"
 version = "0.13.0"
@@ -1405,12 +1394,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "jpeg-decoder"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
-
 [[package]]
 name = "js-sys"
 version = "0.3.77"
@@ -1759,7 +1742,7 @@ dependencies = [
 
 [[package]]
 name = "notan"
-version = "0.12.1"
+version = "0.13.0"
 dependencies = [
  "bytemuck",
  "egui_demo_lib",
@@ -1783,12 +1766,12 @@ dependencies = [
 
 [[package]]
 name = "notan_app"
-version = "0.12.1"
+version = "0.13.0"
 dependencies = [
- "downcast-rs",
+ "downcast-rs 2.0.1",
  "futures",
  "futures-util",
- "hashbrown 0.14.5",
+ "hashbrown",
  "indexmap",
  "js-sys",
  "log",
@@ -1807,14 +1790,14 @@ dependencies = [
 
 [[package]]
 name = "notan_audio"
-version = "0.12.1"
+version = "0.13.0"
 dependencies = [
  "parking_lot",
 ]
 
 [[package]]
 name = "notan_backend"
-version = "0.12.1"
+version = "0.13.0"
 dependencies = [
  "notan_web",
  "notan_winit",
@@ -1822,7 +1805,7 @@ dependencies = [
 
 [[package]]
 name = "notan_core"
-version = "0.12.1"
+version = "0.13.0"
 dependencies = [
  "serde",
  "web-sys",
@@ -1830,7 +1813,7 @@ dependencies = [
 
 [[package]]
 name = "notan_draw"
-version = "0.12.1"
+version = "0.13.0"
 dependencies = [
  "log",
  "lyon",
@@ -1846,7 +1829,7 @@ dependencies = [
 
 [[package]]
 name = "notan_egui"
-version = "0.12.1"
+version = "0.13.0"
 dependencies = [
  "bytemuck",
  "egui",
@@ -1858,7 +1841,7 @@ dependencies = [
 
 [[package]]
 name = "notan_extra"
-version = "0.12.1"
+version = "0.13.0"
 dependencies = [
  "notan_app",
  "spin_sleep",
@@ -1866,11 +1849,11 @@ dependencies = [
 
 [[package]]
 name = "notan_glow"
-version = "0.12.1"
+version = "0.13.0"
 dependencies = [
  "bytemuck",
  "glow",
- "hashbrown 0.14.5",
+ "hashbrown",
  "image",
  "js-sys",
  "log",
@@ -1881,7 +1864,7 @@ dependencies = [
 
 [[package]]
 name = "notan_glyph"
-version = "0.12.1"
+version = "0.13.0"
 dependencies = [
  "bytemuck",
  "glyph_brush",
@@ -1894,7 +1877,7 @@ dependencies = [
 
 [[package]]
 name = "notan_graphics"
-version = "0.12.1"
+version = "0.13.0"
 dependencies = [
  "bytemuck",
  "crevice_notan",
@@ -1908,9 +1891,9 @@ dependencies = [
 
 [[package]]
 name = "notan_input"
-version = "0.12.1"
+version = "0.13.0"
 dependencies = [
- "hashbrown 0.14.5",
+ "hashbrown",
  "log",
  "notan_core",
  "notan_math",
@@ -1919,7 +1902,7 @@ dependencies = [
 
 [[package]]
 name = "notan_log"
-version = "0.12.1"
+version = "0.13.0"
 dependencies = [
  "console_log",
  "fern",
@@ -1932,7 +1915,7 @@ dependencies = [
 
 [[package]]
 name = "notan_macro"
-version = "0.12.1"
+version = "0.13.0"
 dependencies = [
  "cfg_aliases 0.2.1",
  "glsl-to-spirv",
@@ -1946,7 +1929,7 @@ dependencies = [
 
 [[package]]
 name = "notan_math"
-version = "0.12.1"
+version = "0.13.0"
 dependencies = [
  "glam",
  "serde",
@@ -1954,10 +1937,10 @@ dependencies = [
 
 [[package]]
 name = "notan_oddio"
-version = "0.12.1"
+version = "0.13.0"
 dependencies = [
  "cpal",
- "hashbrown 0.14.5",
+ "hashbrown",
  "log",
  "notan_audio",
  "oddio",
@@ -1966,7 +1949,7 @@ dependencies = [
 
 [[package]]
 name = "notan_random"
-version = "0.12.1"
+version = "0.13.0"
 dependencies = [
  "getrandom",
  "rand",
@@ -1975,9 +1958,9 @@ dependencies = [
 
 [[package]]
 name = "notan_text"
-version = "0.12.1"
+version = "0.13.0"
 dependencies = [
- "hashbrown 0.14.5",
+ "hashbrown",
  "lazy_static",
  "log",
  "notan_app",
@@ -1989,7 +1972,7 @@ dependencies = [
 
 [[package]]
 name = "notan_utils"
-version = "0.12.1"
+version = "0.13.0"
 dependencies = [
  "instant",
  "js-sys",
@@ -2001,7 +1984,7 @@ dependencies = [
 
 [[package]]
 name = "notan_web"
-version = "0.12.1"
+version = "0.13.0"
 dependencies = [
  "console_error_panic_hook",
  "js-sys",
@@ -2019,7 +2002,7 @@ dependencies = [
 
 [[package]]
 name = "notan_winit"
-version = "0.12.1"
+version = "0.13.0"
 dependencies = [
  "arboard",
  "glutin",
@@ -3345,7 +3328,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715"
 dependencies = [
  "bitflags 1.3.2",
- "downcast-rs",
+ "downcast-rs 1.2.1",
  "libc",
  "nix 0.24.3",
  "scoped-tls",
@@ -3943,3 +3926,18 @@ dependencies = [
  "quote",
  "syn 2.0.96",
 ]
+
+[[package]]
+name = "zune-core"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
+
+[[package]]
+name = "zune-jpeg"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99a5bab8d7dedf81405c4bb1f2b83ea057643d9cb28778cea9eecddeedd2e028"
+dependencies = [
+ "zune-core",
+]
diff --git a/Cargo.toml b/Cargo.toml
index 25806440..1afd750f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,7 +19,7 @@ members = [
 ]
 
 [workspace.package]
-version = "0.12.1"
+version = "0.13.0"
 authors = ["Nazarí González <nazari.nz@gmail.com>"]
 license = "MIT OR Apache-2.0"
 homepage = "https://github.com/Nazariglez/notan"
@@ -27,33 +27,33 @@ repository = "https://github.com/Nazariglez/notan"
 edition = "2021"
 
 [workspace.dependencies]
-notan_core = { path = "crates/notan_core", version = "0.12.1" }
-notan_input = { path = "crates/notan_input", version = "0.12.1" }
-notan_app = { path = "crates/notan_app", version = "0.12.1" }
-notan_macro = { path = "crates/notan_macro", version = "0.12.1" }
-notan_math = { path = "crates/notan_math", version = "0.12.1" }
-notan_graphics = { path = "crates/notan_graphics", version = "0.12.1" }
-notan_utils = { path = "crates/notan_utils", version = "0.12.1" }
-notan_log = { path = "crates/notan_log", version = "0.12.1" }
-notan_glyph = { path = "crates/notan_glyph", version = "0.12.1" }
-notan_draw = { path = "crates/notan_draw", version = "0.12.1" }
-notan_backend = { path = "crates/notan_backend", version = "0.12.1" }
-notan_egui = { path = "crates/notan_egui", version = "0.12.1" }
-notan_text = { path = "crates/notan_text", version = "0.12.1" }
-notan_audio = { path = "crates/notan_audio", version = "0.12.1" }
-notan_extra = { path = "crates/notan_extra", version = "0.12.1" }
-notan_random = { path = "crates/notan_random", version = "0.12.1" }
-notan_winit = { path = "crates/notan_winit", version = "0.12.1" }
-notan_web = { path = "crates/notan_web", version = "0.12.1" }
-notan_glow = { path = "crates/notan_glow", version = "0.12.1" }
-notan_oddio = { path = "crates/notan_oddio", version = "0.12.1" }
+notan_core = { path = "crates/notan_core", version = "0.13.0" }
+notan_input = { path = "crates/notan_input", version = "0.13.0" }
+notan_app = { path = "crates/notan_app", version = "0.13.0" }
+notan_macro = { path = "crates/notan_macro", version = "0.13.0" }
+notan_math = { path = "crates/notan_math", version = "0.13.0" }
+notan_graphics = { path = "crates/notan_graphics", version = "0.13.0" }
+notan_utils = { path = "crates/notan_utils", version = "0.13.0" }
+notan_log = { path = "crates/notan_log", version = "0.13.0" }
+notan_glyph = { path = "crates/notan_glyph", version = "0.13.0" }
+notan_draw = { path = "crates/notan_draw", version = "0.13.0" }
+notan_backend = { path = "crates/notan_backend", version = "0.13.0" }
+notan_egui = { path = "crates/notan_egui", version = "0.13.0" }
+notan_text = { path = "crates/notan_text", version = "0.13.0" }
+notan_audio = { path = "crates/notan_audio", version = "0.13.0" }
+notan_extra = { path = "crates/notan_extra", version = "0.13.0" }
+notan_random = { path = "crates/notan_random", version = "0.13.0" }
+notan_winit = { path = "crates/notan_winit", version = "0.13.0" }
+notan_web = { path = "crates/notan_web", version = "0.13.0" }
+notan_glow = { path = "crates/notan_glow", version = "0.13.0" }
+notan_oddio = { path = "crates/notan_oddio", version = "0.13.0" }
 
 log = "0.4.25"
-hashbrown = "0.14.5"
+hashbrown = "0.15.2"
 parking_lot = "0.12.3"
 bytemuck = "1.21.0"
 serde = { version = "1.0", features = ["serde_derive"] }
-image = { version = "0.24.9", default-features = false, features = ["jpeg", "png", "ico"] }
+image = { version = "0.25.5", default-features = false, features = ["jpeg", "png", "ico"] }
 
 # wasm deps
 wasm-bindgen = "0.2.100"
diff --git a/crates/notan_app/Cargo.toml b/crates/notan_app/Cargo.toml
index f9b7e3f0..4e562001 100644
--- a/crates/notan_app/Cargo.toml
+++ b/crates/notan_app/Cargo.toml
@@ -24,7 +24,7 @@ hashbrown.workspace = true
 parking_lot.workspace = true
 serde = { workspace = true, optional = true }
 
-downcast-rs = "1.2.1"
+downcast-rs = "2.0.1"
 indexmap = "2.7.1"
 futures = "0.3.31"
 
diff --git a/crates/notan_glow/src/texture_source.rs b/crates/notan_glow/src/texture_source.rs
index c3deb5aa..336476d5 100644
--- a/crates/notan_glow/src/texture_source.rs
+++ b/crates/notan_glow/src/texture_source.rs
@@ -40,7 +40,7 @@ fn invalid_tex_size(max_size: u32, info: &TextureInfo) -> bool {
 
 fn image_load_from_memory(buffer: &[u8]) -> Result<image::DynamicImage, String> {
     let format = image::guess_format(buffer).map_err(|e| e.to_string())?;
-    let mut reader = image::io::Reader::with_format(std::io::Cursor::new(buffer), format);
+    let mut reader = image::ImageReader::with_format(std::io::Cursor::new(buffer), format);
     // TODO allow to pass the limit from a config by the user
     reader.no_limits();
     reader.decode().map_err(|e| e.to_string())
diff --git a/crates/notan_graphics/Cargo.toml b/crates/notan_graphics/Cargo.toml
index a1af9a16..89c78e91 100644
--- a/crates/notan_graphics/Cargo.toml
+++ b/crates/notan_graphics/Cargo.toml
@@ -20,7 +20,7 @@ bytemuck.workspace = true
 parking_lot.workspace = true
 image = { workspace = true, optional = true }
 
-crevice_notan = { version = "0.13.0", features = ["glam"] }
+crevice_notan = { version = "0.14.1" }
 serde = { workspace = true, optional = true }
 
 [features]
diff --git a/crates/notan_graphics/src/to_file.rs b/crates/notan_graphics/src/to_file.rs
index a4032371..5d0f6858 100644
--- a/crates/notan_graphics/src/to_file.rs
+++ b/crates/notan_graphics/src/to_file.rs
@@ -35,7 +35,7 @@ pub(crate) fn save_to_png_file<P: AsRef<std::path::Path>>(
     let mut data = vec![];
     let encoder = image::codecs::png::PngEncoder::new(&mut data);
     encoder
-        .write_image(&bytes, width as _, height as _, typ)
+        .write_image(&bytes, width as _, height as _, typ.into())
         .map_err(|e| e.to_string())?;
 
     save_file(p, &data)
diff --git a/crates/notan_log/Cargo.toml b/crates/notan_log/Cargo.toml
index 40f34a5c..ee46bed2 100644
--- a/crates/notan_log/Cargo.toml
+++ b/crates/notan_log/Cargo.toml
@@ -16,7 +16,7 @@ notan_app.workspace = true
 
 log.workspace = true
 
-fern = { version = "0.6.2", features = ["colored"] }
+fern = { version = "0.7.1", features = ["colored"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 time = { version = "0.3.37", features = ["formatting", "local-offset"] }
diff --git a/crates/notan_math/Cargo.toml b/crates/notan_math/Cargo.toml
index 30ce6511..21274031 100644
--- a/crates/notan_math/Cargo.toml
+++ b/crates/notan_math/Cargo.toml
@@ -12,7 +12,7 @@ description = "Provides simple set of math's utils for Notan"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-glam = { version = "0.24.2", features = ["bytemuck"] }
+glam = { version = "0.29", features = ["bytemuck"] }
 serde = { workspace = true, optional = true }
 
 [features]