summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-05-26 22:46:06 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-05-26 22:50:35 +0200
commite69e429d8f2a2269fe1f8e2a7faa1979d2067628 (patch)
tree6eea8985d28190b248454573c2fa345c6635d012 /chart2
parent3c5392997d76d939f6dfc8730b9a6b405663d2d3 (diff)
hardcode default camera height
instead of having the magic number in 5 places Change-Id: I2550671572dcc36d9a710e56d9d9c1e99f732843
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/view/charttypes/GL3DBarChart.cxx13
1 files changed, 7 insertions, 6 deletions
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 0e5cdca951ea..acb3692a13d7 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -62,6 +62,7 @@ namespace {
const float TEXT_HEIGHT = 15.0f;
const sal_uLong TIMEOUT = 5;
+const float DEFAULT_CAMERA_HEIGHT = 200.0f;
float calculateTextWidth(const OUString& rText)
{
@@ -255,7 +256,7 @@ void GL3DBarChart::create3DShapes(const boost::ptr_vector<VDataSeries>& rDataSer
mnMaxX = nMaxPointCount * (nBarSizeX + nBarDistanceX) + 40;
mnMaxY = nSeriesIndex * (nBarSizeY + nBarDistanceY) + 40;
- maCameraPosition = glm::vec3(-30, -30, 200);
+ maCameraPosition = glm::vec3(-30, -30, DEFAULT_CAMERA_HEIGHT);
mpCamera->setPosition(maCameraPosition);
maCameraDirection = glm::vec3(mnMaxX/2, mnMaxY/2, 0);
mpCamera->setDirection(maCameraDirection);
@@ -355,29 +356,29 @@ glm::vec3 GL3DBarChart::getCornerPosition(sal_Int8 nId)
{
case 0:
{
- return glm::vec3(-30, -30, 200);
+ return glm::vec3(-30, -30, DEFAULT_CAMERA_HEIGHT);
}
break;
case 1:
{
- return glm::vec3(mnMaxX, -30, 200);
+ return glm::vec3(mnMaxX, -30, DEFAULT_CAMERA_HEIGHT);
}
break;
case 2:
{
- return glm::vec3(mnMaxX, mnMaxY, 200);
+ return glm::vec3(mnMaxX, mnMaxY, DEFAULT_CAMERA_HEIGHT);
}
break;
case 3:
{
- return glm::vec3(-30, mnMaxY, 200);
+ return glm::vec3(-30, mnMaxY, DEFAULT_CAMERA_HEIGHT);
}
break;
default:
assert(false);
}
- return glm::vec3(-30, -30, 200);
+ return glm::vec3(-30, -30, DEFAULT_CAMERA_HEIGHT);
}
void GL3DBarChart::moveToCorner()