diff options
author | LaG1924 <12997935+LaG1924@users.noreply.github.com> | 2017-05-26 16:11:17 +0200 |
---|---|---|
committer | LaG1924 <12997935+LaG1924@users.noreply.github.com> | 2017-05-26 16:11:17 +0200 |
commit | 8ac4fe6d5ba5091923c7fdf1fa88724d827706fa (patch) | |
tree | a4ce203f671f9b8311d09dd36f1f80ae65799a56 /src/graphics/Display.cpp | |
parent | 2017-05-21 (diff) | |
download | AltCraft-8ac4fe6d5ba5091923c7fdf1fa88724d827706fa.tar AltCraft-8ac4fe6d5ba5091923c7fdf1fa88724d827706fa.tar.gz AltCraft-8ac4fe6d5ba5091923c7fdf1fa88724d827706fa.tar.bz2 AltCraft-8ac4fe6d5ba5091923c7fdf1fa88724d827706fa.tar.lz AltCraft-8ac4fe6d5ba5091923c7fdf1fa88724d827706fa.tar.xz AltCraft-8ac4fe6d5ba5091923c7fdf1fa88724d827706fa.tar.zst AltCraft-8ac4fe6d5ba5091923c7fdf1fa88724d827706fa.zip |
Diffstat (limited to '')
-rw-r--r-- | src/graphics/Display.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/graphics/Display.cpp b/src/graphics/Display.cpp index 1a44fbc..63498fa 100644 --- a/src/graphics/Display.cpp +++ b/src/graphics/Display.cpp @@ -1,6 +1,6 @@ #include <iomanip> #include "Display.hpp" -#include "AssetManager.hpp" +#include "AssetManager_old.hpp" /*GLfloat vertices[] = { -0.5f, -0.5f, -0.5f, 0.0f, 0.0f, @@ -329,10 +329,10 @@ void Display::MainLoop() { glUniformMatrix4fv(modelLoc, 1, GL_FALSE, glm::value_ptr(model)); glUniform1i(blockLoc, block.id); - std::string textureName = AssetManager::GetAssetNameByBlockId(block.id); + std::string textureName = AssetManager_old::GetAssetNameByBlockId(block.id); if (textureName.find("air") != std::string::npos) continue; - Texture &texture1 = *(AssetManager::GetAsset(textureName).data.texture); + Texture &texture1 = *(AssetManager_old::GetAsset(textureName).data.texture); glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, texture1.texture); |