diff options
author | weigao <weigao@multicorewareinc.com> | 2014-07-26 19:44:16 +0800 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-07-30 21:45:26 +0200 |
commit | 53cb769e2e1dd62b25787cf654b532a05b6b51b5 (patch) | |
tree | cd1d997afd17ff1f7689d35e25089d86c90dd169 /chart2 | |
parent | 8828dbfa0870cb834efda035bc5e041a1434166b (diff) |
add scroll animation for benchmark
Change-Id: I72416ee6bf6c314feb4c5a88742aedd515abc13b
Diffstat (limited to 'chart2')
-rw-r--r-- | chart2/source/view/charttypes/GL3DBarChart.cxx | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx index cb484525a56c..da0db01655fe 100644 --- a/chart2/source/view/charttypes/GL3DBarChart.cxx +++ b/chart2/source/view/charttypes/GL3DBarChart.cxx @@ -189,6 +189,7 @@ private: void MoveToBar(); void MoveToDefault(); void MoveToCorner(); + void ProcessScroll(); private: glm::vec3 maStartPos; glm::vec3 maEndPos; @@ -282,6 +283,13 @@ void RenderBenchMarkThread::MoveToCorner() MoveCamera(); } +void RenderBenchMarkThread::ProcessScroll() +{ + //will add other process later + mpChart->maRenderEvent = EVENT_NON; +} + + void RenderBenchMarkThread::ProcessMouseEvent() { if (mpChart->maRenderEvent == EVENT_CLICK) @@ -296,6 +304,10 @@ void RenderBenchMarkThread::ProcessMouseEvent() { MoveToCorner(); } + else if (mpChart->maRenderEvent == EVENT_SCROLL) + { + ProcessScroll(); + } } void RenderBenchMarkThread::execute() @@ -798,6 +810,8 @@ void GL3DBarChart::scroll(long nDelta) glm::vec3 maDir = glm::normalize(maCameraPosition - maCameraDirection); maCameraPosition -= (float((nDelta/10)) * maDir); mpCamera->setPosition(maCameraPosition); + if(BENCH_MARK_MODE) + maRenderEvent = EVENT_SCROLL; } update(); |