From 75a9c87b50cef2f1d749bd9042a9348bc28b4c09 Mon Sep 17 00:00:00 2001 From: Mel Date: Sun, 23 Oct 2022 02:48:51 +0200 Subject: Sun lighting --- src/World/Chunk.cpp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'src/World/Chunk.cpp') diff --git a/src/World/Chunk.cpp b/src/World/Chunk.cpp index d02e5e5..ee408ae 100644 --- a/src/World/Chunk.cpp +++ b/src/World/Chunk.cpp @@ -9,6 +9,7 @@ void Chunk::set(uint32_t x, uint32_t y, uint32_t z, BlockType type) { GFX::Mesh Chunk::mesh() { std::vector> positions{}; + std::vector> normals{}; std::vector> tex_coords{}; std::vector indices{}; @@ -25,8 +26,9 @@ GFX::Mesh Chunk::mesh() { continue; } - auto side_tex_coords = Chunk::face_tex_coords(type, side); auto side_positions = side.face(); + auto side_normals = Chunk::face_normals(side); + auto side_tex_coords = Chunk::face_tex_coords(type, side); for (auto& position : side_positions) { position = position + Vector<3>{static_cast(x), static_cast(y), static_cast(z)}; @@ -35,6 +37,7 @@ GFX::Mesh Chunk::mesh() { uint32_t s = positions.size(); positions.insert(positions.end(), side_positions.begin(), side_positions.end()); + normals.insert(normals.end(), side_normals.begin(), side_normals.end()); tex_coords.insert(tex_coords.end(), side_tex_coords.begin(), side_tex_coords.end()); indices.insert(indices.end(), {s, s + 1, s + 3, s + 1, s + 2, s + 3}); } @@ -42,7 +45,7 @@ GFX::Mesh Chunk::mesh() { } } - return {positions, tex_coords, indices}; + return {positions, normals, tex_coords, indices}; } Vector<3> Chunk::position() { @@ -121,4 +124,16 @@ std::array, 4> Chunk::face_tex_coords(BlockType type, BlockSide side) } } +std::array, 4> Chunk::face_normals(BlockSide side) { + auto is_side = [=](BlockSide s) -> float { return s == side; }; + + Vector<3> normal = { + is_side(BlockSide::Right) - is_side(BlockSide::Left), + is_side(BlockSide::Top) - is_side(BlockSide::Bottom), + is_side(BlockSide::Front) - is_side(BlockSide::Back), + }; + + return {normal, normal, normal, normal}; +} + } -- cgit 1.4.1