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

Intermediate state that seems to crash rustc, even after running cargo clean.

Browse Source
This commit is contained in:
Avi Weinstock 2021-05-12 21:40:27 -04:00
parent b36b3152fe
commit a8b267387c
1 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
voxygen/src/hud/minimap.rs
View File

@ -30,7 +30,7 @@ use std::sync::Arc;
use vek::*; use vek::*;
pub struct VoxelMinimap { pub struct VoxelMinimap {
chunk_minimaps: HashMap<Vec2<i32>, (i32, Vec<Grid<[u8; 4]>>)>, chunk_minimaps: HashMap<Vec2<i32>, (i32, Vec<Grid<Vec4<u8>>>)>,
composited: RgbaImage, composited: RgbaImage,
image_id: img_ids::Rotations, image_id: img_ids::Rotations,
last_pos: Vec3<i32>, last_pos: Vec3<i32>,
@ -56,6 +56,8 @@ impl VoxelMinimap {
} }
} }
fn composite() {}
pub fn maintain(&mut self, client: &Client, ui: &mut Ui) { pub fn maintain(&mut self, client: &Client, ui: &mut Ui) {
let terrain = client.state().terrain(); let terrain = client.state().terrain();
for (key, chunk) in terrain.iter() { for (key, chunk) in terrain.iter() {
@ -63,12 +65,26 @@ impl VoxelMinimap {
let mut layers = Vec::new(); let mut layers = Vec::new();
for z in chunk.get_min_z()..chunk.get_max_z() { for z in chunk.get_min_z()..chunk.get_max_z() {
let grid = Grid::populate_from(Vec2::new(32, 32), |v| { let grid = Grid::populate_from(Vec2::new(32, 32), |v| {
chunk /*chunk
.get(Vec3::new(v.x, v.y, z)) .get(Vec3::new(v.x, v.y, z))
.ok() .ok()
.and_then(|block| block.get_color()) .and_then(|block| block.get_color())
.map(|rgb| [rgb.r, rgb.g, rgb.b, 192]) .map(|rgb| [rgb.r, rgb.g, rgb.b, 192])
.unwrap_or([0, 0, 0, 0]) .unwrap_or([0, 0, 0, 0])*/
let mut rgba = Vec4::<u16>::zero();
let (weights, zoff) = (&[2, 4, 1, 1, 1][..], -1);
for dz in 0..weights.len() {
let color = chunk
.get(Vec3::new(v.x, v.y, dz as i32 + z + zoff))
.ok()
.and_then(|block| block.get_color())
.map(|rgb| [rgb.r, rgb.g, rgb.b, 192])
.map(|c| Vec4::<u8>::from(c).as_())
.unwrap_or(Vec4::one());
rgba += color.as_() * weights[z as usize];
}
let rgba: Vec4<u8> = (rgba / weights.iter().sum::<u16>()).as_();
rgba
}); });
layers.push(grid); layers.push(grid);
} }
@ -87,7 +103,7 @@ impl VoxelMinimap {
let voff = Vec2::new(x as f32, y as f32); let voff = Vec2::new(x as f32, y as f32);
let coff: Vec2<i32> = voff.map(|i| (i as i32).div_euclid(32)); let coff: Vec2<i32> = voff.map(|i| (i as i32).div_euclid(32));
let cmod: Vec2<i32> = voff.map(|i| (i as i32).rem_euclid(32)); let cmod: Vec2<i32> = voff.map(|i| (i as i32).rem_euclid(32));
let mut rgba = Vec4::<u16>::zero(); /*let mut rgba = Vec4::<u16>::zero();
let (weights, zoff) = let (weights, zoff) =
if (x as i32 - VOXEL_MINIMAP_SIDELENGTH as i32 / 2).abs() < 96 if (x as i32 - VOXEL_MINIMAP_SIDELENGTH as i32 / 2).abs() < 96
&& (y as i32 - VOXEL_MINIMAP_SIDELENGTH as i32 / 2).abs() < 96 && (y as i32 - VOXEL_MINIMAP_SIDELENGTH as i32 / 2).abs() < 96
@ -114,7 +130,13 @@ impl VoxelMinimap {
let color = { let color = {
let rgba: Vec4<u8> = (rgba / weights.iter().sum::<u16>()).as_(); let rgba: Vec4<u8> = (rgba / weights.iter().sum::<u16>()).as_();
image::Rgba([rgba.x, rgba.y, rgba.z, rgba.w]) image::Rgba([rgba.x, rgba.y, rgba.z, rgba.w])
}; };*/
let color = self
.chunk_minimaps
.get(&(cpos + coff))
.and_then(|(zlo, g)| g.get((pos.z as i32 - zlo) as usize))
.and_then(|grid| grid.get(cmod).map(|c| c.as_()))
.unwrap_or(Vec4::one());
self.composited self.composited
.put_pixel(x, VOXEL_MINIMAP_SIDELENGTH - y - 1, color); .put_pixel(x, VOXEL_MINIMAP_SIDELENGTH - y - 1, color);
} }