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/AssetManager_old.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/AssetManager_old.cpp (renamed from src/graphics/AssetManager.cpp) | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/graphics/AssetManager.cpp b/src/graphics/AssetManager_old.cpp index 93462c3..ef856ca 100644 --- a/src/graphics/AssetManager.cpp +++ b/src/graphics/AssetManager_old.cpp @@ -1,16 +1,16 @@ -#include "AssetManager.hpp" +#include "AssetManager_old.hpp" const std::string pathToAssets = "./assets/"; const std::string pathToObjects = pathToAssets + "objects/"; const std::string pathToIndexFile = pathToAssets + "indexes/1.11.json"; -const std::string pathToAssetsMc = "./assetsMc/"; +const std::string pathToAssetsMc = "./assets/"; const std::map<Asset::AssetType, std::string> assetTypeFileExtensions{ std::make_pair(Asset::AssetType::Texture, ".png"), std::make_pair(Asset::AssetType::Lang, ".lang"), std::make_pair(Asset::AssetType::Sound, ".ogg"), }; -AssetManager::AssetManager() { +AssetManager_old::AssetManager_old() { return; std::ifstream indexFile(pathToIndexFile); if (!indexFile) { @@ -35,17 +35,17 @@ AssetManager::AssetManager() { } } -AssetManager::~AssetManager() { +AssetManager_old::~AssetManager_old() { } -Asset &AssetManager::GetAsset(std::string AssetName) { +Asset &AssetManager_old::GetAsset(std::string AssetName) { if (instance().assets.find(AssetName) == instance().assets.end() || !instance().assets[AssetName].isParsed()) LoadAsset(AssetName); return instance().assets[AssetName]; } -void AssetManager::LoadAsset(std::string AssetName) { +void AssetManager_old::LoadAsset(std::string AssetName) { if (instance().assets.find(AssetName) != instance().assets.end() && instance().assets[AssetName].isParsed()) return; std::string AssetFileName = GetPathToAsset(AssetName); @@ -58,7 +58,7 @@ void AssetManager::LoadAsset(std::string AssetName) { } } -std::string AssetManager::GetPathToAsset(std::string AssetName) { +std::string AssetManager_old::GetPathToAsset(std::string AssetName) { if (instance().assets.find(AssetName) != instance().assets.end()){ auto it = instance().assets.find(AssetName); return pathToObjects + std::string(instance().assets[AssetName].hash.c_str(), 2) + "/" + @@ -73,7 +73,7 @@ std::string AssetManager::GetPathToAsset(std::string AssetName) { assetTypeFileExtensions.at(instance().assets[AssetName].type); } -std::string AssetManager::GetAssetNameByBlockId(unsigned short id) { +std::string AssetManager_old::GetAssetNameByBlockId(unsigned short id) { std::string assetBase = "minecraft/textures/blocks/"; std::string textureName; switch (id){ |