From b7c9658ac332e00678258822ff7a5ccc974ff578 Mon Sep 17 00:00:00 2001 From: Quentin Bazin Date: Thu, 3 Jun 2021 20:01:45 +0200 Subject: [PATCH] [ChunkMeshBuilder] Small optimisation for getBlockState. --- source/client/world/ChunkMeshBuilder.hpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/source/client/world/ChunkMeshBuilder.hpp b/source/client/world/ChunkMeshBuilder.hpp index 5ebbe21f..56ba693a 100644 --- a/source/client/world/ChunkMeshBuilder.hpp +++ b/source/client/world/ChunkMeshBuilder.hpp @@ -64,16 +64,18 @@ struct ChunkData { } s8 getTorchlight(s8f x, s8f y, s8f z) const { - auto torchlight = lightData[z + 1][y + 1][x + 1]; - return torchlight ? torchlight.value() & 0xf : -1; + auto light = lightData[z + 1][y + 1][x + 1]; + return light ? light.value() & 0xf : -1; } s8 getSunlight(s8f x, s8f y, s8f z) const { - auto sunlight = lightData[z + 1][y + 1][x + 1]; - return sunlight ? (sunlight.value() >> 4) & 0xf : -1; + auto light = lightData[z + 1][y + 1][x + 1]; + return light ? (light.value() >> 4) & 0xf : -1; } const BlockState *getBlockState(s8f x, s8f y, s8f z) const { + if (!lightData[z + 1][y + 1][x + 1]) return nullptr; + u16 blockID = getBlockID(x, y, z); u16 blockParam = getBlockParam(x, y, z);