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

remove all the unused functions

Browse Source 
Change-Id: Idb78a97793615ff0ccb5377d87442deaaa09161d
This commit is contained in:
Markus Mohrhard
2014-05-25 21:38:38 +02:00
committed by Markus Mohrhard
parent 14a443c107
commit 45c25954db
2 changed files with 0 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,9 +160,6 @@ public:
void EndAddPolygon3DObjectPoint(); void EndAddPolygon3DObjectPoint();
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();
double GetTime();
void SetFPS(float fps);
void RenderClickPos(Point aMPos);
void SetSize(const Size& rSize); void SetSize(const Size& rSize);
void SetCameraInfo(glm::vec3 pos, glm::vec3 direction, glm::vec3 up); void SetCameraInfo(glm::vec3 pos, glm::vec3 direction, glm::vec3 up);
void CreateTextTexture(const BitmapEx& rBitmapEx, glm::vec3 vTopLeft,glm::vec3 vTopRight, glm::vec3 vBottomRight, glm::vec3 vBottomLeft, sal_uInt32 nUniqueId); void CreateTextTexture(const BitmapEx& rBitmapEx, glm::vec3 vTopLeft,glm::vec3 vTopRight, glm::vec3 vBottomRight, glm::vec3 vBottomLeft, sal_uInt32 nUniqueId);
@@ -174,17 +171,14 @@ public:
private: private:
void MoveModelf(PosVecf3& trans,PosVecf3& angle,PosVecf3& scale); void MoveModelf(PosVecf3& trans,PosVecf3& angle,PosVecf3& scale);
void GetFreq();
void RenderPolygon3DObject(); void RenderPolygon3DObject();
void RenderLine3D(Polygon3DInfo &polygon); void RenderLine3D(Polygon3DInfo &polygon);
void RenderPolygon3D(Polygon3DInfo &polygon); void RenderPolygon3D(Polygon3DInfo &polygon);
void Init3DUniformBlock(); void Init3DUniformBlock();
void Update3DUniformBlock(); void Update3DUniformBlock();
void RenderExtrude3DObject(); void RenderExtrude3DObject();
void RenderFPS(float fps);
//add for text //add for text
void RenderTextShape(); void RenderTextShape();
void RenderText(const ::rtl::OUString& string, com::sun::star::awt::Point aPos);
void RenderExtrudeSurface(const Extrude3DInfo& extrude3D); void RenderExtrudeSurface(const Extrude3DInfo& extrude3D);
void RenderExtrudeTopSurface(const Extrude3DInfo& extrude3D); void RenderExtrudeTopSurface(const Extrude3DInfo& extrude3D);
void RenderExtrudeMiddleSurface(const Extrude3DInfo& extrude3D); void RenderExtrudeMiddleSurface(const Extrude3DInfo& extrude3D);

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

@@ -67,7 +67,6 @@ glm::vec4 getColorAsVector(sal_uInt32 nColor)
((nColor & 0x0000FF00) >> 8) / 255.0f, ((nColor & 0x0000FF00) >> 8) / 255.0f,
(nColor & 0x000000FF) / 255.0f, (nColor & 0x000000FF) / 255.0f,
(0xFF - (nColor & 0xFF000000)/255.0)); (0xFF - (nColor & 0xFF000000)/255.0));
} }
} }
@@ -87,7 +86,6 @@ OpenGL3DRenderer::OpenGL3DRenderer():
m_Extrude3DInfo.twoSidesLighting = false; m_Extrude3DInfo.twoSidesLighting = false;
GetFreq();
m_RoundBarMesh.iMeshSizes = 0; m_RoundBarMesh.iMeshSizes = 0;
} }
@@ -669,25 +667,6 @@ int OpenGL3DRenderer::GenerateRoundCornerBar(std::vector<glm::vec3> &vertices, s
return iFacesAdded; return iFacesAdded;
} }
void OpenGL3DRenderer::GetFreq()
{
#if 0
LARGE_INTEGER litmpold;
QueryPerformanceFrequency(&litmpold);
m_dFreq= litmpold.QuadPart;
#endif
}
double OpenGL3DRenderer::GetTime()
{
#if 0
LARGE_INTEGER litmpold;
QueryPerformanceCounter(&litmpold);
return litmpold.QuadPart*1000000 / m_dFreq;
#endif
return 0;
}
void OpenGL3DRenderer::RenderLine3D(Polygon3DInfo &polygon) void OpenGL3DRenderer::RenderLine3D(Polygon3DInfo &polygon)
{ {
glUseProgram(maResources.m_CommonProID); glUseProgram(maResources.m_CommonProID);
@@ -1487,54 +1466,6 @@ void OpenGL3DRenderer::RenderTextShape()
CHECK_GL_ERROR(); CHECK_GL_ERROR();
} }
void OpenGL3DRenderer::RenderText(const ::rtl::OUString& , awt::Point )
{
//TODO: moggi: disabled for now
/*
Font aFont("Arial", Size(0, 100));
Rectangle aRect;
VirtualDevice aDevice;
aDevice.GetTextBoundRect(aRect, string);
int screenWidth = (aRect.BottomRight().X() + 3) & ~3;
int screenHeight = (aRect.BottomRight().Y() + 3) & ~3;
int textHeight = OPENGL_SCALE_VALUE * m_iHeight / 20;
int textWidth = (float)textHeight * ((float)screenWidth / (float)screenHeight);
textWidth = (textWidth + 3) & ~3;
awt::Size aSize(textWidth, textHeight);
//clear text info
size_t listNum = m_TextInfoList.size();
for (size_t i = 0; i < listNum; i++)
{
TextInfo &textInfo = m_TextInfoList.front();
glDeleteTextures(1, &textInfo.texture);
m_TextInfoList.pop_front();
}
//create text texture
CreateTextTexture(string, aFont, 0xFF0000, aPos, aSize, 0);
RenderTextShape();
*/
}
void OpenGL3DRenderer::RenderFPS(float fps)
{
//use width and height to get the position
::rtl::OUString stringFps = ::rtl::OUString("fps ") + ::rtl::OUString::number(fps);
awt::Point aPos(0,0);
RenderText(stringFps, aPos);
}
void OpenGL3DRenderer::RenderClickPos(Point aMPos)
{
//use width and height to get the position
::rtl::OUString stringPos = ::rtl::OUString("(") +
::rtl::OUString::number(aMPos.X()) +
::rtl::OUString(",") +
::rtl::OUString::number(aMPos.Y()) +
::rtl::OUString(")");
awt::Point aPos(aMPos.X(), aMPos.Y());
RenderText(stringPos, aPos);
}
void OpenGL3DRenderer::CreateSceneBoxView() void OpenGL3DRenderer::CreateSceneBoxView()
{ {
m_3DView = glm::lookAt(m_CameraInfo.cameraPos, m_3DView = glm::lookAt(m_CameraInfo.cameraPos,