mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-03 17:18:23 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

OpenGL coverflow: Replace z-buffer picking with raytracing.

Browse Source
This commit is contained in:
Felix Kauselmann 2019-06-01 18:08:38 +02:00 committed by Luis Ángel San Martín
parent 695353841e
commit 622978b2bd
1 changed files with 11 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
common/gl/yacreader_flow_gl.cpp
View File

@ -1066,27 +1066,15 @@ void YACReaderFlowGL::keyPressEvent(QKeyEvent *event)
void YACReaderFlowGL::mousePressEvent(QMouseEvent *event) void YACReaderFlowGL::mousePressEvent(QMouseEvent *event)
{ {
makeCurrent(); if(event->button() == Qt::LeftButton)
if (event->button() == Qt::LeftButton) { {
float x, y; QVector3D intersection = getPlaneIntersection(event->x(), event->y(), images[currentSelected]);
x = event->x() * devicePixelRatio(); if((intersection.x() > 0.5 && !flowRightToLeft) || (intersection.x() < -0.5 && flowRightToLeft))
y = event->y() * devicePixelRatio(); {
GLint viewport[4];
QMatrix4x4 modelview;
QMatrix4x4 projection;
GLfloat winZ;
glGetFloatv(GL_MODELVIEW_MATRIX, modelview.data());
glGetFloatv(GL_PROJECTION_MATRIX, projection.data());
glGetIntegerv(GL_VIEWPORT, viewport);
glReadPixels(x, int((float)viewport[3] - (float)y), 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &winZ);
auto clickVector = QVector3D(x, (float)viewport[3] - (float)y, winZ);
clickVector = clickVector.unproject(modelview, projection, QRect(viewport[0], viewport[1], viewport[2], viewport[3]));
if ((clickVector.x() >= 0.5 && !flowRightToLeft) || (clickVector.x() <= -0.5 && flowRightToLeft)) {
showNext(); showNext();
} else if ((clickVector.x() <= -0.5 && !flowRightToLeft) || (clickVector.x() >= 0.5 && flowRightToLeft)) { }
else if((intersection.x() < -0.5 && !flowRightToLeft) || (intersection.x() > 0.5 && flowRightToLeft) )
{
showPrevious(); showPrevious();
} }
} else { } else {
@ -1097,24 +1085,10 @@ void YACReaderFlowGL::mousePressEvent(QMouseEvent *event)
void YACReaderFlowGL::mouseDoubleClickEvent(QMouseEvent *event) void YACReaderFlowGL::mouseDoubleClickEvent(QMouseEvent *event)
{ {
makeCurrent(); QVector3D intersection = getPlaneIntersection(event->x(), event->y(), images[currentSelected]);
float x, y;
x = event->x() * devicePixelRatio();
y = event->y() * devicePixelRatio();
GLint viewport[4];
QMatrix4x4 modelview;
QMatrix4x4 projection;
GLfloat winZ;
glGetFloatv(GL_MODELVIEW_MATRIX, modelview.data()); if(intersection.x() < 0.5 && intersection.x() > -0.5)
glGetFloatv(GL_PROJECTION_MATRIX, projection.data()); {
glGetIntegerv(GL_VIEWPORT, viewport);
glReadPixels(x, int((float)viewport[3] - (float)y), 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &winZ);
auto clickVector = QVector3D(x, (float)viewport[3] - (float)y, winZ);
clickVector = clickVector.unproject(modelview, projection, QRect(viewport[0], viewport[1], viewport[2], viewport[3]));
if (clickVector.x() <= 0.5 && clickVector.x() >= -0.5) {
emit selected(centerIndex()); emit selected(centerIndex());
event->accept(); event->accept();
} }