Quent42340/OpenMiner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Chunk meshing is no longer limited by framerate.

Browse Source
This commit is contained in:
Quentin Bazin 2021-06-01 14:58:20 +02:00
parent 33847538ba
commit 9c4199bcb7
3 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/client/world/ChunkMeshBuilder.cpp
View File

@ -411,6 +411,7 @@ inline u8 ChunkMeshBuilder::getLightForVertex(Light light, s8f x, s8f y, s8f z,
// return chunk->isInitialized() ? chunk->lightmap().getSunlight(x, y, z) : -1;
// else
// return chunk->isInitialized() ? chunk->lightmap().getTorchlight(x, y, z) : -1;
// FIXME
return (light == Light::Sun)
? chunk.getSunlight(x, y, z)

28
source/client/world/ClientWorld.cpp
View File

@ -70,22 +70,16 @@ void ClientWorld::update(bool allowWorldReload) {
}
}
requestClosestChunkMeshing();
requestChunkMeshing();
m_scene.update();
m_chunkMeshBuilder.update();
}
void ClientWorld::requestClosestChunkMeshing() {
s32 ux = m_closestInitializedChunk.x;
s32 uy = m_closestInitializedChunk.y;
s32 uz = m_closestInitializedChunk.z;
float ud = m_closestInitializedChunk.w;
// If we have a chunk marked for initialization
if (ud < 1000000.0) {
ClientChunk *chunk = (ClientChunk *)getChunk(ux, uy, uz);
void ClientWorld::requestChunkMeshing() {
for (auto &[d, chunkPos] : m_chunksToMesh) {
ClientChunk *chunk = (ClientChunk *)getChunk(chunkPos.x, chunkPos.y, chunkPos.z);
if(chunk && !chunk->isReadyForMeshing() && chunk->areAllNeighboursInitialized()) {
chunk->setReadyForMeshing(true);
chunk->setChanged();
@ -94,6 +88,8 @@ void ClientWorld::requestClosestChunkMeshing() {
// gkDebug() << "Chunk at" << ux << uy << uz << "is ready for meshing";
}
}
m_chunksToMesh.clear();
}
void ClientWorld::checkPlayerChunk(double playerX, double playerY, double playerZ) {
@ -276,8 +272,6 @@ void ClientWorld::draw(gk::RenderTarget &target, gk::RenderStates states) const
gk::Shader::bind(nullptr);
m_closestInitializedChunk = gk::Vector4f{0, 0, 0, 1000000};
// Changing the values sent to the GPU to double precision is suicidal,
// performance wise, if possible at all. Therefore we want to keep the
// GL rendering numbers in single precision format. But that introduces
@ -347,15 +341,9 @@ void ClientWorld::draw(gk::RenderTarget &target, gk::RenderStates states) const
//continue;
}
// If this chunk is not initialized, skip it
// If this chunk is not initialized, skip it and request meshing
if(!it.second->isReadyForMeshing()) {
// But if it is the closest to the camera, mark it for initialization
if(d < m_closestInitializedChunk.w) {
m_closestInitializedChunk.w = d;
m_closestInitializedChunk.x = it.second->x();
m_closestInitializedChunk.y = it.second->y();
m_closestInitializedChunk.z = it.second->z();
}
m_chunksToMesh.emplace(d, gk::Vector3i{it.second->x(), it.second->y(), it.second->z()});
continue;
}

5
source/client/world/ClientWorld.hpp
View File

@ -51,7 +51,7 @@ class ClientWorld : public World, public gk::Drawable {
ClientWorld();
void update(bool allowWorldReload);
void requestClosestChunkMeshing();
void requestChunkMeshing();
void checkPlayerChunk(double playerX, double playerY, double playerZ);
void clear();
@ -95,11 +95,10 @@ class ClientWorld : public World, public gk::Drawable {
gk::Camera *m_camera = nullptr;
gk::EventHandler *m_eventHandler = nullptr;
mutable gk::Vector4d m_closestInitializedChunk{0, 0, 0, 1000000};
const Sky *m_sky = nullptr;
mutable std::set<gk::Vector3i> m_chunksToRemove;
mutable std::multimap<float, gk::Vector3i> m_chunksToMesh;
ChunkMeshBuilder m_chunkMeshBuilder{*this};
};