From efd17361f8bf1196f2c7724081d170b371cd7a15 Mon Sep 17 00:00:00 2001 From: Eduardo Bart Date: Tue, 24 Apr 2012 09:06:32 -0300 Subject: [PATCH] non relevant drawing changes --- src/framework/graphics/painterogl1.cpp | 16 ++++++++-------- src/framework/graphics/painterogl2.cpp | 20 ++++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/framework/graphics/painterogl1.cpp b/src/framework/graphics/painterogl1.cpp index 2e6d7882..cd766baf 100644 --- a/src/framework/graphics/painterogl1.cpp +++ b/src/framework/graphics/painterogl1.cpp @@ -133,10 +133,10 @@ void PainterOGL1::drawTexturedRect(const Rect& dest, const TexturePtr& texture, if(dest.isEmpty() || src.isEmpty() || !texture->getId()) return; + setTexture(texture.get()); + m_coordsBuffer.clear(); m_coordsBuffer.addQuad(dest, src); - - setTexture(texture.get()); drawCoords(m_coordsBuffer, TriangleStrip); } @@ -145,10 +145,10 @@ void PainterOGL1::drawRepeatedTexturedRect(const Rect& dest, const TexturePtr& t if(dest.isEmpty() || src.isEmpty() || !texture->getId()) return; + setTexture(texture.get()); + m_coordsBuffer.clear(); m_coordsBuffer.addRepeatedRects(dest, src); - - setTexture(texture.get()); drawCoords(m_coordsBuffer); } @@ -157,10 +157,10 @@ void PainterOGL1::drawFilledRect(const Rect& dest) if(dest.isEmpty()) return; + setTexture(nullptr); + m_coordsBuffer.clear(); m_coordsBuffer.addRect(dest); - - setTexture(nullptr); drawCoords(m_coordsBuffer); } @@ -169,10 +169,10 @@ void PainterOGL1::drawBoundingRect(const Rect& dest, int innerLineWidth) if(dest.isEmpty() || innerLineWidth == 0) return; + setTexture(nullptr); + m_coordsBuffer.clear(); m_coordsBuffer.addBoudingRect(dest, innerLineWidth); - - setTexture(nullptr); drawCoords(m_coordsBuffer); } diff --git a/src/framework/graphics/painterogl2.cpp b/src/framework/graphics/painterogl2.cpp index 33a68a49..51b9cdcb 100644 --- a/src/framework/graphics/painterogl2.cpp +++ b/src/framework/graphics/painterogl2.cpp @@ -113,11 +113,11 @@ void PainterOGL2::drawTexturedRect(const Rect& dest, const TexturePtr& texture, if(dest.isEmpty() || src.isEmpty() || !texture->getId()) return; - m_coordsBuffer.clear(); - m_coordsBuffer.addQuad(dest, src); - setDrawProgram(m_shaderProgram ? m_shaderProgram : g_shaders.getDrawTexturedProgram().get()); setTexture(texture); + + m_coordsBuffer.clear(); + m_coordsBuffer.addQuad(dest, src); drawCoords(m_coordsBuffer, TriangleStrip); } @@ -126,11 +126,11 @@ void PainterOGL2::drawRepeatedTexturedRect(const Rect& dest, const TexturePtr& t if(dest.isEmpty() || src.isEmpty() || !texture->getId()) return; - m_coordsBuffer.clear(); - m_coordsBuffer.addRepeatedRects(dest, src); - setDrawProgram(m_shaderProgram ? m_shaderProgram : g_shaders.getDrawTexturedProgram().get()); setTexture(texture); + + m_coordsBuffer.clear(); + m_coordsBuffer.addRepeatedRects(dest, src); drawCoords(m_coordsBuffer); } @@ -139,10 +139,10 @@ void PainterOGL2::drawFilledRect(const Rect& dest) if(dest.isEmpty()) return; + setDrawProgram(m_shaderProgram ? m_shaderProgram : g_shaders.getDrawSolidColorProgram().get()); + m_coordsBuffer.clear(); m_coordsBuffer.addRect(dest); - - setDrawProgram(m_shaderProgram ? m_shaderProgram : g_shaders.getDrawSolidColorProgram().get()); drawCoords(m_coordsBuffer); } @@ -151,9 +151,9 @@ void PainterOGL2::drawBoundingRect(const Rect& dest, int innerLineWidth) if(dest.isEmpty() || innerLineWidth == 0) return; + setDrawProgram(m_shaderProgram ? m_shaderProgram : g_shaders.getDrawSolidColorProgram().get()); + m_coordsBuffer.clear(); m_coordsBuffer.addBoudingRect(dest, innerLineWidth); - - setDrawProgram(m_shaderProgram ? m_shaderProgram : g_shaders.getDrawSolidColorProgram().get()); drawCoords(m_coordsBuffer); }