From 1af1750f413973f14fa4cec6b71c8cd3d2fdad19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Tue, 15 Jan 2013 21:59:02 +0100 Subject: [PATCH] Corregido bug en yacreader_flow_gl: abs -> fabs, para evitar conversi?n de float a int al compilar con gcc. Corregida traducci?n en el di?logo crear biblioteca. --- YACReaderLibrary/yacreaderlibrary_es.qm | Bin 23245 -> 23241 bytes YACReaderLibrary/yacreaderlibrary_es.ts | 2 +- common/yacreader_flow_gl.cpp | 9 +++++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/YACReaderLibrary/yacreaderlibrary_es.qm b/YACReaderLibrary/yacreaderlibrary_es.qm index 19156329548102643bfbc586c6669af82b05df38..4e002cdf84148163bb271e20ab24e4dee9c3f442 100644 GIT binary patch delta 1484 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 diff --git a/YACReaderLibrary/yacreaderlibrary_es.ts b/YACReaderLibrary/yacreaderlibrary_es.ts index 56397684..938f9f37 100644 --- a/YACReaderLibrary/yacreaderlibrary_es.ts +++ b/YACReaderLibrary/yacreaderlibrary_es.ts @@ -180,7 +180,7 @@ Create a library could take several minutes. You can stop the process and update the library later for completing the task. - Crear una biblioteca puede llevar varios minutos. Puedesde parar el proceso en cualquier momento y completar la tarea más tarde. + Crear una biblioteca puede llevar varios minutos. Puedes parar el proceso en cualquier momento y completar la tarea más tarde. diff --git a/common/yacreader_flow_gl.cpp b/common/yacreader_flow_gl.cpp index 1e3a276f..ffeb5c1d 100644 --- a/common/yacreader_flow_gl.cpp +++ b/common/yacreader_flow_gl.cpp @@ -2,10 +2,11 @@ #include #include -#include +//#include #include #include #include +#include /*** 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