diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2018-01-07 00:14:48 +1100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2018-02-05 14:04:43 +0100 |
| commit | 16ea77bc4d2218b68d40708f4b8b4a4418a84d05 (patch) | |
| tree | eed59168564295e21d30d2b42dc5934f60ecaada /chart2/source/view | |
| parent | cfd78dadbb461d8364e9294094e38a03732cabc1 (diff) | |
chart2: remove dead code
Change-Id: I67bc3785eb0fd2030626becd1ffb6a80bd97d861
Reviewed-on: https://gerrit.libreoffice.org/47491
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'chart2/source/view')
| -rw-r--r-- | chart2/source/view/charttypes/GL3DBarChart.cxx | 5 | ||||
| -rw-r--r-- | chart2/source/view/inc/GL3DRenderer.hxx | 4 | ||||
| -rw-r--r-- | chart2/source/view/main/DummyXShape.cxx | 4 | ||||
| -rw-r--r-- | chart2/source/view/main/OpenGLRender.hxx | 13 |
4 files changed, 0 insertions, 26 deletions
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx index 35cc5f572a69..946b28d05261 100644 --- a/chart2/source/view/charttypes/GL3DBarChart.cxx +++ b/chart2/source/view/charttypes/GL3DBarChart.cxx @@ -54,13 +54,8 @@ const float TEXT_HEIGHT = 10.0f; float DEFAULT_CAMERA_HEIGHT = 500.0f; const sal_uInt32 ID_STEP = 10; -#if 0 -const float BAR_SIZE_X = 15.0f; -const float BAR_SIZE_Y = 15.0f; -#else const float BAR_SIZE_X = 30.0f; const float BAR_SIZE_Y = 5.0f; -#endif const float BAR_DISTANCE_X = 5.0f; const float BAR_DISTANCE_Y = 5.0; diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx index 19b6996b5d8f..141621c1bc70 100644 --- a/chart2/source/view/inc/GL3DRenderer.hxx +++ b/chart2/source/view/inc/GL3DRenderer.hxx @@ -406,11 +406,7 @@ private: glm::mat4 m_3DMVP; GLuint m_3DUBOBuffer; -#if 0 - GLint m_3DLightBlockIndex; - GLint m_3DMaterialBlockIndex; -#endif GLint m_3DActualSizeLight; GLuint m_NormalBuffer; diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx index 800f9cea2262..99752858c93d 100644 --- a/chart2/source/view/main/DummyXShape.cxx +++ b/chart2/source/view/main/DummyXShape.cxx @@ -1088,11 +1088,7 @@ void DummyChart::render() SAL_INFO("chart2.opengl", "render chart"); m_GLRender.prepareToRender(); -#if 0 - m_GLRender.renderDebug(); -#else DummyXShapes::render(); -#endif } void DummyChart::clear() diff --git a/chart2/source/view/main/OpenGLRender.hxx b/chart2/source/view/main/OpenGLRender.hxx index 025b83297a09..d8f81a0f1799 100644 --- a/chart2/source/view/main/OpenGLRender.hxx +++ b/chart2/source/view/main/OpenGLRender.hxx @@ -109,10 +109,6 @@ public: void SetBackGroundColor(sal_uInt32 color1, sal_uInt32 color2, css::drawing::FillStyle fillstyle); private: -#if 0 - //for performance - double m_dFreq; -#endif int m_iWidth; int m_iHeight; @@ -128,22 +124,13 @@ private: glm::mat4 m_Model; // Our ModelViewProjection : multiplication of our 3 matrices glm::mat4 m_MVP; -#if 0 - GLint m_RenderProID; -#endif GLuint m_VertexBuffer; GLuint m_ColorBuffer; GLint m_MatrixID; -#if 0 - GLint m_RenderVertexID; - GLint m_RenderTexCoordID; - - GLint m_RenderTexID; -#endif GLuint m_RenderVertexBuf; GLuint m_RenderTexCoordBuf; |