aboutsummaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorYann Herklotz <ymherklotz@gmail.com>2017-12-25 13:54:09 +0000
committerYann Herklotz <ymherklotz@gmail.com>2017-12-25 13:54:09 +0000
commitf949692714e72a0e2d45ebb6a5d698424ab71dee (patch)
treecfab638d8c4d35c297e981773cfee1a9af3490ee /examples
parent022a4bdd81332ce67d799be6a06afb42ae45ac2e (diff)
downloadYAGE-f949692714e72a0e2d45ebb6a5d698424ab71dee.tar.gz
YAGE-f949692714e72a0e2d45ebb6a5d698424ab71dee.zip
[Broken] Reorganising and fixing.
Diffstat (limited to 'examples')
-rw-r--r--examples/simplegame/main.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/examples/simplegame/main.cpp b/examples/simplegame/main.cpp
index 06200661..9fba20eb 100644
--- a/examples/simplegame/main.cpp
+++ b/examples/simplegame/main.cpp
@@ -22,8 +22,9 @@ int main()
window.create("Simple Game", 800, 640);
SpriteBatch sp;
- textureProgram.compileShadersFromFile("examples/resources/textureshader.vert",
- "examples/resources/textureshader.frag");
+ textureProgram.compileShadersFromFile(
+ "examples/resources/textureshader.vert",
+ "examples/resources/textureshader.frag");
textureProgram.linkShaders();
Texture fountain = ResourceManager::getTexture(
@@ -52,7 +53,8 @@ int main()
glActiveTexture(GL_TEXTURE0);
- GLint texture_location = textureProgram.getUniformLocation("texture_sampler");
+ GLint texture_location =
+ textureProgram.getUniformLocation("texture_sampler");
glUniform1i(texture_location, 0);
sp.draw({0.f, 0.f, 64.f, 64.f}, {0, 0, 1, 1}, texture.id,