diff options
22 files changed, 96 insertions, 1741 deletions
diff --git a/src/declarative/3rdparty/easing.cpp b/src/declarative/3rdparty/easing.cpp deleted file mode 100644 index 50e9e51..0000000 --- a/src/declarative/3rdparty/easing.cpp +++ /dev/null @@ -1,726 +0,0 @@ -/* -Disclaimer for Robert Penner's Easing Equations license: - -TERMS OF USE - EASING EQUATIONS - -Open source under the BSD License. - -Copyright © 2001 Robert Penner -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of the author nor the names of contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#ifndef M_PI -#define M_PI 3.14159265358979323846 -#endif -#ifndef M_PI_2 -#define M_PI_2 (M_PI / 2) -#endif - - -/** - * Easing equation function for a simple linear tweening, with no easing. - * - * @param t Current time (in frames or seconds). - * @param b Starting value. - * @param c Change needed in value. - * @param d Expected easing duration (in frames or seconds). - * @return The correct value. - */ -static float easeNone(float t, float b, float c, float d) -{ - return c*t/d + b; -} - -/** - * Easing equation function for a quadratic (t^2) easing in: accelerating from zero velocity. - * - * @param t Current time (in frames or seconds). - * @param b Starting value. - * @param c Change needed in value. - * @param d Expected easing duration (in frames or seconds). - * @return The correct value. - */ -static float easeInQuad(float t, float b, float c, float d) -{ - float t_adj = (float)t / (float)d; - return c*t_adj*t_adj + b; -} - -/** -* Easing equation function for a quadratic (t^2) easing out: decelerating to zero velocity. -* -* @param t Current time (in frames or seconds). -* @param b Starting value. -* @param c Change needed in value. -* @param d Expected easing duration (in frames or seconds). -* @return The correct value. -*/ -static float easeOutQuad(float t, float b, float c, float d) -{ - float t_adj = (float)t / (float)d; - return -c *t_adj*(t_adj-2) + b; -} - -/** -* Easing equation function for a quadratic (t^2) easing in/out: acceleration until halfway, then deceleration. -* -* @param t Current time (in frames or seconds). -* @param b Starting value. -* @param c Change needed in value. -* @param d Expected easing duration (in frames or seconds). -* @return The correct value. -*/ -static float easeInOutQuad(float t, float b, float c, float d) -{ - float t_adj = 2.0f * (float)t / (float)d; - if (t_adj < 1) { - return c/2*t_adj*t_adj + b; - } else { - --t_adj; - return -c/2 * ((t_adj)*(t_adj-2) - 1) + b; - } -} - -/** -* Easing equation function for a quadratic (t^2) easing out/in: deceleration until halfway, then acceleration. -* -* @param t Current time (in frames or seconds). -* @param b Starting value. -* @param c Change needed in value. -* @param d Expected easing duration (in frames or seconds). -* @return The correct value. -*/ -static float easeOutInQuad(float t, float b, float c, float d) -{ - if (t < d/2) return easeOutQuad (t*2, b, c/2, d); - return easeInQuad((t*2)-d, b+c/2, c/2, d); -} - -/** -* Easing equation function for a cubic (t^3) easing in: accelerating from zero velocity. -* -* @param t Current time (in frames or seconds). -* @param b Starting value. -* @param c Change needed in value. -* @param d Expected easing duration (in frames or seconds). -* @return The correct value. -*/ -static float easeInCubic(float t, float b, float c, float d) -{ - float t_adj = (float)t / (float)d; - return c*t_adj*t_adj*t_adj + b; -} - -/** -* Easing equation function for a cubic (t^3) easing out: decelerating from zero velocity. -* -* @param t Current time (in frames or seconds). -* @param b Starting value. -* @param c Change needed in value. -* @param d Expected easing duration (in frames or seconds). -* @return The correct value. -*/ -static float easeOutCubic(float t, float b, float c, float d) -{ - float t_adj = (float)t / (float)(d) - 1.0f; - return c*(t_adj*t_adj*t_adj + 1) + b; -} - -/** -* Easing equation function for a cubic (t^3) easing in/out: acceleration until halfway, then deceleration. -* -* @param t Current time (in frames or seconds). -* @param b Starting value. -* @param c Change needed in value. -* @param d Expected easing duration (in frames or seconds). -* @return The correct value. -*/ -static float easeInOutCubic(float t, float b, float c, float d) -{ - float t_adj = 2.0f * (float)t / (float)(d); - if(t_adj < 1) return c/2*t_adj*t_adj*t_adj + b; - else { - t_adj -= 2; - return c/2*(t_adj*t_adj*t_adj + 2) + b; - } -} - -/** -* Easing equation function for a cubic (t^3) easing out/in: deceleration until halfway, then acceleration. -* -* @param t Current time (in frames or seconds). -* @param b Starting value. -* @param c Change needed in value. -* @param d Expected easing duration (in frames or seconds). -* @return The correct value. -*/ -static float easeOutInCubic(float t, float b, float c, float d) -{ - if (t < d/2) return easeOutCubic (t*2, b, c/2, d); - return easeInCubic((t*2)-d, b+c/2, c/2, d); -} - -/** -* Easing equation function for a quartic (t^4) easing in: accelerating from zero velocity. -* -* @param t Current time (in frames or seconds). -* @param b Starting value. -* @param c Change needed in value. -* @param d Expected easing duration (in frames or seconds). -* @return The correct value. -*/ -static float easeInQuart(float t, float b, float c, float d) -{ - float t_adj = (float)t / (float)d; - return c*t_adj*t_adj*t_adj*t_adj + b; -} - -/** -* Easing equation function for a quartic (t^4) easing out: decelerating from zero velocity. -* -* @param t Current time (in frames or seconds). -* @param b Starting value. -* @param c Change needed in value. -* @param d Expected easing duration (in frames or seconds). -* @return The correct value. -*/ -static float easeOutQuart(float t, float b, float c, float d) -{ - float t_adj = (float)t / (float)d - 1.0f; - return -c * (t_adj*t_adj*t_adj*t_adj - 1) + b; -} - -/** -* Easing equation function for a quartic (t^4) easing in/out: acceleration until halfway, then deceleration. -* -* @param t Current time (in frames or seconds). -* @param b Starting value. -* @param c Change needed in value. -* @param d Expected easing duration (in frames or seconds). -* @return The correct value. -*/ -static float easeInOutQuart(float t, float b, float c, float d) -{ - float t_adj = 2.0f * (float)t / (float)d; - if (t_adj < 1) return c/2*t_adj*t_adj*t_adj*t_adj + b; - else { - t_adj -= 2.0f; - return -c/2 * (t_adj*t_adj*t_adj*t_adj - 2) + b; - } -} - -/** -* Easing equation function for a quartic (t^4) easing out/in: deceleration until halfway, then acceleration. -* -* @param t Current time (in frames or seconds). -* @param b Starting value. -* @param c Change needed in value. -* @param d Expected easing duration (in frames or seconds). -* @return The correct value. -*/ -static float easeOutInQuart(float t, float b, float c, float d) -{ - if (t < d/2) return easeOutQuart (t*2, b, c/2, d); - return easeInQuart((t*2)-d, b+c/2, c/2, d); -} - -/** - * Easing equation function for a quintic (t^5) easing in: accelerating from zero velocity. - * - * @param t Current time (in frames or seconds). - * @param b Starting value. - * @param c Change needed in value. - * @param d Expected easing duration (in frames or seconds). - * @return The correct value. - */ -static float easeInQuint(float t, float b, float c, float d) -{ - float t_adj = (float)t/(float)d; - return c*t_adj*t_adj*t_adj*t_adj*t_adj + b; -} - -/** - * Easing equation function for a quintic (t^5) easing out: decelerating from zero velocity. - * - * @param t Current time (in frames or seconds). - * @param b Starting value. - * @param c Change needed in value. - * @param d Expected easing duration (in frames or seconds). - * @return The correct value. - */ -static float easeOutQuint(float t, float b, float c, float d) -{ - float t_adj = (float)t/(float)d - 1.0f; - return c*(t_adj*t_adj*t_adj*t_adj*t_adj + 1) + b; -} - -/** - * Easing equation function for a quintic (t^5) easing in/out: acceleration until halfway, then deceleration. - * - * @param t Current time (in frames or seconds). - * @param b Starting value. - * @param c Change needed in value. - * @param d Expected easing duration (in frames or seconds). - * @return The correct value. - */ -static float easeInOutQuint(float t, float b, float c, float d) -{ - float t_adj = 2.0f * (float)t/(float)d; - if (t_adj < 1) return c/2*t_adj*t_adj*t_adj*t_adj*t_adj + b; - else { - t_adj -= 2.0f; - return c/2*(t_adj*t_adj*t_adj*t_adj*t_adj + 2) + b; - } -} - -/** - * Easing equation function for a quintic (t^5) easing out/in: deceleration until halfway, then acceleration. - * - * @param t Current time (in frames or seconds). - * @param b Starting value. - * @param c Change needed in value. - * @param d Expected easing duration (in frames or seconds). - * @return The correct value. - */ -static float easeOutInQuint(float t, float b, float c, float d) -{ - if (t < d/2) return easeOutQuint (t*2, b, c/2, d); - return easeInQuint((t*2)-d, b+c/2, c/2, d); -} - -/** - * Easing equation function for a sinusoidal (sin(t)) easing in: accelerating from zero velocity. - * - * @param t Current time (in frames or seconds). - * @param b Starting value. - * @param c Change needed in value. - * @param d Expected easing duration (in frames or seconds). - * @return The correct value. - */ -static float easeInSine(float t, float b, float c, float d) -{ - float t_adj = (float)t/(float)d; - return -c * ::cos(t_adj * M_PI_2) + c + b; -} - -/** - * Easing equation function for a sinusoidal (sin(t)) easing out: decelerating from zero velocity. - * - * @param t Current time (in frames or seconds). - * @param b Starting value. - * @param c Change needed in value. - * @param d Expected easing duration (in frames or seconds). - * @return The correct value. - */ -static float easeOutSine(float t, float b, float c, float d) -{ - float t_adj = (float)t/(float)d; - return c * ::sin(t_adj * M_PI_2) + b; -} - -/** - * Easing equation function for a sinusoidal (sin(t)) easing in/out: acceleration until halfway, then deceleration. - * - * @param t Current time (in frames or seconds). - * @param b Starting value. - * @param c Change needed in value. - * @param d Expected easing duration (in frames or seconds). - * @return The correct value. - */ -static float easeInOutSine(float t, float b, float c, float d) -{ - float t_adj = (float)t/(float)d; - return -c/2 * (::cos(M_PI*t_adj) - 1) + b; -} - -/** - * Easing equation function for a sinusoidal (sin(t)) easing out/in: deceleration until halfway, then acceleration. - * - * @param t Current time (in frames or seconds). - * @param b Starting value. - * @param c Change needed in value. - * @param d Expected easing duration (in frames or seconds). - * @return The correct value. - */ -static float easeOutInSine(float t, float b, float c, float d) -{ - if (t < d/2) return easeOutSine (t*2, b, c/2, d); - return easeInSine((t*2)-d, b+c/2, c/2, d); -} - -/** - * Easing equation function for an exponential (2^t) easing in: accelerating from zero velocity. - * - * @param t Current time (in frames or seconds). - * @param b Starting value. - * @param c Change needed in value. - * @param d Expected easing duration (in frames or seconds). - * @return The correct value. - */ -static float easeInExpo(float t, float b, float c, float d) -{ - return (t==0) ? b : c * ::pow(2, 10 * ((float)t/(float)d - 1)) + b - c * 0.001; -} - -/** - * Easing equation function for an exponential (2^t) easing out: decelerating from zero velocity. - * - * @param t Current time (in frames or seconds). - * @param b Starting value. - * @param c Change needed in value. - * @param d Expected easing duration (in frames or seconds). - * @return The correct value. - */ -static float easeOutExpo(float t, float b, float c, float d) -{ - return (t==d) ? b+c : c * 1.001 * (-::pow(2, -10 * (float)t/(float)d) + 1) + b; -} - -/** - * Easing equation function for an exponential (2^t) easing in/out: acceleration until halfway, then deceleration. - * - * @param t Current time (in frames or seconds). - * @param b Starting value. - * @param c Change needed in value. - * @param d Expected easing duration (in frames or seconds). - * @return The correct value. - */ -static float easeInOutExpo(float t, float b, float c, float d) -{ - if (t==0) return b; - if (t==d) return b+c; - float t_adj = 2.0f * (float)t/(float)d; - if (t_adj < 1) return c/2 * ::pow(2, 10 * (t_adj - 1)) + b - c * 0.0005; - return c/2 * 1.0005 * (-::pow(2, -10 * (t_adj - 1)) + 2) + b; -} - -/** - * Easing equation function for an exponential (2^t) easing out/in: deceleration until halfway, then acceleration. - * - * @param t Current time (in frames or seconds). - * @param b Starting value. - * @param c Change needed in value. - * @param d Expected easing duration (in frames or seconds). - * @return The correct value. - */ -static float easeOutInExpo(float t, float b, float c, float d) -{ - if (t < d/2) return easeOutExpo (t*2, b, c/2, d); - return easeInExpo((t*2)-d, b+c/2, c/2, d); -} - -/** - * Easing equation function for a circular (sqrt(1-t^2)) easing in: accelerating from zero velocity. - * - * @param t Current time (in frames or seconds). - * @param b Starting value. - * @param c Change needed in value. - * @param d Expected easing duration (in frames or seconds). - * @return The correct value. - */ -static float easeInCirc(float t, float b, float c, float d) -{ - float t_adj = (float)t / (float)d; - return -c * (::sqrt(1 - t_adj*t_adj) - 1) + b; -} - -/** - * Easing equation function for a circular (sqrt(1-t^2)) easing out: decelerating from zero velocity. - * - * @param t Current time (in frames or seconds). - * @param b Starting value. - * @param c Change needed in value. - * @param d Expected easing duration (in frames or seconds). - * @return The correct value. - */ -static float easeOutCirc(float t, float b, float c, float d) -{ - float t_adj = (float)t / (float)d - 1.0f; - return c * ::sqrt(1 - t_adj * t_adj) + b; -} - -/** - * Easing equation function for a circular (sqrt(1-t^2)) easing in/out: acceleration until halfway, then deceleration. - * - * @param t Current time (in frames or seconds). - * @param b Starting value. - * @param c Change needed in value. - * @param d Expected easing duration (in frames or seconds). - * @return The correct value. - */ -static float easeInOutCirc(float t, float b, float c, float d) -{ - float t_adj = 2.0f * (float)t / (float)d; - if (t_adj < 1) return -c/2 * (::sqrt(1 - t_adj*t_adj) - 1) + b; - else { - t_adj -= 2.0f; - return c/2 * (::sqrt(1 - t_adj*t_adj) + 1) + b; - } -} - -/** - * Easing equation function for a circular (sqrt(1-t^2)) easing out/in: deceleration until halfway, then acceleration. - * - * @param t Current time (in frames or seconds). - * @param b Starting value. - * @param c Change needed in value. - * @param d Expected easing duration (in frames or seconds). - * @return The correct value. - */ -static float easeOutInCirc(float t, float b, float c, float d) -{ - if (t < d/2) return easeOutCirc (t*2, b, c/2, d); - return easeInCirc((t*2)-d, b+c/2, c/2, d); -} - -/** - * Easing equation function for an elastic (exponentially decaying sine wave) easing in: accelerating from zero velocity. - * - * @param t Current time (in frames or seconds). - * @param b Starting value. - * @param c Change needed in value. - * @param d Expected easing duration (in frames or seconds). - * @param a Amplitude. - * @param p Period. - * @return The correct value. - */ -static float easeInElastic(float t, float b, float c, float d) -{ - if (t==0) return b; - float t_adj = (float)t / (float)d; - if (t_adj==1) return b+c; - - qreal p = d * 0.3f; - qreal a = c; - qreal s = p / 4.0f; - - t_adj -= 1.0f; - return -(a*::pow(2,10*t_adj) * ::sin( (t_adj*d-s)*(2*M_PI)/p )) + b; -} - -/** - * Easing equation function for an elastic (exponentially decaying sine wave) easing out: decelerating from zero velocity. - * - * @param t Current time (in frames or seconds). - * @param b Starting value. - * @param c Change needed in value. - * @param d Expected easing duration (in frames or seconds). - * @param a Amplitude. - * @param p Period. - * @return The correct value. - */ -static float easeOutElastic(float t, float b, float c, float d) -{ - if (t==0) return b; - float t_adj = (float)t / (float)d; - if (t_adj==1) return b+c; - - qreal p = d * 0.3f; - qreal a = c; - qreal s = p / 4; - - return (a*::pow(2,-10*t_adj) * ::sin( (t_adj*d-s)*(2*M_PI)/p ) + c + b); -} - -/** - * Easing equation function for an elastic (exponentially decaying sine wave) easing in/out: acceleration until halfway, then deceleration. - * - * @param t Current time (in frames or seconds). - * @param b Starting value. - * @param c Change needed in value. - * @param d Expected easing duration (in frames or seconds). - * @param a Amplitude. - * @param p Period. - * @return The correct value. - */ -static float easeInOutElastic(float t, float b, float c, float d) -{ - if (t==0) return b; - float t_adj = 2.0f * (float)t / (float)d; - if (t_adj==2) return b+c; - - // XXX - qreal p = d * 0.3f * 1.5f; - qreal a = c; - qreal s = p / 4; - - if (t_adj < 1) return -.5*(a*::pow(2,10*(t_adj-1)) * ::sin( ((t_adj-1)*d-s)*(2*M_PI)/p )) + b; - return a*::pow(2,-10*(t_adj-1)) * ::sin( ((t_adj-1)*d-s)*(2*M_PI)/p )*.5 + c + b; -} - -/** - * Easing equation function for an elastic (exponentially decaying sine wave) easing out/in: deceleration until halfway, then acceleration. - * - * @param t Current time (in frames or seconds). - * @param b Starting value. - * @param c Change needed in value. - * @param d Expected easing duration (in frames or seconds). - * @param a Amplitude. - * @param p Period. - * @return The correct value. - */ -static float easeOutInElastic(float t, float b, float c, float d) -{ - if (t < d/2) return easeOutElastic (t*2, b, c/2, d); - return easeInElastic((t*2)-d, b+c/2, c/2, d); -} - -/** - * Easing equation function for a back (overshooting cubic easing: (s+1)*t^3 - s*t^2) easing in: accelerating from zero velocity. - * - * @param t Current time (in frames or seconds). - * @param b Starting value. - * @param c Change needed in value. - * @param d Expected easing duration (in frames or seconds). - * @param s Overshoot ammount: higher s means greater overshoot (0 produces cubic easing with no overshoot, and the default value of 1.70158 produces an overshoot of 10 percent). - * @return The correct value. - */ -static float easeInBack(float t, float b, float c, float d) -{ - // XXX - qreal s = 1.70158; - - float t_adj = (float)t / (float)d; - return c*(t_adj)*t_adj*((s+1)*t_adj - s) + b; -} - -/** - * Easing equation function for a back (overshooting cubic easing: (s+1)*t^3 - s*t^2) easing out: decelerating from zero velocity. - * - * @param t Current time (in frames or seconds). - * @param b Starting value. - * @param c Change needed in value. - * @param d Expected easing duration (in frames or seconds). - * @param s Overshoot ammount: higher s means greater overshoot (0 produces cubic easing with no overshoot, and the default value of 1.70158 produces an overshoot of 10 percent). - * @return The correct value. - */ -static float easeOutBack(float t, float b, float c, float d) -{ - // XXX - qreal s = 1.70158; - - float t_adj = (float)t / (float)d - 1.0f; - return c*(t_adj*t_adj*((s+1)*t_adj + s) + 1) + b; -} - -/** - * Easing equation function for a back (overshooting cubic easing: (s+1)*t^3 - s*t^2) easing in/out: acceleration until halfway, then deceleration. - * - * @param t Current time (in frames or seconds). - * @param b Starting value. - * @param c Change needed in value. - * @param d Expected easing duration (in frames or seconds). - * @param s Overshoot ammount: higher s means greater overshoot (0 produces cubic easing with no overshoot, and the default value of 1.70158 produces an overshoot of 10 percent). - * @return The correct value. - */ -static float easeInOutBack(float t, float b, float c, float d) -{ - // XXX - qreal s = 1.70158; - - float t_adj = 2.0f * (float)t / (float)d; - if (t_adj < 1) { - s *= 1.525f; - return c/2*(t_adj*t_adj*((s+1)*t_adj - s)) + b; - } else { - t_adj -= 2; - s *= 1.525f; - return c/2*(t_adj*t_adj*((s+1)*t_adj + s) + 2) + b; - } -} - -/** - * Easing equation function for a back (overshooting cubic easing: (s+1)*t^3 - s*t^2) easing out/in: deceleration until halfway, then acceleration. - * - * @param t Current time (in frames or seconds). - * @param b Starting value. - * @param c Change needed in value. - * @param d Expected easing duration (in frames or seconds). - * @param s Overshoot ammount: higher s means greater overshoot (0 produces cubic easing with no overshoot, and the default value of 1.70158 produces an overshoot of 10 percent). - * @return The correct value. - */ -static float easeOutInBack(float t, float b, float c, float d) -{ - if (t < d/2) return easeOutBack (t*2, b, c/2, d); - return easeInBack((t*2)-d, b+c/2, c/2, d); -} - -/** - * Easing equation function for a bounce (exponentially decaying parabolic bounce) easing out: decelerating from zero velocity. - * - * @param t Current time (in frames or seconds). - * @param b Starting value. - * @param c Change needed in value. - * @param d Expected easing duration (in frames or seconds). - * @return The correct value. - */ -static float easeOutBounce(float t, float b, float c, float d) -{ - float t_adj = (float)t / (float)d; - if ((t_adj) < (1/2.75)) { - return c*(7.5625*t_adj*t_adj) + b; - } else if (t_adj < (2/2.75)) { - t_adj -= (1.5f/2.75f); - return c*(7.5625*t_adj*t_adj + .75) + b; - } else if (t_adj < (2.5/2.75)) { - t_adj -= (2.25f/2.75f); - return c*(7.5625*t_adj*t_adj + .9375) + b; - } else { - t_adj -= (2.65f/2.75f); - return c*(7.5625*t_adj*t_adj + .984375) + b; - } -} - -/** - * Easing equation function for a bounce (exponentially decaying parabolic bounce) easing in: accelerating from zero velocity. - * - * @param t Current time (in frames or seconds). - * @param b Starting value. - * @param c Change needed in value. - * @param d Expected easing duration (in frames or seconds). - * @return The correct value. - */ -static float easeInBounce(float t, float b, float c, float d) -{ - return c - easeOutBounce (d-t, 0, c, d) + b; -} - - -/** - * Easing equation function for a bounce (exponentially decaying parabolic bounce) easing in/out: acceleration until halfway, then deceleration. - * - * @param t Current time (in frames or seconds). - * @param b Starting value. - * @param c Change needed in value. - * @param d Expected easing duration (in frames or seconds). - * @return The correct value. - */ -static float easeInOutBounce(float t, float b, float c, float d) -{ - if (t < d/2) return easeInBounce (t*2, 0, c, d) * .5 + b; - else return easeOutBounce (t*2-d, 0, c, d) * .5 + c*.5 + b; -} - -/** - * Easing equation function for a bounce (exponentially decaying parabolic bounce) easing out/in: deceleration until halfway, then acceleration. - * - * @param t Current time (in frames or seconds). - * @param b Starting value. - * @param c Change needed in value. - * @param d Expected easing duration (in frames or seconds). - * @return The correct value. - */ -static float easeOutInBounce(float t, float b, float c, float d) -{ - if (t < d/2) return easeOutBounce (t*2, b, c/2, d); - return easeInBounce((t*2)-d, b+c/2, c/2, d); -} - diff --git a/src/declarative/3rdparty/legal.qdoc b/src/declarative/3rdparty/legal.qdoc deleted file mode 100644 index bd0a9b2..0000000 --- a/src/declarative/3rdparty/legal.qdoc +++ /dev/null @@ -1,35 +0,0 @@ -/*! -\page legal-easing.html -\title easing -\ingroup qtopia3rdparty -Easing Equations by Robert Penner. -\legalese -\code -Copyright (c) 2001 Robert Penner -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of the author nor the names of contributors may be used - to endorse or promote products derived from this software without specific - prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -\endcode -\endlegalese -*/ diff --git a/src/declarative/canvas/qsimplecanvasitem.h b/src/declarative/canvas/qsimplecanvasitem.h index 9b010e8..83f19c3 100644 --- a/src/declarative/canvas/qsimplecanvasitem.h +++ b/src/declarative/canvas/qsimplecanvasitem.h @@ -42,7 +42,6 @@ #ifndef QSIMPLECANVASITEM_H #define QSIMPLECANVASITEM_H -#include <gfxtimeline.h> #include <qfxglobal.h> #include <qsimplecanvas.h> #include <QObject> diff --git a/src/declarative/fx/qfxflickable.cpp b/src/declarative/fx/qfxflickable.cpp index 5715116..4cd7e88 100644 --- a/src/declarative/fx/qfxflickable.cpp +++ b/src/declarative/fx/qfxflickable.cpp @@ -43,7 +43,6 @@ #include "qfxflickable_p.h" #include <QGraphicsSceneMouseEvent> -#include <gfxeasing.h> #include <QPointer> #include <QTimer> @@ -128,11 +127,11 @@ void QFxFlickablePrivate::fixupX() vTime = _tl.time(); if(_moveX.value() > q->minXExtent() || q->maxXExtent() > 0) { - _tl.move(_moveX, q->minXExtent(), GfxEasing(GfxEasing::InOutQuad), 200); + _tl.move(_moveX, q->minXExtent(), QEasingCurve(QEasingCurve::InOutQuad), 200); flicked = false; //emit flickingChanged(); } else if(_moveX.value() < q->maxXExtent()) { - _tl.move(_moveX, q->maxXExtent(), GfxEasing(GfxEasing::InOutQuad), 200); + _tl.move(_moveX, q->maxXExtent(), QEasingCurve(QEasingCurve::InOutQuad), 200); flicked = false; //emit flickingChanged(); } @@ -147,10 +146,10 @@ void QFxFlickablePrivate::fixupY() vTime = _tl.time(); if(_moveY.value() > q->minYExtent() || (q->maxYExtent() > q->minYExtent())) { - _tl.move(_moveY, q->minYExtent(), GfxEasing(GfxEasing::InOutQuad), 200); + _tl.move(_moveY, q->minYExtent(), QEasingCurve(QEasingCurve::InOutQuad), 200); //emit flickingChanged(); } else if(_moveY.value() < q->maxYExtent()) { - _tl.move(_moveY, q->maxYExtent(), GfxEasing(GfxEasing::InOutQuad), 200); + _tl.move(_moveY, q->maxYExtent(), QEasingCurve(QEasingCurve::InOutQuad), 200); //emit flickingChanged(); } else { flicked = false; diff --git a/src/declarative/fx/qfxlistview.cpp b/src/declarative/fx/qfxlistview.cpp index 3c8c12c..f25470b 100644 --- a/src/declarative/fx/qfxlistview.cpp +++ b/src/declarative/fx/qfxlistview.cpp @@ -43,7 +43,6 @@ #include "qmlfollow.h" #include "qlistmodelinterface.h" #include "qfxvisualitemmodel.h" -#include "gfxeasing.h" #include "qfxlistview.h" #include <qmlexpression.h> @@ -749,7 +748,7 @@ void QFxListViewPrivate::fixupY() if (currentItem) { moveReason = Mouse; _tl.clear(); - _tl.move(_moveY, -(currentItem->position() - snapPos), GfxEasing(GfxEasing::InOutQuad), 200); + _tl.move(_moveY, -(currentItem->position() - snapPos), QEasingCurve(QEasingCurve::InOutQuad), 200); } } else if (currItemMode == QFxListView::Snap) { moveReason = Mouse; @@ -761,7 +760,7 @@ void QFxListViewPrivate::fixupY() else if (pos < -q->minYExtent()) pos = -q->minYExtent(); _tl.clear(); - _tl.move(_moveY, -(pos), GfxEasing(GfxEasing::InOutQuad), 200); + _tl.move(_moveY, -(pos), QEasingCurve(QEasingCurve::InOutQuad), 200); } } } @@ -775,7 +774,7 @@ void QFxListViewPrivate::fixupX() if (currItemMode == QFxListView::SnapAuto) { moveReason = Mouse; _tl.clear(); - _tl.move(_moveX, -(currentItem->position() - snapPos), GfxEasing(GfxEasing::InOutQuad), 200); + _tl.move(_moveX, -(currentItem->position() - snapPos), QEasingCurve(QEasingCurve::InOutQuad), 200); } else if (currItemMode == QFxListView::Snap) { moveReason = Mouse; int idx = snapIndex(); @@ -786,7 +785,7 @@ void QFxListViewPrivate::fixupX() else if (pos < -q->minXExtent()) pos = -q->minXExtent(); _tl.clear(); - _tl.move(_moveX, -(pos), GfxEasing(GfxEasing::InOutQuad), 200); + _tl.move(_moveX, -(pos), QEasingCurve(QEasingCurve::InOutQuad), 200); } } } diff --git a/src/declarative/fx/qfxparticles.cpp b/src/declarative/fx/qfxparticles.cpp index 9319c46..54e3778 100644 --- a/src/declarative/fx/qfxparticles.cpp +++ b/src/declarative/fx/qfxparticles.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ -#include "gfxtimeline.h" #include "qfxitem_p.h" #if defined(QFX_RENDER_OPENGL) #include "gltexture.h" diff --git a/src/declarative/fx/qfxpathview.cpp b/src/declarative/fx/qfxpathview.cpp index 99f6e86..f2a9065 100644 --- a/src/declarative/fx/qfxpathview.cpp +++ b/src/declarative/fx/qfxpathview.cpp @@ -43,7 +43,6 @@ #include <QDebug> #include <QPen> #include <QEvent> -#include <gfxeasing.h> #include "qmlbindablevalue.h" #include "qmlstate.h" #include "qlistmodelinterface.h" @@ -805,7 +804,7 @@ void QFxPathViewPrivate::snapToCurrent() rounds--; if(distance > 50) rounds++; - tl.move(moveOffset, targetOffset + 100.0*(-rounds), GfxEasing(GfxEasing::InOutQuad), + tl.move(moveOffset, targetOffset + 100.0*(-rounds), QEasingCurve(QEasingCurve::InOutQuad), int(100*items.count()*qMax((qreal)(2.0/items.count()),(qreal)qAbs(rounds)))); tl.execute(fixupOffsetEvent); return; @@ -813,16 +812,16 @@ void QFxPathViewPrivate::snapToCurrent() if (targetOffset - _offset > 50.0) { qreal distance = 100 - targetOffset + _offset; - tl.move(moveOffset, 0.0, GfxEasing(GfxEasing::OutQuad), int(200 * _offset / distance)); + tl.move(moveOffset, 0.0, QEasingCurve(QEasingCurve::OutQuad), int(200 * _offset / distance)); tl.set(moveOffset, 100.0); - tl.move(moveOffset, targetOffset, GfxEasing(GfxEasing::InQuad), int(200 * (100-targetOffset) / distance)); + tl.move(moveOffset, targetOffset, QEasingCurve(QEasingCurve::InQuad), int(200 * (100-targetOffset) / distance)); } else if (targetOffset - _offset <= -50.0) { qreal distance = 100 - _offset + targetOffset; - tl.move(moveOffset, 100.0, GfxEasing(GfxEasing::OutQuad), int(200 * (100-_offset) / distance)); + tl.move(moveOffset, 100.0, QEasingCurve(QEasingCurve::OutQuad), int(200 * (100-_offset) / distance)); tl.set(moveOffset, 0.0); - tl.move(moveOffset, targetOffset, GfxEasing(GfxEasing::InQuad), int(200 * targetOffset / distance)); + tl.move(moveOffset, targetOffset, QEasingCurve(QEasingCurve::InQuad), int(200 * targetOffset / distance)); } else { - tl.move(moveOffset, targetOffset, GfxEasing(GfxEasing::InOutQuad), 200); + tl.move(moveOffset, targetOffset, QEasingCurve(QEasingCurve::InOutQuad), 200); } } diff --git a/src/declarative/qml/qmlbindablevalue.cpp b/src/declarative/qml/qmlbindablevalue.cpp index 423fda8..c2632da 100644 --- a/src/declarative/qml/qmlbindablevalue.cpp +++ b/src/declarative/qml/qmlbindablevalue.cpp @@ -41,9 +41,7 @@ #include <qml.h> #include "qmlbindablevalue.h" -#include <gfxeasing.h> #include <qmlcontext.h> -#include <gfxtimeline.h> #include <QVariant> #include <qfxperf.h> #include <QtCore/qdebug.h> diff --git a/src/declarative/test/qfxtestengine.cpp b/src/declarative/test/qfxtestengine.cpp index 96ce451..d9e3533 100644 --- a/src/declarative/test/qfxtestengine.cpp +++ b/src/declarative/test/qfxtestengine.cpp @@ -41,7 +41,7 @@ #include <QFile> #include <QmlComponent> -#include <gfxtimeline.h> +#include <qmltimeline.h> #include "qfxtestengine.h" #include "qfxtestobjects.h" #include <QCryptographicHash> diff --git a/src/declarative/timeline/gfxeasing.cpp b/src/declarative/timeline/gfxeasing.cpp deleted file mode 100644 index 45b84eb..0000000 --- a/src/declarative/timeline/gfxeasing.cpp +++ /dev/null @@ -1,811 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "gfxeasing.h" -#include <math.h> -#include <QHash> -#include <QPainter> -#include <QVariant> -#include <QDebug> -#include <QStringList> -#include <QMouseEvent> -#include "gfxtimeline.h" - - -QT_BEGIN_NAMESPACE -typedef QHash<QString, qreal> GfxEasingProperties; -class GfxEasingFunction -{ -public: - virtual ~GfxEasingFunction() {} - virtual float value(float t, float b, float c, float d) = 0; - virtual GfxEasingFunction *copy() const = 0; -}; - -#include "../3rdparty/easing.cpp" - -struct ElasticEase : public GfxEasingFunction -{ - enum Type { In, Out }; - ElasticEase(Type t) : _t(t), _p(0.0f), _a(0.0f) {} - - Type _t; - qreal _p; - qreal _a; - - GfxEasingFunction *copy() const - { - ElasticEase *rv = new ElasticEase(_t); - rv->_p = _p; - rv->_a = _a; - return rv; - } - - float value(float t, float b, float c, float d) - { - if (t==0) return b; - float t_adj = (float)t / (float)d; - if (t_adj==1) return b+c; - - qreal p = _p?_p:(d * 0.3f); - - qreal a; - qreal s; - - if(!_a || _a < ::fabs(c)) { - a = c; - s = p / 4.0f; - } else { - a = _a; - s = p / (2 * M_PI) * ::asin(c / a); - } - - if(_t == In) - t_adj -= 1.0f; - - return (a*::pow(2,-10*t_adj) * ::sin( (t_adj*d-s)*(2*M_PI)/p ) + c + b); - } -}; - -struct BounceEase : public GfxEasingFunction -{ - enum Type { In, Out }; - BounceEase(Type t) : _t(t), _a(-1.0) {} - - Type _t; - qreal _a; - - GfxEasingFunction *copy() const - { - BounceEase *rv = new BounceEase(_t); - rv->_t = _t; - rv->_a = _a; - return rv; - } - - float value(float t, float b, float c, float d) - { - if(In == _t) - return c - bounce(d - t, 0, c, d) + b; - else - return bounce(t, b, c, d); - } - - float bounce(float t, float b, float c, float d) - { - float t_adj = (float)t / (float)d; - float amp = (_a == -1.0)?c:_a; - if ((t_adj) < (1/2.75)) { - if(c == 0. && _a != -1.0) { - t_adj -= (0.5f/2.75f); - return -amp * (1. - (30.25*t_adj*t_adj)) + b; - } else { - return c*(7.5625*t_adj*t_adj) + b; - } - } else if (t_adj < (2/2.75)) { - t_adj -= (1.5f/2.75f); - return -amp * (1. - (7.5625*t_adj*t_adj + .75)) + (b + c); - } else if (t_adj < (2.5/2.75)) { - t_adj -= (2.25f/2.75f); - return -amp * (1. - (7.5625*t_adj*t_adj + .9375)) + (b + c); - } else { - t_adj -= (2.65f/2.75f); - return -amp * (1. - (7.5625*t_adj*t_adj + .984375)) + (b + c); - } - } -}; - -static GfxEasingFunction *easeInElasticC(const GfxEasingProperties &p) -{ - ElasticEase *rv = new ElasticEase(ElasticEase::In); - rv->_p = p[QLatin1String("period")]; - rv->_a = p[QLatin1String("amplitude")]; - return rv; -} - - -static GfxEasingFunction *easeOutElasticC(const GfxEasingProperties &p) -{ - ElasticEase *rv = new ElasticEase(ElasticEase::Out); - rv->_p = p[QLatin1String("period")]; - rv->_a = p[QLatin1String("amplitude")]; - return rv; -} - -static GfxEasingFunction *easeOutBounceC(const GfxEasingProperties &p) -{ - BounceEase *rv = new BounceEase(BounceEase::Out); - rv->_a = p[QLatin1String("amplitude")]; - return rv; -} - -static GfxEasingFunction *easeInBounceC(const GfxEasingProperties &p) -{ - BounceEase *rv = new BounceEase(BounceEase::Out); - rv->_a = p[QLatin1String("amplitude")]; - return rv; -} - - -struct SimpleConfig : public GfxEasingFunction -{ - GfxEasing::Function func; - - float value(float t, float b, float c, float d) - { - return func(t, b, c, d); - } - - GfxEasingFunction *copy() const - { - SimpleConfig *rv = new SimpleConfig; - rv->func = func; - return rv; - } -}; - -GfxEasing::Function curveToFunc(GfxEasing::Curve curve) -{ - switch(curve) - { - case GfxEasing::None: - return &easeNone; - case GfxEasing::InQuad: - return &easeInQuad; - case GfxEasing::OutQuad: - return &easeOutQuad; - case GfxEasing::InOutQuad: - return &easeInOutQuad; - case GfxEasing::OutInQuad: - return &easeOutInQuad; - case GfxEasing::InCubic: - return &easeInCubic; - case GfxEasing::OutCubic: - return &easeOutCubic; - case GfxEasing::InOutCubic: - return &easeInOutCubic; - case GfxEasing::OutInCubic: - return &easeOutInCubic; - case GfxEasing::InQuart: - return &easeInQuart; - case GfxEasing::OutQuart: - return &easeOutQuart; - case GfxEasing::InOutQuart: - return &easeInOutQuart; - case GfxEasing::OutInQuart: - return &easeOutInQuart; - case GfxEasing::InQuint: - return &easeInQuint; - case GfxEasing::OutQuint: - return &easeOutQuint; - case GfxEasing::InOutQuint: - return &easeInOutQuint; - case GfxEasing::OutInQuint: - return &easeOutInQuint; - case GfxEasing::InSine: - return &easeInSine; - case GfxEasing::OutSine: - return &easeOutSine; - case GfxEasing::InOutSine: - return &easeInOutSine; - case GfxEasing::OutInSine: - return &easeOutInSine; - case GfxEasing::InExpo: - return &easeInExpo; - case GfxEasing::OutExpo: - return &easeOutExpo; - case GfxEasing::InOutExpo: - return &easeInOutExpo; - case GfxEasing::OutInExpo: - return &easeOutInExpo; - case GfxEasing::InCirc: - return &easeInCirc; - case GfxEasing::OutCirc: - return &easeOutCirc; - case GfxEasing::InOutCirc: - return &easeInOutCirc; - case GfxEasing::OutInCirc: - return &easeOutInCirc; - case GfxEasing::InElastic: - return &easeInElastic; - case GfxEasing::OutElastic: - return &easeOutElastic; - case GfxEasing::InOutElastic: - return &easeInOutElastic; - case GfxEasing::OutInElastic: - return &easeOutInElastic; - case GfxEasing::InBack: - return &easeInBack; - case GfxEasing::OutBack: - return &easeOutBack; - case GfxEasing::InOutBack: - return &easeInOutBack; - case GfxEasing::OutInBack: - return &easeOutInBack; - case GfxEasing::InBounce: - return &easeInBounce; - case GfxEasing::OutBounce: - return &easeOutBounce; - case GfxEasing::InOutBounce: - return &easeInOutBounce; - case GfxEasing::OutInBounce: - return &easeOutInBounce; - default: - return 0; - }; -} - -struct NameFunctionMap : public QHash<QString, GfxEasing::Function> -{ - NameFunctionMap() - { - insert(QLatin1String("easeNone"), easeNone); - insert(QLatin1String("easeInQuad"), easeInQuad); - insert(QLatin1String("easeOutQuad"), easeOutQuad); - insert(QLatin1String("easeInOutQuad"), easeInOutQuad); - insert(QLatin1String("easeOutInQuad"), easeOutInQuad); - insert(QLatin1String("easeInCubic"), easeInCubic); - insert(QLatin1String("easeOutCubic"), easeOutCubic); - insert(QLatin1String("easeInOutCubic"), easeInOutCubic); - insert(QLatin1String("easeOutInCubic"), easeOutInCubic); - insert(QLatin1String("easeInQuart"), easeInQuart); - insert(QLatin1String("easeOutQuart"), easeOutQuart); - insert(QLatin1String("easeInOutQuart"), easeInOutQuart); - insert(QLatin1String("easeOutInQuart"), easeOutInQuart); - insert(QLatin1String("easeInQuint"), easeInQuint); - insert(QLatin1String("easeOutQuint"), easeOutQuint); - insert(QLatin1String("easeInOutQuint"), easeInOutQuint); - insert(QLatin1String("easeOutInQuint"), easeOutInQuint); - insert(QLatin1String("easeInSine"), easeInSine); - insert(QLatin1String("easeOutSine"), easeOutSine); - insert(QLatin1String("easeInOutSine"), easeInOutSine); - insert(QLatin1String("easeOutInSine"), easeOutInSine); - insert(QLatin1String("easeInExpo"), easeInExpo); - insert(QLatin1String("easeOutExpo"), easeOutExpo); - insert(QLatin1String("easeInOutExpo"), easeInOutExpo); - insert(QLatin1String("easeOutInExpo"), easeOutInExpo); - insert(QLatin1String("easeInCirc"), easeInCirc); - insert(QLatin1String("easeOutCirc"), easeOutCirc); - insert(QLatin1String("easeInOutCirc"), easeInOutCirc); - insert(QLatin1String("easeOutInCirc"), easeOutInCirc); - insert(QLatin1String("easeInElastic"), easeInElastic); - insert(QLatin1String("easeOutElastic"), easeOutElastic); - insert(QLatin1String("easeInOutElastic"), easeInOutElastic); - insert(QLatin1String("easeOutInElastic"), easeOutInElastic); - insert(QLatin1String("easeInBack"), easeInBack); - insert(QLatin1String("easeOutBack"), easeOutBack); - insert(QLatin1String("easeInOutBack"), easeInOutBack); - insert(QLatin1String("easeOutInBack"), easeOutInBack); - insert(QLatin1String("easeInBounce"), easeInBounce); - insert(QLatin1String("easeOutBounce"), easeOutBounce); - insert(QLatin1String("easeInOutBounce"), easeInOutBounce); - insert(QLatin1String("easeOutInBounce"), easeOutInBounce); - } -}; -Q_GLOBAL_STATIC(NameFunctionMap, nameFunctionMap); - -typedef GfxEasingFunction *(*ConfigurableFunction)(const GfxEasingProperties &); -struct ConfigFunctionMap : public QHash<QString, ConfigurableFunction> -{ - ConfigFunctionMap() - { - insert(QLatin1String("easeInElastic"), easeInElasticC); - insert(QLatin1String("easeOutElastic"), easeOutElasticC); - insert(QLatin1String("easeInBounce"), easeInBounceC); - insert(QLatin1String("easeOutBounce"), easeOutBounceC); - } -}; -Q_GLOBAL_STATIC(ConfigFunctionMap, configFunctionMap); - -/*! - \class GfxEasing - \ingroup group_animation - \brief The GfxEasing class provides easing curves for controlling animation. - - Easing curves describe a function that controls how a value changes over - time. Easing curves allow transitions from one value to another to appear - more natural than a simple linear motion would allow. The GfxEasing class - is usually used in conjunction with the GfxTimeLine class, but can be used - on its own. - - To calculate the value at a given time, the easing curve function requires - the starting value, the final value and the total time to change from the - starting to the final value. When using the GfxEasing class with - GfxTimeLine, these values are supplied by the GfxTimeLine. When using - the GfxEasing class on its own, the programmer must specify them using - the GfxEasing::setFrom(), GfxEasing::setTo() and GfxEasing::setLength() - methods, or by passing them explicitly to the GfxEasing::valueAt() method. - - For example, - \code - GfxEasing easing(GfxEasing::InOutQuad); - easing.setFrom(0); - easing.setTo(1000); - easing.setLength(1000); - - for(int milliseconds = 0; milliseconds < 1000; ++milliseconds) - qWarning() << "Value at" << milliseconds << "milliseconds is - << easing.valueAt(milliseconds); - \endcode - will print the value at each millisecond for an InOutQuad transition from - 0 to 1000 over 1 second. - - When using a GfxTimeLine, the values are communicated implicitly. - \code - GfxTimeLine timeline; - GfxValue value(0); - - timeline.move(value, 1000, GfxEasing(GfxEasing::InOutQuad), 1000); - \endcode - In this case, any values set using the previous setter methods would be - ignored. - */ - -/*! - \qmlproperty string NumericAnimation::easing - \brief the easing curve used for the transition. - - Available values are: - - \list - \i \e easeNone - Easing equation function for a simple linear tweening, with no easing. - \i \e easeInQuad - Easing equation function for a quadratic (t^2) easing in: accelerating from zero velocity. - \i \e easeOutQuad - Easing equation function for a quadratic (t^2) easing out: decelerating to zero velocity. - \i \e easeInOutQuad - Easing equation function for a quadratic (t^2) easing in/out: acceleration until halfway, then deceleration. - \i \e easeOutInQuad - Easing equation function for a quadratic (t^2) easing out/in: deceleration until halfway, then acceleration. - \i \e easeInCubic - Easing equation function for a cubic (t^3) easing in: accelerating from zero velocity. - \i \e easeOutCubic - Easing equation function for a cubic (t^3) easing out: decelerating from zero velocity. - \i \e easeInOutCubic - Easing equation function for a cubic (t^3) easing in/out: acceleration until halfway, then deceleration. - \i \e easeOutInCubic - Easing equation function for a cubic (t^3) easing out/in: deceleration until halfway, then acceleration. - \i \e easeInQuart - Easing equation function for a quartic (t^4) easing in: accelerating from zero velocity. - \i \e easeOutQuart - Easing equation function for a quartic (t^4) easing out: decelerating from zero velocity. - \i \e easeInOutQuart - Easing equation function for a quartic (t^4) easing in/out: acceleration until halfway, then deceleration. - \i \e easeOutInQuart - Easing equation function for a quartic (t^4) easing out/in: deceleration until halfway, then acceleration. - \i \e easeInQuint - Easing equation function for a quintic (t^5) easing in: accelerating from zero velocity. - \i \e easeOutQuint - Easing equation function for a quintic (t^5) easing out: decelerating from zero velocity. - \i \e easeInOutQuint - Easing equation function for a quintic (t^5) easing in/out: acceleration until halfway, then deceleration. - \i \e easeOutInQuint - Easing equation function for a quintic (t^5) easing out/in: deceleration until halfway, then acceleration. - \i \e easeInSine - Easing equation function for a sinusoidal (sin(t)) easing in: accelerating from zero velocity. - \i \e easeOutSine - Easing equation function for a sinusoidal (sin(t)) easing out: decelerating from zero velocity. - \i \e easeInOutSine - Easing equation function for a sinusoidal (sin(t)) easing in/out: acceleration until halfway, then deceleration. - \i \e easeOutInSine - Easing equation function for a sinusoidal (sin(t)) easing out/in: deceleration until halfway, then acceleration. - \i \e easeInExpo - Easing equation function for an exponential (2^t) easing in: accelerating from zero velocity. - \i \e easeOutExpo - Easing equation function for an exponential (2^t) easing out: decelerating from zero velocity. - \i \e easeInOutExpo - Easing equation function for an exponential (2^t) easing in/out: acceleration until halfway, then deceleration. - \i \e easeOutInExpo - Easing equation function for an exponential (2^t) easing out/in: deceleration until halfway, then acceleration. - \i \e easeInCirc - Easing equation function for a circular (sqrt(1-t^2)) easing in: accelerating from zero velocity. - \i \e easeOutCirc - Easing equation function for a circular (sqrt(1-t^2)) easing out: decelerating from zero velocity. - \i \e easeInOutCirc - Easing equation function for a circular (sqrt(1-t^2)) easing in/out: acceleration until halfway, then deceleration. - \i \e easeOutInCirc - Easing equation function for a circular (sqrt(1-t^2)) easing out/in: deceleration until halfway, then acceleration. - \i \e easeInElastic - Easing equation function for an elastic (exponentially decaying sine wave) easing in: accelerating from zero velocity. The peak amplitude can be set with the \i amplitude parameter, and the period of decay by the \i period parameter. - \i \e easeOutElastic - Easing equation function for an elastic (exponentially decaying sine wave) easing out: decelerating from zero velocity. The peak amplitude can be set with the \i amplitude parameter, and the period of decay by the \i period parameter. - \i \e easeInOutElastic - Easing equation function for an elastic (exponentially decaying sine wave) easing in/out: acceleration until halfway, then deceleration. - \i \e easeOutInElastic - Easing equation function for an elastic (exponentially decaying sine wave) easing out/in: deceleration until halfway, then acceleration. - \i \e easeInBack - Easing equation function for a back (overshooting cubic easing: (s+1)*t^3 - s*t^2) easing in: accelerating from zero velocity. - \i \e easeOutBack - Easing equation function for a back (overshooting cubic easing: (s+1)*t^3 - s*t^2) easing out: decelerating from zero velocity. - \i \e easeInOutBack - Easing equation function for a back (overshooting cubic easing: (s+1)*t^3 - s*t^2) easing in/out: acceleration until halfway, then deceleration. - \i \e easeOutInBack - Easing equation function for a back (overshooting cubic easing: (s+1)*t^3 - s*t^2) easing out/in: deceleration until halfway, then acceleration. - \i \e easeOutBounce - Easing equation function for a bounce (exponentially decaying parabolic bounce) easing out: decelerating from zero velocity. - \i \e easeInBounce - Easing equation function for a bounce (exponentially decaying parabolic bounce) easing in: accelerating from zero velocity. - \i \e easeInOutBounce - Easing equation function for a bounce (exponentially decaying parabolic bounce) easing in/out: acceleration until halfway, then deceleration. - \i \e easeOutInBounce - Easing equation function for a bounce (exponentially decaying parabolic bounce) easing out/in: deceleration until halfway, then acceleration. - \endlist -*/ - -/*! - \enum GfxEasing::Curve - - The type of easing curve. - - \value None - Easing equation function for a simple linear tweening, with no easing. - - \value InQuad - Easing equation function for a quadratic (t^2) easing in: accelerating from zero velocity. - - \value OutQuad - Easing equation function for a quadratic (t^2) easing out: decelerating to zero velocity. - - \value InOutQuad - Easing equation function for a quadratic (t^2) easing in/out: acceleration until halfway, then deceleration. - - \value OutInQuad - Easing equation function for a quadratic (t^2) easing out/in: deceleration until halfway, then acceleration. - - \value InCubic - Easing equation function for a cubic (t^3) easing in: accelerating from zero velocity. - - \value OutCubic - Easing equation function for a cubic (t^3) easing out: decelerating from zero velocity. - - \value InOutCubic - Easing equation function for a cubic (t^3) easing in/out: acceleration until halfway, then deceleration. - - \value OutInCubic - Easing equation function for a cubic (t^3) easing out/in: deceleration until halfway, then acceleration. - - \value InQuart - Easing equation function for a quartic (t^4) easing in: accelerating from zero velocity. - - \value OutQuart - Easing equation function for a quartic (t^4) easing out: decelerating from zero velocity. - - \value InOutQuart - Easing equation function for a quartic (t^4) easing in/out: acceleration until halfway, then deceleration. - - \value OutInQuart - Easing equation function for a quartic (t^4) easing out/in: deceleration until halfway, then acceleration. - - \value InQuint - Easing equation function for a quintic (t^5) easing in: accelerating from zero velocity. - - \value OutQuint - Easing equation function for a quintic (t^5) easing out: decelerating from zero velocity. - - \value InOutQuint - Easing equation function for a quintic (t^5) easing in/out: acceleration until halfway, then deceleration. - - \value OutInQuint - Easing equation function for a quintic (t^5) easing out/in: deceleration until halfway, then acceleration. - - \value InSine - Easing equation function for a sinusoidal (sin(t)) easing in: accelerating from zero velocity. - - \value OutSine - Easing equation function for a sinusoidal (sin(t)) easing out: decelerating from zero velocity. - - \value InOutSine - Easing equation function for a sinusoidal (sin(t)) easing in/out: acceleration until halfway, then deceleration. - - \value OutInSine - Easing equation function for a sinusoidal (sin(t)) easing out/in: deceleration until halfway, then acceleration. - - \value InExpo - Easing equation function for an exponential (2^t) easing in: accelerating from zero velocity. - - \value OutExpo - Easing equation function for an exponential (2^t) easing out: decelerating from zero velocity. - - \value InOutExpo - Easing equation function for an exponential (2^t) easing in/out: acceleration until halfway, then deceleration. - - \value OutInExpo - Easing equation function for an exponential (2^t) easing out/in: deceleration until halfway, then acceleration. - - \value InCirc - Easing equation function for a circular (sqrt(1-t^2)) easing in: accelerating from zero velocity. - - \value OutCirc - Easing equation function for a circular (sqrt(1-t^2)) easing out: decelerating from zero velocity. - - \value InOutCirc - Easing equation function for a circular (sqrt(1-t^2)) easing in/out: acceleration until halfway, then deceleration. - - \value OutInCirc - Easing equation function for a circular (sqrt(1-t^2)) easing out/in: deceleration until halfway, then acceleration. - - \value InElastic - Easing equation function for an elastic (exponentially decaying - sine wave) easing in: accelerating from zero velocity. The peak - amplitude can be set with the \e amplitude parameter, and the - period of decay by the \e period parameter. - - \value OutElastic - Easing equation function for an elastic (exponentially decaying - sine wave) easing out: decelerating from zero velocity. The peak - amplitude can be set with the \e amplitude parameter, and the - period of decay by the \e period parameter. - - \value InOutElastic - Easing equation function for an elastic (exponentially decaying sine wave) easing in/out: acceleration until halfway, then deceleration. - - \value OutInElastic - Easing equation function for an elastic (exponentially decaying sine wave) easing out/in: deceleration until halfway, then acceleration. - - \value InBack - Easing equation function for a back (overshooting cubic easing: (s+1)*t^3 - s*t^2) easing in: accelerating from zero velocity. - - \value OutBack - Easing equation function for a back (overshooting cubic easing: (s+1)*t^3 - s*t^2) easing out: decelerating from zero velocity. - - \value InOutBack - Easing equation function for a back (overshooting cubic easing: (s+1)*t^3 - s*t^2) easing in/out: acceleration until halfway, then deceleration. - - \value OutInBack - Easing equation function for a back (overshooting cubic easing: (s+1)*t^3 - s*t^2) easing out/in: deceleration until halfway, then acceleration. - - \value OutBounce - Easing equation function for a bounce (exponentially decaying parabolic bounce) easing out: decelerating from zero velocity. - - \value InBounce - Easing equation function for a bounce (exponentially decaying parabolic bounce) easing in: accelerating from zero velocity. - - \value InOutBounce - Easing equation function for a bounce (exponentially decaying parabolic bounce) easing in/out: acceleration until halfway, then deceleration. - - \value OutInBounce - Easing equation function for a bounce (exponentially decaying parabolic bounce) easing out/in: deceleration until halfway, then acceleration. -*/ - -/*! - Construct a linear easing object. This is equivalent to \c {GfxEasing(GfxEasing::None)}. - */ -GfxEasing::GfxEasing() -: _config(0), _func(&easeNone), _b(0.), _c(1.), _d(1.) -{ -} - -/*! - Construct an easing object with the given \a curve. - */ -GfxEasing::GfxEasing(Curve curve) -: _config(0), _func(0), _b(0.), _c(1.), _d(1.) -{ - _func = curveToFunc(curve); - if(!_func) { - qWarning("GfxEasing: Invalid curve type %d", curve); - _func = &easeNone; - } -} - -/*! - Construct an easing object with the given \a curve. If \a curve does not - describe a legal curve, a linear easing object is constructed. - - Curve names have the form - \c {ease<CurveName>[(<arg>: <arg value>[, <arg2>: <arg value>])]}. The - \e CurveName is equivalent to the GfxEasing::Curve enum name. Some more - advanced curves can take arguments to further refine their behaviour. Where - applicable, these parameters are described in the corresponding - GfxEasing::Curve value documentation. - - For example, - \code - GfxEasing easing("easeInOutQuad"); - GfxEasing easing2("easeInElastic(period: 5, amplitude: 100)"); - \endcode - */ -GfxEasing::GfxEasing(const QString &curve) -: _config(0), _func(&easeNone), _b(0.), _c(1.), _d(1.) -{ - if(curve.contains(QLatin1Char('('))) { - QString easeName = curve.trimmed(); - GfxEasingProperties prop; - if(!easeName.endsWith(QLatin1Char(')'))) { - qWarning("GfxEasing: Unmatched perenthesis in easing function '%s'", - curve.toLatin1().constData()); - return; - } - - int idx = easeName.indexOf(QLatin1Char('(')); - QString prop_str = - easeName.mid(idx + 1, easeName.length() - 1 - idx - 1); - easeName = easeName.left(idx); - - QStringList props = prop_str.split(QLatin1Char(',')); - foreach(QString str, props) { - int sep = str.indexOf(QLatin1Char(':')); - - if(sep == -1) { - qWarning("GfxEasing: Improperly specified property in easing function '%s'", - curve.toLatin1().constData()); - return; - } - - QString propName = str.left(sep).trimmed(); - bool isOk; - qreal propValue = str.mid(sep + 1).trimmed().toDouble(&isOk); - - if(propName.isEmpty() || !isOk) { - qWarning("GfxEasing: Improperly specified property in easing function '%s'", - curve.toLatin1().constData()); - return; - } - - prop.insert(propName, propValue); - } - - QHash<QString, ConfigurableFunction>::Iterator iter = - configFunctionMap()->find(easeName); - - if(iter != configFunctionMap()->end()) - _config = (*iter)(prop); - } else { - if(nameFunctionMap()->contains(curve)) - _func = *(nameFunctionMap()->find(curve)); - } - - if(!_func && !_config) { - qWarning("GfxEasing: Unknown easing curve '%s'", - curve.toLatin1().constData()); - _func = &easeNone; - } -} - -/*! - Construct a copy of \a other. - */ -GfxEasing::GfxEasing(const GfxEasing &other) -: _config(0), _func(other._func), _b(other._b), _c(other._c), _d(other._d) -{ - if(other._config) _config = other._config->copy(); -} - -/*! - Copy \a other. - */ -GfxEasing &GfxEasing::operator=(const GfxEasing &other) -{ - if(_config) { delete _config; _config = 0; } - if(other._config) _config = other._config->copy(); - - _func = other._func; - _b = other._b; - _c = other._c; - _d = other._d; - - return *this; -} - -/*! - Returns true if this is a linear easing object. - */ -bool GfxEasing::isLinear() const -{ - return !_config && _func == &easeNone; -} - -/*! - Return the starting value for the easing curve. By default this is 0. - */ -qreal GfxEasing::from() const -{ - return _b; -} - -/*! - Set the starting value for the easing curve to \a from. - */ -void GfxEasing::setFrom(qreal from) -{ - _b = from; -} - -/*! - Return the final value for the easing curve. By default this is 0. - */ -qreal GfxEasing::to() const -{ - return _c; -} - -/*! - Set the final value for the easing curve to \a to. - */ -void GfxEasing::setTo(qreal to) -{ - _c = to; -} - -/*! - Return the length of the easing curve, in milliseconds. By default this - is 1. - */ -qreal GfxEasing::length() const -{ - return _d; -} - -/*! - Set the \a length of the easing curve, in milliseconds. - */ -void GfxEasing::setLength(qreal length) -{ - Q_ASSERT(length > 0); - _d = length; -} - -/*! - Return the value for the easing curve at time \a t milliseconds, based on - the parameters returned by GfxEasing::from(), GfxEasing::to() and - GfxEasing::length(). - - \a t is clamped to (0, GfxEasing::length()). - */ -qreal GfxEasing::valueAt(qreal t) const -{ - if(t < 0) t = 0; - else if(t > length()) t = length(); - - if(_config) - return _config->value(t, _b, _c - _b, _d); - else - return _func(t, _b, _c - _b, _d); -} - -/* - Return the value for the easing curve at time \a t milliseconds, based on - the provided parameters \a from, \a to and \a length. The values returned - from the object's GfxEasing::from(), GfxEasing::to() and GfxEasing::length() - methods are ignored. - - \a t is clamped to (0, \a length). - */ -qreal GfxEasing::valueAt(qreal t, qreal from, qreal to, qreal length) const -{ - if(t < 0) t = 0; - else if(t > length) t = length; - - if(_config) - return _config->value(t, from, to - from, length); - else - return _func(t, from, to - from, length); -} - -/*! - \internal - */ -QStringList GfxEasing::curves() -{ - return nameFunctionMap()->keys(); -} - -QT_END_NAMESPACE diff --git a/src/declarative/timeline/gfxeasing.h b/src/declarative/timeline/gfxeasing.h deleted file mode 100644 index c15aadc..0000000 --- a/src/declarative/timeline/gfxeasing.h +++ /dev/null @@ -1,107 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef GFXEASING_H -#define GFXEASING_H - -#include <qfxglobal.h> -#include <QList> -#include <QPair> -#include <QWidget> - - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Declarative) - -class GfxEasingFunction; -class Q_DECLARATIVE_EXPORT GfxEasing -{ -public: - enum Curve { - None, - InQuad, OutQuad, InOutQuad, OutInQuad, - InCubic, OutCubic, InOutCubic, OutInCubic, - InQuart, OutQuart, InOutQuart, OutInQuart, - InQuint, OutQuint, InOutQuint, OutInQuint, - InSine, OutSine, InOutSine, OutInSine, - InExpo, OutExpo, InOutExpo, OutInExpo, - InCirc, OutCirc, InOutCirc, OutInCirc, - InElastic, OutElastic, InOutElastic, OutInElastic, - InBack, OutBack, InOutBack, OutInBack, - InBounce, OutBounce, InOutBounce, OutInBounce - }; - - GfxEasing(); - GfxEasing(Curve); - GfxEasing(const QString &); - GfxEasing(const GfxEasing &); - GfxEasing &operator=(const GfxEasing &); - - bool isLinear() const; - - qreal from() const; - void setFrom(qreal); - qreal to() const; - void setTo(qreal); - qreal length() const; - void setLength(qreal); - - qreal valueAt(qreal t) const; - qreal valueAt(qreal t, qreal from, qreal to, qreal length) const; - - static QStringList curves(); - - typedef float (*Function)(float t, float b, float c, float d); -private: - GfxEasingFunction *_config; - Function _func; - - qreal _b, _c, _d; -}; - - -QT_END_NAMESPACE - -QT_END_HEADER -#endif diff --git a/src/declarative/timeline/gfxvalueproxy.h b/src/declarative/timeline/gfxvalueproxy.h index 1eaf44e..1bb716c 100644 --- a/src/declarative/timeline/gfxvalueproxy.h +++ b/src/declarative/timeline/gfxvalueproxy.h @@ -41,6 +41,9 @@ #ifndef GFXVALUEPROXY_H #define GFXVALUEPROXY_H + +#include "qmltimeline.h" + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/declarative/timeline/gfxtimeline.cpp b/src/declarative/timeline/qmltimeline.cpp index 3e84df8..2006fd0 100644 --- a/src/declarative/timeline/gfxtimeline.cpp +++ b/src/declarative/timeline/qmltimeline.cpp @@ -39,20 +39,18 @@ ** ****************************************************************************/ -#include "gfxtimeline.h" +#include "qmltimeline.h" #include <QDebug> #include <QMutex> #include <QThread> #include <QWaitCondition> #include <QEvent> #include <QCoreApplication> -#include "gfxeasing.h" +#include <QEasingCurve> #include <QTime> QT_BEGIN_NAMESPACE -#define TIMETICK 5 - // // Timeline stuff // @@ -84,7 +82,7 @@ struct QmlTimeLinePrivate }; Op() {} Op(Type t, int l, qreal v, qreal v2, int o, - const GfxEvent &ev = GfxEvent(), const GfxEasing &es = GfxEasing()) + const GfxEvent &ev = GfxEvent(), const QEasingCurve &es = QEasingCurve()) : type(t), length(l), value(v), value2(v2), order(o), event(ev), easing(es) {} Op(const Op &o) @@ -104,7 +102,7 @@ struct QmlTimeLinePrivate int order; GfxEvent event; - GfxEasing easing; + QEasingCurve easing; }; struct TimeLine { @@ -208,13 +206,12 @@ qreal QmlTimeLinePrivate::value(const Op &op, int time, qreal base, bool *change } else if(time == (op.length)) { return op.value; } else { - if(op.easing.isLinear()) { - qreal delta = op.value - base; - qreal pTime = (qreal)(time) / (qreal)op.length; + qreal delta = op.value - base; + qreal pTime = (qreal)(time) / (qreal)op.length; + if(op.easing.type() == QEasingCurve::Linear) return base + delta * pTime; - } else { - return op.easing.valueAt(time, base, op.value, op.length); - } + else + return base + delta * op.easing.valueForProgress(pTime); } case Op::MoveBy: if(time == 0) { @@ -222,13 +219,12 @@ qreal QmlTimeLinePrivate::value(const Op &op, int time, qreal base, bool *change } else if(time == (op.length)) { return base + op.value; } else { - if(op.easing.isLinear()) { - qreal delta = op.value; - qreal pTime = (qreal)(time) / (qreal)op.length; + qreal delta = op.value; + qreal pTime = (qreal)(time) / (qreal)op.length; + if(op.easing.type() == QEasingCurve::Linear) return base + delta * pTime; - } else { - return op.easing.valueAt(time, base, base + op.value, op.length); - } + else + return base + delta * op.easing.valueForProgress(pTime); } case Op::Accel: if(time == 0) { @@ -260,6 +256,7 @@ qreal QmlTimeLinePrivate::value(const Op &op, int time, qreal base, bool *change } /*! + \internal \class QmlTimeLine \ingroup group_animation \brief The QmlTimeLine class provides a timeline for controlling animations. @@ -469,7 +466,7 @@ void QmlTimeLine::move(GfxValue &gfxValue, qreal destination, int time) Change the \a gfxValue from its current value to the given \a destination value over \a time milliseconds using the \a easing curve. */ -void QmlTimeLine::move(GfxValue &gfxValue, qreal destination, const GfxEasing &easing, int time) +void QmlTimeLine::move(GfxValue &gfxValue, qreal destination, const QEasingCurve &easing, int time) { if(time <= 0) return; QmlTimeLinePrivate::Op op(QmlTimeLinePrivate::Op::Move, time, destination, 0.0f, d->order++, GfxEvent(), easing); @@ -491,7 +488,7 @@ void QmlTimeLine::moveBy(GfxValue &gfxValue, qreal change, int time) Change the \a gfxValue from its current value by the \a change amount over \a time milliseconds using the \a easing curve. */ -void QmlTimeLine::moveBy(GfxValue &gfxValue, qreal change, const GfxEasing &easing, int time) +void QmlTimeLine::moveBy(GfxValue &gfxValue, qreal change, const QEasingCurve &easing, int time) { if(time <= 0) return; QmlTimeLinePrivate::Op op(QmlTimeLinePrivate::Op::MoveBy, time, change, 0.0f, d->order++, GfxEvent(), easing); diff --git a/src/declarative/timeline/gfxtimeline.h b/src/declarative/timeline/qmltimeline.h index 0bdddaf..77980fb 100644 --- a/src/declarative/timeline/gfxtimeline.h +++ b/src/declarative/timeline/qmltimeline.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef GFXTIMELINE_H -#define GFXTIMELINE_H +#ifndef QMLTIMELINE_H +#define QMLTIMELINE_H #include <QObject> #include <qfxglobal.h> @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -class GfxEasing; +class QEasingCurve; class GfxValue; class GfxEvent; struct QmlTimeLinePrivate; @@ -77,9 +77,9 @@ public: int accelDistance(GfxValue &, qreal velocity, qreal distance); void move(GfxValue &, qreal destination, int time = 500); - void move(GfxValue &, qreal destination, const GfxEasing &, int time = 500); + void move(GfxValue &, qreal destination, const QEasingCurve &, int time = 500); void moveBy(GfxValue &, qreal change, int time = 500); - void moveBy(GfxValue &, qreal change, const GfxEasing &, int time = 500); + void moveBy(GfxValue &, qreal change, const QEasingCurve &, int time = 500); void sync(); void setSyncPoint(int); diff --git a/src/declarative/timeline/timeline.pri b/src/declarative/timeline/timeline.pri index 8994c78..0a0875c 100644 --- a/src/declarative/timeline/timeline.pri +++ b/src/declarative/timeline/timeline.pri @@ -1,9 +1,7 @@ SOURCES += \ - timeline/gfxeasing.cpp \ - timeline/gfxtimeline.cpp \ + timeline/qmltimeline.cpp \ HEADERS += \ - timeline/gfxeasing.h \ - timeline/gfxtimeline.h \ + timeline/qmltimeline.h \ timeline/gfxvalueproxy.h \ diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp index ede4008..c0b89be 100644 --- a/src/declarative/util/qmlanimation.cpp +++ b/src/declarative/util/qmlanimation.cpp @@ -40,19 +40,19 @@ ****************************************************************************/ #include "qmlanimation.h" -#include "gfxtimeline.h" #include "qvariant.h" #include "qcolor.h" #include "qfile.h" -#include "gfxeasing.h" #include "qmlpropertyvaluesource.h" #include "qml.h" #include "qmlanimation_p.h" -#include "gfxtimeline.h" #include "qmlbehaviour.h" #include <QParallelAnimationGroup> #include <QSequentialAnimationGroup> #include <QtCore/qset.h> +#include <QtCore/qrect.h> +#include <QtCore/qpoint.h> +#include <QtCore/qsize.h> #include <QtDeclarative/qmlexpression.h> #include <private/qmlstringconverters_p.h> #include <private/qvariantanimation_p.h> @@ -1447,7 +1447,57 @@ void QmlNumericAnimation::setTo(qreal t) emit toChanged(t); } -/* XML docs in GfxEasing */ +/*! + \qmlproperty string NumericAnimation::easing + \brief the easing curve used for the transition. + + Available values are: + + \list + \i \e easeNone - Easing equation function for a simple linear tweening, with no easing. + \i \e easeInQuad - Easing equation function for a quadratic (t^2) easing in: accelerating from zero velocity. + \i \e easeOutQuad - Easing equation function for a quadratic (t^2) easing out: decelerating to zero velocity. + \i \e easeInOutQuad - Easing equation function for a quadratic (t^2) easing in/out: acceleration until halfway, then deceleration. + \i \e easeOutInQuad - Easing equation function for a quadratic (t^2) easing out/in: deceleration until halfway, then acceleration. + \i \e easeInCubic - Easing equation function for a cubic (t^3) easing in: accelerating from zero velocity. + \i \e easeOutCubic - Easing equation function for a cubic (t^3) easing out: decelerating from zero velocity. + \i \e easeInOutCubic - Easing equation function for a cubic (t^3) easing in/out: acceleration until halfway, then deceleration. + \i \e easeOutInCubic - Easing equation function for a cubic (t^3) easing out/in: deceleration until halfway, then acceleration. + \i \e easeInQuart - Easing equation function for a quartic (t^4) easing in: accelerating from zero velocity. + \i \e easeOutQuart - Easing equation function for a quartic (t^4) easing out: decelerating from zero velocity. + \i \e easeInOutQuart - Easing equation function for a quartic (t^4) easing in/out: acceleration until halfway, then deceleration. + \i \e easeOutInQuart - Easing equation function for a quartic (t^4) easing out/in: deceleration until halfway, then acceleration. + \i \e easeInQuint - Easing equation function for a quintic (t^5) easing in: accelerating from zero velocity. + \i \e easeOutQuint - Easing equation function for a quintic (t^5) easing out: decelerating from zero velocity. + \i \e easeInOutQuint - Easing equation function for a quintic (t^5) easing in/out: acceleration until halfway, then deceleration. + \i \e easeOutInQuint - Easing equation function for a quintic (t^5) easing out/in: deceleration until halfway, then acceleration. + \i \e easeInSine - Easing equation function for a sinusoidal (sin(t)) easing in: accelerating from zero velocity. + \i \e easeOutSine - Easing equation function for a sinusoidal (sin(t)) easing out: decelerating from zero velocity. + \i \e easeInOutSine - Easing equation function for a sinusoidal (sin(t)) easing in/out: acceleration until halfway, then deceleration. + \i \e easeOutInSine - Easing equation function for a sinusoidal (sin(t)) easing out/in: deceleration until halfway, then acceleration. + \i \e easeInExpo - Easing equation function for an exponential (2^t) easing in: accelerating from zero velocity. + \i \e easeOutExpo - Easing equation function for an exponential (2^t) easing out: decelerating from zero velocity. + \i \e easeInOutExpo - Easing equation function for an exponential (2^t) easing in/out: acceleration until halfway, then deceleration. + \i \e easeOutInExpo - Easing equation function for an exponential (2^t) easing out/in: deceleration until halfway, then acceleration. + \i \e easeInCirc - Easing equation function for a circular (sqrt(1-t^2)) easing in: accelerating from zero velocity. + \i \e easeOutCirc - Easing equation function for a circular (sqrt(1-t^2)) easing out: decelerating from zero velocity. + \i \e easeInOutCirc - Easing equation function for a circular (sqrt(1-t^2)) easing in/out: acceleration until halfway, then deceleration. + \i \e easeOutInCirc - Easing equation function for a circular (sqrt(1-t^2)) easing out/in: deceleration until halfway, then acceleration. + \i \e easeInElastic - Easing equation function for an elastic (exponentially decaying sine wave) easing in: accelerating from zero velocity. The peak amplitude can be set with the \e amplitude parameter, and the period of decay by the \e period parameter. + \i \e easeOutElastic - Easing equation function for an elastic (exponentially decaying sine wave) easing out: decelerating from zero velocity. The peak amplitude can be set with the \e amplitude parameter, and the period of decay by the \e period parameter. + \i \e easeInOutElastic - Easing equation function for an elastic (exponentially decaying sine wave) easing in/out: acceleration until halfway, then deceleration. + \i \e easeOutInElastic - Easing equation function for an elastic (exponentially decaying sine wave) easing out/in: deceleration until halfway, then acceleration. + \i \e easeInBack - Easing equation function for a back (overshooting cubic easing: (s+1)*t^3 - s*t^2) easing in: accelerating from zero velocity. + \i \e easeOutBack - Easing equation function for a back (overshooting cubic easing: (s+1)*t^3 - s*t^2) easing out: decelerating from zero velocity. + \i \e easeInOutBack - Easing equation function for a back (overshooting cubic easing: (s+1)*t^3 - s*t^2) easing in/out: acceleration until halfway, then deceleration. + \i \e easeOutInBack - Easing equation function for a back (overshooting cubic easing: (s+1)*t^3 - s*t^2) easing out/in: deceleration until halfway, then acceleration. + \i \e easeOutBounce - Easing equation function for a bounce (exponentially decaying parabolic bounce) easing out: decelerating from zero velocity. + \i \e easeInBounce - Easing equation function for a bounce (exponentially decaying parabolic bounce) easing in: accelerating from zero velocity. + \i \e easeInOutBounce - Easing equation function for a bounce (exponentially decaying parabolic bounce) easing in/out: acceleration until halfway, then deceleration. + \i \e easeOutInBounce - Easing equation function for a bounce (exponentially decaying parabolic bounce) easing out/in: deceleration until halfway, then acceleration. + \endlist +*/ + /*! \property QmlNumericAnimation::easing This property holds the easing curve to use. diff --git a/src/declarative/util/qmlbehaviour.h b/src/declarative/util/qmlbehaviour.h index 080423a..3d25cd8 100644 --- a/src/declarative/util/qmlbehaviour.h +++ b/src/declarative/util/qmlbehaviour.h @@ -45,8 +45,6 @@ #include <qmlpropertyvaluesource.h> #include <qml.h> #include <qmlstate.h> -#include <gfxtimeline.h> - QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlfollow.cpp b/src/declarative/util/qmlfollow.cpp index 01d8962..35f3c49 100644 --- a/src/declarative/util/qmlfollow.cpp +++ b/src/declarative/util/qmlfollow.cpp @@ -41,7 +41,6 @@ #include <limits.h> #include <QtCore/qdebug.h> -#include <gfxtimeline.h> #include "private/qobject_p.h" #include "qmlfollow.h" #include "private/qmlanimation_p.h" diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp index f07fecb..9b1b695 100644 --- a/src/declarative/util/qmlstate.cpp +++ b/src/declarative/util/qmlstate.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ -#include <gfxeasing.h> #include "qmltransition.h" #include "qmlstategroup.h" #include "qmlstate_p.h" diff --git a/src/declarative/util/qmlstate.h b/src/declarative/util/qmlstate.h index 3e6727d..68c43fa 100644 --- a/src/declarative/util/qmlstate.h +++ b/src/declarative/util/qmlstate.h @@ -44,7 +44,6 @@ #include <QtCore/qobject.h> #include <qfxglobal.h> -#include <gfxtimeline.h> #include <qml.h> #include <QSequentialAnimationGroup> diff --git a/src/declarative/util/qmlstateoperations.cpp b/src/declarative/util/qmlstateoperations.cpp index a8779f9..6836472 100644 --- a/src/declarative/util/qmlstateoperations.cpp +++ b/src/declarative/util/qmlstateoperations.cpp @@ -40,7 +40,6 @@ ****************************************************************************/ #include <private/qobject_p.h> -#include <gfxeasing.h> #include <qml.h> #include <QtDeclarative/qmlcontext.h> #include "qmlbindablevalue.h" diff --git a/src/declarative/util/qmltransition.h b/src/declarative/util/qmltransition.h index 0d86b7d..0b7ea14 100644 --- a/src/declarative/util/qmltransition.h +++ b/src/declarative/util/qmltransition.h @@ -44,7 +44,6 @@ #include <QtCore/qobject.h> #include <qfxglobal.h> -#include <gfxtimeline.h> #include <qmlstate.h> #include <qml.h> |