[Libreoffice-commits] core.git: Branch 'feature/chart-opengl2' - 2 commits - chart2/source

[Markus Mohrhard]

 chart2/source/view/main/OpenGLRender.cxx |   21 ++++-----------------
 chart2/source/view/main/OpenGLRender.hxx |    8 --------
 2 files changed, 4 insertions(+), 25 deletions(-)

New commits:
commit 473f9ccf6871ac95ef541845f445c5321893bd47
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Mon Jan 13 00:59:59 2014 +0100

    remove unused variables
    
    Change-Id: I52be4e3a6539392bbe030e1a77fcbb61960eeab8

diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx
index 70e8ac3..33d1754 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -974,16 +974,6 @@ void OpenGLRender::SetHeight(int height)
     m_Projection = glm::ortho(0.f, float(m_iWidth), 0.f, float(m_iHeight), -4.f, 3.f);
 }
 
-int OpenGLRender::GetWidth()
-{
-    return m_iWidth;
-}
-
-int OpenGLRender::GetHeight()
-{
-    return m_iHeight;
-}
-
 int OpenGLRender::CreateBMPHeader(sal_uInt8 *bmpHeader, int xsize, int ysize)
 {
     unsigned char header[BMP_HEADER_LEN] = {
diff --git a/chart2/source/view/main/OpenGLRender.hxx b/chart2/source/view/main/OpenGLRender.hxx
index 48eae6c..4e7de03 100644
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -144,8 +144,6 @@ public:
     int MoveModelf(PosVecf3 trans, PosVecf3 angle, PosVecf3 scale);
     void SetWidth(int width);
     void SetHeight(int height);
-    int GetWidth();
-    int GetHeight();
     void Release();
     int CreateBMPHeader(sal_uInt8 *bmpHeader, int xsize, int ysize);
     int CreateBMPHeaderRGBA(sal_uInt8 *bmpHeader, int xsize, int ysize);
commit 473bd0ecc5f8f7cbc96cc365165240bfa4054d69
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Mon Jan 13 00:58:17 2014 +0100

    make a few variables local, no need for member variables
    
    Change-Id: I2559756acf655f73c782db023b7502f969346171

diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx
index ceaa07e..70e8ac3 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -865,10 +865,10 @@ int OpenGLRender::CreateRenderObj(int width, int height)
 
 int OpenGLRender::MoveModelf(PosVecf3 trans, PosVecf3 angle, PosVecf3 scale)
 {
-    m_TranslationMatrix = glm::translate(glm::vec3(trans.x, trans.y, trans.z));
-    m_ScaleMatrix = glm::scale(glm::vec3(scale.x, scale.y, scale.z));
-    m_RotationMatrix = glm::eulerAngleYXZ(angle.y, angle.x, angle.z);
-    m_Model = m_TranslationMatrix * m_RotationMatrix * m_ScaleMatrix;
+    glm::mat4 aTranslationMatrix = glm::translate(glm::vec3(trans.x, trans.y, trans.z));
+    glm::mat4 aScaleMatrix = glm::scale(glm::vec3(scale.x, scale.y, scale.z));
+    glm::mat4 aRotationMatrix = glm::eulerAngleYXZ(angle.y, angle.x, angle.z);
+    m_Model = aTranslationMatrix * aRotationMatrix * aScaleMatrix;
     return 0;
 }
 
@@ -928,9 +928,6 @@ void OpenGLRender::Release()
 
 OpenGLRender::OpenGLRender(uno::Reference< drawing::XShape > xTarget):
     m_Model(glm::mat4(1.0f)),
-    m_TranslationMatrix(glm::translate(m_Model, glm::vec3(0.0f, 0.0f, 0.0f))),
-    m_RotationMatrix(glm::eulerAngleYXZ(0.0f, 0.0f, 0.0f)),
-    m_ScaleMatrix(glm::scale(m_Model, glm::vec3(1.0f, 1.0f, 1.0f))),
     m_Line2DColor(glm::vec4(1.0, 0.0, 0.0, 1.0)),
     m_TextureObj(0),
     m_FboID(0),
diff --git a/chart2/source/view/main/OpenGLRender.hxx b/chart2/source/view/main/OpenGLRender.hxx
index 875f6fa..48eae6c 100644
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -208,12 +208,6 @@ private:
     // Our ModelViewProjection : multiplication of our 3 matrices
     glm::mat4 m_MVP;
 
-    glm::mat4 m_TranslationMatrix;
-
-    glm::mat4 m_RotationMatrix;
-
-    glm::mat4 m_ScaleMatrix;
-
     GLint m_RenderProID;
 
     glm::vec4 m_Line2DColor;