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

Merge branch 'pfau/icon_shading' into 'master'

Browse Source 
better icon shading

See merge request veloren/veloren!2392
This commit is contained in:
Marcel 2021-06-07 12:56:49 +00:00
commit a02f4bea18
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
voxygen/src/ui/graphic/renderer.rs
View File

@ -36,6 +36,7 @@ impl Default for Transform {
struct Voxel { struct Voxel {
mvp: Mat4<f32>, mvp: Mat4<f32>,
light_dir: Vec3<f32>,
} }
// TODO: use norm or remove it // TODO: use norm or remove it
@ -43,15 +44,15 @@ struct Voxel {
struct Vert { struct Vert {
pos: Vec3<f32>, pos: Vec3<f32>,
col: Rgb<f32>, col: Rgb<f32>,
//norm: Vec3<f32>, norm: Vec3<f32>,
ao_level: u8, ao_level: u8,
} }
impl Vert { impl Vert {
fn new(pos: Vec3<f32>, col: Rgb<f32>, _norm: Vec3<f32>, ao_level: u8) -> Self { fn new(pos: Vec3<f32>, col: Rgb<f32>, norm: Vec3<f32>, ao_level: u8) -> Self {
Vert { Vert {
pos, pos,
col, col,
//norm, norm,
ao_level, ao_level,
} }
} }
@ -89,11 +90,16 @@ impl<'a> Pipeline for Voxel {
Vert { Vert {
pos, pos,
col, col,
//norm: _, norm,
ao_level, ao_level,
}: &Self::Vertex, }: &Self::Vertex,
) -> ([f32; 4], Self::VsOut) { ) -> ([f32; 4], Self::VsOut) {
let light = Rgba::from_opaque(Rgb::from(*ao_level as f32 / 4.0 + 0.25)); let ambiance = 0.25;
let diffuse = norm.dot(-self.light_dir).max(0.0);
let brightness = 2.5;
let light = Rgba::from_opaque(Rgb::from(*ao_level as f32 / 4.0))
* (diffuse + ambiance)
* brightness;
let color = light * srgba_to_linear(Rgba::from_opaque(*col)); let color = light * srgba_to_linear(Rgba::from_opaque(*col));
let position = (self.mvp * Vec4::from_point(*pos)).into_array(); let position = (self.mvp * Vec4::from_point(*pos)).into_array();
(position, VsOut(color)) (position, VsOut(color))
@ -175,7 +181,11 @@ pub fn draw_vox(
* ori_mat * ori_mat
* Mat4::translation_3d([-w / 2.0, -h / 2.0, -d / 2.0]); * Mat4::translation_3d([-w / 2.0, -h / 2.0, -d / 2.0]);
Voxel { mvp }.draw::<rasterizer::Triangles<_>, _>( Voxel {
mvp,
light_dir: Vec3::broadcast(-1.0).normalized(),
}
.draw::<rasterizer::Triangles<_>, _>(
&generate_mesh(segment, Vec3::from(0.0)), &generate_mesh(segment, Vec3::from(0.0)),
&mut color, &mut color,
Some(&mut depth), Some(&mut depth),