diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-04-08 05:06:31 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-04-08 05:06:31 +0200 |
| commit | 39c74649f61d21b8fcb3f8374b56d6bffdf0a020 (patch) | |
| tree | b7395821a98187850a6b2efe31593b8ccdf760c9 /chart2 | |
| parent | b5d0eb510a9ccde7a086ae0acfca910f4432df5c (diff) | |
add camera control
Change-Id: Ie641a916f62e80f390514f91de23873364df89a6
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/view/charttypes/3DBarChart.cxx | 1 | ||||
| -rw-r--r-- | chart2/source/view/inc/3DChartObjects.hxx | 10 | ||||
| -rw-r--r-- | chart2/source/view/main/3DChartObjects.cxx | 6 |
3 files changed, 17 insertions, 0 deletions
diff --git a/chart2/source/view/charttypes/3DBarChart.cxx b/chart2/source/view/charttypes/3DBarChart.cxx index e8db5bfb47c0..f294d3db63f4 100644 --- a/chart2/source/view/charttypes/3DBarChart.cxx +++ b/chart2/source/view/charttypes/3DBarChart.cxx @@ -35,6 +35,7 @@ void Bar3DChart::create3DShapes() const float nBarDistanceX = nBarSizeX / 2; const float nBarDistanceY = nBarSizeY / 2; + maShapes.push_back(new opengl3D::Camera()); sal_Int32 nSeriesIndex = 0; for(std::vector<VDataSeries*>::const_iterator itr = maDataSeries.begin(), itrEnd = maDataSeries.end(); itr != itrEnd; ++itr) diff --git a/chart2/source/view/inc/3DChartObjects.hxx b/chart2/source/view/inc/3DChartObjects.hxx index 257653f5ecff..dc65252990da 100644 --- a/chart2/source/view/inc/3DChartObjects.hxx +++ b/chart2/source/view/inc/3DChartObjects.hxx @@ -66,6 +66,16 @@ private: Color maLineColor; // RGBA line color }; +class Camera : public Renderable3DObject +{ +public: + Camera(); +private: + + glm::vec3 maPos; + glm::vec3 maDirection; +}; + namespace temporary { class TemporaryContext diff --git a/chart2/source/view/main/3DChartObjects.cxx b/chart2/source/view/main/3DChartObjects.cxx index c74b475babef..41dc086d0146 100644 --- a/chart2/source/view/main/3DChartObjects.cxx +++ b/chart2/source/view/main/3DChartObjects.cxx @@ -18,6 +18,12 @@ Bar::Bar(const glm::mat4& rPosition): { } +Camera::Camera(): + maPos(10,10,-10), + maDirection(glm::vec3(0,0,0)-maPos) +{ +} + namespace temporary { TemporaryContext::TemporaryContext(): |