summaryrefslogtreecommitdiffstats
path: root/src/Render.cpp
diff options
context:
space:
mode:
authorLaG1924 <12997935+LaG1924@users.noreply.github.com>2018-08-05 01:40:01 +0200
committerLaG1924 <12997935+LaG1924@users.noreply.github.com>2018-08-05 01:40:01 +0200
commitc0b81150298ce9f2f21da42f26a57fe59a93bb77 (patch)
tree15304e4c36093a5beb524e67c976a241c5c556f3 /src/Render.cpp
parentImplemented texture atlas (diff)
downloadAltCraft-c0b81150298ce9f2f21da42f26a57fe59a93bb77.tar
AltCraft-c0b81150298ce9f2f21da42f26a57fe59a93bb77.tar.gz
AltCraft-c0b81150298ce9f2f21da42f26a57fe59a93bb77.tar.bz2
AltCraft-c0b81150298ce9f2f21da42f26a57fe59a93bb77.tar.lz
AltCraft-c0b81150298ce9f2f21da42f26a57fe59a93bb77.tar.xz
AltCraft-c0b81150298ce9f2f21da42f26a57fe59a93bb77.tar.zst
AltCraft-c0b81150298ce9f2f21da42f26a57fe59a93bb77.zip
Diffstat (limited to '')
-rw-r--r--src/Render.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Render.cpp b/src/Render.cpp
index ba8d0ed..1bd5273 100644
--- a/src/Render.cpp
+++ b/src/Render.cpp
@@ -92,8 +92,8 @@ void Render::InitGlew() {
void Render::PrepareToRendering() {
//TextureAtlas texture
- glActiveTexture(GL_TEXTURE0);
- glBindTexture(GL_TEXTURE_2D, AssetManager::Instance().GetTextureAtlas());
+ glActiveTexture(GL_TEXTURE0);
+ glBindTexture(GL_TEXTURE_2D_ARRAY, AssetManager::Instance().GetTextureAtlasId());
AssetManager::Instance().GetTextureAtlasIndexes();
ImGui_ImplSdlGL3_Init(window);