From f3e01e3a318fea8d7065468df09e32c1765bfef8 Mon Sep 17 00:00:00 2001
From: LaG1924 <12997935+LaG1924@users.noreply.github.com>
Date: Sun, 5 Aug 2018 18:21:42 +0500
Subject: Refactored AssetManager

---
 src/Render.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/Render.cpp')

diff --git a/src/Render.cpp b/src/Render.cpp
index 88fe2cc..314840d 100644
--- a/src/Render.cpp
+++ b/src/Render.cpp
@@ -22,6 +22,8 @@ Render::Render(unsigned int windowWidth, unsigned int windowHeight,
     glCheckError();
     InitGlew();
     glCheckError();
+	AssetManager::InitAssetManager();
+	glCheckError();
     PrepareToRendering();
     glCheckError();
 
@@ -93,7 +95,7 @@ void Render::InitGlew() {
 void Render::PrepareToRendering() {
     //TextureAtlas texture
 	glActiveTexture(GL_TEXTURE0);
-	glBindTexture(GL_TEXTURE_2D_ARRAY, AssetManager::Instance().GetTextureAtlasId());
+	glBindTexture(GL_TEXTURE_2D_ARRAY, AssetManager::GetTextureAtlasId());
 
     ImGui_ImplSdlGL3_Init(window);
 }
@@ -421,7 +423,7 @@ void Render::RenderGui() {
         case State::Inventory: {
             auto renderSlot = [](const SlotDataType &slot, int i) -> bool {
                 return ImGui::Button(((slot.BlockId == -1 ? "  ##" :
-                    AssetManager::Instance().GetAssetNameByBlockId(BlockId{ (unsigned short)slot.BlockId,0 }) + " x" + std::to_string(slot.ItemCount) + "##")
+                    AssetManager::GetAssetNameByBlockId(BlockId{ (unsigned short)slot.BlockId,0 }) + " x" + std::to_string(slot.ItemCount) + "##")
                     + std::to_string(i)).c_str());
             };
             ImGui::SetNextWindowPosCenter();
-- 
cgit v1.2.3