Reverted back to version of app without memeory leaks - implemented back all else but the part that cuased the leaks

Author: MartinOpat

simulation/TODO.md

@@ -1,27 +1,17 @@
-## To discuss in thesis
-- Check that the uses of "was done" and "will be done" is consistent and makes sense
-- 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)
-- Update research question
-
 
 ## Android side
 - Delete unused project files / folders
-- Properly handle the screen layout (see boxVisualization branch)
 
 ## Native side
 - Delete unused functions
-- Take out functions from native-lib into a class called application and make the native-lib only be responsible for JNI communication
 
 ## Stuff to research
 - Try cuberiles after all
 - Direct volume rendering / volume ray casting
-- The outline box approach
 
 ## General project
 - Make sure to use same case (e.g. camelCase)
-- 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
+
 
 ## Next meeting points
 - Make repo public?

simulation/app/src/main/cpp/CMakeLists.txt

@@ -82,11 +82,6 @@ target_link_libraries(${CMAKE_PROJECT_NAME}
 # For including libraries (outside NDK) later on
 # include_directories(include/)
 
-# TODO: Maybe add this to make sure the C++ standard is enforced
-#set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES
-#        CXX_STANDARD 17
-#        CXX_STANDARD_REQUIRED ON)
-
 # Compiler flags
 # target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE -Wall -Wextra -O2)
 

simulation/app/src/main/cpp/include/ThreadPool.h

@@ -1,6 +1,6 @@
 //
 // Created: https://github.com/progschj/ThreadPool
-// Modified by: Martin K. Mwila
+// Modified by: Martin Opat
 //
 #ifndef THREAD_POOL_H
 #define THREAD_POOL_H

simulation/app/src/main/cpp/include/consts.h

@@ -30,8 +30,5 @@ enum class Mode {
 };
 extern Mode mode;
 
-//// Application state - user (i.e. programmer) defined
-//struct appState;
-//extern appState *globalAppState;
 
 #endif //LAGRANGIAN_FLUID_SIMULATION_CONSTS_H

simulation/app/src/main/cpp/include/timer.h

@@ -20,18 +20,56 @@
 template<typename ClockType>
 class Timer {
 public:
+    /**
+     * @brief Constructor for the Timer class.
+     */
     Timer();
 
+    /**
+     * @brief Starts the timer.
+     */
     void start();
+
+    /**
+     * @brief Stops the timer.
+     */
     void stop();
+
+    /**
+     * @brief Gets the elapsed time in seconds.
+     *
+     * @return The elapsed time in seconds.
+     */
     float getElapsedTimeInSeconds();
+
+    /**
+     * @brief Gets the elapsed time in milliseconds.
+     *
+     * @return The elapsed time in milliseconds.
+     */
     std::chrono::milliseconds getElapsedTime();
 
+    /**
+     * @brief Logs the frames per second to console.
+     */
     void logFPS();
+
+    /**
+     * @brief Logs the elapsed time to console.
+     */
     void logElapsedTime();
 
+    /**
+     * @brief Checks if the timer is started.
+     *
+     * @return True if the timer is started, false otherwise.
+     */
     bool isStarted();
 
+    /**
+     * @brief Measures the time elapsed since the last measurement.
+     * @note This method logs the elapsed time to console every `displayFrequency` milliseconds.
+     */
     void measure();
 
 private:

simulation/app/src/main/cpp/src/native-lib.cpp

@@ -122,6 +122,7 @@ void init(std::string packageName) {
     /////////////////////////////////////////////////////////////
 
 
+    // Choose one of the following particle initialization methods
     globalAppState->particlesHandler = new ParticlesHandler(*globalAppState->physics, NUM_PARTICLES);  // Initialization from file
 //    globalAppState->particlesHandler = new ParticlesHandler(ParticlesHandler::InitType::line , *(globalAppState->physics), NUM_PARTICLES);  // Diagonal line code-wise initialization
 //    globalAppState->particlesHandler = new ParticlesHandler(ParticlesHandler::InitType::uniform ,*(globalAppState->physics), NUM_PARTICLES);  // Random uniform code-wise initialization
@@ -144,7 +145,7 @@ extern "C" {
         (globalAppState->mainview)->drawUI();
     }
 
-    JNIEXPORT void JNICALL Java_com_rug_lagrangianfluidsimulation_MainActivity_setupGraphics(JNIEnv* env, jobject obj, jobject assetManager, jstring path) {  // TODO: Rename
+    JNIEXPORT void JNICALL Java_com_rug_lagrangianfluidsimulation_MainActivity_setupNative(JNIEnv* env, jobject obj, jobject assetManager, jstring path) {  // TODO: Rename
         globalAppState->mainview = new Mainview(AAssetManager_fromJava(env, assetManager));
         (globalAppState->mainview)->setupGraphics();
 
@@ -182,7 +183,7 @@ extern "C" {
     }
 
     JNIEXPORT void JNICALL
-    Java_com_rug_lagrangianfluidsimulation_MainActivity_createBuffers(JNIEnv *env, jobject thiz) {  // TODO: Is there a reason for this to be exported ?
+    Java_com_rug_lagrangianfluidsimulation_MainActivity_createBuffers(JNIEnv *env, jobject thiz) {
         (globalAppState->mainview)->createVectorFieldBuffer((globalAppState->vectorFieldHandler)->getOldVertices());
         (globalAppState->mainview)->createParticlesBuffer((globalAppState->particlesHandler)->getParticlesPositions());
         (globalAppState->mainview)->createComputeBuffer((globalAppState->vectorFieldHandler)->getOldVertices(), (globalAppState->vectorFieldHandler)->getNewVertices(), (globalAppState->vectorFieldHandler)->getFutureVertices());

simulation/app/src/main/java/com/rug/lagrangianfluidsimulation/MainActivity.java

@@ -39,7 +39,7 @@ public class MainActivity extends Activity {
 
 
     private native void drawFrame();
-    public native void setupGraphics(AssetManager assetManager, String workPath);
+    public native void setupNative(AssetManager assetManager, String workPath);
     public native void createBuffers();
     public native void nativeSendTouchEvent(int pointerCount, float[] x, float[] y, int action);
     public native void onDestroyNative();
@@ -77,7 +77,7 @@ public void onSurfaceCreated(GL10 gl, EGLConfig config) {
                 AssetManager assetManager = getAssets();
 
                 String workPath = getFilesDir().getAbsolutePath();
-                setupGraphics(assetManager, workPath);
+                setupNative(assetManager, workPath);
             }
 
             @Override