summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Jaumann <meta_dev@yahoo.com>2014-12-01 12:33:07 +0000
committerMichael Jaumann <meta_dev@yahoo.com>2015-03-02 12:42:48 +0000
commit5e60a646c448ed55a12020bff3a9f1f426962fdc (patch)
tree45092413b7c0b58540db79d6d513634ede594793
parent06390b63547deb56c82b3d975fbfda3af5fe3943 (diff)
cleanup
Change-Id: Ide2746b3fc112642bc6e262689b710326166fd28
-rw-r--r--canvas/source/opengl/ogl_spritedevicehelper.cxx26
1 files changed, 8 insertions, 18 deletions
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index 0d171d62664b..ba49896ce5a3 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -100,6 +100,7 @@ namespace oglcanvas
initContext();
mRenderHelper.InitOpenGL();
+
mnLinearMultiColorGradientProgram =
OpenGLHelper::LoadShaders("dummyVertexShader", "linearMultiColorGradientFragmentShader");
@@ -301,16 +302,6 @@ namespace oglcanvas
const ::Size& rOutputSize = pChildWindow->GetSizePixel();
initTransformation(rOutputSize);
- glm::mat4 ViewTranslate = glm::translate(
- glm::mat4(1.0f),
- glm::vec3(-1.0, 1.0, 0.0));
- glm::mat4 ViewScaled = glm::scale(
- ViewTranslate,
- glm::vec3(2.0 / rOutputSize.Width(),
- -2.0/ rOutputSize.Height(),
- 1.0 ));
- mRenderHelper.SetModelAndMVP(ViewScaled);
-
// render the actual spritecanvas content
mpSpriteCanvas->renderRecordedActions();
@@ -334,17 +325,16 @@ namespace oglcanvas
const double fps(denominator == 0.0 ? 100.0 : 1.0/denominator);
- mRenderHelper.SetModelAndMVP(ViewScaled);
+#ifdef DEBUG_RENDERING
+ std::vector<double> aVec;
+ aVec.push_back(mfAlpha);
+ aVec.push_back(mfPriority);
+ aVec.push_back(maCanvasHelper.getRecordedActionCount());
-#ifdef RENDER_DEBUG
- std::vector<double> aVec; aVec.push_back(fps);
- aVec.push_back(maActiveSprites.size());
- aVec.push_back(mpTextureCache->getCacheSize());
- aVec.push_back(mpTextureCache->getCacheMissCount());
- aVec.push_back(mpTextureCache->getCacheHitCount());
- renderOSD( aVec, 20 , getRenderHelper());
+ renderOSD( aVec, 20, pRenderHelper);
#endif
+
/*
* TODO: moggi: fix it!
// switch buffer, sync etc.