diff options
Diffstat (limited to 'src/datavis3d/engine')
-rw-r--r-- | src/datavis3d/engine/abstract3dcontroller.cpp | 2 | ||||
-rw-r--r-- | src/datavis3d/engine/abstract3drenderer.cpp | 2 | ||||
-rw-r--r-- | src/datavis3d/engine/bars3drenderer.cpp | 3 | ||||
-rw-r--r-- | src/datavis3d/engine/drawer.cpp | 1 | ||||
-rw-r--r-- | src/datavis3d/engine/surface3drenderer.cpp | 6 |
5 files changed, 9 insertions, 5 deletions
diff --git a/src/datavis3d/engine/abstract3dcontroller.cpp b/src/datavis3d/engine/abstract3dcontroller.cpp index 23781624..cb50faf5 100644 --- a/src/datavis3d/engine/abstract3dcontroller.cpp +++ b/src/datavis3d/engine/abstract3dcontroller.cpp @@ -67,7 +67,7 @@ Abstract3DController::Abstract3DController(QRect boundRect, QObject *parent) : Abstract3DController::~Abstract3DController() { delete m_cameraHelper; - + delete m_inputHandler; // Attached axes are children, so no need to explicitly delete them } diff --git a/src/datavis3d/engine/abstract3drenderer.cpp b/src/datavis3d/engine/abstract3drenderer.cpp index fe0f10c4..c53adea0 100644 --- a/src/datavis3d/engine/abstract3drenderer.cpp +++ b/src/datavis3d/engine/abstract3drenderer.cpp @@ -294,7 +294,7 @@ AxisRenderCache &Abstract3DRenderer::axisCacheForOrientation(Q3DAbstractAxis::Ax case Q3DAbstractAxis::AxisOrientationZ: return m_axisCacheZ; default: - qFatal(__FUNCTION__); + qFatal("Abstract3DRenderer::axisCacheForOrientation"); return m_axisCacheX; } } diff --git a/src/datavis3d/engine/bars3drenderer.cpp b/src/datavis3d/engine/bars3drenderer.cpp index 34fbcdec..260b36a2 100644 --- a/src/datavis3d/engine/bars3drenderer.cpp +++ b/src/datavis3d/engine/bars3drenderer.cpp @@ -50,6 +50,7 @@ static QVector3D selectionSkipColor = QVector3D(255, 255, 255); // Selection tex Bars3DRenderer::Bars3DRenderer(Bars3DController *controller) : Abstract3DRenderer(controller), m_controller(controller), + m_cachedIsSlicingActivated(false), m_selectedBar(0), m_sliceSelection(0), m_sliceCache(0), @@ -110,6 +111,8 @@ Bars3DRenderer::~Bars3DRenderer() delete m_barObj; delete m_backgroundObj; delete m_gridLineObj; + delete m_labelObj; + delete m_labelShader; } void Bars3DRenderer::initializeOpenGL() diff --git a/src/datavis3d/engine/drawer.cpp b/src/datavis3d/engine/drawer.cpp index 9ea958ba..6f2941d6 100644 --- a/src/datavis3d/engine/drawer.cpp +++ b/src/datavis3d/engine/drawer.cpp @@ -51,6 +51,7 @@ Drawer::Drawer(const Theme &theme, const QFont &font, QDataVis::LabelTransparenc Drawer::~Drawer() { + delete m_textureHelper; } void Drawer::initializeOpenGL() diff --git a/src/datavis3d/engine/surface3drenderer.cpp b/src/datavis3d/engine/surface3drenderer.cpp index 49a3df61..c8b15309 100644 --- a/src/datavis3d/engine/surface3drenderer.cpp +++ b/src/datavis3d/engine/surface3drenderer.cpp @@ -50,10 +50,10 @@ const GLfloat coordSpace = 2.0f; // From -1.0 to 1.0 Surface3DRenderer::Surface3DRenderer(Surface3DController *controller) : Abstract3DRenderer(controller), m_controller(controller), - m_isGridEnabled(true), - m_shadowQuality(QDataVis::ShadowLow), m_labelTransparency(QDataVis::TransparencyFromTheme), m_font(QFont(QStringLiteral("Arial"))), + m_isGridEnabled(true), + m_shadowQuality(QDataVis::ShadowLow), m_segmentYCount(0), m_segmentYStep(0.0f), m_segmentXCount(0), @@ -75,8 +75,8 @@ Surface3DRenderer::Surface3DRenderer(Surface3DController *controller) m_maxSceneSize(40.0), m_backgroundObj(0), m_gridLineObj(0), - m_surfaceObj(0), m_labelObj(0), + m_surfaceObj(0), m_depthTexture(0), m_depthFrameBuffer(0), m_selectionFrameBuffer(0), |