Kaydet (Commit) 2597da2d authored tarafından weigao's avatar weigao Kaydeden (comit) Markus Mohrhard

add functions of setting the speed and distance of bars

Change-Id: Id44adf11d445b9c30467e220465528a80ee31b18
üst cc20cedc
...@@ -654,6 +654,12 @@ void GL3DBarChart::create3DShapes(const boost::ptr_vector<VDataSeries>& rDataSer ...@@ -654,6 +654,12 @@ void GL3DBarChart::create3DShapes(const boost::ptr_vector<VDataSeries>& rDataSer
} }
if (BENCH_MARK_MODE && (!mpRenderThread.is())) if (BENCH_MARK_MODE && (!mpRenderThread.is()))
{ {
//if scroll the bars, set the speed and distance first
if (mbScrollFlg)
{
mpRenderer->SetScrollSpeed((float)(BAR_SIZE_X + BAR_DISTANCE_X) / (float)miScrollRate);
mpRenderer->SetScrollDistance((float)(BAR_SIZE_X + BAR_DISTANCE_X));
}
Size aSize = mrWindow.GetSizePixel(); Size aSize = mrWindow.GetSizePixel();
mrWindow.getContext().setWinSize(aSize); mrWindow.getContext().setWinSize(aSize);
mpRenderThread = rtl::Reference<RenderThread>(new RenderBenchMarkThread(this)); mpRenderThread = rtl::Reference<RenderThread>(new RenderBenchMarkThread(this));
......
...@@ -210,6 +210,8 @@ public: ...@@ -210,6 +210,8 @@ public:
void StartClick(sal_uInt32 &selectID); void StartClick(sal_uInt32 &selectID);
void EndClick(); void EndClick();
void SetScroll(); void SetScroll();
void SetScrollSpeed(float scrollSpeed);
void SetScrollDistance(float scrollDistance);
private: private:
void MoveModelf( const PosVecf3& trans, const PosVecf3& angle, const PosVecf3& scale); void MoveModelf( const PosVecf3& trans, const PosVecf3& angle, const PosVecf3& scale);
...@@ -453,6 +455,8 @@ private: ...@@ -453,6 +455,8 @@ private:
std::vector<GLuint> m_Texturelist; std::vector<GLuint> m_Texturelist;
bool m_bHighLighting; bool m_bHighLighting;
sal_uInt32 m_uiSelectID; sal_uInt32 m_uiSelectID;
float m_fScrollSpeed;
float m_fScrollDistance;
}; };
} }
......
...@@ -109,6 +109,8 @@ OpenGL3DRenderer::OpenGL3DRenderer(): ...@@ -109,6 +109,8 @@ OpenGL3DRenderer::OpenGL3DRenderer():
, m_iLightNum(0) , m_iLightNum(0)
, m_bHighLighting(false) , m_bHighLighting(false)
, m_uiSelectID(0) , m_uiSelectID(0)
, m_fScrollSpeed(0.0f)
, m_fScrollDistance(0.0f)
{ {
m_Polygon3DInfo.lineOnly = false; m_Polygon3DInfo.lineOnly = false;
m_Polygon3DInfo.twoSidesLighting = false; m_Polygon3DInfo.twoSidesLighting = false;
...@@ -2281,6 +2283,15 @@ void OpenGL3DRenderer::SetScroll() ...@@ -2281,6 +2283,15 @@ void OpenGL3DRenderer::SetScroll()
maResources.m_bScrollFlag = true; maResources.m_bScrollFlag = true;
} }
void OpenGL3DRenderer::SetScrollSpeed(float scrollSpeed)
{
m_fScrollSpeed = scrollSpeed;
}
void OpenGL3DRenderer::SetScrollDistance(float scrollDistance)
{
m_fScrollDistance = scrollDistance;
}
void OpenGL3DRenderer::RenderBatchBars(bool bNewScene) void OpenGL3DRenderer::RenderBatchBars(bool bNewScene)
{ {
if(bNewScene) if(bNewScene)
......
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