split up fragment shader - finished main TODOs

MartinOpat · MartinOpat · commit 3311e6e622b9 · 2024-07-01T13:47:36.000+02:00
diff --git a/simulation/TODO.md b/simulation/TODO.md
@@ -14,13 +14,9 @@
 - Make sure that it is properly distinguished between the time step of switching files (a day), and a simulation time step (dt)
 - Make sure that it is clear that fluid simulation and particle simulation is the same thing as we are simulating the fluid as particles (probs. in the intro)
 
-### When sending the thesis draft mention:
-- Found the inline feedback for the research proposal draft, did not know that was a thing ... implemented those changes
 
 ## Android side
 - Delete unused project files / folders
-- Fixed the occasional glitch during user interactions
-- Split up the fragment shader
 
 ## Native side
 - Delete unused functions
@@ -48,11 +44,7 @@ Note that the dense grid is pretty much an issue just for the compute shaders, f
 - Try better rendering methods when exatra time, e.g. thesis draft is being review ->volume rendering / volume ray casting, find new ones
 - Mention the different (attempted) different ways of rendering stuff - so far: LIC
 - Make a measurement for the "new bottleneck" see how the performance changes with a more random distrib. (either perlin, or bigger double-gyre)
-- Make proper APKs for a) reduced, b) full version of the app
-- Make measurements for (very) small numbers of particles -> see if v-sync doesn't make it pointless
-- Question: Since a lot of the app is asynchronous, for compute shaders especially cause lot of GPU time, is it okay to just limit (unrelated) background processes and measure the wall-clock time?
-  - Ideally measure it all separately, and report that way.
-  - Measure, GPU compute, GPU render, GPU buffer load, CPU file load, CPU time ... all separately, as any could potentially become bottleneck
+
 - Put detailed lib versions in the readme.md
 - Put library credit in the readme.md
 - Add apk as a github release
