chart2/source/view/charttypes/GL3DBarChart.cxx | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit e975f78a306df35663319d03c882cb679c12e20c
Author: xukai <xu...@multicorewareinc.com>
Date: Sat Sep 13 10:31:42 2014 +0800
instead of a top view a 45 degree view
Change-Id: Iaf922b998552778c527440c4b3a83cb8c05d2a6e
Reviewed-on: https://gerrit.libreoffice.org/11536
Reviewed-by: Kohei Yoshida <libreoff...@kohei.us>
Tested-by: Kohei Yoshida <libreoff...@kohei.us>
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index b863dee..3474de3 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
