diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-05-08 01:30:30 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-05-08 02:30:56 +0200 |
| commit | cfcb4a7cefebda88a70336afe15129304f202f6b (patch) | |
| tree | 1c337d5af6eb77eae4e08c5b775d783c4de5e4a1 | |
| parent | 07f14bac2d62cc6dfbb62f8f4f6ba4b7ffea0c6c (diff) | |
this inheritance is no longer needed
Change-Id: I039dd767bcfd0c1343f4230d3fe8e52ab5a6e4fd
| -rw-r--r-- | chart2/source/view/inc/GL3DRenderer.hxx | 4 | ||||
| -rw-r--r-- | chart2/source/view/main/GL3DRenderer.cxx | 10 |
2 files changed, 2 insertions, 12 deletions
diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx index 81c93151a1ce..1d103529580b 100644 --- a/chart2/source/view/inc/GL3DRenderer.hxx +++ b/chart2/source/view/inc/GL3DRenderer.hxx @@ -164,7 +164,7 @@ typedef struct SceneBox }SceneBox; -class OpenGL3DRenderer : public IOpenGLInfoProvider +class OpenGL3DRenderer { public: OpenGL3DRenderer(); @@ -174,7 +174,6 @@ public: void CreateRenderObj(int, int); void LoadShaders(); void init(); - virtual bool isOpenGLInitialized() SAL_OVERRIDE; void Set3DSenceInfo(sal_Int32 color = 255, bool twoSidesLighting = true); void SetLightInfo(bool lightOn, sal_Int32 color, const glm::vec4& direction); void AddShapePolygon3DObject(sal_Int32 color, bool lineOnly, sal_Int32 lineColor, @@ -244,7 +243,6 @@ private: glm::mat4 m_Model; // Our ModelViewProjection : multiplication of our 3 matrices glm::mat4 m_MVP; - bool m_IsOpenglInit; #if 0 double m_dFreq; #endif diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx index 54f5e3d8fcee..40a38851f405 100644 --- a/chart2/source/view/main/GL3DRenderer.cxx +++ b/chart2/source/view/main/GL3DRenderer.cxx @@ -56,8 +56,7 @@ int static checkGLError(const char *file, int line) } OpenGL3DRenderer::OpenGL3DRenderer(): - m_IsOpenglInit(false) - , m_TranslationMatrix(glm::translate(m_Model, glm::vec3(0.0f, 0.0f, 0.0f))) + m_TranslationMatrix(glm::translate(m_Model, glm::vec3(0.0f, 0.0f, 0.0f))) , m_TextProID(0) , m_TextMatrixID(0) , m_TextVertexID(0) @@ -253,7 +252,6 @@ void OpenGL3DRenderer::init() glBindBuffer(GL_ARRAY_BUFFER, 0); CHECK_GL_ERROR(); Init3DUniformBlock(); - m_IsOpenglInit = true; } void OpenGL3DRenderer::SetSize(const Size& rSize) @@ -262,12 +260,6 @@ void OpenGL3DRenderer::SetSize(const Size& rSize) m_iHeight = rSize.Height(); } -bool OpenGL3DRenderer::isOpenGLInitialized() -{ - return m_IsOpenglInit; -} - - void OpenGL3DRenderer::AddVertexData(GLuint vertexBuf) { glBindBuffer(GL_ARRAY_BUFFER, vertexBuf); |