mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-21 06:24:39 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Corregido bug en yacreader_flow_gl: abs -> fabs, para evitar conversi?n de float a int al compilar con gcc.

Browse Source 
Corregida traducci?n en el di?logo crear biblioteca.
This commit is contained in:
Luis Ángel San Martín
2013-01-15 21:59:02 +01:00
parent 142b917c2b
commit 1af1750f41
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/yacreader_flow_gl.cpp
View File

@ -2,10 +2,11 @@
#include <QtGui>
#include <QtOpenGL>
#include <math.h>
//#include <math.h>
#include <GL/glu.h>
#include <QGLContext>
#include <QGLPixelBuffer>
#include <cmath>
/*** Animation Settings ***/
@ -351,7 +352,7 @@ void YACReaderFlowGL::animate(RVect *Current,RVect to)
Current->y = Current->y+(to.y-Current->y)*config.animationStep;
Current->z = Current->z+(to.z-Current->z)*config.animationStep;
if(abs(to.rot-Current->rot) > 0.01){
if(fabs(to.rot-Current->rot) > 0.01){
Current->rot = Current->rot+(to.rot-Current->rot)*(config.animationStep*config.preRotation);
}
else
@ -364,7 +365,7 @@ void YACReaderFlowGL::drawCover(CFImage *CF)
float h = CF->height;
//fadeout
float opacity = 1-1/(config.animationFadeOutDist+config.viewRotateLightStrenght*abs(viewRotate))*abs(0-CF->current.x);
float opacity = 1-1/(config.animationFadeOutDist+config.viewRotateLightStrenght*fabs(viewRotate))*fabs(0-CF->current.x);
glLoadIdentity();
glTranslatef(config.cfX,config.cfY,config.cfZ);
@ -601,7 +602,7 @@ void YACReaderFlowGL::updatePositions()
viewRotate += (0-viewRotate)*config.viewRotateSub;
}
if(abs (cfImages[currentSelected].current.x - cfImages[currentSelected].animEnd.x) < 1)//viewRotate < 0.2)
if(fabs (cfImages[currentSelected].current.x - cfImages[currentSelected].animEnd.x) < 1)//viewRotate < 0.2)
{
cleanupAnimation();
if(updateCount >= 0) //TODO parametrizar