diff --git a/Editor/src/Misc/GizmoDrawer.cpp b/Editor/src/Misc/GizmoDrawer.cpp index 1b92bbcf..d2384878 100644 --- a/Editor/src/Misc/GizmoDrawer.cpp +++ b/Editor/src/Misc/GizmoDrawer.cpp @@ -47,8 +47,11 @@ void GizmoDrawer::DrawGizmos(Ref scene) flatShader->SetUniformMat4f("u_View", scene->m_EditorCamera->GetTransform()); flatShader->SetUniformMat4f("u_Projection", scene->m_EditorCamera->GetPerspective()); flatShader->SetUniform4f("u_Color", 0.5f, 0.5f, 0.5f, 1.0f); - RenderCommand::Disable(RendererEnum::FACE_CULL); + RenderCommand::Enable(RendererEnum::DEPTH_TEST); + RenderCommand::Enable(RendererEnum::FACE_CULL); + glCullFace(GL_BACK); + RenderList renderList; auto camView = scene->m_Registry.view(); for (auto e : camView) @@ -69,8 +72,6 @@ void GizmoDrawer::DrawGizmos(Ref scene) renderList.Flush(flatShader, true); } - RenderCommand::Enable(RendererEnum::FACE_CULL); - glCullFace(GL_FRONT); renderList.Flush(flatShader, true); RenderCommand::Enable(RendererEnum::DEPTH_TEST); diff --git a/Nuake/src/Resource/ModelLoader.cpp b/Nuake/src/Resource/ModelLoader.cpp index 56cfdd2d..e0fece67 100644 --- a/Nuake/src/Resource/ModelLoader.cpp +++ b/Nuake/src/Resource/ModelLoader.cpp @@ -6,6 +6,8 @@ #include "src/Core/String.h" #include "src/Resource/Model.h" + + namespace Nuake { ModelLoader::ModelLoader() {} diff --git a/Nuake/src/Resource/ModelLoader.h b/Nuake/src/Resource/ModelLoader.h index ecec8214..5ba8845c 100644 --- a/Nuake/src/Resource/ModelLoader.h +++ b/Nuake/src/Resource/ModelLoader.h @@ -11,8 +11,12 @@ #include #include +#include + namespace Nuake { + + class Model; class ModelLoader { @@ -23,6 +27,7 @@ namespace Nuake Ref LoadModel(const std::string& path); private: + std::bitset<8> _flags; std::string modelDir; std::vector> m_Meshes;