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

pass more parameters by const reference

Browse Source 
Change-Id: I46be96d6ba9f3fecb590c4be62775824194c380a
This commit is contained in:
Markus Mohrhard
2014-05-29 02:00:24 +02:00
parent ea15c9dc4d
commit e7aa417021
2 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
chart2/source/view/inc/GL3DRenderer.hxx
View File

@@ -168,17 +168,15 @@ public:
void AddShape3DExtrudeObject(bool roundedCorner, sal_uInt32 color, sal_uInt32 specular, const glm::mat4& modelMatrix, sal_uInt32 nUniqueId); void AddShape3DExtrudeObject(bool roundedCorner, sal_uInt32 color, sal_uInt32 specular, const glm::mat4& modelMatrix, sal_uInt32 nUniqueId);
void EndAddShape3DExtrudeObject(); void EndAddShape3DExtrudeObject();
void SetSize(const Size& rSize); void SetSize(const Size& rSize);
void SetCameraInfo(glm::vec3 pos, glm::vec3 direction, glm::vec3 up); void SetCameraInfo(const glm::vec3& pos, const glm::vec3& direction, const glm::vec3& up);
void CreateTextTexture(const boost::shared_array<sal_uInt8> &bitmapBuf, void CreateTextTexture(const boost::shared_array<sal_uInt8> &bitmapBuf,
::Size maSizePixels, ::Size maSizePixels,
glm::vec3 vTopLeft,glm::vec3 vTopRight, const glm::vec3& vTopLeft, const glm::vec3& vTopRight,
glm::vec3 vBottomRight, glm::vec3 vBottomLeft, const glm::vec3& vBottomRight, const glm::vec3& vBottomLeft,
sal_uInt32 nUniqueId); sal_uInt32 nUniqueId);
void CreateScreenTextTexture(const boost::shared_array<sal_uInt8> &bitmapBuf, void CreateScreenTextTexture(const boost::shared_array<sal_uInt8> &bitmapBuf,
::Size maSizePixels, ::Size maSizePixels, const glm::vec2& vTopLeft,
const glm::vec2& vBottomRight, sal_uInt32 nUniqueId);
glm::vec2 vTopLeft, glm::vec2 vBottomRight,
sal_uInt32 nUniqueId);
void ProcessUnrenderedShape(bool bNewScene); void ProcessUnrenderedShape(bool bNewScene);
void SetPickingMode(bool bPickingMode); void SetPickingMode(bool bPickingMode);
@@ -188,12 +186,12 @@ public:
void ReleaseShapes(); void ReleaseShapes();
void ReleaseScreenTextShapes(); void ReleaseScreenTextShapes();
private: private:
void MoveModelf(PosVecf3& trans,PosVecf3& angle,PosVecf3& scale); void MoveModelf( const PosVecf3& trans, const PosVecf3& angle, const PosVecf3& scale);
void ClearBuffer(); void ClearBuffer();
void RenderPolygon3DObject(); void RenderPolygon3DObject();
void RenderLine3D(Polygon3DInfo &polygon); void RenderLine3D(const Polygon3DInfo &polygon);
void RenderPolygon3D(Polygon3DInfo &polygon); void RenderPolygon3D(const Polygon3DInfo &polygon);
void Init3DUniformBlock(); void Init3DUniformBlock();
void Update3DUniformBlock(); void Update3DUniformBlock();
void RenderExtrude3DObject(); void RenderExtrude3DObject();
@@ -228,8 +226,8 @@ private:
void ReleaseTextShapes(); void ReleaseTextShapes();
void ReleaseBatchBarInfo(); void ReleaseBatchBarInfo();
void GetBatchBarsInfo(); void GetBatchBarsInfo();
void GetBatchTopAndFlatInfo(Extrude3DInfo &extrude3D); void GetBatchTopAndFlatInfo(const Extrude3DInfo &extrude3D);
void GetBatchMiddleInfo(Extrude3DInfo &extrude3D); void GetBatchMiddleInfo(const Extrude3DInfo &extrude3D);
void InitBatch3DUniformBlock(); void InitBatch3DUniformBlock();
void UpdateBatch3DUniformBlock(); void UpdateBatch3DUniformBlock();
void RenderBatchBars(bool bNewScene); void RenderBatchBars(bool bNewScene);

20
chart2/source/view/main/GL3DRenderer.cxx
View File

