From 3c1c392ab177566f09d11a380210e1937741fad2 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sun, 28 May 2023 11:45:01 +0100 Subject: Swap GLEW for more modern glad --- assetFactory/modelFactoryMesh.h | 2 +- assetFactory/texturePacker.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'assetFactory') 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 #include #include +#include #include #include #include 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 #include #include +#include #include #include #include @@ -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 {}, -- cgit v1.2.3