From b77024de4351bcddee5c4781aa9fc031131f293b Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sat, 20 Feb 2021 14:06:29 +0000 Subject: Pass linters --- gfx/models/mesh.cpp | 6 ------ gfx/models/mesh.h | 7 ++----- gfx/models/obj.impl.cpp | 6 ++++++ 3 files changed, 8 insertions(+), 11 deletions(-) (limited to 'gfx/models') diff --git a/gfx/models/mesh.cpp b/gfx/models/mesh.cpp index c829f4e..3487083 100644 --- a/gfx/models/mesh.cpp +++ b/gfx/models/mesh.cpp @@ -1,11 +1,5 @@ #include "mesh.h" -#include "obj.h" #include "vertex.hpp" -#include -#include -#include -#include -#include Mesh::Mesh(std::span vertices, std::span indices, GLenum m) : m_vertexArrayObject {}, m_vertexArrayBuffers {}, m_numIndices {indices.size()}, mode {m} diff --git a/gfx/models/mesh.h b/gfx/models/mesh.h index ea3a26b..1e53407 100644 --- a/gfx/models/mesh.h +++ b/gfx/models/mesh.h @@ -4,14 +4,11 @@ #include #include #include -#include -#include +#include #include #include -#include -#include -class ObjParser; +class Vertex; enum MeshBufferPositions { POSITION_VB, TEXCOORD_VB, NORMAL_VB, INDEX_VB }; diff --git a/gfx/models/obj.impl.cpp b/gfx/models/obj.impl.cpp index e410058..0c1303a 100644 --- a/gfx/models/obj.impl.cpp +++ b/gfx/models/obj.impl.cpp @@ -1,6 +1,12 @@ #include "obj.h" +#include #include #include +#include +#include +#include +#include +#include std::vector ObjParser::createMeshes() const -- cgit v1.2.3