diff --git a/Cargo.lock b/Cargo.lock index e70ee7bc6a..04fb72ea68 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -709,6 +709,12 @@ dependencies = [ "objc", ] +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + [[package]] name = "combine" version = "3.8.1" @@ -1803,9 +1809,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a4d35f7401e948629c9c3d6638fb9bf94e0b2121e96c3b428cc4e631f3eb74" +checksum = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64" dependencies = [ "futures-core", "futures-sink", @@ -1813,9 +1819,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d674eaa0056896d5ada519900dbf97ead2e46a7b6621e8160d79e2f2e1e2784b" +checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748" [[package]] name = "futures-cpupool" @@ -1841,15 +1847,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789" +checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb" [[package]] name = "futures-macro" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39" +checksum = "77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556" dependencies = [ "proc-macro-hack", "proc-macro2 1.0.24", @@ -1859,15 +1865,15 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8764258ed64ebc5d9ed185cf86a95db5cac810269c5d20ececb32e0088abbd" +checksum = "f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d" [[package]] name = "futures-task" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626" +checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d" dependencies = [ "once_cell", ] @@ -1886,9 +1892,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6" +checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2" dependencies = [ "futures 0.1.29", "futures-channel", @@ -1898,7 +1904,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project", + "pin-project 1.0.2", "pin-utils", "proc-macro-hack", "proc-macro-nested", @@ -2513,12 +2519,13 @@ dependencies = [ [[package]] name = "image" -version = "0.23.10" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "985fc06b1304d19c28d5c562ed78ef5316183f2b0053b46763a0b94862373c34" +checksum = "7ce04077ead78e39ae8610ad26216aed811996b043d47beed5090db674f9e9b5" dependencies = [ "bytemuck", "byteorder", + "color_quant", "num-iter", "num-rational 0.3.2", "num-traits 0.2.14", @@ -3578,9 +3585,9 @@ dependencies = [ [[package]] name = "ordered-float" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fe9037165d7023b1228bc4ae9a2fa1a2b0095eca6c2998c624723dfd01314a5" +checksum = "dacdec97876ef3ede8c50efc429220641a0b11ba0048b4b0c357bccbc47c5204" dependencies = [ "num-traits 0.2.14", ] @@ -3752,7 +3759,16 @@ version = "0.4.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f48fad7cfbff853437be7cf54d7b993af21f53be7f0988cbfe4a51535aa77205" dependencies = [ - "pin-project-internal", + "pin-project-internal 0.4.24", +] + +[[package]] +name = "pin-project" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7" +dependencies = [ + "pin-project-internal 1.0.2", ] [[package]] @@ -3766,6 +3782,17 @@ dependencies = [ "syn 1.0.54", ] +[[package]] +name = "pin-project-internal" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f" +dependencies = [ + "proc-macro2 1.0.24", + "quote 1.0.7", + "syn 1.0.54", +] + [[package]] name = "pin-project-lite" version = "0.1.9" @@ -3884,9 +3911,9 @@ dependencies = [ [[package]] name = "proc-macro-hack" -version = "0.5.18" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99c605b9a0adc77b7211c6b1f722dcb613d68d66859a44f3d485a6da332b0598" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro-nested" @@ -5318,7 +5345,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c" dependencies = [ - "pin-project", + "pin-project 0.4.24", "tracing", ] @@ -5677,7 +5704,7 @@ dependencies = [ "notify", "num-derive", "num-traits 0.2.14", - "ordered-float 2.0.0", + "ordered-float 2.0.1", "rand 0.7.3", "rayon", "ron", @@ -5861,7 +5888,7 @@ dependencies = [ "native-dialog", "num 0.3.1", "old_school_gfx_glutin_ext", - "ordered-float 2.0.0", + "ordered-float 2.0.1", "rand 0.7.3", "rodio", "ron", @@ -5919,7 +5946,7 @@ dependencies = [ "minifb", "noise", "num 0.3.1", - "ordered-float 2.0.0", + "ordered-float 2.0.1", "packed_simd_2", "rand 0.7.3", "rand_chacha 0.2.2", diff --git a/client/Cargo.toml b/client/Cargo.toml index eb7dac2ca2..879e31c8d5 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -18,10 +18,10 @@ network = { package = "veloren_network", path = "../network", features = ["compr byteorder = "1.3.2" uvth = "3.1.1" -futures-util = "0.3" +futures-util = "0.3.7" futures-executor = "0.3" futures-timer = "3.0" -image = { version = "0.23.8", default-features = false, features = ["png"] } +image = { version = "0.23.12", default-features = false, features = ["png"] } num = "0.3.1" num_cpus = "1.10.1" tracing = { version = "0.1", default-features = false } diff --git a/common/Cargo.toml b/common/Cargo.toml index 048c17156e..0912973764 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -20,7 +20,7 @@ enum-iterator = "0.6" lazy_static = "1.4.0" num-derive = "0.3" num-traits = "0.2" -ordered-float = { version = "2.0.0", default-features = false } +ordered-float = { version = "2.0.1", default-features = false } rand = "0.7" rayon = "1.3.0" roots = "0.0.6" @@ -32,7 +32,7 @@ uuid = { version = "0.8.1", default-features = false, features = ["serde", "v4"] # Assets directories-next = "2.0" dot_vox = "4.0" -image = { version = "0.23.8", default-features = false, features = ["png"] } +image = { version = "0.23.12", default-features = false, features = ["png"] } notify = "5.0.0-pre.3" # Data structures diff --git a/server/Cargo.toml b/server/Cargo.toml index 7d17b39458..6d71534206 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -24,7 +24,7 @@ tracing = "0.1" specs = { git = "https://github.com/amethyst/specs.git", features = ["shred-derive"], rev = "7a2e348ab2223818bad487695c66c43db88050a5" } vek = { version = "0.12.0", features = ["serde"] } uvth = "3.1.1" -futures-util = "0.3" +futures-util = "0.3.7" futures-executor = "0.3" futures-timer = "3.0" futures-channel = "0.3" diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml index 561e3d0271..625fdff81f 100644 --- a/voxygen/Cargo.toml +++ b/voxygen/Cargo.toml @@ -72,10 +72,10 @@ enum-iterator = "0.6" glsl-include = "0.3.1" guillotiere = "0.5.2" hashbrown = {version = "0.7.2", features = ["rayon", "serde", "nightly"]} -image = {version = "0.23.8", default-features = false, features = ["ico", "png"]} +image = {version = "0.23.12", default-features = false, features = ["ico", "png"]} native-dialog = { version = "0.4.2", default-features = false, optional = true } num = "0.3.1" -ordered-float = { version = "2.0.0", default-features = false } +ordered-float = { version = "2.0.1", default-features = false } rand = "0.7" rodio = {version = "0.13", default-features = false, features = ["wav", "vorbis"]} ron = {version = "0.6", default-features = false} diff --git a/voxygen/src/ui/graphic/mod.rs b/voxygen/src/ui/graphic/mod.rs index 0ff74b738c..1180b8bda4 100644 --- a/voxygen/src/ui/graphic/mod.rs +++ b/voxygen/src/ui/graphic/mod.rs @@ -392,7 +392,7 @@ fn draw_graphic( // Render image at requested resolution // TODO: Use source aabr. Some(&Graphic::Image(ref image, border_color)) => Some(( - resize_pixel_art(&image.to_rgba(), u32::from(dims.x), u32::from(dims.y)), + resize_pixel_art(&image.to_rgba8(), u32::from(dims.x), u32::from(dims.y)), border_color, )), Some(Graphic::Voxel(ref segment, trans, sample_strat)) => Some(( diff --git a/voxygen/src/ui/graphic/renderer.rs b/voxygen/src/ui/graphic/renderer.rs index a456c8936b..16d368ed33 100644 --- a/voxygen/src/ui/graphic/renderer.rs +++ b/voxygen/src/ui/graphic/renderer.rs @@ -201,7 +201,7 @@ pub fn draw_vox( output_size.y as u32, image::imageops::FilterType::Triangle, ) - .to_rgba(), + .to_rgba8(), SampleStrat::PixelCoverage => super::pixel_art::resize_pixel_art( &rgba_img, output_size.x as u32, diff --git a/world/Cargo.toml b/world/Cargo.toml index e6bad09750..44460cbcc7 100644 --- a/world/Cargo.toml +++ b/world/Cargo.toml @@ -15,12 +15,12 @@ common-net = { package = "veloren-common-net", path = "../common/net" } bincode = "1.2.0" bitvec = "0.19.4" fxhash = "0.2.1" -image = { version = "0.23.8", default-features = false, features = ["png"] } +image = { version = "0.23.12", default-features = false, features = ["png"] } itertools = "0.9" vek = { version = "0.12.0", features = ["serde"] } noise = { version = "0.6.0", default-features = false } num = "0.3.1" -ordered-float = "2.0" +ordered-float = "2.0.1" hashbrown = { version = "0.7.2", features = ["rayon", "serde", "nightly"] } lazy_static = "1.4.0" tracing = { version = "0.1", default-features = false }