summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorxukai <xukai@multicorewareinc.com>2014-09-13 10:31:42 +0800
committerKohei Yoshida <libreoffice@kohei.us>2014-09-23 15:02:44 +0000
commite975f78a306df35663319d03c882cb679c12e20c (patch)
treea4ad3a9b2b6233515bd51d81ac8ebafa7519855a /chart2
parent57cc338ddfd2fcca35641ef9f49f13caac932754 (diff)
instead of a top view a 45 degree view
Change-Id: Iaf922b998552778c527440c4b3a83cb8c05d2a6e Reviewed-on: https://gerrit.libreoffice.org/11536 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/view/charttypes/GL3DBarChart.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx
index b863dee4e006..3474de32daea 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -304,10 +304,11 @@ void RenderBenchMarkThread::MoveToBar()
glm::vec3 maTargetPosition = rBarInfo.maPos;
maTargetPosition.z += 240;
maTargetPosition.x += BAR_SIZE_X / 2.0f;
- maStep = (maTargetPosition - mpChart->maCameraPosition)/((float)mnStepsTotal);
glm::vec3 maTargetDirection = rBarInfo.maPos;
maTargetDirection.x += BAR_SIZE_X / 2.0f;
maTargetDirection.y += BAR_SIZE_Y / 2.0f;
+ maTargetPosition.y = maTargetDirection.y - 240;
+ maStep = (maTargetPosition - mpChart->maCameraPosition)/((float)mnStepsTotal);
maStepDirection = (maTargetDirection - mpChart->maCameraDirection)/((float)mnStepsTotal);
mpChart->maClickCond.set();
mbExecuting = true;
@@ -334,10 +335,11 @@ void RenderBenchMarkThread::AutoMoveToBar()
glm::vec3 maTargetPosition = rBarInfo.maPos;
maTargetPosition.z += 240;
maTargetPosition.x += BAR_SIZE_X / 2.0f;
- maStep = (maTargetPosition - mpChart->maCameraPosition)/((float)mnStepsTotal);
glm::vec3 maTargetDirection = rBarInfo.maPos;
maTargetDirection.x += BAR_SIZE_X / 2.0f;
maTargetDirection.y += BAR_SIZE_Y / 2.0f;
+ maTargetPosition.y = maTargetDirection.y - 240;
+ maStep = (maTargetPosition - mpChart->maCameraPosition)/((float)mnStepsTotal);
maStepDirection = (maTargetDirection - mpChart->maCameraDirection)/((float)mnStepsTotal);
mpChart->mpRenderer->StartClick(mpChart->mnSelectBarId);
mbAutoFlyExecuting = true;