[Libreoffice-commits] core.git: Branch 'private/moggi/chart-opengl-window-version2' - chart2/source
Markus Mohrhard
markus.mohrhard at collabora.co.uk
Tue May 6 20:22:35 PDT 2014
chart2/source/view/inc/3DChartObjects.hxx | 16 ----------------
chart2/source/view/main/3DChartObjects.cxx | 24 ------------------------
2 files changed, 40 deletions(-)
New commits:
commit 7e7e3a7ae1673d0ccb57b123708e4b5b456058e9
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Wed May 7 05:17:19 2014 +0200
the temporary context can finally die
Change-Id: I7dec2772000e25c4bd23f21b61dbd835ef9397cf
diff --git a/chart2/source/view/inc/3DChartObjects.hxx b/chart2/source/view/inc/3DChartObjects.hxx
index 02c008d..e9490e3 100644
--- a/chart2/source/view/inc/3DChartObjects.hxx
+++ b/chart2/source/view/inc/3DChartObjects.hxx
@@ -95,22 +95,6 @@ private:
glm::vec3 maDirection;
};
-namespace temporary {
-
-class TemporaryContext: public opengl3D::Renderable3DObject
-{
-public:
- TemporaryContext(OpenGL3DRenderer* pRenderer);
-
- virtual void render();
- void init();
-
-private:
- OpenGLContext maContext;
-};
-
-}
-
}
}
diff --git a/chart2/source/view/main/3DChartObjects.cxx b/chart2/source/view/main/3DChartObjects.cxx
index 330747d..86f9c63 100644
--- a/chart2/source/view/main/3DChartObjects.cxx
+++ b/chart2/source/view/main/3DChartObjects.cxx
@@ -111,30 +111,6 @@ void Camera::render()
mpRenderer->SetCameraInfo(maPos, maDirection, maUp, true);
}
-
-namespace temporary {
-
-TemporaryContext::TemporaryContext(OpenGL3DRenderer* pRenderer):
- Renderable3DObject(pRenderer, -1)
-{
-}
-
-void TemporaryContext::render()
-{
- maContext.renderToFile();
-}
-
-void TemporaryContext::init()
-{
- maContext.init();
- Size winSize(800, 600);
- maContext.setWinSize(winSize);
- mpRenderer->SetSize(winSize);
- mpRenderer->init();
-}
-
-}
-
}
}
More information about the Libreoffice-commits
mailing list