Merge branch 'milek-dev' into gfx-work

shaders/billboard.frag

@@ -1,4 +1,3 @@
-in vec3 f_normal;
 in vec2 f_coord;
 
 #texture (tex1, 0, sRGB_A)

shaders/smoke.frag

@@ -0,0 +1,34 @@
+in vec4 f_color;
+in vec2 f_coord;
+
+in vec4 f_clip_pos;
+in vec4 f_clip_future_pos;
+
+#texture (tex1, 0, sRGB_A)
+uniform sampler2D tex1;
+
+#include <common>
+#include <tonemapping.glsl>
+
+layout(location = 0) out vec4 out_color;
+#if MOTIONBLUR_ENABLED
+layout(location = 1) out vec4 out_motion;
+#endif
+
+void main()
+{
+	vec4 tex_color = texture(tex1, f_coord);
+#if POSTFX_ENABLED
+	out_color = tex_color * f_color;
+#else
+    out_color = tonemap(tex_color * f_color);
+#endif
+#if MOTIONBLUR_ENABLED
+	{
+        vec2 a = (f_clip_future_pos.xy / f_clip_future_pos.w) * 0.5 + 0.5;;
+        vec2 b = (f_clip_pos.xy / f_clip_pos.w) * 0.5 + 0.5;;
+        
+        out_motion = vec4(a - b, 0.0f, tex_color.a * alpha_mult);
+	}
+#endif
+}

shaders/smoke.vert

@@ -0,0 +1,21 @@
+layout(location = 0) in vec3 v_vert;
+layout(location = 1) in vec4 v_color;
+layout(location = 2) in vec2 v_coord;
+
+out vec4 f_color;
+out vec2 f_coord;
+
+out vec4 f_clip_pos;
+out vec4 f_clip_future_pos;
+
+#include <common>
+
+void main()
+{
+	f_clip_pos = (projection * modelview) * vec4(v_vert, 1.0f);
+	f_clip_future_pos = (projection * future * modelview) * vec4(v_vert, 1.0f);
+
+	gl_Position = f_clip_pos;
+	f_coord = v_coord;
+	f_color = v_color;
+}