benkyd/minceraft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed skylight propagation from world generation code

Browse Source
This commit is contained in:
CobaltXII
2018-12-31 16:53:41 -05:00
parent 4350a6a3ae
commit 823ad956a6
1 changed files with 2 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
src/inc/generator.hpp
View File

@@ -403,126 +403,7 @@ void generate_world(world* out, unsigned int seed)
}
}
// For each vertical strip of land, start with a lighting value of 15. Go
// downwards, if the block is air, stay at light level 15. If not, set
// everything below it to 0.
// Propagate skylight.
for (int x = 0; x < out->x_res; x++)
{
for (float z = 0; z < out->z_res; z++)
{
unsigned char natural = 15;
for (int y = 0; y < out->y_res; y++)
{
out->set_natural(x, y, z, natural);
if (out->get_id(x, y, z) != id_air)
{
natural = 0;
}
}
}
}
// All blocks that are of light level 0 that have one or more neighbors
// that have a light level of 15 are added to the light_queue.
std::vector<std::tuple<unsigned int, unsigned int, unsigned int>> light_queue;
for (unsigned int x = 0; x < out->x_res; x++)
for (unsigned int y = 0; y < out->y_res; y++)
for (unsigned int z = 0; z < out->z_res; z++)
{
if (out->get_natural(x, y, z) == 0)
{
if
(
out->get_natural_safe(x + 1, y, z) == 15 ||
out->get_natural_safe(x - 1, y, z) == 15 ||
out->get_natural_safe(x, y + 1, z) == 15 ||
out->get_natural_safe(x, y - 1, z) == 15 ||
out->get_natural_safe(x, y, z + 1) == 15 ||
out->get_natural_safe(x, y, z - 1) == 15
)
{
out->set_natural(x, y, z, 14);
light_queue.push_back(std::tuple<unsigned int, unsigned int, unsigned int>(x, y, z));
}
}
}
// Pop the top off of the queue. We'll call this the 'current block'.
// Check it's six neighbors, if any of them have a light value less than
// the current block's light value minus one, set that neighbors light
// value to the current block's light value minus one, and add that
// neighbor to the queue. Keep doing this until the queue is empty.
while (light_queue.size() > 0)
{
int x = std::get<0>(light_queue[light_queue.size() - 1]);
int y = std::get<1>(light_queue[light_queue.size() - 1]);
int z = std::get<2>(light_queue[light_queue.size() - 1]);
light_queue.pop_back();
unsigned char current_value = out->get_natural(x, y, z);
// Right neighbor.
if (out->in_bounds(x + 1, y, z) && out->get_natural(x + 1, y, z) < current_value - 1)
{
out->set_natural(x + 1, y, z, current_value - 1);
light_queue.push_back(std::tuple<unsigned int, unsigned int, unsigned int>(x + 1, y, z));
}
// Left neighbor.
if (out->in_bounds(x - 1, y, z) && out->get_natural(x - 1, y, z) < current_value - 1)
{
out->set_natural(x - 1, y, z, current_value - 1);
light_queue.push_back(std::tuple<unsigned int, unsigned int, unsigned int>(x - 1, y, z));
}
// Bottom neighbor.
if (out->in_bounds(x, y + 1, z) && out->get_natural(x, y + 1, z) < current_value - 1)
{
out->set_natural(x, y + 1, z, current_value - 1);
light_queue.push_back(std::tuple<unsigned int, unsigned int, unsigned int>(x, y + 1, z));
}
// Top neighbor.
if (out->in_bounds(x, y - 1, z) && out->get_natural(x, y - 1, z) < current_value - 1)
{
out->set_natural(x, y - 1, z, current_value - 1);
light_queue.push_back(std::tuple<unsigned int, unsigned int, unsigned int>(x, y - 1, z));
}
// Front neighbor.
if (out->in_bounds(x, y, z + 1) && out->get_natural(x, y, z + 1) < current_value - 1)
{
out->set_natural(x, y, z + 1, current_value - 1);
light_queue.push_back(std::tuple<unsigned int, unsigned int, unsigned int>(x, y, z + 1));
}
// Back neighbor.
if (out->in_bounds(x, y, z - 1) && out->get_natural(x, y, z - 1) < current_value - 1)
{
out->set_natural(x, y, z - 1, current_value - 1);
light_queue.push_back(std::tuple<unsigned int, unsigned int, unsigned int>(x, y, z - 1));
}
}
propagate_skylight(out);
}