diff --git a/assets/voxygen/shaders/particle-vert.glsl b/assets/voxygen/shaders/particle-vert.glsl index 5492b94168..7170fbc6f8 100644 --- a/assets/voxygen/shaders/particle-vert.glsl +++ b/assets/voxygen/shaders/particle-vert.glsl @@ -109,19 +109,19 @@ void main() { attr = Attr( linear_motion( vec3(0.0, 0.0, 0.0), - vec3(rand2 * 0.1, rand3 * 0.1, 1.0 + rand4 * 0.1) + vec3(rand2 * 0.02, rand3 * 0.02, 1.0 + rand4 * 0.1) ), - linear_scale(0.2), - vec4(1, 1, 1, start_end(0.1, 0.0)), + linear_scale(0.5), + vec4(1, 1, 1, start_end(1.0, 0.0)), spin_in_axis(vec3(rand6, rand7, rand8), rand9 * 3 + lifetime * 0.5) ); } else if (inst_mode == FIRE) { attr = Attr( linear_motion( - vec3(rand0 * 0.3, rand1 * 0.3, 0.2), - vec3(rand1 * 0.1, rand3 * 0.1, 3.0 + rand4 * 1.2) + vec3(rand0 * 0.25, rand1 * 0.25, 0.3), + vec3(rand2 * 0.1, rand3 * 0.1, 2.0 + rand4 * 1.0) ), - 1.3, + 1.0, vec4(2, 0.8 + rand5 * 0.3, 0, 1), spin_in_axis(vec3(rand6, rand7, rand8), rand9 * 3) ); diff --git a/voxygen/src/scene/mod.rs b/voxygen/src/scene/mod.rs index f01ba9ec65..eb2ac72d2c 100644 --- a/voxygen/src/scene/mod.rs +++ b/voxygen/src/scene/mod.rs @@ -1022,9 +1022,6 @@ impl Scene { // Render the skybox. renderer.render_skybox(&self.skybox.model, global, &self.skybox.locals, lod); - // Render particle effects. - self.particle_mgr.render(renderer, scene_data, global, lod); - self.terrain.render_translucent( renderer, global, @@ -1034,6 +1031,9 @@ impl Scene { scene_data.sprite_render_distance, ); + // Render particle effects. + self.particle_mgr.render(renderer, scene_data, global, lod); + renderer.render_post_process( &self.postprocess.model, &global.globals,