moved imgui to different folder

and other things i forgot

bin/imgui.ini

@@ -5,7 +5,7 @@ Collapsed=0
 
 [Window][Debug Menu]
 Pos=211,19
-Size=206,1061
+Size=272,1061
 Collapsed=0
 DockId=0x00000006,0
 
@@ -52,10 +52,10 @@ DockId=0x00000005,0
 
 [Docking][Data]
 DockSpace     ID=0x8B93E3BD Window=0xA787BDB4 Pos=0,19 Size=1920,1061 Split=X
-  DockNode    ID=0x00000003 Parent=0x8B93E3BD SizeRef=417,1061 Split=X Selected=0x82A4B83C
+  DockNode    ID=0x00000003 Parent=0x8B93E3BD SizeRef=483,1061 Split=X Selected=0x82A4B83C
     DockNode  ID=0x00000005 Parent=0x00000003 SizeRef=209,1061 Selected=0x82A4B83C
-    DockNode  ID=0x00000006 Parent=0x00000003 SizeRef=206,1061 Selected=0xA0FC9443
-  DockNode    ID=0x00000004 Parent=0x8B93E3BD SizeRef=1501,1061 Split=X
-    DockNode  ID=0x00000001 Parent=0x00000004 SizeRef=1129,1061 CentralNode=1 Selected=0xE87781F4
+    DockNode  ID=0x00000006 Parent=0x00000003 SizeRef=272,1061 Selected=0xA0FC9443
+  DockNode    ID=0x00000004 Parent=0x8B93E3BD SizeRef=1435,1061 Split=X
+    DockNode  ID=0x00000001 Parent=0x00000004 SizeRef=1063,1061 CentralNode=1 Selected=0xE87781F4
     DockNode  ID=0x00000002 Parent=0x00000004 SizeRef=370,1061 Selected=0xE7039252
 

include/ignition/camera.hpp

@@ -22,6 +22,7 @@ namespace Ignition {
 
       Camera() = default;
       Camera(Window* window) { this->window = window; } 
+      Matrix4 viewProj;
    private:
       Window* window;
    };

include/ignition/module.hpp

@@ -16,6 +16,6 @@ namespace Ignition {
       virtual std::string type() const = 0; 
 
       bool enabled;
-      std::shared_ptr<Transform> transform;
+      Transform* transform;
    };
 }

include/ignition/object.hpp

@@ -9,7 +9,7 @@
 
 #define UPDATE_OBJECT() this->transform.UpdateVectors();                                  \
                         for (std::shared_ptr<Module> m : modules)  {                      \
-                           m->transform = std::make_shared<Transform>(this->transform);   \
+                           m->transform = &this->transform;\
                            m->Update();                                                   \
                         }
 

include/ignition/scene.hpp

@@ -16,6 +16,8 @@ namespace Ignition {
       void WriteSceneToDisk();
       void ReadSceneFromDisk();
 
+      std::string name;
+
    private:
       std::vector<Object> objects;
    };

include/ignition/serialization/preferences.cpp

@@ -2,6 +2,7 @@
 #include "input/camera_movement.hpp"
 
 #include <iostream>
+#include <filesystem>
 
 bool preferencesChanged;
 Implosion::GUI* gui;
@@ -10,7 +11,11 @@ void PreferencesChanged() { preferencesChanged = true; }
 
 void WritePreferences() 
 {
-   FS::BeginBinaryWrite(FS::GetHome() + "/Ignition/preferences");
+   if (!std::filesystem::exists(FS::GetHome() + "/Implosion"))
+   {
+      std::filesystem::create_directory(FS::GetHome() + "/Implosion");
+   }
+   FS::BeginBinaryWrite(FS::GetHome() + "/Implosion/preferences");
 
    FS::Write8(gui->vsync);
    FS::Write8(gui->anti);
@@ -43,7 +48,9 @@ void WritePreferences()
 
 void ReadPreferences(Implosion::GUI* guis)
 {
-   FS::BeginBinaryRead(FS::GetHome() + "/Ignition/preferences");
+   gui = guis;
+   if (!FS::BeginBinaryRead(FS::GetHome() + "/Implosion/preferences"))
+      return;
 
    if (!FS::CanRead())
       return;
@@ -71,5 +78,4 @@ void ReadPreferences(Implosion::GUI* guis)
    guis->camera->fov = FS::ReadFloat();
 
    FS::EndBinaryRead();
-   gui = guis;
 }

include/ignition/utils/files.hpp

@@ -8,13 +8,16 @@ namespace FS {
 
    std::string GetHome();
 
+   void SetProjectHome(std::string);
+   std::string GetProjectHome();
+
    std::string ReadTextFile(std::string path);
    std::string ReadFileFromHome(std::string path);
 
    void WriteFile(std::string path, std::string data);
    void WriteFileFromHome(std::string path, std::string data);
 
-   void BeginBinaryRead(std::string path);
+   bool BeginBinaryRead(std::string path);
    void BeginBinaryWrite(std::string path);
 
    uint8_t Read8();

premake5.lua

@@ -7,13 +7,15 @@ project "implosion"
    language "C++"
    cppdialect "gnu++17"
    targetdir "bin"
-   includedirs { "include/ignition", "include/ignition/components", "include/implosion", "include/implosion/imgui" }
+   removefiles "hub/*"
+   includedirs { "include/ignition", "include/ignition/components", "include/implosion", "imgui" }
    files { "**.h", "**.cpp", "**.hpp" }
 
    links { "glfw", "GL", "GLEW", "m" }
 
    filter "configurations:Debug"
       defines { "DEBUG" }
+      optimize "On"
       symbols "On"
 
    filter "configurations:Release"

src/ignition/camera.cpp

@@ -35,5 +35,6 @@ namespace Ignition {
       glfwSwapBuffers((GLFWwindow*)*this->window);
       Rendering::currentProgram = 9999;
       Rendering::currentVao = 9999;
+      viewProj = Matrix4(0);
    }
 }

src/ignition/components/rendering/meshrenderer.cpp

@@ -68,21 +68,25 @@ namespace Ignition::Rendering {
       if (this->shader.program != currentProgram) {
          glUseProgram(this->shader.program);
          currentProgram = this->shader.program;
-
+
+         if (camera->viewProj == Matrix4(0)) {
+            camera->viewProj = camera->view_projection();
+         }
 
-         this->shader.SetMatrix4(camera->view_projection(), "projection");
+         this->shader.SetMatrix4(camera->viewProj, "projection");
       }
       if (this->vao != currentVao) {
          glBindVertexArray(this->vao); 
          currentVao = this->vao;
       }
 
 
-      Matrix4 model = Matrix4(1.f);
-      model = glm::translate(model, this->transform->position);
+      Matrix4 model;
+
+      model = glm::translate(Matrix4(1.f), this->transform->position);
       model *= glm::mat4_cast(glm::quat(glm::radians(this->transform->rotation)));
       model = glm::scale(model, this->transform->scale);
- 
+
       this->shader.SetMatrix4(model, "model");
       glActiveTexture(GL_TEXTURE0 ); 
       glBindTexture(GL_TEXTURE_2D, this->shader.albedo);

src/ignition/object.cpp

@@ -11,7 +11,7 @@ namespace Ignition {
    void Object::AddModule(std::shared_ptr<Module> mod)
    {
       this->modules.push_back(mod);
-      mod->transform = std::make_shared<Transform>(this->transform);
+      //mod->transform = std::make_shared<Transform>(this->transform);
       mod->Start();
    }
 

src/ignition/scene.cpp

@@ -1,6 +1,8 @@
 #include "scene.hpp"
+#include "utils/files.hpp"
 
 namespace Ignition {
+
    void Scene::Update()
    {
       for (int i = 0; i < objects.size(); ++i)
@@ -36,5 +38,10 @@ namespace Ignition {
       return objects.size()-1;
    }
 
+   void Scene::WriteSceneToDisk()
+   {
+      FS::BeginBinaryWrite(FS::GetProjectHome() + ""); 
+   }
+
    Scene scene;
 }

src/ignition/utils/files.cpp

@@ -20,6 +20,14 @@
 #endif 
 
 namespace FS {
+
+   std::string projectName;
+   void SetProjectHome(std::string s)
+   {
+      projectName = s;
+   }
+   std::string GetProjectHome() { return projectName; }
+
    std::string ReadTextFile(std::string path) 
    {
       std::ifstream f(path);
@@ -56,14 +64,19 @@ namespace FS {
       std::string path;
    } write;
 
-   void BeginBinaryRead(std::string path)
+   bool BeginBinaryRead(std::string path)
    {
       read.file = std::ifstream(path);
+
+      if (!read.file.is_open())
+         return false;
+
       std::stringstream s;
       s << read.file.rdbuf();
       read.data = s.str();
       read.size = read.data.size();
       read.i = -1;
+      return true;
    }
    void BeginBinaryWrite(std::string path)
    {

src/implosion/gui/gui_addobject.cpp

@@ -61,11 +61,16 @@ namespace Implosion {
             glUseProgram(m.shader.program);
             std::shared_ptr<MeshRenderer> ptr = std::make_shared<MeshRenderer>(m);
             Ignition::Object* o = &Ignition::scene.GetObjects()->at(Ignition::scene.CreateObject());
-            int x = -10 + rand() % 20;
-            int y = -10 + rand() % 20;
-            int z = -10 + rand() % 20;
+            int x = -50 + rand() % 100;
+            int y = -50 + rand() % 100;
+            int z = -50 + rand() % 100;
+
+            int rx = -180 + rand() % 360;
+            int ry = -180 + rand() % 360;
+            int rz = -180 + rand() % 360;
             o->AddModule(ptr);
             o->transform.position = Ignition::Vector3(x,y,z);
+            o->transform.rotation = Ignition::Vector3(rx,ry,rz);
 
          }
       }

src/implosion/gui/gui_debug.cpp

@@ -2,6 +2,8 @@
 #include <GL/glew.h>
 #include <GLFW/glfw3.h>
 
+#include "scene.hpp"
+
 #ifdef __unix__
 #  ifdef __linux__
 const char* os = "Linux";
@@ -40,6 +42,11 @@ ImGuiWindowFlags flags = ImGuiWindowFlags_NoBackground;
       ImGui::Text("Delta Time %f", dt);
       ImGui::Text("FPS %f", fps);
 
+      ImGui::Separator();
+
+      ImGui::Text("Objects %lu", Ignition::scene.GetObjects()->size());
+      ImGui::Text("Objects with tag \"Bananna\" %lu", Ignition::scene.GetObjectsWithTag("Banana").size());
+
       if (ImGui::CollapsingHeader("Hardware"))
       {
          ImGui::SeparatorText("GPU Info");

src/implosion/main.cpp

@@ -36,6 +36,7 @@ int main()
 
       Ignition::scene.Update();
       gui.NewFrame();
+
       if (Ignition::scene.GetObjects()->size() > 0)
       {
          gui.Inspector(&Ignition::scene.GetObjects()->at(0));
@@ -52,7 +53,7 @@ int main()
       gui.EndFrame();
       camera.EndRender();
    }
-
+   WritePreferences(); 
    gui.Shutdown();
    window.Shutdown();
 }