oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-05 19:31:04 +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

16
src/client/render/core.cpp
View file

@ -9,17 +9,15 @@
#include "settings.h"
RenderingCore::RenderingCore(IrrlichtDevice *_device, Client *_client, Hud *_hud,
ShadowRenderer *_shadow_renderer, RenderPipeline *_pipeline, v2f _virtual_size_scale)
: device(_device), client(_client), hud(_hud), shadow_renderer(_shadow_renderer),
pipeline(_pipeline), virtual_size_scale(_virtual_size_scale)
std::unique_ptr<ShadowRenderer> _shadow_renderer,
std::unique_ptr<RenderPipeline> _pipeline,
v2f _virtual_size_scale)
: device(_device), client(_client), hud(_hud), shadow_renderer(std::move(_shadow_renderer)),
pipeline(std::move(_pipeline)), virtual_size_scale(_virtual_size_scale)
{
}
RenderingCore::~RenderingCore()
{
delete pipeline;
delete shadow_renderer;
}
RenderingCore::~RenderingCore() = default;
void RenderingCore::draw(video::SColor _skycolor, bool _show_hud,
bool _draw_wield_tool, bool _draw_crosshair)
@ -27,7 +25,7 @@ void RenderingCore::draw(video::SColor _skycolor, bool _show_hud,
v2u32 screensize = device->getVideoDriver()->getScreenSize();
virtual_size = v2u32(screensize.X * virtual_size_scale.X, screensize.Y * virtual_size_scale.Y);
PipelineContext context(device, client, hud, shadow_renderer, _skycolor, screensize);
PipelineContext context(device, client, hud, shadow_renderer.get(), _skycolor, screensize);
context.draw_crosshair = _draw_crosshair;
context.draw_wield_tool = _draw_wield_tool;
context.show_hud = _show_hud;

10
src/client/render/core.h
View file

@ -7,6 +7,7 @@
#include "irr_v2d.h"
#include <SColor.h>
#include <memory>
class IrrlichtDevice;
@ -21,16 +22,17 @@ protected:
IrrlichtDevice *device;
Client *client;
Hud *hud;
ShadowRenderer *shadow_renderer;
std::unique_ptr<ShadowRenderer> shadow_renderer;
RenderPipeline *pipeline;
std::unique_ptr<RenderPipeline> pipeline;
v2f virtual_size_scale;
v2u32 virtual_size { 0, 0 };
public:
RenderingCore(IrrlichtDevice *device, Client *client, Hud *hud,
ShadowRenderer *shadow_renderer, RenderPipeline *pipeline,
std::unique_ptr<ShadowRenderer> shadow_renderer,
std::unique_ptr<RenderPipeline> pipeline,
v2f virtual_size_scale);
RenderingCore(const RenderingCore &) = delete;
RenderingCore(RenderingCore &&) = delete;
@ -44,5 +46,5 @@ public:
v2u32 getVirtualSize() const;
ShadowRenderer *get_shadow_renderer() { return shadow_renderer; };
ShadowRenderer *get_shadow_renderer() { return shadow_renderer.get(); };
};

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);
}

4
src/client/render/interlaced.h
View file

@ -4,13 +4,13 @@
// Copyright (C) 2017 numzero, Lobachevskiy Vitaliy <numzer0@yandex.ru>
#pragma once
#include "stereo.h"
#include "pipeline.h"
class InitInterlacedMaskStep : public TrivialRenderStep
{
public:
InitInterlacedMaskStep(TextureBuffer *buffer, u8 index);
void run(PipelineContext &context);
void run(PipelineContext &context) override;
private:
TextureBuffer *buffer;
video::ITexture *last_mask { nullptr };

2
src/client/render/sidebyside.h
View file

@ -23,4 +23,4 @@ private:
RenderTarget *target;
};
void populateSideBySidePipeline(RenderPipeline *pipeline, Client *client, bool horizontal, bool flipped, v2f &virtual_size_scale);
void populateSideBySidePipeline(RenderPipeline *pipeline, Client *client, bool horizontal, bool flipped, v2f &virtual_size_scale);