diff options
author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-05-10 22:45:30 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-05-12 03:00:06 +0200 |
commit | 3729f6ca6abe83b8f6b2a712b286e7ba57442302 (patch) | |
tree | 08a0c07b24fd57efb7436088e5c05205345f8bc4 | |
parent | c4a490eb0b6cc19e2aab39f639ae251af511cc62 (diff) |
remove scene box that should not be in the renderer
Change-Id: I3ec69042782aaac2fa2b583dd5a667b91dcdbb88
-rw-r--r-- | chart2/source/view/inc/GL3DRenderer.hxx | 28 | ||||
-rw-r--r-- | chart2/source/view/main/GL3DRenderer.cxx | 24 |
2 files changed, 0 insertions, 52 deletions
diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx index 9eb21b27a69b..7e407db33abe 100644 --- a/chart2/source/view/inc/GL3DRenderer.hxx +++ b/chart2/source/view/inc/GL3DRenderer.hxx @@ -154,26 +154,6 @@ struct TextInfo float vertex[12]; }; - -struct SceneBox -{ - float maxXCoord; - float minXCoord; - float maxYCoord; - float minYCoord; - float maxZCoord; - float minZCoord; - - SceneBox(): - maxXCoord(-1*FLT_MAX), - minXCoord(FLT_MAX), - maxYCoord(-1*FLT_MAX), - minYCoord(FLT_MAX), - maxZCoord(-1*FLT_MAX), - minZCoord(FLT_MAX) {} -}; - - class OpenGL3DRenderer { public: @@ -198,7 +178,6 @@ public: void EndAddShape3DExtrudeObject(); double GetTime(); void SetFPS(float fps); - void SetClickPos(Point aMPos); void RenderClickPos(Point aMPos); void SetSize(const Size& rSize); void SetCameraInfo(glm::vec3 pos, glm::vec3 direction, glm::vec3 up); @@ -370,13 +349,6 @@ private: GLint m_RenderVertexID; GLint m_RenderTexCoordID; - //TODO: moggi: kill the following parts - // don't add anything below or I will remove it -#if 0 - size_t m_iPointNum; -#endif - - SceneBox m_SenceBox; float m_fViewAngle; diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx index 412d401007ad..e581d230a8c2 100644 --- a/chart2/source/view/main/GL3DRenderer.cxx +++ b/chart2/source/view/main/GL3DRenderer.cxx @@ -924,17 +924,7 @@ void OpenGL3DRenderer::AddPolygon3DObjectPoint(float x, float y, float z) float actualX = x; float actualY = y; float actualZ = z; - float maxCoord = std::max(actualX, std::max(actualY, actualZ)); - m_fZmax = std::max(maxCoord, m_fZmax); m_Polygon3DInfo.vertices->push_back(glm::vec3(actualX, actualY, actualZ)); - m_SenceBox.maxXCoord = std::max(m_SenceBox.maxXCoord, actualX); - m_SenceBox.minXCoord = std::min(m_SenceBox.minXCoord, actualX); - - m_SenceBox.maxYCoord = std::max(m_SenceBox.maxYCoord, actualY); - m_SenceBox.minYCoord = std::min(m_SenceBox.minYCoord, actualY); - - m_SenceBox.maxZCoord = std::max(m_SenceBox.maxZCoord, actualZ); - m_SenceBox.minZCoord = std::min(m_SenceBox.minZCoord, actualZ); } void OpenGL3DRenderer::EndAddPolygon3DObjectPoint() @@ -993,15 +983,6 @@ void OpenGL3DRenderer::AddShape3DExtrudeObject(bool roundedCorner, sal_Int32 col m_Vertices.clear(); m_Normals.clear(); m_Indeices.clear(); - m_SenceBox.maxXCoord = std::max(m_SenceBox.maxXCoord, m_Extrude3DInfo.xTransform + m_Extrude3DInfo.xScale); - m_SenceBox.minXCoord = std::min(m_SenceBox.minXCoord, m_Extrude3DInfo.xTransform); - - m_SenceBox.maxYCoord = std::max(m_SenceBox.maxYCoord, m_Extrude3DInfo.yTransform + m_Extrude3DInfo.yScale); - m_SenceBox.minYCoord = std::min(m_SenceBox.minYCoord, m_Extrude3DInfo.yTransform ); - - m_SenceBox.maxZCoord = std::max(m_SenceBox.maxZCoord, m_Extrude3DInfo.zTransform + m_Extrude3DInfo.zScale); - m_SenceBox.minZCoord = std::min(m_SenceBox.minZCoord, m_Extrude3DInfo.zTransform); - } void OpenGL3DRenderer::EndAddShape3DExtrudeObject() @@ -1283,11 +1264,6 @@ void OpenGL3DRenderer::SetFPS(float fps) m_fFPS = fps; } -void OpenGL3DRenderer::SetClickPos(Point aMPos) -{ - m_aMPos = aMPos; -} - void OpenGL3DRenderer::CreateTextTexture(const BitmapEx& rBitmapEx, glm::vec3 vTopLeft,glm::vec3 vTopRight, glm::vec3 vBottomRight, glm::vec3 vBottomLeft) { long bmpWidth = rBitmapEx.GetSizePixel().Width(); |