new ribbon for read comics (only in gl comic flow)

This commit is contained in:
Luis Ángel San Martín 2013-05-17 07:34:46 +02:00
parent 36ad46a632
commit ea2216aef5
4 changed files with 10 additions and 9 deletions

View File

@ -67,5 +67,6 @@
<file>../images/glowLine.png</file> <file>../images/glowLine.png</file>
<file>../images/clearSearch.png</file> <file>../images/clearSearch.png</file>
<file>../images/iconSearch.png</file> <file>../images/iconSearch.png</file>
<file>../images/readRibbon.png</file>
</qresource> </qresource>
</RCC> </RCC>

View File

@ -130,7 +130,7 @@ void LibraryWindow::doLayout()
m.scale(-1,1); m.scale(-1,1);
QImage image(":/images/setRead.png"); QImage image(":/images/setRead.png");
QImage imageTransformed = image.transformed(m,Qt::SmoothTransformation); QImage imageTransformed = image.transformed(m,Qt::SmoothTransformation);
comicFlow->setMarkImage(imageTransformed); comicFlow->setMarkImage(imageTransformed); //not used in flowGL...
int heightDesktopResolution = QApplication::desktop()->screenGeometry().height(); int heightDesktopResolution = QApplication::desktop()->screenGeometry().height();
int height,width; int height,width;
height = heightDesktopResolution*0.39; height = heightDesktopResolution*0.39;

View File

@ -279,7 +279,7 @@ void YACReaderFlowGL::initializeGL()
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
defaultTexture = bindTexture(QImage(":/images/defaultCover.png"),GL_TEXTURE_2D,GL_RGBA,QGLContext::LinearFilteringBindOption | QGLContext::MipmapBindOption); defaultTexture = bindTexture(QImage(":/images/defaultCover.png"),GL_TEXTURE_2D,GL_RGBA,QGLContext::LinearFilteringBindOption | QGLContext::MipmapBindOption);
markTexture = bindTexture(QImage(":/images/setRead.png"),GL_TEXTURE_2D,GL_RGBA,QGLContext::LinearFilteringBindOption | QGLContext::MipmapBindOption); markTexture = bindTexture(QImage(":/images/readRibbon.png"),GL_TEXTURE_2D,GL_RGBA,QGLContext::LinearFilteringBindOption | QGLContext::MipmapBindOption);
if(lazyPopulateObjects!=-1) if(lazyPopulateObjects!=-1)
populate(lazyPopulateObjects); populate(lazyPopulateObjects);
@ -461,24 +461,24 @@ void YACReaderFlowGL::drawCover(CFImage *CF)
glBegin(GL_QUADS); glBegin(GL_QUADS);
//esquina inferior izquierda //esquina inferior izquierda
glColor4f(LDOWN*opacity,LDOWN*opacity,LDOWN*opacity,1); glColor4f(RUP*opacity,RUP*opacity,RUP*opacity,1);
glTexCoord2f(0.0f, 1.0f); glTexCoord2f(0.0f, 1.0f);
glVertex3f(w/2.f-0.2f, -0.5f, 0.001f); glVertex3f(w/2.f-0.2, -0.685f+h, 0.001f);
//esquina inferior derecha //esquina inferior derecha
glColor4f(RDOWN*opacity,RDOWN*opacity,RDOWN*opacity,1); glColor4f(RUP*opacity,RUP*opacity,RUP*opacity,1);
glTexCoord2f(1.0f, 1.0f); glTexCoord2f(1.0f, 1.0f);
glVertex3f(w/2.f, -0.5f, 0.001f); glVertex3f(w/2.f-0.05, -0.685f+h, 0.001f);
//esquina superior derecha //esquina superior derecha
glColor4f(RUP*opacity,RUP*opacity,RUP*opacity,1); glColor4f(RUP*opacity,RUP*opacity,RUP*opacity,1);
glTexCoord2f(1.0f, 0.0f); glTexCoord2f(1.0f, 0.0f);
glVertex3f(w/2.f, -0.3f, 0.001f); glVertex3f(w/2.f-0.05, -0.485f+h, 0.001f);
//esquina superior izquierda //esquina superior izquierda
glColor4f(LUP*opacity,LUP*opacity,LUP*opacity,1); glColor4f(RUP*opacity,RUP*opacity,RUP*opacity,1);
glTexCoord2f(0.0f, 0.0f); glTexCoord2f(0.0f, 0.0f);
glVertex3f(w/2.f-0.2f, -0.3f, 0.001f); glVertex3f(w/2.f-0.2, -0.485f+h, 0.001f);
glEnd(); glEnd();
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);

BIN
images/readRibbon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB