SPH

AsulconS · Aug 17, 2020 · 31f88f7 · 31f88f7
1 parent ac8e7ba
commit 31f88f7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/fluid.cpp b/fluid.cpp
@@ -124,7 +124,6 @@ void initGLParams(const SIM_State& sim, const gil::RenderingWindow& window, gil:
     particleShader.use();
     particleShader.setMat4("view", view);
     particleShader.setMat4("projection", projection);
-    particleShader.setVec3("particleColor", {1.0f, 0.13f, 0.0f});
 
     volcanoShader.use();
     volcanoShader.setMat4("view", view);
@@ -151,9 +150,9 @@ void initSPH(SIM_State& sim)
                 sim.vertexData.push_back(0.0f);
                 sim.vertexData.push_back(0.0f);
                 // Colors
-                sim.vertexData.push_back(1.0f);
-                sim.vertexData.push_back(0.13f);
                 sim.vertexData.push_back(0.0f);
+                sim.vertexData.push_back(0.5f);
+                sim.vertexData.push_back(1.0f);
 			}
 		}
 	}
@@ -186,7 +185,7 @@ void initSPH(SIM_State& sim)
 
 int main()
 {
-    gil::RenderingWindow window {800, 600, "SPH"};
+    gil::RenderingWindow window {1600, 900, "SPH"};
     if(!window.isReady())
     {
         return EXIT_FAILURE;
@@ -226,9 +225,9 @@ int main()
     // ---------------------------------------------------------------------------------------------------------------------------------------------------------------
     gil::Timer timer(true);
 
-    glm::vec3 viewPos {0.4f, 0.8f, 1.6f};
+    glm::vec3 viewPos {0.2f, 0.4f, 0.8f};
 
-    gil::Shader shader("shader");
+    gil::Shader shader("water");
     gil::Shader volcanoShader("volcano");
     initGLParams(sim, window, shader, volcanoShader, viewPos);
     // ---------------------------------------------------------------------------------------------------------------------------------------------------------------

diff --git a/shaders/water.fs b/shaders/water.fs
@@ -12,10 +12,10 @@ void main()
     {
         discard;
     }
-    if(dot(circCoord, circCoord) > 0.5f)
-    {
-        FragColor = vec4(0.0f, 0.0f, 0.5f, 1.0f);
-    }
+    //if(dot(circCoord, circCoord) > 0.5f)
+    //{
+        //FragColor = vec4(0.6f, 0.85f, 0.91f, 1.0f);
+    //}
     else
     {
         FragColor = vec4(colorDepth * color, 1.0f);

diff --git a/shaders/water.vs b/shaders/water.vs
@@ -8,7 +8,7 @@ uniform mat4 model;
 uniform mat4 view;
 uniform mat4 projection;
 
-#define pointSize 32.0f
+#define pointSize 64.0f
 
 void main()
 {