tarion/Engine2026
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Claire Schwarzer 2026-02-03 05:24:35 +01:00
commit ccc1c76762
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
assets/shaders/basicVertex.vert
View file

@ -1,4 +1,4 @@
#version 330 core #version 330 core
layout (location = 0) in vec3 aPos; layout (location = 0) in vec3 aPos;
layout (location = 1) in vec3 aColor; layout (location = 1) in vec3 aColor;
layout (location = 2) in vec2 aTexCoord; layout (location = 2) in vec2 aTexCoord;

4
engine/shader.h
View file

@ -42,6 +42,10 @@ public:
// Save the contents to our strings // Save the contents to our strings
vertexCode = vertexStream.str(); vertexCode = vertexStream.str();
fragmentCode = fragmentStream.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) catch (std::ifstream::failure& e)
{ {