summaryrefslogtreecommitdiffstats
path: root/src/imports/particles/resources/ctvertex.shader
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports/particles/resources/ctvertex.shader')
-rw-r--r--src/imports/particles/resources/ctvertex.shader12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/imports/particles/resources/ctvertex.shader b/src/imports/particles/resources/ctvertex.shader
index b6db4b345a..b20676cc49 100644
--- a/src/imports/particles/resources/ctvertex.shader
+++ b/src/imports/particles/resources/ctvertex.shader
@@ -6,7 +6,8 @@ attribute lowp vec4 vColor;
uniform highp mat4 matrix;
uniform highp float timestamp;
-uniform lowp float opacity;
+uniform sampler2D sizetable;
+uniform sampler2D opacitytable;
varying highp vec2 fTex;
varying lowp vec4 fColor;
@@ -19,7 +20,7 @@ void main() {
highp float t = (timestamp - vData.x) / vData.y;
- highp float currentSize = mix(size, endSize, t * t);
+ highp float currentSize = mix(size, endSize, t * t) * texture2D(sizetable, vec2(t,0.5)).w;
if (t < 0. || t > 1.)
currentSize = 0.;
@@ -31,12 +32,7 @@ void main() {
gl_Position = matrix * vec4(pos.x, pos.y, 0, 1);
-// highp float fadeIn = min(t * 10., 1.);
-// highp float fadeOut = 1. - max(0., min((t - 0.75) * 4., 1.));
-
- fColor = vColor
-// * fadeIn * fadeOut
- * opacity;
+ fColor = vColor;
tt = t;
}