diff --git a/simulation/app/src/main/assets/fragment_shader.glsl b/simulation/app/src/main/assets/fragment_shader.glsl
diff --git a/simulation/app/src/main/assets/fragment_shader_lines.glsl b/simulation/app/src/main/assets/fragment_shader_lines.glsl
@@ -0,0 +1,10 @@
+#version 320 es
+precision mediump float;
+
+flat in vec4 col;
+out vec4 fragColor;
+
+void main() {
+    fragColor = col;
+}
+
diff --git a/simulation/app/src/main/assets/fragment_shader_points.glsl b/simulation/app/src/main/assets/fragment_shader_points.glsl
@@ -0,0 +1,18 @@
+#version 320 es
+precision mediump float;
+
+flat in vec4 col;
+out vec4 fragColor;
+
+void main() {
+    vec2 center = vec2(0.5, 0.5);
+    float radius = 0.1;
+    float dist = length(gl_PointCoord - center);
+
+    if (dist > radius) {
+        discard;
+    } else {
+        fragColor = vec4(1.0, 0, 0, 1.0);  // Red
+    }
+}
+
diff --git a/simulation/app/src/main/cpp/include/mainview.h b/simulation/app/src/main/cpp/include/mainview.h
@@ -157,8 +157,6 @@ class Mainview {
     NavigCube *navigCube;
 
     // Uniforms
-    GLint isPointLocationLines;
-    GLint isPointLocationPoints;
     GLint pointSize;
     GLint modelLocationLines;
     GLint viewLocationLines;
diff --git a/simulation/app/src/main/cpp/include/physics.h b/simulation/app/src/main/cpp/include/physics.h
@@ -25,11 +25,13 @@ class Physics {
     /**
      * @enum Model
      * @brief The model of physics for the particles.
+     *
+     * @note particles_simple and particles are not compatible with the compute shader implementation
      */
     enum class Model {
         particles_simple,       // drag force
         particles,              // centripetal, buoyant, drag, gravity, drag, and added mass force
-        particles_advection,    // Advection equation for particles - default
+        particles_advection,    // Advection equation for tracer particles - default
     };
 
     /**
diff --git a/simulation/app/src/main/cpp/include/shaderManager.h b/simulation/app/src/main/cpp/include/shaderManager.h
@@ -126,7 +126,8 @@ class ShaderManager {
 
     // Shader sources
     std::string vertexShaderSource;
-    std::string fragmentShaderSource;
+    std::string fragmentShaderLinesSource;
+    std::string fragmentShaderPointsSource;
     std::string geometryLinesShaderSource;
     std::string geometryPointsShaderSource;
     std::string computeShaderSource;
@@ -135,7 +136,8 @@ class ShaderManager {
 
     // Shaders
     GLuint vertexShader;
-    GLuint fragmentShader;
+    GLuint fragmentShaderLines;
+    GLuint fragmentShaderPoints;
     GLuint geometryLinesShader;
     GLuint geometryPointsShader;
     GLuint computeShader;
diff --git a/simulation/app/src/main/cpp/src/mainview.cpp b/simulation/app/src/main/cpp/src/mainview.cpp
@@ -37,13 +37,11 @@ void Mainview::setFrame() {
 
 
 void Mainview::loadUniforms() {
-    this->isPointLocationPoints = glGetUniformLocation(shaderManager->shaderPointsProgram, "uIsPoint");
     this->pointSize = glGetUniformLocation(shaderManager->shaderPointsProgram, "uPointSize");
     this->modelLocationPoints = glGetUniformLocation(shaderManager->shaderPointsProgram, "modelTransform");
     this->viewLocationPoints = glGetUniformLocation(shaderManager->shaderPointsProgram, "viewTransform");
     this->projectionLocationPoints = glGetUniformLocation(shaderManager->shaderPointsProgram, "projectionTransform");
 
-    this->isPointLocationLines = glGetUniformLocation(shaderManager->shaderLinesProgram, "uIsPoint");
     this->modelLocationLines = glGetUniformLocation(shaderManager->shaderLinesProgram, "modelTransform");
     this->projectionLocationLines = glGetUniformLocation(shaderManager->shaderLinesProgram, "projectionTransform");
     this->viewLocationLines = glGetUniformLocation(shaderManager->shaderLinesProgram, "viewTransform");
@@ -95,7 +93,6 @@ void Mainview::drawParticles(int size) {
     glBindVertexArray(particleVAO);
 
     // Load uniforms
-    glUniform1i(isPointLocationPoints, 1);
     glUniform1f(pointSize, 15.0f);
     glUniformMatrix4fv(modelLocationPoints, 1, GL_TRUE, &(transforms->modelTransform)[0][0]);
     glUniformMatrix4fv(projectionLocationPoints, 1, GL_TRUE, &(transforms->projectionTransform)[0][0]);
@@ -142,7 +139,6 @@ void Mainview::drawVectorField(int size) {
     glBindVertexArray(vectorFieldVAO);
 
     // Load uniforms
-    glUniform1i(isPointLocationLines, 0);
     glUniformMatrix4fv(modelLocationLines, 1, GL_TRUE, &(transforms->modelTransform)[0][0]);
     glUniformMatrix4fv(projectionLocationLines, 1, GL_TRUE, &transforms->projectionTransform[0][0]);
     glUniformMatrix4fv(viewLocationLines, 1, GL_TRUE, &transforms->viewTransform[0][0]);
diff --git a/simulation/app/src/main/cpp/src/native-lib.cpp b/simulation/app/src/main/cpp/src/native-lib.cpp
@@ -105,7 +105,7 @@ void init(std::string packageName) {
     //////////////////////// Double gyre ////////////////////////
     globalAppState->vectorFieldHandler = new VectorFieldHandler(15, 15, 5);
     globalAppState->physics = new Physics(*(globalAppState->vectorFieldHandler), Physics::Model::particles_advection, 0.1f);
-    globalAppState->particlesHandler = new ParticlesHandler(ParticlesHandler::InitType::two_lines , *(globalAppState->physics), NUM_PARTICLES);
+    globalAppState->particlesHandler = new ParticlesHandler(ParticlesHandler::InitType::line , *(globalAppState->physics), NUM_PARTICLES);
     /////////////////////////////////////////////////////////////
 
     //////////////////////// Perlin noise ////////////////////////
diff --git a/simulation/app/src/main/cpp/src/shaderManager.cpp b/simulation/app/src/main/cpp/src/shaderManager.cpp
@@ -47,7 +47,9 @@ void ShaderManager::compileVertexShaders() {
 }
 
 void ShaderManager::compileFragmentShaders() {
-    compileShaderHelper(fragmentShader, fragmentShaderSource, GL_FRAGMENT_SHADER);
+    compileShaderHelper(fragmentShaderLines, fragmentShaderLinesSource, GL_FRAGMENT_SHADER);
+//    LOGI("shaderManager", "fragmentShaderPointsSource: %s", fragmentShaderPointsSource.c_str());
+    compileShaderHelper(fragmentShaderPoints, fragmentShaderPointsSource, GL_FRAGMENT_SHADER);
     compileShaderHelper(uiFragmentShader, uiFragmentShaderSource, GL_FRAGMENT_SHADER);
 }
 
@@ -60,6 +62,7 @@ void ShaderManager::compileComputeShaders() {
     compileShaderHelper(computeShader, computeShaderSource, GL_COMPUTE_SHADER);
 }
 
+// Helper function to create a shader program
 void createProgramHelper(GLuint& program, GLuint shaders[]) {
     GLint linkSuccess = 0;
     GLchar infoLog[512];
@@ -84,11 +87,11 @@ void createProgramHelper(GLuint& program, GLuint shaders[]) {
 }
 
 void ShaderManager::createLinesProgram() {
-    createProgramHelper(shaderLinesProgram, (GLuint[]) {vertexShader, geometryLinesShader, fragmentShader, 0});
+    createProgramHelper(shaderLinesProgram, (GLuint[]) {vertexShader, geometryLinesShader, fragmentShaderLines, 0});
 }
 
 void ShaderManager::createPointsProgram() {
-    createProgramHelper(shaderPointsProgram, (GLuint[]) {vertexShader, geometryPointsShader, fragmentShader, 0});
+    createProgramHelper(shaderPointsProgram, (GLuint[]) {vertexShader, geometryPointsShader, fragmentShaderPoints, 0});
 }
 
 void ShaderManager::createComputeProgram() {
@@ -102,11 +105,11 @@ void ShaderManager::createUIProgram() {
 void ShaderManager::detachShaders() {
     glDetachShader(shaderLinesProgram, vertexShader);
     glDetachShader(shaderLinesProgram, geometryLinesShader);
-    glDetachShader(shaderLinesProgram, fragmentShader);
+    glDetachShader(shaderLinesProgram, fragmentShaderLines);
 
     glDetachShader(shaderPointsProgram, vertexShader);
     glDetachShader(shaderPointsProgram, geometryPointsShader);
-    glDetachShader(shaderPointsProgram, fragmentShader);
+    glDetachShader(shaderPointsProgram, fragmentShaderPoints);
 
     glDetachShader(shaderComputeProgram, computeShader);
 
@@ -119,7 +122,8 @@ void ShaderManager::deleteShaders() {
     glDeleteShader(vertexShader);
     glDeleteShader(geometryPointsShader);
     glDeleteShader(geometryLinesShader);
-    glDeleteShader(fragmentShader);
+    glDeleteShader(fragmentShaderLines);
+    glDeleteShader(fragmentShaderPoints);
     glDeleteShader(computeShader);
     glDeleteShader(uiVertexShader);
     glDeleteShader(uiFragmentShader);
@@ -144,7 +148,8 @@ void ShaderManager::compileAndLinkShaders() {
 
 void ShaderManager::loadShaderSources() {
     vertexShaderSource = loadShaderFile("vertex_shader.glsl");
-    fragmentShaderSource = loadShaderFile("fragment_shader.glsl");
+    fragmentShaderLinesSource = loadShaderFile("fragment_shader_lines.glsl");
+    fragmentShaderPointsSource = loadShaderFile("fragment_shader_points.glsl");
     geometryLinesShaderSource = loadShaderFile("geometry_lines_shader.glsl");
     geometryPointsShaderSource = loadShaderFile("geometry_points_shader.glsl");
     computeShaderSource = loadShaderFile("compute_shader.glsl");
@@ -180,7 +185,8 @@ void ShaderManager::checkShaderProgramLinkStatus() {
 
 void ShaderManager::cleanShaderSources() {
     vertexShaderSource.clear();
-    fragmentShaderSource.clear();
+    fragmentShaderLinesSource.clear();
+    fragmentShaderPointsSource.clear();
     geometryLinesShaderSource.clear();
     geometryPointsShaderSource.clear();
     computeShaderSource.clear();
