diff options
author | LaG1924 <12997935+LaG1924@users.noreply.github.com> | 2022-12-15 16:41:06 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-15 16:41:06 +0100 |
commit | d2b2f223cc62a1cc6e9d41d32020ef94d229a581 (patch) | |
tree | de0685c59a55557893d8d6d64bad01e9c98d206a /src/Block.cpp | |
parent | Merge pull request #82 from LaG1924/fix/sdl-wayland-build (diff) | |
parent | Added liquid rendering pass (diff) | |
download | AltCraft-d2b2f223cc62a1cc6e9d41d32020ef94d229a581.tar AltCraft-d2b2f223cc62a1cc6e9d41d32020ef94d229a581.tar.gz AltCraft-d2b2f223cc62a1cc6e9d41d32020ef94d229a581.tar.bz2 AltCraft-d2b2f223cc62a1cc6e9d41d32020ef94d229a581.tar.lz AltCraft-d2b2f223cc62a1cc6e9d41d32020ef94d229a581.tar.xz AltCraft-d2b2f223cc62a1cc6e9d41d32020ef94d229a581.tar.zst AltCraft-d2b2f223cc62a1cc6e9d41d32020ef94d229a581.zip |
Diffstat (limited to '')
-rw-r--r-- | src/Block.cpp | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/src/Block.cpp b/src/Block.cpp index 85870f6..8af5a4b 100644 --- a/src/Block.cpp +++ b/src/Block.cpp @@ -1,25 +1,29 @@ #include "Block.hpp" #include <map> -#include <vector> -#include "Plugin.hpp" +static std::map<BlockId, BlockInfo> blocks; +static std::map<BlockId, LiquidInfo> liquids; -static std::vector<BlockInfo> blocks; -static std::map<BlockId, size_t> staticBlockInfo; - -BlockInfo WTFBlock{ true, "", "" }; +static BlockInfo UnknownBlock{ true, "", "" }; +static LiquidInfo UnknownLiquid{ "", "" }; void RegisterStaticBlockInfo(BlockId blockId, BlockInfo blockInfo) { - //NOTE: It can be made thread-safe by using atomic incrementer - staticBlockInfo[blockId] = blocks.size(); - blocks.push_back(blockInfo); + blocks.emplace(blockId, blockInfo); +} + +void RegisterStaticLiquidInfo(BlockId blockId, LiquidInfo liquidInfo) { + liquids[blockId] = liquidInfo; + for (uint8_t i = 0; i < 16; i++) + blocks.emplace(BlockId{ blockId.id, i }, BlockInfo{ true, "@liquid", liquidInfo.stillTexture }); } BlockInfo* GetBlockInfo(BlockId blockId) { - auto it = staticBlockInfo.find(blockId); - if (it != staticBlockInfo.end()) - return &blocks.data()[it->second]; - else - return &WTFBlock; + auto it = blocks.find(blockId); + return it != blocks.end() ? &it->second : &UnknownBlock; +} + +const LiquidInfo& GetBlockLiquidInfo(BlockId blockId) { + auto it = liquids.find(blockId); + return it != liquids.end() ? it->second : UnknownLiquid; } |