summaryrefslogtreecommitdiff
path: root/src/World
diff options
context:
space:
mode:
authorMel <einebeere@gmail.com>2022-10-23 02:48:51 +0200
committerMel <einebeere@gmail.com>2022-10-23 02:48:51 +0200
commit75a9c87b50cef2f1d749bd9042a9348bc28b4c09 (patch)
tree8d82f3cbbb5bdc63c7e5b6431dac3d49b23a478d /src/World
parent589bfb5cad0052856077ce867f3858ca3741d95d (diff)
downloadmeowcraft-75a9c87b50cef2f1d749bd9042a9348bc28b4c09.tar.zst
meowcraft-75a9c87b50cef2f1d749bd9042a9348bc28b4c09.zip
Sun lighting
Diffstat (limited to 'src/World')
-rw-r--r--src/World/Chunk.cpp19
-rw-r--r--src/World/Chunk.hpp1
2 files changed, 18 insertions, 2 deletions
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<Vector<3>> positions{};
+ std::vector<Vector<3>> normals{};
std::vector<Vector<2>> tex_coords{};
std::vector<uint32_t> 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<float>(x), static_cast<float>(y), static_cast<float>(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<Vector<2>, 4> Chunk::face_tex_coords(BlockType type, BlockSide side)
}
}
+std::array<Vector<3>, 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};
+}
+
}
diff --git a/src/World/Chunk.hpp b/src/World/Chunk.hpp
index 4c7810d..7415d7c 100644
--- a/src/World/Chunk.hpp
+++ b/src/World/Chunk.hpp
@@ -25,6 +25,7 @@ private:
bool is_face_visible(uint32_t x, uint32_t y, uint32_t z, BlockSide side);
static std::array<Vector<2>, 4> face_tex_coords(BlockType type, BlockSide side);
+ static std::array<Vector<3>, 4> face_normals(BlockSide side);
struct BlockData {
BlockType type;