gjs r141 - trunk/modules/tweener

[hp svn gnome org]

Author: hp
Date: Tue Jan 20 18:11:00 2009
New Revision: 141
URL: http://svn.gnome.org/viewvc/gjs?rev=141&view=rev

Log:
remove "useFrames" mode from Tweener
    
the Tweener docs say don't use it, nobody is using it, and it complicates
fixing up the frame ticker code to work the way it should.



Modified:
   trunk/modules/tweener/tweener.js

Modified: trunk/modules/tweener/tweener.js
==============================================================================
--- trunk/modules/tweener/tweener.js	(original)
+++ trunk/modules/tweener/tweener.js	Tue Jan 20 18:11:00 2009
@@ -45,7 +45,6 @@
 var _transitionList = null;
 var _tweenList = null;
 
-var _currentTimeFrame = 0;
 var _currentTime = 0;
 var _timeScale = 1;
 
@@ -139,7 +138,6 @@
                                       _onEnterFrame);
     _ticker.start();
 
-    _currentTimeFrame = 0;
     _currentTime = 0;
 }
 
@@ -149,7 +147,6 @@
 
     _engineExists = false;
     _tweenList = false;
-    _currentTimeFrame = 0;
     _currentTime = 0;
 
     _ticker.disconnect(_prepareFrameId);
@@ -158,7 +155,7 @@
 }
 
 function _getCurrentTweeningTime(tweening) {
-    return tweening.useFrames ? _currentTimeFrame : _currentTime;
+    return _currentTime;
 }
 
 function _removeTweenByIndex(i) {
@@ -328,7 +325,6 @@
 
 /* Ran once every 'frame'. It's the main engine, updates all existing tweenings */
 function _onEnterFrame() {
-    _currentTimeFrame++;
     _currentTime += 1000/_ticker.FRAME_RATE;
 
     if (!_updateTweens())
@@ -472,21 +468,12 @@
             }
         }
 
-        if (obj.useFrames == true) {
-            tween = new TweenList.TweenList(scopes[i],
-                                            _currentTimeFrame + (delay / _timeScale),
-                                            _currentTimeFrame + ((delay + time) / _timeScale),
-                                            true,
-                                            transition,
-                                            obj.transitionParams);
-        } else {
-            tween = new TweenList.TweenList(scopes[i],
-                                            _currentTime + ((delay * 1000) / _timeScale),
-                                            _currentTime + (((delay * 1000) + (time * 1000)) / _timeScale),
-                                            false,
-                                            transition,
-                                            obj.transitionParams);
-        }
+        tween = new TweenList.TweenList(scopes[i],
+                                        _currentTime + ((delay * 1000) / _timeScale),
+                                        _currentTime + (((delay * 1000) + (time * 1000)) / _timeScale),
+                                        false,
+                                        transition,
+                                        obj.transitionParams);
 
         tween.properties               =       isCaller ? null : copyProperties;
         tween.onStart                  =       obj.onStart;