diff options
Diffstat (limited to 'chart2')
-rw-r--r-- | chart2/Library_chartcore.mk | 2 | ||||
-rw-r--r-- | chart2/source/view/charttypes/3DBarChart.cxx | 2 | ||||
-rw-r--r-- | chart2/source/view/inc/3DChartObjects.hxx | 4 | ||||
-rw-r--r-- | chart2/source/view/main/3DChartObjects.cxx | 9 |
4 files changed, 14 insertions, 3 deletions
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk index e4b0051cfd6a..e027865c9e11 100644 --- a/chart2/Library_chartcore.mk +++ b/chart2/Library_chartcore.mk @@ -249,6 +249,4 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\ chart2/source/tools/XMLRangeHelper \ )) - - # vim: set noet sw=4 ts=4: diff --git a/chart2/source/view/charttypes/3DBarChart.cxx b/chart2/source/view/charttypes/3DBarChart.cxx index 3a13059be014..e8db5bfb47c0 100644 --- a/chart2/source/view/charttypes/3DBarChart.cxx +++ b/chart2/source/view/charttypes/3DBarChart.cxx @@ -7,6 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include <GL/glew.h> + #include "3DBarChart.hxx" #include <glm/glm.hpp> diff --git a/chart2/source/view/inc/3DChartObjects.hxx b/chart2/source/view/inc/3DChartObjects.hxx index f7eed23e8733..257653f5ecff 100644 --- a/chart2/source/view/inc/3DChartObjects.hxx +++ b/chart2/source/view/inc/3DChartObjects.hxx @@ -71,12 +71,16 @@ namespace temporary { class TemporaryContext { public: + TemporaryContext(); void init(); void render(); private: OpenGLContext maContext; + + int miWidth; + int miHeight; }; } diff --git a/chart2/source/view/main/3DChartObjects.cxx b/chart2/source/view/main/3DChartObjects.cxx index 3c5a5b8b6138..c74b475babef 100644 --- a/chart2/source/view/main/3DChartObjects.cxx +++ b/chart2/source/view/main/3DChartObjects.cxx @@ -20,14 +20,21 @@ Bar::Bar(const glm::mat4& rPosition): namespace temporary { +TemporaryContext::TemporaryContext(): + miWidth(200), + miHeight(200) +{ +} + void TemporaryContext::init() { maContext.init(); + maContext.setWinSize(Size(miWidth, miHeight)); } void TemporaryContext::render() { - + maContext.renderToFile(); } } |