Kaydet (Commit) 664fb35a authored tarafından Markus Mohrhard's avatar Markus Mohrhard

first part for threaded chart rendering, fdo#81110

It is nor working correctly yet.

Change-Id: Ic592eb2f50265886ad6d97539d2c52d7c45179e6
üst b75f6baa
...@@ -21,6 +21,9 @@ ...@@ -21,6 +21,9 @@
#include <vcl/timer.hxx> #include <vcl/timer.hxx>
#include <vcl/openglwin.hxx> #include <vcl/openglwin.hxx>
#include <rtl/ref.hxx>
#include <salhelper/thread.hxx>
namespace chart { namespace chart {
class ExplicitCategoriesProvider; class ExplicitCategoriesProvider;
...@@ -34,8 +37,15 @@ class Camera; ...@@ -34,8 +37,15 @@ class Camera;
} }
class RenderThread;
class RenderOneFrameThread;
class RenderAnimationThread;
class GL3DBarChart : public GL3DPlotterBase, public IRenderer class GL3DBarChart : public GL3DPlotterBase, public IRenderer
{ {
friend class RenderThread;
friend class RenderOneFrameThread;
friend class RenderAnimationThread;
public: public:
GL3DBarChart( GL3DBarChart(
const css::uno::Reference<css::chart2::XChartType>& xChartType, const css::uno::Reference<css::chart2::XChartType>& xChartType,
...@@ -61,9 +71,6 @@ private: ...@@ -61,9 +71,6 @@ private:
void moveToDefault(); void moveToDefault();
glm::vec3 getCornerPosition(sal_Int8 nCornerId); glm::vec3 getCornerPosition(sal_Int8 nCornerId);
DECL_LINK(MoveCamera, void*);
DECL_LINK(MoveToBar, void*);
css::uno::Reference<css::chart2::XChartType> mxChartType; css::uno::Reference<css::chart2::XChartType> mxChartType;
boost::ptr_vector<opengl3D::Renderable3DObject> maShapes; boost::ptr_vector<opengl3D::Renderable3DObject> maShapes;
...@@ -81,11 +88,7 @@ private: ...@@ -81,11 +88,7 @@ private:
glm::vec3 maDefaultCameraPosition; glm::vec3 maDefaultCameraPosition;
glm::vec3 maDefaultCameraDirection; glm::vec3 maDefaultCameraDirection;
Timer maTimer;
glm::vec3 maStep;
glm::vec3 maStepDirection; glm::vec3 maStepDirection;
size_t mnStep;
size_t mnStepsTotal;
float mnMaxX; float mnMaxX;
float mnMaxY; float mnMaxY;
float mnDistance; float mnDistance;
...@@ -112,6 +115,9 @@ private: ...@@ -112,6 +115,9 @@ private:
bool mbBlockUserInput; bool mbBlockUserInput;
bool mbNeedsNewRender; bool mbNeedsNewRender;
bool mbCameraInit; bool mbCameraInit;
osl::Mutex maMutex;
rtl::Reference<RenderThread> mpRenderThread;
}; };
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment