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 bugs with sprite rendering

Browse Source
This commit is contained in:
Imbris 2021-02-07 13:21:35 -05:00
parent d317a1a1cc
commit deffca1513
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/voxygen/shaders/sprite-vert.glsl
View File

@ -76,7 +76,7 @@ void main() {
uint v_atlas_pos = pos_atlas_pos_norm_ao.y; uint v_atlas_pos = pos_atlas_pos_norm_ao.y;
// Expand the model vertex position bits into float values // Expand the model vertex position bits into float values
vec3 v_pos = vec3(ivec3((uvec3(v_pos_norm) >> uvec3(0, 8, 16)) & uvec3(0xFu, 0xFu, 0x0FFFu)) - ivec3(0, 0, VERT_EXTRA_NEG_Z)); vec3 v_pos = vec3(ivec3((uvec3(v_pos_norm) >> uvec3(0, 8, 16)) & uvec3(0xFFu, 0xFFu, 0x0FFFu)) - ivec3(0, 0, VERT_EXTRA_NEG_Z));
// Transform into chunk space and scale // Transform into chunk space and scale
f_pos = (inst_mat * vec4(v_pos, 1.0)).xyz; f_pos = (inst_mat * vec4(v_pos, 1.0)).xyz;

2
voxygen/src/render/pipelines/sprite.rs
View File

@ -269,7 +269,7 @@ impl SpriteLayout {
visibility: wgpu::ShaderStage::VERTEX, visibility: wgpu::ShaderStage::VERTEX,
ty: wgpu::BindingType::Texture { ty: wgpu::BindingType::Texture {
sample_type: wgpu::TextureSampleType::Uint, sample_type: wgpu::TextureSampleType::Uint,
view_dimension: wgpu::TextureViewDimension::D1, view_dimension: wgpu::TextureViewDimension::D2,
multisampled: false, multisampled: false,
}, },
count: None, count: None,

22
voxygen/src/scene/terrain.rs
View File

@ -217,23 +217,21 @@ fn mesh_worker<V: BaseVol<Vox = Block> + RectRasterableVol + ReadVol + Debug + '
let key = (sprite, variation); let key = (sprite, variation);
// NOTE: Safe because we called sprite_config_for already. // NOTE: Safe because we called sprite_config_for already.
// NOTE: Safe because 0 ≤ ori < 8 // NOTE: Safe because 0 ≤ ori < 8
let sprite_data_lod_0 = &sprite_data[&key][0];
let mat = Mat4::identity()
// NOTE: offset doesn't change with lod level
// TODO: pull out of per lod level info or remove lod levels
// for sprites entirely
.translated_3d(sprite_data_lod_0.offset)
// Lod scaling etc is baked during meshing
.scaled_3d(SPRITE_SCALE)
.rotated_z(f32::consts::PI * 0.25 * ori as f32)
.translated_3d(
(rel_pos.map(|e| e as f32) + Vec3::new(0.5, 0.5, 0.0))
);
let light = light_map(wpos); let light = light_map(wpos);
let glow = glow_map(wpos); let glow = glow_map(wpos);
for lod_level in 0..SPRITE_LOD_LEVELS { for lod_level in 0..SPRITE_LOD_LEVELS {
let sprite_data = &sprite_data[&key][lod_level]; let sprite_data = &sprite_data[&key][lod_level];
let mat = Mat4::identity()
// Scaling for different LOD resolutions
.scaled_3d(sprite_data.scale)
// Offset
.translated_3d(sprite_data.offset)
.scaled_3d(SPRITE_SCALE)
.rotated_z(f32::consts::PI * 0.25 * ori as f32)
.translated_3d(
(rel_pos.map(|e| e as f32) + Vec3::new(0.5, 0.5, 0.0))
);
// Add an instance for each page in the sprite model // Add an instance for each page in the sprite model
for page in sprite_data.vert_pages.clone() { for page in sprite_data.vert_pages.clone() {
// TODO: could be more efficient to create once and clone while // TODO: could be more efficient to create once and clone while