diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-05-07 20:37:15 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-05-07 21:23:55 +0200 |
| commit | 5ae77e8fbf34bf2e76612f7e39f87ccfbc846c80 (patch) | |
| tree | c1ab117fb2ca3700c78709ce7b6a51f58945e3dd | |
| parent | 464439667f7f3e356549d91380ebd58273ccce9d (diff) | |
provide bar color for 3D OGL chart
Change-Id: Ia41748cabba89a0257c62f66a280810adc56960e
| -rw-r--r-- | chart2/source/view/charttypes/GL3DBarChart.cxx | 6 | ||||
| -rw-r--r-- | chart2/source/view/inc/3DChartObjects.hxx | 2 | ||||
| -rw-r--r-- | chart2/source/view/main/3DChartObjects.cxx | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx index e21a34b87e92..12a541771426 100644 --- a/chart2/source/view/charttypes/GL3DBarChart.cxx +++ b/chart2/source/view/charttypes/GL3DBarChart.cxx @@ -17,6 +17,8 @@ #include "3DChartObjects.hxx" #include "GL3DRenderer.hxx" +using namespace com::sun::star; + namespace chart { GL3DBarChart::GL3DBarChart(const std::vector<VDataSeries*>& rDataSeries, @@ -53,11 +55,13 @@ void GL3DBarChart::create3DShapes() float nXPos = nIndex * (nBarSizeX + nBarDistanceX); float nYPos = nSeriesIndex * (nBarSizeY + nBarDistanceY); + sal_Int32 nColor = COL_BLUE; + glm::mat4 aBarPosition; aBarPosition = glm::scale(aBarPosition, nBarSizeX, nBarSizeY, nVal); aBarPosition = glm::translate(aBarPosition, nXPos, nYPos, nVal/2); - maShapes.push_back(new opengl3D::Bar(mpRenderer.get(), aBarPosition, nId++)); + maShapes.push_back(new opengl3D::Bar(mpRenderer.get(), aBarPosition, nColor, nId++)); } ++nSeriesIndex; diff --git a/chart2/source/view/inc/3DChartObjects.hxx b/chart2/source/view/inc/3DChartObjects.hxx index 9b4f1187b310..05c2f5b1a238 100644 --- a/chart2/source/view/inc/3DChartObjects.hxx +++ b/chart2/source/view/inc/3DChartObjects.hxx @@ -37,7 +37,7 @@ protected: class Bar : public Renderable3DObject { public: - Bar(OpenGL3DRenderer* pRenderer, const glm::mat4& rPosition, sal_uInt32 nId); + Bar(OpenGL3DRenderer* pRenderer, const glm::mat4& rPosition, sal_Int32 nColor, sal_uInt32 nId); virtual void render() SAL_OVERRIDE; private: diff --git a/chart2/source/view/main/3DChartObjects.cxx b/chart2/source/view/main/3DChartObjects.cxx index 86f9c631a567..c43b9999e45f 100644 --- a/chart2/source/view/main/3DChartObjects.cxx +++ b/chart2/source/view/main/3DChartObjects.cxx @@ -24,10 +24,11 @@ void Renderable3DObject::render() (void) mnUniqueId; } -Bar::Bar(OpenGL3DRenderer* pRenderer, const glm::mat4& rPosition, sal_uInt32 nId) +Bar::Bar(OpenGL3DRenderer* pRenderer, const glm::mat4& rPosition, sal_Int32 aColor, sal_uInt32 nId) : Renderable3DObject(pRenderer, nId) , mbRoundedCorners(false) , maPos(rPosition) + , maColor(aColor) { } |