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 'non-integer-offsets' into 'master'

Browse Source 
Non integer offsets

See merge request veloren/veloren!956
This commit is contained in:
Joshua Barretto 2020-04-29 14:45:21 +00:00
commit 00f0a011de
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/voxygen/shaders/figure-vert.glsl
View File

@ -36,7 +36,7 @@ void main() {
uint bone_idx = (v_ao_bone >> 2) & 0x3Fu; uint bone_idx = (v_ao_bone >> 2) & 0x3Fu;
mat4 combined_mat = model_mat * bones[bone_idx].bone_mat; mat4 combined_mat = model_mat * bones[bone_idx].bone_mat;
vec3 pos = vec3((uvec3(v_pos_norm) >> uvec3(0, 8, 16)) & uvec3(0xFFu)) - 128.0; vec3 pos = (vec3((uvec3(v_pos_norm) >> uvec3(0, 9, 18)) & uvec3(0x1FFu)) - 256.0) / 2.0;
f_pos = ( f_pos = (
combined_mat * combined_mat *
@ -48,7 +48,7 @@ void main() {
// First 3 normals are negative, next 3 are positive // First 3 normals are negative, next 3 are positive
vec3 normals[6] = vec3[](vec3(-1,0,0), vec3(1,0,0), vec3(0,-1,0), vec3(0,1,0), vec3(0,0,-1), vec3(0,0,1)); vec3 normals[6] = vec3[](vec3(-1,0,0), vec3(1,0,0), vec3(0,-1,0), vec3(0,1,0), vec3(0,0,-1), vec3(0,0,1));
vec3 norm = normals[(v_pos_norm >> 24) & 0x7u]; vec3 norm = normals[(v_pos_norm >> 29) & 0x7u];
// Calculate normal here rather than for each pixel in the fragment shader // Calculate normal here rather than for each pixel in the fragment shader
f_norm = normalize(( f_norm = normalize((

6
voxygen/src/render/pipelines/figure.rs
View File

@ -56,11 +56,11 @@ impl Vertex {
}; };
Self { Self {
pos_norm: pos pos_norm: pos
.map2(Vec3::new(0, 8, 16), |e, shift| { .map2(Vec3::new(0, 9, 18), |e, shift| {
((e + 128.0) as u32) << shift (((e * 2.0 + 256.0) as u32) & 0x3FF) << shift
}) })
.reduce_bitor() .reduce_bitor()
| (norm_bits << 24), | (norm_bits << 29),
col: col col: col
.map2(Rgb::new(0, 8, 16), |e, shift| ((e * 255.0) as u32) << shift) .map2(Rgb::new(0, 8, 16), |e, shift| ((e * 255.0) as u32) << shift)
.reduce_bitor(), .reduce_bitor(),