Kaydet (Commit) 8f38b9e1 authored tarafından weigao's avatar weigao Kaydeden (comit) Markus Mohrhard

remove test code of screen text

Change-Id: Ibcda49dc561b2778d17c03edaaaf2b8e2fff4a0a
üst b2b57d51
...@@ -377,16 +377,7 @@ void RenderBenchMarkThread::UpdateFPS() ...@@ -377,16 +377,7 @@ void RenderBenchMarkThread::UpdateFPS()
osl_getSystemTime(&mafpsRenderStartTime); osl_getSystemTime(&mafpsRenderStartTime);
} }
osl_getSystemTime(&mafpsRenderEndTime); osl_getSystemTime(&mafpsRenderEndTime);
#if 1 //will add the fps render code here later
opengl3D::ScreenText tFPS(mpChart->mpRenderer.get(), *(mpChart->mpTextCache), mpChart->mTestString, 0);
opengl3D::TextCacheItem tmpTextCache = mpChart->mpTextCache->getText(mpChart->mTestString);
#else
opengl3D::ScreenText tFPS(mpChart->mpRenderer.get(), *(mpChart->mpTextCache), maFPS, 0);
opengl3D::TextCacheItem tmpTextCache = mpChart->mpTextCache->getText(maFPS);
#endif
float rectWidth = (float)tmpTextCache.maSize.Width() / (float)tmpTextCache.maSize.Height() * 0.05;
tFPS.setPosition(glm::vec2(-0.99f, 0.99f), glm::vec2(-0.99f + rectWidth, 0.89f));
tFPS.render();
} }
void RenderBenchMarkThread::UpdateScreenText() void RenderBenchMarkThread::UpdateScreenText()
...@@ -648,7 +639,6 @@ void GL3DBarChart::create3DShapes(const boost::ptr_vector<VDataSeries>& rDataSer ...@@ -648,7 +639,6 @@ void GL3DBarChart::create3DShapes(const boost::ptr_vector<VDataSeries>& rDataSer
maShapes.push_back(new opengl3D::Text(mpRenderer.get(), *mpTextCache, maShapes.push_back(new opengl3D::Text(mpRenderer.get(), *mpTextCache,
aCats[i], nId)); aCats[i], nId));
mTestString = aCats[i];
nId += ID_STEP; nId += ID_STEP;
p = static_cast<opengl3D::Text*>(&maShapes.back()); p = static_cast<opengl3D::Text*>(&maShapes.back());
aTopLeft.x = nXPos + TEXT_HEIGHT + 0.5 * BAR_SIZE_X; aTopLeft.x = nXPos + TEXT_HEIGHT + 0.5 * BAR_SIZE_X;
......
...@@ -137,7 +137,6 @@ private: ...@@ -137,7 +137,6 @@ private:
RenderEventType maRenderEvent; RenderEventType maRenderEvent;
sal_uInt32 mSelectBarId; sal_uInt32 mSelectBarId;
Point maClickPos; Point maClickPos;
OUString mTestString;
sal_uInt32 miScrollRate; sal_uInt32 miScrollRate;
bool mbScrollFlg; bool mbScrollFlg;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment