diff --git a/editor/include/editor.hpp b/editor/include/editor.hpp index fe80219..66c2e54 100755 --- a/editor/include/editor.hpp +++ b/editor/include/editor.hpp @@ -10,6 +10,7 @@ #include "open_engine/renderer/renderer3d.hpp" #include "open_engine/scene/components.hpp" #include "panels/content_browser.hpp" +#include "panels/models_panel.hpp" #include "panels/scene_hierarchy.hpp" #include @@ -146,8 +147,8 @@ namespace OpenEngine { Ref monkey = Model3D::Create("./assets/models/monkey.glb"); cube3.AddComponent(model); - cube3.AddComponent(model2); cube4.AddComponent(monkey); + cube5.AddComponent(model2); /* auto view = scene->GetRegistry().view(); @@ -585,6 +586,7 @@ namespace OpenEngine { DrawStats(); scene_hierarchy.OnImGuiRender(); browser.OnImGuiRender(); + ModelsPanelOnImGuiRender(); DrawViewport(); DrawPlayBar(); diff --git a/editor/src/editor_component.cpp b/editor/src/editor_component.cpp index 61a374b..0cde322 100644 --- a/editor/src/editor_component.cpp +++ b/editor/src/editor_component.cpp @@ -304,9 +304,7 @@ namespace OpenEngine { bool opened = ImGui::TreeNodeEx( (void*)(intptr_t)entity, ImGuiTreeNodeFlags_None, - "Meshes", - nullptr - ); + "Meshes"); if (opened) { unsigned int i = 0; diff --git a/open_engine/include/open_engine.hpp b/open_engine/include/open_engine.hpp index ba00954..8be3bd5 100644 --- a/open_engine/include/open_engine.hpp +++ b/open_engine/include/open_engine.hpp @@ -27,6 +27,7 @@ #include "open_engine/renderer/renderer2d.hpp" #include "open_engine/renderer/renderer3d.hpp" #include "open_engine/renderer/renderer.hpp" +#include #include "open_engine/renderer/texture.hpp" #include "open_engine/renderer/buffer.hpp" #include "open_engine/renderer/shader.hpp" diff --git a/open_engine/src/open_engine/renderer/renderer3d.cpp b/open_engine/src/open_engine/renderer/renderer3d.cpp index 75c04f9..9069195 100644 --- a/open_engine/src/open_engine/renderer/renderer3d.cpp +++ b/open_engine/src/open_engine/renderer/renderer3d.cpp @@ -1,3 +1,4 @@ +#include "core/uuid.hpp" #include "logging.hpp" #include "scene/scene_camera.hpp" #include @@ -19,6 +20,7 @@ #include #include +#include namespace OpenEngine {