Develop

.gitignore

@@ -5,10 +5,11 @@
 /bin/
 /data/
 /scripts/
+/Articles/
+/tests_results/
 #Files
 *.o
 *.obj
 *.out
 *.exe
-*.sh
 *.ini

App/CMakeLists.txt

@@ -1,6 +1,19 @@
-set(APP_NAME PrototypeApp)
+set(APP_NAME Simulation)
 
-add_executable( ${APP_NAME} app.cpp )
+#Shaders and test folder path
+set(CIRCLE_SHADER "${CMAKE_SOURCE_DIR}/res/shaders/circle.shader")
+add_compile_definitions(CIRCLE_SHADER="${CIRCLE_SHADER}")
+
+set(LINE_SHADER "${CMAKE_SOURCE_DIR}/res/shaders/line.shader")
+add_compile_definitions(LINE_SHADER="${LINE_SHADER}")
+
+set(TRAIL_SHADER "${CMAKE_SOURCE_DIR}/res/shaders/trail.shader")
+add_compile_definitions(TRAIL_SHADER="${TRAIL_SHADER}")
+
+set(TEST_FOLDER_PATH "${CMAKE_SOURCE_DIR}/tests_results/")
+add_compile_definitions(TEST_FOLDER_PATH="${TEST_FOLDER_PATH}")
+
+add_executable( ${APP_NAME} app.cpp simulation2D.cpp pendulum.cpp numerical_eq.cpp)
 
 target_include_directories( ${APP_NAME} PUBLIC 
                             ${PULSAR_INCLUDE_PATH}

App/app.cpp

@@ -1,113 +1,29 @@
-#include "Pulsar.hpp"
+#include "simulation2D.hpp"
+#include "numerical_eq.hpp"
+// #include "simulation3D.hpp"
 
-#define EXAMPLE_SHADER "/home/marek/Dev/Projects/pulsarEngine/res/shaders/shader_prog.txt"
-#define EXAMPLE_TEXTURE  "/home/marek/Dev/Projects/pulsarEngine/res/images/hagrid.jpg"
+#include <memory>
 
 int main(){
 
-    //Pulsar core
-    PX_LOG::Init();
-    GlobalTimer::Init();
-    FPSTimer::Init();
-    ScopedTimer::Init();
 
-    //Pulsar graphics
-    PX::Init();
-
-    const Window* window = PX::GetWindow();
-    const Renderer* renderer = PX::GetRenderer();
-    const Gui* gui = PX::GetGui();
-
-    //Window option
-    window->SetVsync(false);
-
-    class Cube cube1;
-
-    //Buffers / containers
-    VertexArray  vao;
-    VertexBuffer vbo(cube1.GetVerticesArrayData(), cube1.GetVerticesArraySize() );
-    IndexBuffer  ebo(cube1.GetIndicatesArrayData(), cube1.GetIndicatesArraySize());
-
-    //Vertex attributes
-    VertexBufferLayout layout;
-    layout.Push<float>(3);
-    layout.Push<float>(2);
-
-    //Add everything to one container - vao
-    vao.AddBuffer(vbo, layout);
-
-    //Unbind everything (buffers are not needed, vao will be changed in loop)
-    vao.UnBind();
-    vbo.UnBind();
-    //Unbind index buffer only when vao is unbind.
-    ebo.UnBind();
 
     /*
-        SHADERS
+        NUMERICAL TESTS FIRST
     */
-    std::string file_path = EXAMPLE_SHADER;
-    Shader shaderProgram(file_path);
-    shaderProgram.Bind();
-
-    //Bind shaderProgram first
-    shaderProgram.SetUniform4f("u_color", 1.0f, 0.984f, 0.0f, 1.0f );
+    RunTests();
 
     /*
-        TEXTURES
+        SIMULATION APP
     */
-    file_path = EXAMPLE_TEXTURE;
-    Texture2D texture1(file_path);
-    texture1.Bind(); //choose slot
-
-    while (!window->ShouldWindowClose())
-    {
-
-        /*
-            START MEASURING APP FRAMERATE
-        */
-        FPSTimer::GetTimer()->StartFrame();
-
-
-        //Event handler - in the future
-        window->onEvents();
-
-        renderer->BeginRender();
-
-
-        //Calculation...
-
-        //Rendering staff...
-        vao.Bind();
-        ebo.Bind();
-
-
+    std::unique_ptr<Simulation> sim = std::make_unique<Simulation2D>();
 
-        /*
-            START MEASURING RENDER FRAME TIME
-        */       
+    sim->initialize();
 
-        renderer->Render();
-        /*
-            STOP MEASURING RENDER FRAME TIME
-        */  
-
-
-        gui->OnBegin();
-        /*
-            Customizing gui...
-        */
-        gui->OnEnd();
-
-        window->onUpdate();
+    sim->run();
 
-        /*
-            STOP MEASURING APP FRAMERATE
-        */
+    sim->shutdown();
 
-        FPSTimer::GetTimer()->UpdateFPS();
-
-    }
 
-    PX::ShutDown();
     return 0;
 }