Merge branch 'main' into heightmaps

This commit is contained in:
MihailRis 2024-10-01 23:29:40 +03:00
commit e73da1687a
5 changed files with 40 additions and 10 deletions

View file

@ -20,7 +20,7 @@ BlocksRenderer::BlocksRenderer(
const ContentGfxCache* cache,
const EngineSettings* settings
) : content(content),
vertexBuffer(std::make_unique<float[]>(capacity)),
vertexBuffer(std::make_unique<float[]>(capacity * VERTEX_SIZE)),
indexBuffer(std::make_unique<int[]>(capacity)),
vertexOffset(0),
indexOffset(0),

View file

@ -12,18 +12,17 @@
static debug::Logger logger("chunks-render");
const uint RENDERER_CAPACITY = 9 * 6 * 6 * 3000;
class RendererWorker : public util::Worker<Chunk, RendererResult> {
Level* level;
BlocksRenderer renderer;
public:
RendererWorker(
Level* level,
const ContentGfxCache* cache,
const ContentGfxCache* cache,
const EngineSettings* settings
) : level(level),
renderer(RENDERER_CAPACITY, level->content, cache, settings)
renderer(settings->graphics.chunkMaxVertices.get(),
level->content, cache, settings)
{}
RendererResult operator()(const std::shared_ptr<Chunk>& chunk) override {
@ -43,12 +42,13 @@ ChunksRenderer::ChunksRenderer(
[=](RendererResult& mesh){
meshes[mesh.key] = mesh.renderer->createMesh();
inwork.erase(mesh.key);
})
}, settings->graphics.chunkMaxRenderers.get())
{
threadPool.setStandaloneResults(false);
threadPool.setStopOnFail(false);
renderer = std::make_unique<BlocksRenderer>(
RENDERER_CAPACITY, level->content, cache, settings
settings->graphics.chunkMaxVertices.get(),
level->content, cache, settings
);
logger.info() << "created " << threadPool.getWorkersCount() << " workers";
}