diff options
author | LaG1924 <12997935+LaG1924@users.noreply.github.com> | 2018-08-05 15:21:42 +0200 |
---|---|---|
committer | LaG1924 <12997935+LaG1924@users.noreply.github.com> | 2018-08-05 15:21:42 +0200 |
commit | f3e01e3a318fea8d7065468df09e32c1765bfef8 (patch) | |
tree | 8840f61192ba65b92912405940f948755305af2e /src/RendererWorld.cpp | |
parent | Removed previous implementation of texture atlas (diff) | |
download | AltCraft-f3e01e3a318fea8d7065468df09e32c1765bfef8.tar AltCraft-f3e01e3a318fea8d7065468df09e32c1765bfef8.tar.gz AltCraft-f3e01e3a318fea8d7065468df09e32c1765bfef8.tar.bz2 AltCraft-f3e01e3a318fea8d7065468df09e32c1765bfef8.tar.lz AltCraft-f3e01e3a318fea8d7065468df09e32c1765bfef8.tar.xz AltCraft-f3e01e3a318fea8d7065468df09e32c1765bfef8.tar.zst AltCraft-f3e01e3a318fea8d7065468df09e32c1765bfef8.zip |
Diffstat (limited to '')
-rw-r--r-- | src/RendererWorld.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/RendererWorld.cpp b/src/RendererWorld.cpp index ed4a4a3..d4586f5 100644 --- a/src/RendererWorld.cpp +++ b/src/RendererWorld.cpp @@ -427,10 +427,10 @@ void RendererWorld::PrepareRender() { skyShader = new Shader("./shaders/sky.vs", "./shaders/sky.fs"); skyShader->Use(); glUniform1i(glGetUniformLocation(skyShader->Program, "textureAtlas"), 0); - TextureCoord sunTexture = AssetManager::Instance().GetTexture("/minecraft/textures/environment/sun"); + TextureCoord sunTexture = AssetManager::GetTexture("/minecraft/textures/environment/sun"); glUniform4f(glGetUniformLocation(skyShader->Program, "sunTexture"), sunTexture.x, sunTexture.y, sunTexture.w, sunTexture.h); glUniform1f(glGetUniformLocation(skyShader->Program, "sunTextureLayer"), sunTexture.layer); - TextureCoord moonTexture = AssetManager::Instance().GetTexture("/minecraft/textures/environment/moon_phases"); + TextureCoord moonTexture = AssetManager::GetTexture("/minecraft/textures/environment/moon_phases"); moonTexture.w /= 4.0f; //First phase will be fine for now moonTexture.h /= 2.0f; glUniform4f(glGetUniformLocation(skyShader->Program, "moonTexture"), moonTexture.x, moonTexture.y, moonTexture.w, moonTexture.h); |