tween.js
Advanced tools
Comparing version 16.1.1 to 16.2.0
@@ -20,3 +20,4 @@ { | ||
"scripts": { | ||
"test": "nodeunit $(pwd)/test/unit/nodeunitheadless.js", | ||
"test": "nodeunit $(pwd)/test/unit/nodeunitheadless.js && npm run jshint", | ||
"jshint": "jshint --config $(pwd)/test/jshintrc $(pwd)/src/Tween.js", | ||
"semantic-release": "semantic-release pre && npm publish && semantic-release post" | ||
@@ -26,6 +27,7 @@ }, | ||
"devDependencies": { | ||
"jshint": "^2.8.0", | ||
"nodeunit": "^0.9.1", | ||
"semantic-release": "^4.3.5" | ||
}, | ||
"version": "16.1.1" | ||
"version": "16.2.0" | ||
} |
139
src/Tween.js
@@ -71,3 +71,5 @@ /** | ||
if ( _tweens.length === 0 ) return false; | ||
if ( _tweens.length === 0 ) { | ||
return false; | ||
} | ||
@@ -342,3 +344,3 @@ var i = 0; | ||
if ( elapsed == 1 ) { | ||
if ( elapsed === 1 ) { | ||
@@ -431,3 +433,5 @@ if ( _repeat > 0 ) { | ||
if ( ( k *= 2 ) < 1 ) return 0.5 * k * k; | ||
if ( ( k *= 2 ) < 1 ) { | ||
return 0.5 * k * k; | ||
} | ||
return - 0.5 * ( --k * ( k - 2 ) - 1 ); | ||
@@ -455,3 +459,5 @@ | ||
if ( ( k *= 2 ) < 1 ) return 0.5 * k * k * k; | ||
if ( ( k *= 2 ) < 1 ) { | ||
return 0.5 * k * k * k; | ||
} | ||
return 0.5 * ( ( k -= 2 ) * k * k + 2 ); | ||
@@ -479,3 +485,5 @@ | ||
if ( ( k *= 2 ) < 1) return 0.5 * k * k * k * k; | ||
if ( ( k *= 2 ) < 1) { | ||
return 0.5 * k * k * k * k; | ||
} | ||
return - 0.5 * ( ( k -= 2 ) * k * k * k - 2 ); | ||
@@ -503,3 +511,5 @@ | ||
if ( ( k *= 2 ) < 1 ) return 0.5 * k * k * k * k * k; | ||
if ( ( k *= 2 ) < 1 ) { | ||
return 0.5 * k * k * k * k * k; | ||
} | ||
return 0.5 * ( ( k -= 2 ) * k * k * k * k + 2 ); | ||
@@ -549,5 +559,14 @@ | ||
if ( k === 0 ) return 0; | ||
if ( k === 1 ) return 1; | ||
if ( ( k *= 2 ) < 1 ) return 0.5 * Math.pow( 1024, k - 1 ); | ||
if ( k === 0 ) { | ||
return 0; | ||
} | ||
if ( k === 1 ) { | ||
return 1; | ||
} | ||
if ( ( k *= 2 ) < 1 ) { | ||
return 0.5 * Math.pow( 1024, k - 1 ); | ||
} | ||
return 0.5 * ( - Math.pow( 2, - 10 * ( k - 1 ) ) + 2 ); | ||
@@ -575,3 +594,5 @@ | ||
if ( ( k *= 2 ) < 1) return - 0.5 * ( Math.sqrt( 1 - k * k) - 1); | ||
if ( ( k *= 2 ) < 1) { | ||
return - 0.5 * ( Math.sqrt( 1 - k * k) - 1); | ||
} | ||
return 0.5 * ( Math.sqrt( 1 - ( k -= 2) * k) + 1); | ||
@@ -588,6 +609,13 @@ | ||
var s, a = 0.1, p = 0.4; | ||
if ( k === 0 ) return 0; | ||
if ( k === 1 ) return 1; | ||
if ( !a || a < 1 ) { a = 1; s = p / 4; } | ||
else s = p * Math.asin( 1 / a ) / ( 2 * Math.PI ); | ||
if ( k === 0 ) { | ||
return 0; | ||
} | ||
if ( k === 1 ) { | ||
return 1; | ||
} | ||
if ( !a || a < 1 ) { | ||
a = 1; s = p / 4; | ||
} else { | ||
s = p * Math.asin( 1 / a ) / ( 2 * Math.PI ); | ||
} | ||
return - ( a * Math.pow( 2, 10 * ( k -= 1 ) ) * Math.sin( ( k - s ) * ( 2 * Math.PI ) / p ) ); | ||
@@ -600,6 +628,15 @@ | ||
var s, a = 0.1, p = 0.4; | ||
if ( k === 0 ) return 0; | ||
if ( k === 1 ) return 1; | ||
if ( !a || a < 1 ) { a = 1; s = p / 4; } | ||
else s = p * Math.asin( 1 / a ) / ( 2 * Math.PI ); | ||
if ( k === 0 ) { | ||
return 0; | ||
} | ||
if ( k === 1 ) { | ||
return 1; | ||
} | ||
if ( !a || a < 1 ) { | ||
a = 1; s = p / 4; | ||
} else { | ||
s = p * Math.asin( 1 / a ) / ( 2 * Math.PI ); | ||
} | ||
return ( a * Math.pow( 2, - 10 * k) * Math.sin( ( k - s ) * ( 2 * Math.PI ) / p ) + 1 ); | ||
@@ -612,7 +649,20 @@ | ||
var s, a = 0.1, p = 0.4; | ||
if ( k === 0 ) return 0; | ||
if ( k === 1 ) return 1; | ||
if ( !a || a < 1 ) { a = 1; s = p / 4; } | ||
else s = p * Math.asin( 1 / a ) / ( 2 * Math.PI ); | ||
if ( ( k *= 2 ) < 1 ) return - 0.5 * ( a * Math.pow( 2, 10 * ( k -= 1 ) ) * Math.sin( ( k - s ) * ( 2 * Math.PI ) / p ) ); | ||
if ( k === 0 ) { | ||
return 0; | ||
} | ||
if ( k === 1 ) { | ||
return 1; | ||
} | ||
if ( !a || a < 1 ) { | ||
a = 1; s = p / 4; | ||
} else { | ||
s = p * Math.asin( 1 / a ) / ( 2 * Math.PI ); | ||
} | ||
if ( ( k *= 2 ) < 1 ) { | ||
return - 0.5 * ( a * Math.pow( 2, 10 * ( k -= 1 ) ) * Math.sin( ( k - s ) * ( 2 * Math.PI ) / p ) ); | ||
} | ||
return a * Math.pow( 2, -10 * ( k -= 1 ) ) * Math.sin( ( k - s ) * ( 2 * Math.PI ) / p ) * 0.5 + 1; | ||
@@ -643,3 +693,5 @@ | ||
var s = 1.70158 * 1.525; | ||
if ( ( k *= 2 ) < 1 ) return 0.5 * ( k * k * ( ( s + 1 ) * k - s ) ); | ||
if ( ( k *= 2 ) < 1 ) { | ||
return 0.5 * ( k * k * ( ( s + 1 ) * k - s ) ); | ||
} | ||
return 0.5 * ( ( k -= 2 ) * k * ( ( s + 1 ) * k + s ) + 2 ); | ||
@@ -683,3 +735,5 @@ | ||
if ( k < 0.5 ) return TWEEN.Easing.Bounce.In( k * 2 ) * 0.5; | ||
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; | ||
@@ -699,5 +753,10 @@ | ||
if ( k < 0 ) return fn( v[ 0 ], v[ 1 ], f ); | ||
if ( k > 1 ) return fn( v[ m ], v[ m - 1 ], m - f ); | ||
if ( k < 0 ) { | ||
return fn( v[ 0 ], v[ 1 ], f ); | ||
} | ||
if ( k > 1 ) { | ||
return fn( v[ m ], v[ m - 1 ], m - f ); | ||
} | ||
return fn( v[ i ], v[ i + 1 > m ? m : i + 1 ], f - i ); | ||
@@ -725,3 +784,5 @@ | ||
if ( k < 0 ) i = Math.floor( f = m * ( 1 + k ) ); | ||
if ( k < 0 ) { | ||
i = Math.floor( f = m * ( 1 + k ) ); | ||
} | ||
@@ -732,5 +793,10 @@ return fn( v[ ( i - 1 + m ) % m ], v[ i ], v[ ( i + 1 ) % m ], v[ ( i + 2 ) % m ], f - i ); | ||
if ( k < 0 ) return v[ 0 ] - ( fn( v[ 0 ], v[ 0 ], v[ 1 ], v[ 1 ], -f ) - v[ 0 ] ); | ||
if ( k > 1 ) return v[ m ] - ( fn( v[ m ], v[ m ], v[ m - 1 ], v[ m - 1 ], f - m ) - v[ m ] ); | ||
if ( k < 0 ) { | ||
return v[ 0 ] - ( fn( v[ 0 ], v[ 0 ], v[ 1 ], v[ 1 ], -f ) - v[ 0 ] ); | ||
} | ||
if ( k > 1 ) { | ||
return v[ m ] - ( fn( v[ m ], v[ m ], v[ m - 1 ], v[ m - 1 ], f - m ) - v[ m ] ); | ||
} | ||
return fn( v[ i ? i - 1 : 0 ], v[ i ], v[ m < i + 1 ? m : i + 1 ], v[ m < i + 2 ? m : i + 2 ], f - i ); | ||
@@ -764,6 +830,13 @@ | ||
var s = 1, i; | ||
if ( a[ n ] ) return a[ n ]; | ||
for ( i = n; i > 1; i-- ) s *= i; | ||
return a[ n ] = s; | ||
if ( a[ n ] ) { | ||
return a[ n ]; | ||
} | ||
for ( i = n; i > 1; i-- ) { | ||
s *= i; | ||
} | ||
a[n] = s; | ||
return s; | ||
}; | ||
@@ -770,0 +843,0 @@ |
Sorry, the diff of this file is not supported yet
22974
514
3