From d0f191b3b7419f846342ea5eba5a9bb69cf9bb14 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Sat, 28 Apr 2018 13:52:47 -0400 Subject: Moved stb_image.h to a vendor folder --- src/renderer/renderer.cpp | 9 ++------- src/renderer/texture.cpp | 6 +----- 2 files changed, 3 insertions(+), 12 deletions(-) (limited to 'src/renderer') diff --git a/src/renderer/renderer.cpp b/src/renderer/renderer.cpp index 6eef2f3..30ef787 100644 --- a/src/renderer/renderer.cpp +++ b/src/renderer/renderer.cpp @@ -1,15 +1,10 @@ #include "renderer.h" +#include +#include #include "consts.h" #include "game.h" -#include #include "texture.h" -// include stb_image -#define STB_IMAGE_IMPLEMENTATION -#define STBI_ONLY_PNG -#define STBI_ONLY_BMP -#include "stb_image.h" - void setFramebufferSize(GLFWwindow* w, int width, int height) { Game& game = *static_cast(glfwGetWindowUserPointer(w)); diff --git a/src/renderer/texture.cpp b/src/renderer/texture.cpp index 2728665..04d5cf4 100644 --- a/src/renderer/texture.cpp +++ b/src/renderer/texture.cpp @@ -1,13 +1,9 @@ #include "texture.h" #include +#include #include "renderer.h" #include "util.h" -// include stb_image -#define STBI_ONLY_PNG -#define STBI_ONLY_BMP -#include "stb_image.h" - Texture::Texture( int width, int height) : -- cgit 1.4.1