Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

update guillotiere

Browse Source
This commit is contained in:
Marcel Märtens 2020-12-16 10:56:00 +01:00
parent e3307344ab
commit a1b50a86c4
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.lock generated
View File

@ -1656,9 +1656,9 @@ dependencies = [
[[package]] [[package]]
name = "euclid" name = "euclid"
version = "0.20.14" version = "0.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2bb7ef65b3777a325d1eeefefab5b6d4959da54747e33bd6258e789640f307ad" checksum = "5337024b8293bdce5265dc9570ef6e608a34bfacbbc87fe1a5dcb5f1dac2f4e2"
dependencies = [ dependencies = [
"num-traits 0.2.14", "num-traits 0.2.14",
] ]
@ -2219,9 +2219,9 @@ dependencies = [
[[package]] [[package]]
name = "guillotiere" name = "guillotiere"
version = "0.5.2" version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47065d052e2f000066c4ffbea7051e55bff5c1532c400fc1e269492b2474ccc1" checksum = "bc7cccefbf418f663e11e9500326f46a44273dc598210bbedc8bbe95e696531f"
dependencies = [ dependencies = [
"euclid", "euclid",
"svg_fmt", "svg_fmt",

2
voxygen/Cargo.toml
View File

@ -70,7 +70,7 @@ directories-next = "2.0"
dot_vox = "4.0" dot_vox = "4.0"
enum-iterator = "0.6" enum-iterator = "0.6"
glsl-include = "0.3.1" glsl-include = "0.3.1"
guillotiere = "0.5.2" guillotiere = "0.6"
hashbrown = {version = "0.7.2", features = ["rayon", "serde", "nightly"]} hashbrown = {version = "0.7.2", features = ["rayon", "serde", "nightly"]}
image = {version = "0.23.12", 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 } native-dialog = { version = "0.4.2", default-features = false, optional = true }

2
voxygen/src/mesh/greedy.rs
View File

@ -119,7 +119,7 @@ impl<'a> GreedyMesh<'a> {
let size = guillotiere::Size::new(32, 32).min(max_size); let size = guillotiere::Size::new(32, 32).min(max_size);
let atlas = let atlas =
guillotiere::SimpleAtlasAllocator::with_options(size, &guillotiere::AllocatorOptions { guillotiere::SimpleAtlasAllocator::with_options(size, &guillotiere::AllocatorOptions {
snap_size: 1, alignment: guillotiere::Size::default(),
small_size_threshold, small_size_threshold,
large_size_threshold, large_size_threshold,
}); });