remove extra glew includes
This commit is contained in:
@@ -1,7 +1,6 @@
|
|||||||
#include "png.hpp"
|
#include "png.hpp"
|
||||||
|
|
||||||
#include <png.h>
|
#include <png.h>
|
||||||
#include <GL/glew.h>
|
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
|
|||||||
@@ -4,8 +4,6 @@
|
|||||||
#include "gl_util.hpp"
|
#include "gl_util.hpp"
|
||||||
#include "maths/UVRegion.hpp"
|
#include "maths/UVRegion.hpp"
|
||||||
|
|
||||||
#include <GL/glew.h>
|
|
||||||
|
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
#include "Mesh.hpp"
|
#include "Mesh.hpp"
|
||||||
#include "Texture.hpp"
|
#include "Texture.hpp"
|
||||||
|
|
||||||
#include <GL/glew.h>
|
|
||||||
#include "typedefs.hpp"
|
#include "typedefs.hpp"
|
||||||
#include "maths/UVRegion.hpp"
|
#include "maths/UVRegion.hpp"
|
||||||
|
|
||||||
|
|||||||
@@ -12,20 +12,19 @@ struct VertexAttribute {
|
|||||||
bool normalized = false;
|
bool normalized = false;
|
||||||
ubyte count = 0;
|
ubyte count = 0;
|
||||||
|
|
||||||
|
|
||||||
[[nodiscard]] uint32_t size() const {
|
[[nodiscard]] uint32_t size() const {
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case GL_FLOAT:
|
case GL_FLOAT:
|
||||||
return count * sizeof(float);
|
return count * sizeof(GLfloat);
|
||||||
case GL_UNSIGNED_INT:
|
case GL_UNSIGNED_INT:
|
||||||
case GL_INT:
|
case GL_INT:
|
||||||
return count * sizeof(uint32_t);
|
return count * sizeof(GLint);
|
||||||
case GL_UNSIGNED_SHORT:
|
case GL_UNSIGNED_SHORT:
|
||||||
case GL_SHORT:
|
case GL_SHORT:
|
||||||
return count * sizeof(uint16_t);
|
return count * sizeof(GLshort);
|
||||||
case GL_UNSIGNED_BYTE:
|
case GL_UNSIGNED_BYTE:
|
||||||
case GL_BYTE:
|
case GL_BYTE:
|
||||||
return count * sizeof(uint8_t);
|
return count * sizeof(GLbyte);
|
||||||
default:
|
default:
|
||||||
throw std::runtime_error("VertexAttribute type is not supported");
|
throw std::runtime_error("VertexAttribute type is not supported");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
#include "WorldRenderer.hpp"
|
#include "WorldRenderer.hpp"
|
||||||
|
|
||||||
#include <GL/glew.h>
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|||||||
Reference in New Issue
Block a user