diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2015-02-02 00:26:09 +0100 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2015-02-02 00:26:09 +0100 |
| commit | 843b3abde6e338d252950438acf9d5bd734921f2 (patch) | |
| tree | 5a7b7767b6fd0c91806b857b6bddf8a578d5f6d9 /src/World/Block.cpp | |
| parent | 9b1d92387dd83e7340c7ee5f06dbad0a971981b0 (diff) | |
| download | MinedMap-843b3abde6e338d252950438acf9d5bd734921f2.tar MinedMap-843b3abde6e338d252950438acf9d5bd734921f2.zip | |
Extend colors by metadata
Diffstat (limited to 'src/World/Block.cpp')
| -rw-r--r-- | src/World/Block.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/World/Block.cpp b/src/World/Block.cpp index ae6c9cd..6bd6a00 100644 --- a/src/World/Block.cpp +++ b/src/World/Block.cpp @@ -38,9 +38,11 @@ uint32_t Block::getColor() const { if (!t.opaque) return 0; - unsigned r = uint8_t(t.color >> 16); - unsigned g = uint8_t(t.color >> 8); - unsigned b = uint8_t(t.color); + uint32_t color = t.colors[data]; + + unsigned r = uint8_t(color >> 16); + unsigned g = uint8_t(color >> 8); + unsigned b = uint8_t(color); uint8_t light = (blockLight > skyLight) ? blockLight : skyLight; |