Merge branch 'main' of https://github.com/Seb-Park/ocean-simulation

2 files changed, 36 insertions, 0 deletions

diff --git a/resources/shaders/particles.frag b/resources/shaders/particles.frag
new file mode 100644
index 0000000..99373e7
--- /dev/null
+++ b/resources/shaders/particles.frag
@@ -0,0 +1,15 @@
+#version 330 core
+in vec2 TexCoords;
+in vec4 ParticleColor;
+
+out vec4 fragColor;
+
+uniform sampler2D sprite;
+uniform float alpha;
+
+
+void main()
+{
+   // color = (texture(sprite, TexCoords) * ParticleColor);
+    fragColor = vec4(1,1,1,alpha);
+}
diff --git a/resources/shaders/particles.vert b/resources/shaders/particles.vert
new file mode 100644
index 0000000..7b49a46
--- /dev/null
+++ b/resources/shaders/particles.vert
@@ -0,0 +1,21 @@
+#version 330 core
+layout (location = 0) in vec2 pos; // <vec2 position, vec2 texCoords>
+
+out vec2 TexCoords;
+out vec4 ParticleColor;
+
+uniform mat4 view, projection, model;
+uniform vec3 offset;
+uniform vec4 color;
+uniform float alpha;
+
+
+void main()
+{
+    float scale = 1.f;//2000.0f;
+    //TexCoords = vertex.zw;
+    ParticleColor = color;
+   // gl_Position = projection *view* vec4((pos * scale) + vec2(offset), 0.0, 1.0);
+   gl_Position = (vec4(pos.x*alpha, pos.y*alpha, 0, 1) + projection*view*vec4(vec3(offset), 1))*scale;
+
+}