From ea2216aef51606cce8ef1d123d56bef2ff80c3bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Fri, 17 May 2013 07:34:46 +0200 Subject: [PATCH] new ribbon for read comics (only in gl comic flow) --- YACReaderLibrary/images.qrc | 1 + YACReaderLibrary/library_window.cpp | 2 +- common/yacreader_flow_gl.cpp | 16 ++++++++-------- images/readRibbon.png | Bin 0 -> 8481 bytes 4 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 images/readRibbon.png diff --git a/YACReaderLibrary/images.qrc b/YACReaderLibrary/images.qrc index 84b28ad0..3579057f 100644 --- a/YACReaderLibrary/images.qrc +++ b/YACReaderLibrary/images.qrc @@ -67,5 +67,6 @@ ../images/glowLine.png ../images/clearSearch.png ../images/iconSearch.png + ../images/readRibbon.png \ No newline at end of file diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp index e47ded10..977404cd 100644 --- a/YACReaderLibrary/library_window.cpp +++ b/YACReaderLibrary/library_window.cpp @@ -130,7 +130,7 @@ void LibraryWindow::doLayout() m.scale(-1,1); QImage image(":/images/setRead.png"); QImage imageTransformed = image.transformed(m,Qt::SmoothTransformation); - comicFlow->setMarkImage(imageTransformed); + comicFlow->setMarkImage(imageTransformed); //not used in flowGL... int heightDesktopResolution = QApplication::desktop()->screenGeometry().height(); int height,width; height = heightDesktopResolution*0.39; diff --git a/common/yacreader_flow_gl.cpp b/common/yacreader_flow_gl.cpp index 44302e34..39cc7fac 100644 --- a/common/yacreader_flow_gl.cpp +++ b/common/yacreader_flow_gl.cpp @@ -279,7 +279,7 @@ void YACReaderFlowGL::initializeGL() 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); - 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) populate(lazyPopulateObjects); @@ -461,24 +461,24 @@ void YACReaderFlowGL::drawCover(CFImage *CF) glBegin(GL_QUADS); //esquina inferior izquierda - glColor4f(LDOWN*opacity,LDOWN*opacity,LDOWN*opacity,1); + glColor4f(RUP*opacity,RUP*opacity,RUP*opacity,1); 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 - glColor4f(RDOWN*opacity,RDOWN*opacity,RDOWN*opacity,1); + glColor4f(RUP*opacity,RUP*opacity,RUP*opacity,1); 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 glColor4f(RUP*opacity,RUP*opacity,RUP*opacity,1); 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 - glColor4f(LUP*opacity,LUP*opacity,LUP*opacity,1); + glColor4f(RUP*opacity,RUP*opacity,RUP*opacity,1); 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(); glDisable(GL_TEXTURE_2D); diff --git a/images/readRibbon.png b/images/readRibbon.png new file mode 100644 index 0000000000000000000000000000000000000000..f1a862c012e937292710ed9eed923017cb05507e GIT binary patch literal 8481 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