summaryrefslogtreecommitdiffstats
path: root/src/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'src/graphics')
-rw-r--r--src/graphics/Shader.cpp3
-rw-r--r--src/graphics/Shader.hpp2
-rw-r--r--src/graphics/Texture.cpp2
-rw-r--r--src/graphics/Texture.hpp2
4 files changed, 4 insertions, 5 deletions
diff --git a/src/graphics/Shader.cpp b/src/graphics/Shader.cpp
index 9bb08ba..83eb93f 100644
--- a/src/graphics/Shader.cpp
+++ b/src/graphics/Shader.cpp
@@ -1,4 +1,3 @@
-#include <easylogging++.h>
#include "Shader.hpp"
Shader::Shader(const GLchar *vertexPath, const GLchar *fragmentPath) {
@@ -70,7 +69,7 @@ Shader::Shader(const GLchar *vertexPath, const GLchar *fragmentPath) {
glGetProgramiv(this->Program, GL_LINK_STATUS, &success);
if (!success) {
glGetProgramInfoLog(this->Program, 512, NULL, infoLog);
- LOG(ERROR) << "ERROR::SHADER::PROGRAM::LINKING_FAILED\n" << infoLog;
+ LOG(FATAL) << "ERROR::SHADER::PROGRAM::LINKING_FAILED\n" << infoLog;
}
// Удаляем шейдеры, поскольку они уже в программу и нам больше не нужны.
diff --git a/src/graphics/Shader.hpp b/src/graphics/Shader.hpp
index 66d687c..a336b1a 100644
--- a/src/graphics/Shader.hpp
+++ b/src/graphics/Shader.hpp
@@ -2,7 +2,7 @@
#include <string>
#include <fstream>
#include <sstream>
-
+#include <easylogging++.h>
#include <GL/glew.h>
class Shader
diff --git a/src/graphics/Texture.cpp b/src/graphics/Texture.cpp
index bd5c53f..5d183c3 100644
--- a/src/graphics/Texture.cpp
+++ b/src/graphics/Texture.cpp
@@ -1,5 +1,3 @@
-#include <SFML/Graphics.hpp>
-#include <easylogging++.h>
#include "Texture.hpp"
Texture::Texture(std::string filename, GLenum textureWrapping, GLenum textureFiltering) {
diff --git a/src/graphics/Texture.hpp b/src/graphics/Texture.hpp
index 8e3f1af..277806a 100644
--- a/src/graphics/Texture.hpp
+++ b/src/graphics/Texture.hpp
@@ -1,5 +1,7 @@
#pragma once
+#include <SFML/Graphics.hpp>
+#include <easylogging++.h>
#include <GL/glew.h>
class Texture {