From 6353d8c7abe551c25946dcea872a0e711cf08808 Mon Sep 17 00:00:00 2001 From: Richard Davey Date: Thu, 26 Sep 2013 15:22:49 +0100 Subject: [PATCH] Fixed some eases. --- README.md | 2 ++ src/tween/Easing.js | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 52a419c9..57576c33 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,8 @@ Version 1.0.7 (in progress in the dev branch) * Complete overhaul of Physics.Arcade.Body - now significantly more stable and faster too. * Updated ArcadePhysics.separateX/Y to use new body system - much better results now. * QuadTree bug found in 1.0.5 now fixed. The QuadTree is updated properly now using worldTransform values. +* Fixed the Bounce.In and Bounce.InOut tweens (thanks XekeDeath) + * TODO: addMarker hh:mm:ss:ms * TODO: Direction constants diff --git a/src/tween/Easing.js b/src/tween/Easing.js index 7e007a8e..b2b8350c 100644 --- a/src/tween/Easing.js +++ b/src/tween/Easing.js @@ -240,7 +240,7 @@ Phaser.Easing = { In: function ( k ) { - return 1 - TWEEN.Easing.Bounce.Out( 1 - k ); + return 1 - Phaser.Easing.Bounce.Out( 1 - k ); }, @@ -268,8 +268,8 @@ Phaser.Easing = { InOut: function ( k ) { - if ( k < 0.5 ) return TWEEN.Easing.Bounce.In( k * 2 ) * 0.5; - return TWEEN.Easing.Bounce.Out( k * 2 - 1 ) * 0.5 + 0.5; + if ( k < 0.5 ) return Phaser.Easing.Bounce.In( k * 2 ) * 0.5; + return Phaser.Easing.Bounce.Out( k * 2 - 1 ) * 0.5 + 0.5; }