From c0b81150298ce9f2f21da42f26a57fe59a93bb77 Mon Sep 17 00:00:00 2001 From: LaG1924 <12997935+LaG1924@users.noreply.github.com> Date: Sun, 5 Aug 2018 04:40:01 +0500 Subject: Replaced usage of old texture atlas --- src/AssetManager.hpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/AssetManager.hpp') diff --git a/src/AssetManager.hpp b/src/AssetManager.hpp index 1b64215..0663f48 100644 --- a/src/AssetManager.hpp +++ b/src/AssetManager.hpp @@ -132,6 +132,7 @@ struct BlockModel { ElementData::FaceDirection visibility; glm::mat4 transform; glm::vec4 texture; + float layer; glm::vec3 color; }; @@ -204,7 +205,11 @@ public: template T *GetAsset(const std::string &assetName) { - AssetTreeNode *node = GetAssetByAssetName(assetName); + AssetTreeNode *node; + if (assetName[0] != '/') + node = GetAssetByAssetName('/'+assetName); + else + node = GetAssetByAssetName(assetName); if (!node) return nullptr; return dynamic_cast(node->asset.get()); -- cgit v1.2.3