mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-04 18:41:51 +00:00
fix generator area centering
This commit is contained in:
parent
639531b352
commit
568e2185dd
3 changed files with 6 additions and 7 deletions
|
|
@ -77,8 +77,8 @@ void LevelController::update(float delta, bool pause) {
|
|||
player->updateEntity();
|
||||
glm::vec3 position = player->getPosition();
|
||||
player->chunks->configure(
|
||||
position.x,
|
||||
position.z,
|
||||
glm::floor(position.x),
|
||||
glm::floor(position.z),
|
||||
settings.chunks.loadDistance.get() + settings.chunks.padding.get()
|
||||
);
|
||||
chunks->update(
|
||||
|
|
|
|||
|
|
@ -32,18 +32,18 @@ Chunks::Chunks(
|
|||
: events(events),
|
||||
indices(indices),
|
||||
areaMap(w, d) {
|
||||
areaMap.setCenter(ox-w/2, oz-d/2);
|
||||
areaMap.setCenter(ox - w / 2, oz - d / 2);
|
||||
areaMap.setOutCallback([this](int, int, const auto& chunk) {
|
||||
this->events->trigger(LevelEventType::CHUNK_HIDDEN, chunk.get());
|
||||
});
|
||||
}
|
||||
|
||||
void Chunks::configure(int32_t x, int32_t z, uint32_t radius) {
|
||||
setCenter(x, z);
|
||||
uint32_t diameter = radius * 2LL;
|
||||
if (getWidth() != diameter) {
|
||||
resize(diameter, diameter);
|
||||
}
|
||||
setCenter(x, z);
|
||||
}
|
||||
|
||||
voxel* Chunks::get(int32_t x, int32_t y, int32_t z) const {
|
||||
|
|
@ -313,7 +313,7 @@ glm::vec3 Chunks::rayCastToObstacle(
|
|||
}
|
||||
|
||||
void Chunks::setCenter(int32_t x, int32_t z) {
|
||||
areaMap.setCenter(floordiv(x, CHUNK_W), floordiv(z, CHUNK_D));
|
||||
areaMap.setCenter(floordiv<CHUNK_W>(x), floordiv<CHUNK_D>(z));
|
||||
}
|
||||
|
||||
void Chunks::resize(uint32_t newW, uint32_t newD) {
|
||||
|
|
|
|||
|
|
@ -355,8 +355,7 @@ void WorldGenerator::generateHeightmap(
|
|||
|
||||
void WorldGenerator::update(int centerX, int centerY, int loadDistance) {
|
||||
surroundMap.setCenter(centerX, centerY);
|
||||
// 2 is safety padding preventing ChunksController rounding problem
|
||||
surroundMap.resize(loadDistance + 2);
|
||||
surroundMap.resize(loadDistance);
|
||||
surroundMap.setCenter(centerX, centerY);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue