[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bkstars=5D_kstars=3A_Use_drawTexturedRectangle_for_f?=
From:       Khudyakov Alexey <alexey.skladnoy () gmail ! com>
Date:       2011-05-05 12:20:30
Message-ID: 20110505122030.A7892A60C9 () git ! kde ! org
[Download RAW message or body]

Git commit d5cb16978192821693f91136d28b4e93e221ef85 by Khudyakov Alexey.
Committed on 05/05/2011 at 14:06.
Pushed by khudyakov into branch 'master'.

Use drawTexturedRectangle for flags

M  +12   -29   kstars/skyglpainter.cpp     

http://commits.kde.org/kstars/d5cb16978192821693f91136d28b4e93e221ef85

diff --git a/kstars/skyglpainter.cpp b/kstars/skyglpainter.cpp
index a9788ec..8189cc7 100644
--- a/kstars/skyglpainter.cpp
+++ b/kstars/skyglpainter.cpp
@@ -517,35 +517,18 @@ void SkyGLPainter::drawFlags()
         vec = m_proj->toScreenVec( point, true, &visible );
 
         // Return if flag is not visible
-        if( !visible || !m_proj->onScreen( vec ) ) continue;
-
-        // Get texture from TextureManager
-        if ( data->skyComposite()->flags()->imageName( i ) == "Default" )
-            TextureManager::bindTexture("defaultflag", m_widget);
-        else 
-            TextureManager::bindFromImage( image, m_widget );
-
-        glEnable(GL_TEXTURE_2D);
-        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-        glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-        Vector2f vertex;
-        glBegin(GL_QUADS);
-        vertex = vec + Vector2f( image.width()/2 * -1, image.height()/2 );
-        glTexCoord2f(0.,0.);
-            glVertex2fv(vertex.data());
-            vertex = vec + Vector2f( image.width()/2, image.height()/2 );
-            glTexCoord2f(1.,0.);
-            glVertex2fv(vertex.data());
-            vertex = vec + Vector2f( image.width()/2, image.height()/2 * -1  );
-            glTexCoord2f(1.,1.);
-            glVertex2fv(vertex.data());
-            vertex = vec + Vector2f( image.width()/2 * -1, image.height()/2 * -1 );
-            glTexCoord2f(0.,1.);
-            glVertex2fv(vertex.data());
-        glEnd();
-
-        // Draw label
-        drawText( vec.x(), vec.y(), data->skyComposite()->flags()->label( i ), \
QFont( "Courier New", 10, QFont::Bold ), data->skyComposite()->flags()->labelColor( i \
) ); +        if( !visible || !m_proj->onScreen( vec ) )
+            continue;
+
+        const QImage& img = data->skyComposite()->flags()->imageName( i ) == \
"Default" +                          ? TextureManager::getImage("defaultflag")
+                          : image;
+
+        drawTexturedRectangle( img, vec, 0, img.width(), img.height() );
+        drawText( vec.x(), vec.y(),
+                  data->skyComposite()->flags()->label( i ),
+                  QFont( "Courier New", 10, QFont::Bold ),
+                  data->skyComposite()->flags()->labelColor( i ) );
     }
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]