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

Fix old compilation bug

Browse Source
This commit is contained in:
Aidar Shaikhiev 2024-05-31 01:24:45 +05:00
parent 12726cf58c
commit 5f0fedadb5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
voxygen/src/bin/img-export.rs
View File

@ -21,7 +21,7 @@ pub fn main() {
for (_, spec) in manifest.read().0.iter() { for (_, spec) in manifest.read().0.iter() {
match spec { match spec {
ImageSpec::Vox(specifier, model_index) => { ImageSpec::Vox(specifier, model_index) => {
voxel_to_png(&specifier, Transform::default(), args.scale, model_index) voxel_to_png(&specifier, Transform::default(), args.scale, *model_index as usize)
}, },
ImageSpec::VoxTrans(specifier, offset, [rot_x, rot_y, rot_z], zoom, model_index) => { ImageSpec::VoxTrans(specifier, offset, [rot_x, rot_y, rot_z], zoom, model_index) => {
voxel_to_png( voxel_to_png(
@ -39,7 +39,7 @@ pub fn main() {
stretch: false, stretch: false,
}, },
args.scale, args.scale,
model_index, *model_index as usize,
) )
}, },
ImageSpec::Png(specifier) => { ImageSpec::Png(specifier) => {
@ -50,7 +50,7 @@ pub fn main() {
} }
} }
fn voxel_to_png(specifier: &String, transform: Transform, scale: u32, model_index: u32) { fn voxel_to_png(specifier: &String, transform: Transform, scale: u32, model_index: usize) {
let voxel = match DotVoxAsset::load(&format!("voxygen.{}", specifier)) { let voxel = match DotVoxAsset::load(&format!("voxygen.{}", specifier)) {
Ok(dot_vox) => dot_vox, Ok(dot_vox) => dot_vox,
Err(err) => { Err(err) => {
@ -73,7 +73,7 @@ fn voxel_to_png(specifier: &String, transform: Transform, scale: u32, model_inde
x: ((rotated_size.y as u32) * scale) as u16, x: ((rotated_size.y as u32) * scale) as u16,
y: ((rotated_size.z as u32) * scale) as u16, y: ((rotated_size.z as u32) * scale) as u16,
}; };
let segment = Segment::from_vox(dot_vox_data, false); let segment = Segment::from_vox(dot_vox_data, false, model_index);
let path = format!("img-export/{}.png", &specifier_to_path(specifier)); let path = format!("img-export/{}.png", &specifier_to_path(specifier));
let folder_path = path.rsplit_once('/').expect("Invalid path").0; let folder_path = path.rsplit_once('/').expect("Invalid path").0;
let full_path = Path::new(&path); let full_path = Path::new(&path);