diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2017-08-19 13:01:01 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2017-08-19 13:01:01 +0200 |
| commit | b04e1cb0566ae90cb8fea259db0ca65dd3176d93 (patch) | |
| tree | c1f46ec218ec498222817d18dce93a61054f993b /src/World/Block.cpp | |
| parent | 292f4f4f3bdc650e452652e76be03d39afec4036 (diff) | |
| download | MinedMap-b04e1cb0566ae90cb8fea259db0ca65dd3176d93.tar MinedMap-b04e1cb0566ae90cb8fea259db0ca65dd3176d93.zip | |
BlockType: allow specifying visible and green value per damage value
Diffstat (limited to 'src/World/Block.cpp')
| -rw-r--r-- | src/World/Block.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/World/Block.cpp b/src/World/Block.cpp index 3c295d4..c47e2bc 100644 --- a/src/World/Block.cpp +++ b/src/World/Block.cpp @@ -33,16 +33,14 @@ namespace MinedMap { namespace World { uint32_t Block::getColor() const { - const Resource::BlockType &t = Resource::BLOCK_TYPES[id]; + const Resource::BlockType &t = Resource::BLOCK_TYPES[id][data]; if (!t.opaque) return 0; - uint32_t color = t.colors[data]; - - unsigned r = uint8_t(color >> 16); - unsigned g = uint8_t(color >> 8); - unsigned b = uint8_t(color); + unsigned r = uint8_t(t.color >> 16); + unsigned g = uint8_t(t.color >> 8); + unsigned b = uint8_t(t.color); float heightCoef = height/255.0f + 0.5f; |