diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/renderer/renderer.cpp | 9 | ||||
| -rw-r--r-- | src/renderer/texture.cpp | 6 | ||||
| -rw-r--r-- | vendor/stb_image.cpp | 4 | ||||
| -rw-r--r-- | vendor/stb_image.h (renamed from src/stb_image.h) | 0 |
5 files changed, 9 insertions, 12 deletions
| diff --git a/CMakeLists.txt b/CMakeLists.txt index 81365c9..49a0384 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -41,6 +41,7 @@ include_directories( | |||
| 41 | ${OPENGL_INCLUDE_DIRS} | 41 | ${OPENGL_INCLUDE_DIRS} |
| 42 | ${GLEW_INCLUDE_DIRS} | 42 | ${GLEW_INCLUDE_DIRS} |
| 43 | src | 43 | src |
| 44 | vendor | ||
| 44 | ) | 45 | ) |
| 45 | 46 | ||
| 46 | link_directories( | 47 | link_directories( |
| @@ -67,6 +68,7 @@ add_executable(Aromatherapy | |||
| 67 | src/systems/playing.cpp | 68 | src/systems/playing.cpp |
| 68 | src/systems/scheduling.cpp | 69 | src/systems/scheduling.cpp |
| 69 | src/systems/realizing.cpp | 70 | src/systems/realizing.cpp |
| 71 | vendor/stb_image.cpp | ||
| 70 | ) | 72 | ) |
| 71 | 73 | ||
| 72 | set_property(TARGET Aromatherapy PROPERTY CXX_STANDARD 11) | 74 | set_property(TARGET Aromatherapy PROPERTY CXX_STANDARD 11) |
| 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 @@ | |||
| 1 | #include "renderer.h" | 1 | #include "renderer.h" |
| 2 | #include <glm/gtc/matrix_transform.hpp> | ||
| 3 | #include <stb_image.h> | ||
| 2 | #include "consts.h" | 4 | #include "consts.h" |
| 3 | #include "game.h" | 5 | #include "game.h" |
| 4 | #include <glm/gtc/matrix_transform.hpp> | ||
| 5 | #include "texture.h" | 6 | #include "texture.h" |
| 6 | 7 | ||
| 7 | // include stb_image | ||
| 8 | #define STB_IMAGE_IMPLEMENTATION | ||
| 9 | #define STBI_ONLY_PNG | ||
| 10 | #define STBI_ONLY_BMP | ||
| 11 | #include "stb_image.h" | ||
| 12 | |||
| 13 | void setFramebufferSize(GLFWwindow* w, int width, int height) | 8 | void setFramebufferSize(GLFWwindow* w, int width, int height) |
| 14 | { | 9 | { |
| 15 | Game& game = *static_cast<Game*>(glfwGetWindowUserPointer(w)); | 10 | Game& game = *static_cast<Game*>(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 @@ | |||
| 1 | #include "texture.h" | 1 | #include "texture.h" |
| 2 | #include <stdexcept> | 2 | #include <stdexcept> |
| 3 | #include <stb_image.h> | ||
| 3 | #include "renderer.h" | 4 | #include "renderer.h" |
| 4 | #include "util.h" | 5 | #include "util.h" |
| 5 | 6 | ||
| 6 | // include stb_image | ||
| 7 | #define STBI_ONLY_PNG | ||
| 8 | #define STBI_ONLY_BMP | ||
| 9 | #include "stb_image.h" | ||
| 10 | |||
| 11 | Texture::Texture( | 7 | Texture::Texture( |
| 12 | int width, | 8 | int width, |
| 13 | int height) : | 9 | int height) : |
| diff --git a/vendor/stb_image.cpp b/vendor/stb_image.cpp new file mode 100644 index 0000000..e834e1e --- /dev/null +++ b/vendor/stb_image.cpp | |||
| @@ -0,0 +1,4 @@ | |||
| 1 | #define STB_IMAGE_IMPLEMENTATION | ||
| 2 | #define STBI_ONLY_PNG | ||
| 3 | #define STBI_ONLY_BMP | ||
| 4 | #include "stb_image.h" | ||
| diff --git a/src/stb_image.h b/vendor/stb_image.h index cea66f5..cea66f5 100644 --- a/src/stb_image.h +++ b/vendor/stb_image.h | |||