mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-02-08 15:25:52 +00:00
Code Issues Projects Releases Wiki Activity

Class Renderer: Store TextureManager instance as unique_ptr for easier memory management

Browse Source
This commit is contained in:
Kai Blaschke
2022-06-06 18:07:19 +02:00
parent 6906d4ed60
commit 788a5ecaac
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libprojectM/Renderer/Renderer.cpp
View File

@ -209,7 +209,7 @@ void Renderer::RenderItems(const Pipeline& pipeline, const PipelineContext& pipe
m_renderContext.aspectY = m_fAspectY;
m_renderContext.invAspectX = m_fInvAspectX;
m_renderContext.invAspectY = m_fInvAspectY;
m_renderContext.textureManager = m_textureManager;
m_renderContext.textureManager = m_textureManager.get();
m_renderContext.beatDetect = m_beatDetect;
for (std::vector<RenderItem*>::const_iterator pos = pipeline.drawables.begin(); pos != pipeline.drawables.end(); ++pos)
@ -428,10 +428,6 @@ void Renderer::Interpolation(const Pipeline& pipeline, const PipelineContext& pi
Renderer::~Renderer()
{
if (m_textureManager)
delete (m_textureManager);
free(m_perPointMeshBuffer);
glDeleteBuffers(1, &m_vboInterpolation);
@ -479,13 +475,9 @@ void Renderer::reset(int w, int h)
InitCompositeShaderVertex();
if (m_textureManager != nullptr)
{
delete m_textureManager;
}
m_textureManager = new TextureManager(m_presetPath, m_textureSizeX, m_textureSizeY, m_dataPath);
m_textureManager = std::make_unique<TextureManager>(m_presetPath, m_textureSizeX, m_textureSizeY, m_dataPath);
m_shaderEngine.setParams(m_textureSizeX, m_textureSizeY, m_fAspectX, m_fAspectY, m_beatDetect, m_textureManager);
m_shaderEngine.setParams(m_textureSizeX, m_textureSizeY, m_fAspectX, m_fAspectY, m_beatDetect, m_textureManager.get());
m_shaderEngine.reset();
m_shaderEngine.loadPresetShaders(*m_currentPipeline, m_presetName);

2
src/libprojectM/Renderer/Renderer.hpp
View File

@ -187,7 +187,7 @@ private:
PerPixelMesh m_perPixelMesh;
BeatDetect* m_beatDetect{nullptr};
TextureManager* m_textureManager{nullptr};
std::unique_ptr<TextureManager> m_textureManager;
Pipeline* m_currentPipeline{nullptr};
RenderContext m_renderContext;
ShaderEngine m_shaderEngine;