@@ -227,7 +227,7 @@ void OpenGL3DRenderer::PickingShaderResources::LoadShaders()
m_2DColorID = glGetUniformLocation(m_CommonProID, "vColor"); m_2DColorID = glGetUniformLocation(m_CommonProID, "vColor");
} }
void OpenGL3DRenderer::SetCameraInfo(glm::vec3 pos, glm::vec3 direction, glm::vec3 up) void OpenGL3DRenderer::SetCameraInfo(const glm::vec3& pos, const glm::vec3& direction, const glm::vec3& up)
{ {
m_CameraInfo.cameraPos = pos; m_CameraInfo.cameraPos = pos;
m_CameraInfo.cameraOrg = direction; m_CameraInfo.cameraOrg = direction;
@@ -712,7 +712,7 @@ int OpenGL3DRenderer::GenerateRoundCornerBar(std::vector<glm::vec3> &vertices, s
return iFacesAdded; return iFacesAdded;
} }
void OpenGL3DRenderer::RenderLine3D(Polygon3DInfo &polygon) void OpenGL3DRenderer::RenderLine3D(const Polygon3DInfo& polygon)
{ {
glUseProgram(maResources.m_CommonProID); glUseProgram(maResources.m_CommonProID);
PosVecf3 trans = {0.0f, 0, 0.0}; PosVecf3 trans = {0.0f, 0, 0.0};
@@ -756,7 +756,7 @@ void OpenGL3DRenderer::RenderLine3D(Polygon3DInfo &polygon)
glUseProgram(0); glUseProgram(0);
} }
void OpenGL3DRenderer::RenderPolygon3D(Polygon3DInfo &polygon) void OpenGL3DRenderer::RenderPolygon3D(const Polygon3DInfo& polygon)
{ {
size_t verticesNum = polygon.verticesList.size(); size_t verticesNum = polygon.verticesList.size();
size_t normalsNum = polygon.normalsList.size(); size_t normalsNum = polygon.normalsList.size();
@@ -1455,8 +1455,8 @@ void OpenGL3DRenderer::RenderExtrude3DObject()
void OpenGL3DRenderer::CreateScreenTextTexture( void OpenGL3DRenderer::CreateScreenTextTexture(
const boost::shared_array<sal_uInt8> &bitmapBuf, const boost::shared_array<sal_uInt8> &bitmapBuf,
::Size maSizePixels, ::Size maSizePixels, const glm::vec2& vTopLeft,
glm::vec2 vTopLeft, glm::vec2 vBottomRight, sal_uInt32 nUniqueId) const glm::vec2& vBottomRight, sal_uInt32 nUniqueId)
{ {
long bmpWidth = maSizePixels.Width(); long bmpWidth = maSizePixels.Width();
long bmpHeight = maSizePixels.Height(); long bmpHeight = maSizePixels.Height();
@@ -1501,8 +1501,8 @@ void OpenGL3DRenderer::CreateScreenTextTexture(
void OpenGL3DRenderer::CreateTextTexture(const boost::shared_array<sal_uInt8> &bitmapBuf, void OpenGL3DRenderer::CreateTextTexture(const boost::shared_array<sal_uInt8> &bitmapBuf,
::Size maSizePixels, ::Size maSizePixels,
glm::vec3 vTopLeft,glm::vec3 vTopRight, const glm::vec3& vTopLeft, const glm::vec3& vTopRight,
glm::vec3 vBottomRight, glm::vec3 vBottomLeft, const glm::vec3& vBottomRight, const glm::vec3& vBottomLeft,
sal_uInt32 nUniqueId) sal_uInt32 nUniqueId)
{ {
long bmpWidth = maSizePixels.Width(); long bmpWidth = maSizePixels.Width();
@@ -1744,7 +1744,7 @@ void OpenGL3DRenderer::ProcessUnrenderedShape(bool bNewScene)
#endif #endif
} }
void OpenGL3DRenderer::MoveModelf(PosVecf3& trans,PosVecf3& angle,PosVecf3& scale) void OpenGL3DRenderer::MoveModelf(const PosVecf3& trans, const PosVecf3& angle, const PosVecf3& scale)
{ {
glm::mat4 aTranslationMatrix = glm::translate(glm::vec3(trans.x, trans.y, trans.z)); glm::mat4 aTranslationMatrix = glm::translate(glm::vec3(trans.x, trans.y, trans.z));
glm::mat4 aScaleMatrix = glm::scale(glm::vec3(scale.x, scale.y, scale.z)); glm::mat4 aScaleMatrix = glm::scale(glm::vec3(scale.x, scale.y, scale.z));
@@ -1797,7 +1797,7 @@ void OpenGL3DRenderer::ReleaseShapes()
ReleaseBatchBarInfo(); ReleaseBatchBarInfo();
} }
void OpenGL3DRenderer::GetBatchMiddleInfo(Extrude3DInfo &extrude3D) void OpenGL3DRenderer::GetBatchMiddleInfo(const Extrude3DInfo &extrude3D)
{ {
float xyScale = extrude3D.xScale; float xyScale = extrude3D.xScale;
float zScale = extrude3D.zScale; float zScale = extrude3D.zScale;
@@ -1822,7 +1822,7 @@ void OpenGL3DRenderer::GetBatchMiddleInfo(Extrude3DInfo &extrude3D)
m_BarSurface[MIDDLE_SURFACE].colorList.push_back(extrude3D.material.materialColor); m_BarSurface[MIDDLE_SURFACE].colorList.push_back(extrude3D.material.materialColor);
} }
void OpenGL3DRenderer::GetBatchTopAndFlatInfo(Extrude3DInfo &extrude3D) void OpenGL3DRenderer::GetBatchTopAndFlatInfo(const Extrude3DInfo &extrude3D)
{ {
float xyScale = extrude3D.xScale; float xyScale = extrude3D.xScale;
float zScale = extrude3D.zScale; float zScale = extrude3D.zScale;