diff options
author | jjesswan <jessica_wan@brown.edu> | 2024-05-10 03:41:20 -0400 |
---|---|---|
committer | jjesswan <jessica_wan@brown.edu> | 2024-05-10 03:41:20 -0400 |
commit | 7c0cd109b098b24279fb17b9a05ab846405d169b (patch) | |
tree | 3c7dcc4f098a83c5c14f5c4f42357a9ab6e1256e /resources | |
parent | c5ff8ed6e95b7de0876dc5e97a9cb606fd84be85 (diff) |
particlesss
Diffstat (limited to 'resources')
-rw-r--r-- | resources/shaders/particles.frag | 2 | ||||
-rw-r--r-- | resources/shaders/particles.vert | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/resources/shaders/particles.frag b/resources/shaders/particles.frag index 73a4eb4..99373e7 100644 --- a/resources/shaders/particles.frag +++ b/resources/shaders/particles.frag @@ -11,5 +11,5 @@ uniform float alpha; void main() { // color = (texture(sprite, TexCoords) * ParticleColor); - fragColor = vec4(0,1,0,alpha); + fragColor = vec4(1,1,1,alpha); } diff --git a/resources/shaders/particles.vert b/resources/shaders/particles.vert index 0905514..7b49a46 100644 --- a/resources/shaders/particles.vert +++ b/resources/shaders/particles.vert @@ -7,6 +7,8 @@ out vec4 ParticleColor; uniform mat4 view, projection, model; uniform vec3 offset; uniform vec4 color; +uniform float alpha; + void main() { @@ -14,6 +16,6 @@ void main() //TexCoords = vertex.zw; ParticleColor = color; // gl_Position = projection *view* vec4((pos * scale) + vec2(offset), 0.0, 1.0); - gl_Position = (vec4(pos.x, pos.y, 0, 1) + projection*view*vec4(vec3(offset), 1))*scale; + gl_Position = (vec4(pos.x*alpha, pos.y*alpha, 0, 1) + projection*view*vec4(vec3(offset), 1))*scale; } |