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 dot_vox dependency

Browse Source
This commit is contained in:
Isse 2023-01-22 18:00:39 +01:00
parent 75e07c04f0
commit 4fdcbeeb71
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.lock generated
View File

@ -1724,14 +1724,14 @@ dependencies = [
[[package]]
name = "dot_vox"
version = "4.1.0"
version = "5.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83c18405ef54de0398b77a3ec8394d3a1639e7bf060e1385201e8db40c44ab41"
checksum = "822f8b56c7ce710d336190a76a03690238d19a214ce2b85db33a47cac30f106c"
dependencies = [
"byteorder",
"ahash 0.8.0",
"lazy_static",
"log",
"nom 4.2.3",
"nom 7.1.1",
]
[[package]]

2
common/Cargo.toml
View File

@ -56,7 +56,7 @@ fxhash = "0.2.1"
# Assets
common-assets = {package = "veloren-common-assets", path = "assets"}
dot_vox = "4.0"
dot_vox = "5.1"
# Assets
serde_repr = "0.1.6"

2
common/assets/Cargo.toml
View File

@ -9,7 +9,7 @@ version = "0.10.0"
lazy_static = "1.4.0"
assets_manager = {version = "0.9", features = ["bincode", "ron", "json"]}
ron = { version = "0.8", default-features = false }
dot_vox = "4.0"
dot_vox = "5.1"
wavefront = "0.2" # TODO: Use vertex-colors branch when we have models that have them
image = { version = "0.24", default-features = false, features = ["png"] }
tracing = "0.1"

4
common/src/figure/mod.rs
View File

@ -40,7 +40,7 @@ impl Segment {
let palette = dot_vox_data
.palette
.iter()
.map(|col| Rgba::from(col.to_ne_bytes()).into())
.map(|col| Rgb::new(col.r, col.g, col.b))
.collect::<Vec<_>>();
let mut segment = Segment::filled(
@ -207,7 +207,7 @@ impl MatSegment {
let palette = dot_vox_data
.palette
.iter()
.map(|col| Rgba::from(col.to_ne_bytes()).into())
.map(|col| Rgb::new(col.r, col.g, col.b))
.collect::<Vec<_>>();
let mut vol = Dyna::filled(

2
common/src/terrain/structure.rs
View File

@ -146,7 +146,7 @@ impl assets::Compound for BaseStructure {
for (i, col) in dot_vox_data
.palette
.iter()
.map(|col| Rgba::from(col.to_ne_bytes()).into())
.map(|col| Rgb::new(col.r, col.g, col.b))
.enumerate()
{
palette[(i + 1).min(255)] = StructureBlock::Filled(BlockKind::Misc, col);

2
voxygen/Cargo.toml
View File

@ -109,7 +109,7 @@ crossbeam-utils = "0.8.1"
crossbeam-channel = "0.5"
# TODO: remove
directories-next = "2.0"
dot_vox = "4.0"
dot_vox = "5.1"
enum-iterator = "1.1.0"
guillotiere = "0.6.2"
etagere = "0.2.7"