mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change transformation matrix

Browse Source
This commit is contained in:
Markus Mohrhard
2014-05-15 07:33:49 +02:00
parent 282b0123a3
commit fd37d07576
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
chart2/source/view/charttypes/GL3DBarChart.cxx
View File

@@ -72,7 +72,7 @@ void GL3DBarChart::create3DShapes(const boost::ptr_vector<VDataSeries>& rDataSer
for (boost::ptr_vector<VDataSeries>::const_iterator itr = rDataSeriesContainer.begin(), for (boost::ptr_vector<VDataSeries>::const_iterator itr = rDataSeriesContainer.begin(),
itrEnd = rDataSeriesContainer.end(); itr != itrEnd; ++itr) itrEnd = rDataSeriesContainer.end(); itr != itrEnd; ++itr)
{ {
nYPos = nSeriesIndex * (nBarSizeY + nBarDistanceY) + nBarSizeY; nYPos = nSeriesIndex * (nBarSizeY + nBarDistanceY);
const VDataSeries& rDataSeries = *itr; const VDataSeries& rDataSeries = *itr;
sal_Int32 nPointCount = rDataSeries.getTotalPointCount(); sal_Int32 nPointCount = rDataSeries.getTotalPointCount();
@@ -97,10 +97,10 @@ void GL3DBarChart::create3DShapes(const boost::ptr_vector<VDataSeries>& rDataSer
for(sal_Int32 nIndex = 0; nIndex < nPointCount; ++nIndex) for(sal_Int32 nIndex = 0; nIndex < nPointCount; ++nIndex)
{ {
float nVal = rDataSeries.getYValue(nIndex); float nVal = rDataSeries.getYValue(nIndex);
float nXPos = nIndex * (nBarSizeX + nBarDistanceX) + nBarSizeX; float nXPos = nIndex * (nBarSizeX + nBarDistanceX);
glm::mat4 aScaleMatrix = glm::scale(nBarSizeX, nBarSizeY, nVal); glm::mat4 aScaleMatrix = glm::scale(nBarSizeX, nBarSizeY, 0);
glm::mat4 aTranslationMatrix = glm::translate(nXPos, nYPos, nVal); glm::mat4 aTranslationMatrix = glm::translate(nXPos, nYPos, nVal);
glm::mat4 aBarPosition = aTranslationMatrix * aScaleMatrix; glm::mat4 aBarPosition = aTranslationMatrix * aScaleMatrix;