fixing double adding a component
This commit is contained in:
@@ -10,6 +10,7 @@
|
|||||||
#include "open_engine/renderer/renderer3d.hpp"
|
#include "open_engine/renderer/renderer3d.hpp"
|
||||||
#include "open_engine/scene/components.hpp"
|
#include "open_engine/scene/components.hpp"
|
||||||
#include "panels/content_browser.hpp"
|
#include "panels/content_browser.hpp"
|
||||||
|
#include "panels/models_panel.hpp"
|
||||||
#include "panels/scene_hierarchy.hpp"
|
#include "panels/scene_hierarchy.hpp"
|
||||||
|
|
||||||
#include <Jolt/Physics/Collision/Shape/Shape.h>
|
#include <Jolt/Physics/Collision/Shape/Shape.h>
|
||||||
@@ -146,8 +147,8 @@ namespace OpenEngine {
|
|||||||
Ref<Model3D> monkey = Model3D::Create("./assets/models/monkey.glb");
|
Ref<Model3D> monkey = Model3D::Create("./assets/models/monkey.glb");
|
||||||
|
|
||||||
cube3.AddComponent<ModelComponent>(model);
|
cube3.AddComponent<ModelComponent>(model);
|
||||||
cube3.AddComponent<ModelComponent>(model2);
|
|
||||||
cube4.AddComponent<ModelComponent>(monkey);
|
cube4.AddComponent<ModelComponent>(monkey);
|
||||||
|
cube5.AddComponent<ModelComponent>(model2);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
auto view = scene->GetRegistry().view<TagComponent>();
|
auto view = scene->GetRegistry().view<TagComponent>();
|
||||||
@@ -585,6 +586,7 @@ namespace OpenEngine {
|
|||||||
DrawStats();
|
DrawStats();
|
||||||
scene_hierarchy.OnImGuiRender();
|
scene_hierarchy.OnImGuiRender();
|
||||||
browser.OnImGuiRender();
|
browser.OnImGuiRender();
|
||||||
|
ModelsPanelOnImGuiRender();
|
||||||
DrawViewport();
|
DrawViewport();
|
||||||
DrawPlayBar();
|
DrawPlayBar();
|
||||||
|
|
||||||
|
|||||||
@@ -304,9 +304,7 @@ namespace OpenEngine {
|
|||||||
bool opened = ImGui::TreeNodeEx(
|
bool opened = ImGui::TreeNodeEx(
|
||||||
(void*)(intptr_t)entity,
|
(void*)(intptr_t)entity,
|
||||||
ImGuiTreeNodeFlags_None,
|
ImGuiTreeNodeFlags_None,
|
||||||
"Meshes",
|
"Meshes");
|
||||||
nullptr
|
|
||||||
);
|
|
||||||
|
|
||||||
if (opened) {
|
if (opened) {
|
||||||
unsigned int i = 0;
|
unsigned int i = 0;
|
||||||
|
|||||||
@@ -27,6 +27,7 @@
|
|||||||
#include "open_engine/renderer/renderer2d.hpp"
|
#include "open_engine/renderer/renderer2d.hpp"
|
||||||
#include "open_engine/renderer/renderer3d.hpp"
|
#include "open_engine/renderer/renderer3d.hpp"
|
||||||
#include "open_engine/renderer/renderer.hpp"
|
#include "open_engine/renderer/renderer.hpp"
|
||||||
|
#include <open_engine/renderer/model3d.hpp>
|
||||||
#include "open_engine/renderer/texture.hpp"
|
#include "open_engine/renderer/texture.hpp"
|
||||||
#include "open_engine/renderer/buffer.hpp"
|
#include "open_engine/renderer/buffer.hpp"
|
||||||
#include "open_engine/renderer/shader.hpp"
|
#include "open_engine/renderer/shader.hpp"
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
#include "core/uuid.hpp"
|
||||||
#include "logging.hpp"
|
#include "logging.hpp"
|
||||||
#include "scene/scene_camera.hpp"
|
#include "scene/scene_camera.hpp"
|
||||||
#include <pch.hpp>
|
#include <pch.hpp>
|
||||||
@@ -19,6 +20,7 @@
|
|||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
|
|
||||||
#include <glad/glad.h>
|
#include <glad/glad.h>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
namespace OpenEngine {
|
namespace OpenEngine {
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user