diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-05-28 11:45:01 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-05-28 11:45:01 +0100 |
| commit | 3c1c392ab177566f09d11a380210e1937741fad2 (patch) | |
| tree | 67b12689c60dc2e75a5587988dd11bf36c12da9a /assetFactory | |
| parent | Add glad submodule and build a glad library (diff) | |
| download | ilt-3c1c392ab177566f09d11a380210e1937741fad2.tar.bz2 ilt-3c1c392ab177566f09d11a380210e1937741fad2.tar.xz ilt-3c1c392ab177566f09d11a380210e1937741fad2.zip | |
Swap GLEW for more modern glad
Diffstat (limited to 'assetFactory')
| -rw-r--r-- | assetFactory/modelFactoryMesh.h | 2 | ||||
| -rw-r--r-- | assetFactory/texturePacker.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/assetFactory/modelFactoryMesh.h b/assetFactory/modelFactoryMesh.h index 012977a..32e7ab5 100644 --- a/assetFactory/modelFactoryMesh.h +++ b/assetFactory/modelFactoryMesh.h @@ -1,9 +1,9 @@ #pragma once #include "modelFactoryMesh_fwd.h" -#include <GL/glew.h> #include <OpenMesh/Core/Mesh/PolyMesh_ArrayKernelT.hh> #include <OpenMesh/Core/Mesh/Traits.hh> +#include <glad/gl.h> #include <glm/geometric.hpp> #include <glm/vec2.hpp> #include <glm/vec3.hpp> diff --git a/assetFactory/texturePacker.cpp b/assetFactory/texturePacker.cpp index 1d533c1..dbafc4b 100644 --- a/assetFactory/texturePacker.cpp +++ b/assetFactory/texturePacker.cpp @@ -1,8 +1,8 @@ #include "texturePacker.h" #include "collections.h" -#include <GL/glew.h> #include <algorithm> #include <cstdio> +#include <glad/gl.h> #include <glm/common.hpp> #include <numeric> #include <ostream> @@ -65,7 +65,7 @@ TexturePacker::pack(Size size) const return {}; } } - if (GLEW_ARB_texture_non_power_of_two) { + if (GL_ARB_texture_non_power_of_two) { // Crop the size back to minimum size size = std::transform_reduce( result.begin(), result.end(), inputImages.begin(), Size {}, |