diff --git a/assets/shaders/basicVertex.vert b/assets/shaders/basicVertex.vert index f6783a5..e05b122 100644 --- a/assets/shaders/basicVertex.vert +++ b/assets/shaders/basicVertex.vert @@ -1,4 +1,4 @@ -#version 330 core +#version 330 core layout (location = 0) in vec3 aPos; layout (location = 1) in vec3 aColor; layout (location = 2) in vec2 aTexCoord; diff --git a/engine/shader.h b/engine/shader.h index 5a41a3d..a2888b7 100644 --- a/engine/shader.h +++ b/engine/shader.h @@ -42,6 +42,10 @@ public: // Save the contents to our strings vertexCode = vertexStream.str(); fragmentCode = fragmentStream.str(); + + // Fix encoding issues, specifically for Linux + vertexCode.erase(std::remove(vertexCode.begin(), vertexCode.end(), '\r'), vertexCode.end()); + fragmentCode.erase(std::remove(fragmentCode.begin(), fragmentCode.end(), '\r'), fragmentCode.end()); } catch (std::ifstream::failure& e) {