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

Somewhat fix lod, prevent particles spamming new buffers when disabled

Browse Source
This commit is contained in:
Imbris 2020-12-06 16:22:48 -05:00 committed by Avi Weinstock
parent 513b761909
commit 6c8978a513
6 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
assets/voxygen/shaders/include/light.glsl
View File

@ -9,7 +9,8 @@ struct Light {
layout (std140, set = 0, binding = 3) layout (std140, set = 0, binding = 3)
uniform u_lights { uniform u_lights {
Light lights[31]; // TODO: insert light max count constant here when loading the shaders
Light lights[20];
}; };
struct Shadow { struct Shadow {

3
assets/voxygen/shaders/include/lod.glsl
View File

@ -136,7 +136,8 @@ float alt_at_real(vec2 pos) {
// #if (FLUID_MODE == FLUID_MODE_CHEAP) // #if (FLUID_MODE == FLUID_MODE_CHEAP)
// return alt_at(pos); // return alt_at(pos);
// #elif (FLUID_MODE == FLUID_MODE_SHINY) // #elif (FLUID_MODE == FLUID_MODE_SHINY)
return (/*round*/(utextureBicubic(t_alt, s_alt, pos_to_tex(pos)).r * (/*1300.0*//*1278.7266845703125*/view_distance.w)) + /*140.0*/view_distance.z - focus_off.z); const float U16_MAX = 65535.0;
return (/*round*/(utextureBicubic(t_alt, s_alt, pos_to_tex(pos)).r / U16_MAX * (/*1300.0*//*1278.7266845703125*/view_distance.w)) + /*140.0*/view_distance.z - focus_off.z);
// #endif // #endif
//+ (texture(t_noise, pos * 0.002).x - 0.5) * 64.0; //+ (texture(t_noise, pos * 0.002).x - 0.5) * 64.0;

2
assets/voxygen/shaders/include/shadows.glsl
View File

@ -11,7 +11,7 @@ struct ShadowLocals {
layout (std140, set = 0, binding = 9) layout (std140, set = 0, binding = 9)
uniform u_light_shadows { uniform u_light_shadows {
ShadowLocals shadowMats[/*MAX_LAYER_FACES*/192]; ShadowLocals shadowMats[/*MAX_LAYER_FACES*//*192*/126];
}; };
// Use with sampler2DShadow // Use with sampler2DShadow

1
voxygen/src/render/pipelines/mod.rs
View File

@ -220,6 +220,7 @@ impl Default for Shadow {
// Global scene data spread across several arrays. // Global scene data spread across several arrays.
pub struct GlobalModel { pub struct GlobalModel {
// TODO: enforce that these are the lengths in the shaders??
pub globals: Consts<Globals>, pub globals: Consts<Globals>,
pub lights: Consts<Light>, pub lights: Consts<Light>,
pub shadows: Consts<Shadow>, pub shadows: Consts<Shadow>,

9
voxygen/src/scene/particle.rs
View File

@ -236,15 +236,18 @@ impl ParticleMgr {
self.maintain_shockwave_particles(scene_data); self.maintain_shockwave_particles(scene_data);
self.maintain_aura_particles(scene_data); self.maintain_aura_particles(scene_data);
self.maintain_buff_particles(scene_data); self.maintain_buff_particles(scene_data);
self.upload_particles(renderer);
} else { } else {
// remove all particle lifespans // remove all particle lifespans
self.particles.clear(); if !self.particles.is_empty() {
self.particles.clear();
self.upload_particles(renderer);
}
// remove all timings // remove all timings
self.scheduler.clear(); self.scheduler.clear();
} }
self.upload_particles(renderer);
} }
fn maintain_body_particles(&mut self, scene_data: &SceneData) { fn maintain_body_particles(&mut self, scene_data: &SceneData) {

4
voxygen/src/scene/simple.rs
View File

@ -107,8 +107,8 @@ impl Scene {
let data = GlobalModel { let data = GlobalModel {
globals: renderer.create_consts(&[Globals::default()]), globals: renderer.create_consts(&[Globals::default()]),
lights: renderer.create_consts(&[Light::default(); 32]), lights: renderer.create_consts(&[Light::default(); 20]),
shadows: renderer.create_consts(&[Shadow::default(); 32]), shadows: renderer.create_consts(&[Shadow::default(); 24]),
shadow_mats: renderer.create_consts(&[ShadowLocals::default(); 6]), shadow_mats: renderer.create_consts(&[ShadowLocals::default(); 6]),
}; };
let lod = LodData::dummy(renderer); let lod = LodData::dummy(renderer);