add 'graphics.chunk-max-vertices', 'graphics.chunk-max-renderers' settings
This commit is contained in:
parent
a65cf6ed66
commit
e750d90ff4
@ -70,6 +70,8 @@ SettingsHandler::SettingsHandler(EngineSettings& settings) {
|
||||
builder.add("gamma", &settings.graphics.gamma);
|
||||
builder.add("frustum-culling", &settings.graphics.frustumCulling);
|
||||
builder.add("skybox-resolution", &settings.graphics.skyboxResolution);
|
||||
builder.add("chunk-max-vertices", &settings.graphics.chunkMaxVertices);
|
||||
builder.add("chunk-max-renderers", &settings.graphics.chunkMaxRenderers);
|
||||
|
||||
builder.section("ui");
|
||||
builder.add("language", &settings.ui.language);
|
||||
|
||||
@ -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),
|
||||
|
||||
@ -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";
|
||||
}
|
||||
|
||||
@ -64,6 +64,8 @@ struct GraphicsSettings {
|
||||
/// @brief Enable chunks frustum culling
|
||||
FlagSetting frustumCulling {true};
|
||||
IntegerSetting skyboxResolution {64 + 32, 64, 128};
|
||||
IntegerSetting chunkMaxVertices {1'000'000, 0, 4'000'000};
|
||||
IntegerSetting chunkMaxRenderers {0, -4, 32};
|
||||
};
|
||||
|
||||
struct DebugSettings {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user