Small fixes required to get platformer to work.

Added back CanvasItemMaterial

1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/gles3/shaders/particles.glsl b/drivers/gles3/shaders/particles.glsl
index 7e7b083f73..ec2577538c 100644
--- a/drivers/gles3/shaders/particles.glsl
+++ b/drivers/gles3/shaders/particles.glsl
@@ -37,6 +37,7 @@ uniform bool clear;
 uniform uint cycle;
 uniform float lifetime;
 uniform mat4 emission_transform;
+uniform uint random_seed;
 
 
 out highp vec4 out_color; //tfb:
@@ -104,7 +105,9 @@ void main() {
 	bool shader_active = velocity_active.a > 0.5;
 
 	if (system_phase > prev_system_phase) {
-		if (prev_system_phase < restart_phase && system_phase >= restart_phase) {
+		// restart_phase >= prev_system_phase is used so particles emit in the first frame they are processed
+
+		if (restart_phase >= prev_system_phase && restart_phase < system_phase ) {
 			restart=true;
 #ifdef USE_FRACTIONAL_DELTA
 			local_delta = (system_phase - restart_phase) * lifetime;
@@ -112,12 +115,12 @@ void main() {
 		}
 
 	} else {
-		if (prev_system_phase < restart_phase) {
+		if (restart_phase >= prev_system_phase) {
 			restart=true;
 #ifdef USE_FRACTIONAL_DELTA
 			local_delta = (1.0 - restart_phase + system_phase) * lifetime;
 #endif
-		} else if (system_phase >= restart_phase) {
+		} else if (restart_phase < system_phase ) {
 			restart=true;
 #ifdef USE_FRACTIONAL_DELTA
 			local_delta = (system_phase - restart_phase) * lifetime;