From 6cef3efbbca12444410ef71fb8850f16765b828d Mon Sep 17 00:00:00 2001 From: LandaMm Date: Sun, 5 Oct 2025 16:39:20 +0200 Subject: [PATCH] feat: basic improvements, unused includes --- include/app/app.h | 2 -- include/renderer/debug.h | 2 -- include/renderer/engine.h | 2 -- include/renderer/mesh.h | 4 ++-- include/renderer/shader.h | 2 -- include/renderer/texture.h | 9 ++++----- include/renderer/wavefront.h | 20 +++++++++----------- include/window/event.h | 1 - src/main.cpp | 1 - src/renderer/debug.cpp | 4 +++- src/renderer/engine.cpp | 2 -- src/renderer/mesh.cpp | 7 +++++-- src/renderer/shader.cpp | 2 ++ 13 files changed, 25 insertions(+), 33 deletions(-) diff --git a/include/app/app.h b/include/app/app.h index 5cdaa22..00646c6 100644 --- a/include/app/app.h +++ b/include/app/app.h @@ -1,8 +1,6 @@ #ifndef APPLICATION_H_ #define APPLICATION_H_ -#include "window/event.h" - class IApplication { public: virtual ~IApplication() = default; diff --git a/include/renderer/debug.h b/include/renderer/debug.h index a2afaf2..e82635c 100644 --- a/include/renderer/debug.h +++ b/include/renderer/debug.h @@ -1,8 +1,6 @@ #ifndef RENDERER_DEBUG_ #define RENDERER_DEBUG_ -#include - #include void MessageCallback(GLenum source, diff --git a/include/renderer/engine.h b/include/renderer/engine.h index e60e55a..466b855 100644 --- a/include/renderer/engine.h +++ b/include/renderer/engine.h @@ -12,8 +12,6 @@ class Engine { public: static void Run(std::unique_ptr app); -private: - void HandleWindowResized(const WindowResized& event); private: static std::unique_ptr s_app; static std::shared_ptr s_window; diff --git a/include/renderer/mesh.h b/include/renderer/mesh.h index d286d92..3dacb01 100644 --- a/include/renderer/mesh.h +++ b/include/renderer/mesh.h @@ -13,9 +13,9 @@ public: // TODO: abstract away std::vector m_vertexBuffer; std::vector m_indexBuffer; public: // TODO: abstract away - void Bind() { glBindVertexArray(m_vao); } + void Bind() const { glBindVertexArray(m_vao); } void Unbind() { glBindVertexArray(0); } - void Upload(); + void Upload() const; public: std::string materialName; public: diff --git a/include/renderer/shader.h b/include/renderer/shader.h index 488f426..e5f0639 100644 --- a/include/renderer/shader.h +++ b/include/renderer/shader.h @@ -1,10 +1,8 @@ #ifndef SHADER_H #define SHADER_H -#include #include -#include #include class Shader diff --git a/include/renderer/texture.h b/include/renderer/texture.h index 78741cb..75ddfaf 100644 --- a/include/renderer/texture.h +++ b/include/renderer/texture.h @@ -4,14 +4,13 @@ #include class Texture { -private: - unsigned int m_id; -private: public: - Texture() {} + Texture() : m_id(0) {} static std::unique_ptr LoadFile(const std::string& filename); public: - inline const unsigned int GetID() const { return m_id; } + [[nodiscard]] unsigned int GetID() const { return m_id; } +private: + unsigned int m_id; }; #endif // TEXTURE_H_ diff --git a/include/renderer/wavefront.h b/include/renderer/wavefront.h index 23e3ad1..edc9a1f 100644 --- a/include/renderer/wavefront.h +++ b/include/renderer/wavefront.h @@ -8,24 +8,13 @@ #include #include "shader.h" -#include "texture.h" #include "renderer/material.h" -#include "renderer/basics.h" #include "renderer/mesh.h" enum ObjElement { OHASH, MTLLIB, USEMTL, O, V, VN, VT, F, OUNKNOWN }; enum MtlElement { MHASH, NEWMTL, NS, KA, KS, KD, NI, D, ILLUM, MAP_KD, MAP_KA, MUNKNOWN }; class Object { -private: - std::string m_name; - std::vector m_vertices; - std::vector m_normals; - std::vector m_texCoords; - - std::vector m_meshes; - - std::unordered_map> m_materials; private: static inline int NormalizeIndex(int idx, int baseCount); @@ -46,6 +35,15 @@ private: void CreateNewMesh(const std::string& materialName); public: void Render(Shader& shader); +private: + std::string m_name; + std::vector m_vertices; + std::vector m_normals; + std::vector m_texCoords; + + std::vector m_meshes; + + std::unordered_map> m_materials; }; #endif // MODEL_H_ \ No newline at end of file diff --git a/include/window/event.h b/include/window/event.h index afddfb6..64356a9 100644 --- a/include/window/event.h +++ b/include/window/event.h @@ -6,7 +6,6 @@ #include #include #include -#include class EventDispatcher { using Type = std::type_index; diff --git a/src/main.cpp b/src/main.cpp index a06f0f4..aff3079 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -8,7 +8,6 @@ #ifdef WIN32 #include #endif -#include #include #include #include diff --git a/src/renderer/debug.cpp b/src/renderer/debug.cpp index bed02de..c8ea40d 100644 --- a/src/renderer/debug.cpp +++ b/src/renderer/debug.cpp @@ -1,5 +1,7 @@ #include "renderer/debug.h" +#include + void MessageCallback(GLenum source, GLenum type, GLuint id, @@ -19,4 +21,4 @@ void MessageCallback(GLenum source, // std::cerr << "GL CALLBACK: %s type = 0x%x, severity = 0x%x, message = %s\n", // (type == GL_DEBUG_TYPE_ERROR ? "** GL ERROR **" : ""), // type, severity, message); -} \ No newline at end of file +} diff --git a/src/renderer/engine.cpp b/src/renderer/engine.cpp index b26dec4..84b4276 100644 --- a/src/renderer/engine.cpp +++ b/src/renderer/engine.cpp @@ -3,8 +3,6 @@ #include "renderer/engine.h" #include "window/event.h" -#include "IO/file_manager.h" -#include "renderer/shader.h" #include "renderer/wavefront.h" std::unique_ptr Engine::s_app = nullptr; diff --git a/src/renderer/mesh.cpp b/src/renderer/mesh.cpp index 934c123..544c2e7 100644 --- a/src/renderer/mesh.cpp +++ b/src/renderer/mesh.cpp @@ -1,6 +1,10 @@ #include "renderer/mesh.h" Mesh::Mesh() { + m_vao = 0; + m_vbo = 0; + m_ebo = 0; + glGenVertexArrays(1, &m_vao); glGenBuffers(1, &m_vbo); glGenBuffers(1, &m_ebo); @@ -21,8 +25,7 @@ Mesh::Mesh() { glBindVertexArray(0); } -void Mesh::Upload() -{ +void Mesh::Upload() const { glBindVertexArray(m_vao); glBindBuffer(GL_ARRAY_BUFFER, m_vbo); diff --git a/src/renderer/shader.cpp b/src/renderer/shader.cpp index 9a71ee6..ed58acb 100644 --- a/src/renderer/shader.cpp +++ b/src/renderer/shader.cpp @@ -1,3 +1,5 @@ +#include +#include #include "renderer/shader.h" Shader::Shader()