From 2d0e856124f5050f031c9a57e3c880584a64e415 Mon Sep 17 00:00:00 2001
From: karl <karl.bittner@hexaquo.at>
Date: Sat, 8 May 2021 13:19:58 +0200
Subject: [PATCH] Particles are functional!

---
 Shader/particle_render.fs | 2 +-
 Shader/particle_render.gs | 4 ++--
 Shader/particle_render.vs | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Shader/particle_render.fs b/Shader/particle_render.fs
index c75d262..90754a8 100644
--- a/Shader/particle_render.fs
+++ b/Shader/particle_render.fs
@@ -9,5 +9,5 @@ out vec4 FragColor;
 
 void main()
 {
-  FragColor = vec4(1.0, 0.0, 0.0, 1.0);// texture2D(texture, tex_coords) * color_part;
+  FragColor = texture2D(texture, tex_coords) * color_part;
 }
diff --git a/Shader/particle_render.gs b/Shader/particle_render.gs
index d88e7b3..da62be7 100644
--- a/Shader/particle_render.gs
+++ b/Shader/particle_render.gs
@@ -19,7 +19,7 @@ smooth out vec2 tex_coords;
 flat out vec4 color_part;
 
 void main() {
-  //if(type_pass[0] != 0) {
+  if(type_pass[0] != 0) {
     // This is not a generator particle
 
     vec3 old_pos = gl_in[0].gl_Position.xyz;
@@ -50,5 +50,5 @@ void main() {
     EmitVertex();
       
     EndPrimitive();
-  //}
+  }
 }
\ No newline at end of file
diff --git a/Shader/particle_render.vs b/Shader/particle_render.vs
index 468d4f5..665adc3 100644
--- a/Shader/particle_render.vs
+++ b/Shader/particle_render.vs
@@ -15,6 +15,7 @@ void main()
 {
    gl_Position = vec4(position, 1.0);
    color_pass = color;
-   size_pass = size;
    lifetime_pass = lifetime;
+   size_pass = size;
+   type_pass = type;
 }
\ No newline at end of file