diff --git a/Editor/src/ComponentsPanel/MeshPanel.h b/Editor/src/ComponentsPanel/MeshPanel.h index 1f6162c3..b8388fda 100644 --- a/Editor/src/ComponentsPanel/MeshPanel.h +++ b/Editor/src/ComponentsPanel/MeshPanel.h @@ -9,7 +9,8 @@ #include #include -class MeshPanel : ComponentPanel { +class MeshPanel : ComponentPanel +{ private: Scope _modelInspector; bool _expanded = false; diff --git a/Nuake/Engine.h b/Nuake/Engine.h index 0daac3cf..24832714 100644 --- a/Nuake/Engine.h +++ b/Nuake/Engine.h @@ -6,12 +6,9 @@ #include "src/Core/Logger.h" /* TODOS: -* -* Engine: -* Scripting API for editing UI maybe -* Launch game standalone -* Fix physics system -* --play argument rendering in framebuffer +[ ] - Parse the bones +[ ] - Create SceneStructure Entities(with bone component) +[ ] - Create SkinnedMesh resource(?) */ // Welcome to the Nuake source code. diff --git a/Nuake/src/Rendering/Mesh/Mesh.h b/Nuake/src/Rendering/Mesh/Mesh.h index cbdaf289..3433e2a3 100644 --- a/Nuake/src/Rendering/Mesh/Mesh.h +++ b/Nuake/src/Rendering/Mesh/Mesh.h @@ -2,7 +2,7 @@ #include "src/Core/Core.h" #include "src/Rendering/AABB.h" #include "src/Resource/Resource.h" -#include +#include "src/Resource/Serializable.h" namespace Nuake { @@ -21,7 +21,7 @@ namespace Nuake void AddSurface(std::vector vertices, std::vector indices); std::vector& GetVertices(); std::vector& GetIndices(); - + Ref GetMaterial() inline const; void SetMaterial(Ref material); @@ -33,6 +33,7 @@ namespace Nuake json Serialize() override; bool Deserialize(const json& j) override; + private: Ref m_Material = nullptr; std::vector m_Indices; @@ -41,9 +42,9 @@ namespace Nuake Scope m_VertexBuffer; Scope m_VertexArray; Scope m_ElementBuffer; - + void SetupMesh(); - + AABB m_AABB; void CalculateAABB(); }; diff --git a/Nuake/src/Resource/Model.cpp b/Nuake/src/Resource/Model.cpp index 37232d4b..08588337 100644 --- a/Nuake/src/Resource/Model.cpp +++ b/Nuake/src/Resource/Model.cpp @@ -2,7 +2,6 @@ #include "src/Core/FileSystem.h" #include "src/Core/Logger.h" #include "src/Rendering/Mesh/Mesh.h" - #include "src/Resource/ModelLoader.h" namespace Nuake diff --git a/Nuake/src/Resource/Model.h b/Nuake/src/Resource/Model.h index e909fb15..4dfed423 100644 --- a/Nuake/src/Resource/Model.h +++ b/Nuake/src/Resource/Model.h @@ -4,9 +4,9 @@ #include "src/Resource/Resource.h" #include "src/Resource/Serializable.h" #include "src/Rendering/Mesh/Mesh.h" + namespace Nuake { - class Model : public Resource, ISerializable { private: @@ -21,6 +21,5 @@ namespace Nuake json Serialize() override; bool Deserialize(const json& j) override; - }; } \ No newline at end of file