voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-06 03:21:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

debug::Logger

Browse source
This commit is contained in:
MihailRis 2024-04-04 18:19:19 +03:00
parent f298d6ef1d
commit 0c411cf227
16 changed files with 233 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/graphics/render/ChunksRenderer.cpp
View file

@ -1,5 +1,6 @@
#include "ChunksRenderer.h"
#include "../../debug/Logger.h"
#include "../../graphics/core/Mesh.h"
#include "BlocksRenderer.h"
#include "../../voxels/Chunk.h"
@ -9,6 +10,8 @@
#include <glm/glm.hpp>
#include <glm/ext.hpp>
static debug::Logger logger("chunks-render");
ChunksRenderer::ChunksRenderer(Level* level, const ContentGfxCache* cache, const EngineSettings& settings)
: level(level), cache(cache), settings(settings) {
const int MAX_FULL_CUBES = 3000;
@ -21,7 +24,7 @@ ChunksRenderer::ChunksRenderer(Level* level, const ContentGfxCache* cache, const
threads.emplace_back(&ChunksRenderer::threadLoop, this, i);
workersBlocked.emplace_back();
}
std::cout << "created " << num_threads << " chunks rendering threads" << std::endl;
logger.info() << "created " << num_threads << " rendering threads";
}
ChunksRenderer::~ChunksRenderer() {
@ -32,7 +35,7 @@ ChunksRenderer::~ChunksRenderer() {
resultsMutex.lock();
while (!results.empty()) {
mesh_entry entry = results.front();
Result entry = results.front();
results.pop();
entry.locked = false;
entry.variable.notify_all();
@ -70,7 +73,7 @@ void ChunksRenderer::threadLoop(int index) {
process(chunk, renderer);
{
resultsMutex.lock();
results.push(mesh_entry {renderer, variable, index, locked, glm::ivec2(chunk->x, chunk->z)});
results.push(Result {variable, index, locked, {renderer, glm::ivec2(chunk->x, chunk->z)}});
locked = true;
resultsMutex.unlock();
}
@ -139,10 +142,11 @@ std::shared_ptr<Mesh> ChunksRenderer::get(Chunk* chunk) {
void ChunksRenderer::update() {
resultsMutex.lock();
while (!results.empty()) {
mesh_entry entry = results.front();
Result entry = results.front();
mesh_entry mesh = entry.entry;
results.pop();
meshes[entry.key] = std::shared_ptr<Mesh>(entry.renderer.createMesh());
inwork.erase(entry.key);
meshes[mesh.key] = std::shared_ptr<Mesh>(mesh.renderer.createMesh());
inwork.erase(mesh.key);
entry.locked = false;
entry.variable.notify_all();
}

8
src/graphics/render/ChunksRenderer.h
View file

@ -22,10 +22,14 @@ class ContentGfxCache;
struct mesh_entry {
BlocksRenderer& renderer;
glm::ivec2 key;
};
struct Result {
std::condition_variable& variable;
int workerIndex;
bool& locked;
glm::ivec2 key;
mesh_entry entry;
};
class ChunksRenderer {
@ -35,7 +39,7 @@ class ChunksRenderer {
std::unordered_map<glm::ivec2, bool> inwork;
std::vector<std::thread> threads;
std::queue<mesh_entry> results;
std::queue<Result> results;
std::mutex resultsMutex;
std::queue<std::shared_ptr<Chunk>> jobs;