oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-09-30 19:22:14 +00:00
Code Wiki Activity

Replace some raw pointers by unique_ptr (#16304)

Browse source
This commit is contained in:
Lucas OH 2025-08-06 23:17:34 +02:00 • committed by GitHub
parent c611a1f9e8
commit ecc876045f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 56 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/client/render/factory.cpp
View file

@ -4,6 +4,7 @@
// Copyright (C) 2017 numzero, Lobachevskiy Vitaliy <numzer0@yandex.ru>
#include "factory.h"
#include "log.h"
#include "plain.h"
#include "anaglyph.h"
@ -12,11 +13,13 @@
#include "secondstage.h"
#include "client/shadows/dynamicshadowsrender.h"
#include <memory>
struct CreatePipelineResult
{
v2f virtual_size_scale;
ShadowRenderer *shadow_renderer { nullptr };
RenderPipeline *pipeline { nullptr };
std::unique_ptr<ShadowRenderer> shadow_renderer;
std::unique_ptr<RenderPipeline> pipeline;
};
void createPipeline(const std::string &stereo_mode, IrrlichtDevice *device, Client *client, Hud *hud, CreatePipelineResult &result);
@ -27,44 +30,46 @@ RenderingCore *createRenderingCore(const std::string &stereo_mode, IrrlichtDevic
CreatePipelineResult created_pipeline;
createPipeline(stereo_mode, device, client, hud, created_pipeline);
return new RenderingCore(device, client, hud,
created_pipeline.shadow_renderer, created_pipeline.pipeline, created_pipeline.virtual_size_scale);
std::move(created_pipeline.shadow_renderer),
std::move(created_pipeline.pipeline),
created_pipeline.virtual_size_scale);
}
void createPipeline(const std::string &stereo_mode, IrrlichtDevice *device, Client *client, Hud *hud, CreatePipelineResult &result)
{
result.shadow_renderer = createShadowRenderer(device, client);
result.virtual_size_scale = v2f(1.0f);
result.pipeline = new RenderPipeline();
result.pipeline = std::make_unique<RenderPipeline>();
if (result.shadow_renderer)
result.pipeline->addStep<RenderShadowMapStep>();
if (stereo_mode == "none") {
populatePlainPipeline(result.pipeline, client);
populatePlainPipeline(result.pipeline.get(), client);
return;
}
if (stereo_mode == "anaglyph") {
populateAnaglyphPipeline(result.pipeline, client);
populateAnaglyphPipeline(result.pipeline.get(), client);
return;
}
if (stereo_mode == "interlaced") {
populateInterlacedPipeline(result.pipeline, client);
populateInterlacedPipeline(result.pipeline.get(), client);
return;
}
if (stereo_mode == "sidebyside") {
populateSideBySidePipeline(result.pipeline, client, false, false, result.virtual_size_scale);
populateSideBySidePipeline(result.pipeline.get(), client, false, false, result.virtual_size_scale);
return;
}
if (stereo_mode == "topbottom") {
populateSideBySidePipeline(result.pipeline, client, true, false, result.virtual_size_scale);
populateSideBySidePipeline(result.pipeline.get(), client, true, false, result.virtual_size_scale);
return;
}
if (stereo_mode == "crossview") {
populateSideBySidePipeline(result.pipeline, client, false, true, result.virtual_size_scale);
populateSideBySidePipeline(result.pipeline.get(), client, false, true, result.virtual_size_scale);
return;
}
// fallback to plain renderer
errorstream << "Invalid rendering mode: " << stereo_mode << std::endl;
populatePlainPipeline(result.pipeline, client);
}
populatePlainPipeline(result.pipeline.get(), client);
}