チェンジセット 3422

コミット日時:

2010/02/15 19:21:34 (7 ヶ月前)

コミッタ:

yossy

ログメッセージ:

BetweenAS3: Added an overwrite like behavior.

ファイル:

• as3/BetweenAS3/trunk/CHANGES (更新) (1 diff)
• as3/BetweenAS3/trunk/CHANGES.ja (更新) (1 diff)
• as3/BetweenAS3/trunk/src/fp10/org/libspark/betweenas3/tickers/EnterFrameTicker.as (更新) (6 diffs)
• as3/BetweenAS3/trunk/src/fp9/org/libspark/betweenas3/tickers/EnterFrameTicker.as (更新) (6 diffs)
• as3/BetweenAS3/trunk/tests/fp10/OverwriteTest.as (追加)
• as3/BetweenAS3/trunk/tests/fp10/org/libspark/betweenas3/tickers/EnterFrameTickerTest.as (更新) (5 diffs)
• as3/BetweenAS3/trunk/tests/fp9/OverwriteTest.as (追加)
• as3/BetweenAS3/trunk/tests/fp9/org/libspark/betweenas3/tickers/EnterFrameTickerTest.as (更新) (5 diffs)

as3/BetweenAS3/trunk/CHANGES

@@ -4 +4 @@
-Alpha r3022 -> HEAD
---------------------
+
+ * [r3422] Added an overwrite like behavior.
+
+    BetweenAS3 will not stop old tweens like Tweener, but gives priority to new tween's values.
-
- * [r3080] Fix: gotoAndPlay will not affected while playing. (#107)

as3/BetweenAS3/trunk/CHANGES.ja

@@ -4 +4 @@
-Alpha r3022 -> HEAD
---------------------
+
+ * [r3422] オーバーライトっぽい挙動をするように変更
+
+    Tweener のように古いトゥイーンを停止はしませんが、新しいトゥイーンの値が優先されるようになりました
-
- * [r3080] 修正: play 中の gotoAndPlay が効かない (#107)

as3/BetweenAS3/trunk/src/fp10/org/libspark/betweenas3/tickers/EnterFrameTicker.as

@@ -61 +61 @@
-                
-                private var _first:TickerListener = null;
+                private var _last:TickerListener = null;
-                private var _numListeners:uint = 0;
-                private var _tickerListenerPaddings:Vector.<TickerListener>;
@@ -82 +83 @@
-                        }
-                        
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        
-                        ++_numListeners;
@@ -117 +122 @@
-                                                l.prevListener = null;
-                                        }
+                                        else {
+                                                _last = l.prevListener;
+                                        }
-                                        --_numListeners;
-                                }
@@ -150 +158 @@
-                        // リスナの数を 8 の倍数になるようにパディングして 8 個ずつ一気にループさせる
-                        
-n:uint = 8 - (_numListeners % 8)
+i:int = (_numListeners / 8 + 1) | 0, n:uint = i * 8 - _numListeners
-                        
-                        // このようにつなぎかえることでパディングの数を変える
@@ -157 +165 @@
-                        }
-                        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                        }
-                                        ll = listener.prevListener;
@@ -292 +324 @@
-                                _first.prevListener = null;
-                        }
+                        else {
+                                _last = null;
+                        }
-                        l.nextListener = _tickerListenerPaddings[n + 1];
-                }

as3/BetweenAS3/trunk/src/fp9/org/libspark/betweenas3/tickers/EnterFrameTicker.as

@@ -61 +61 @@
-                
-                private var _first:TickerListener = null;
+                private var _last:TickerListener = null;
-                private var _numListeners:uint = 0;
-                private var _tickerListenerPaddings:Array;
@@ -82 +83 @@
-                        }
-                        
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        
-                        ++_numListeners;
@@ -117 +122 @@
-                                                l.prevListener = null;
-                                        }
+                                        else {
+                                                _last = l.prevListener;
+                                        }
-                                        --_numListeners;
-                                }
@@ -150 +158 @@
-                        // リスナの数を 8 の倍数になるようにパディングして 8 個ずつ一気にループさせる
-                        
-n:uint = 8 - (_numListeners % 8)
+i:int = (_numListeners / 8 + 1) | 0, n:uint = i * 8 - _numListeners
-                        
-                        // このようにつなぎかえることでパディングの数を変える
@@ -157 +165 @@
-                        }
-                        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                        }
-                                        ll = listener.prevListener;
@@ -292 +324 @@
-                                _first.prevListener = null;
-                        }
+                        else {
+                                _last = null;
+                        }
-                        l.nextListener = _tickerListenerPaddings[n + 1] as TickerListener;
-                }

as3/BetweenAS3/trunk/tests/fp10/org/libspark/betweenas3/tickers/EnterFrameTickerTest.as

@@ -201 +201 @@
-                        assertEquals(2, l8.c);
-                }
+                
+                test function iterationOrder():void
+                {
+                        var l01:LoggingTickerListener = new LoggingTickerListener('A', 1);
+                        var l02:LoggingTickerListener = new LoggingTickerListener('B', 2);
+                        var l03:LoggingTickerListener = new LoggingTickerListener('C', 3);
+                        var l04:LoggingTickerListener = new LoggingTickerListener('D', 4);
+                        var l05:LoggingTickerListener = new LoggingTickerListener('E', 5);
+                        var l06:LoggingTickerListener = new LoggingTickerListener('F', 6);
+                        var l07:LoggingTickerListener = new LoggingTickerListener('G', 7);
+                        var l08:LoggingTickerListener = new LoggingTickerListener('H', 8);
+                        
+                        var ticker:EnterFrameTicker = new EnterFrameTicker();
+                        
+                        ticker.addTickerListener(l01);
+                        ticker.addTickerListener(l02);
+                        ticker.addTickerListener(l03);
+                        ticker.addTickerListener(l04);
+                        ticker.addTickerListener(l05);
+                        ticker.addTickerListener(l06);
+                        ticker.addTickerListener(l07);
+                        ticker.addTickerListener(l08);
+                        
+                        Static.log = '';
+                        
+                        for (var i:uint = 1; i < 10; ++i) {
+                                ticker.update(null);
+                        }
+                        
+                        var log:String = '';
+                        log += 'A1 B1 C1 D1 E1 F1 G1 H1 ';
+                        log += 'B2 C2 D2 E2 F2 G2 H2 ';
+                        log += 'C3 D3 E3 F3 G3 H3 ';
+                        log += 'D4 E4 F4 G4 H4 ';
+                        log += 'E5 F5 G5 H5 ';
+                        log += 'F6 G6 H6 ';
+                        log += 'G7 H7 ';
+                        log += 'H8 ';
+                        
+                        assertEquals(log, Static.log);
+                }
+                
+                test function insertAfterDelete():void
+                {
+                        var ticker:EnterFrameTicker = new EnterFrameTicker();
+                        
+                        var l1:MockTickerListener = new MockTickerListener(1);
+                        var l2:MockTickerListener = new MockTickerListener(1);
+                        var l3:AddingListenerTickerListener = new AddingListenerTickerListener(2, ticker, l1, 1);
+                        
+                        ticker.addTickerListener(l3);
+                        ticker.addTickerListener(l2);
+                        
+                        ticker.update(null);
+                        ticker.update(null);
+                        ticker.update(null);
+                        
+                        assertEquals(1, l1.c);
+                        assertEquals(1, l2.c);
+                        assertEquals(2, l3.c);
+                }
-        }
-}
@@ -207 +268 @@
-import org.libspark.betweenas3.core.ticker.ITicker;
-
+internal class Static
+{
+        public static var log:String;
+}
+
-internal class MockTickerListener extends TickerListener
-{
@@ -226 +292 @@
-internal class AddingListenerTickerListener extends MockTickerListener
-{
-
+, n2:uint = 0
-        {
-                super(n);
@@ -232 +298 @@
-                this.ticker = ticker;
-                this.listener = listener;
+                this.n2 = n2;
-        }
-        
-        public var ticker:ITicker;
-        public var listener:TickerListener;
+        public var n2:uint;
-        
-        override public function tick(time:Number):Boolean
-        {
-0
+n2
-                        ticker.addTickerListener(listener);
-                }
@@ -245 +313 @@
-        }
-}
+
+internal class LoggingTickerListener extends TickerListener
+{
+        public function LoggingTickerListener(name:String, n:uint)
+        {
+                this.name = name;
+                this.n = n;
+                this.c = 0;
+        }
+        
+        public var name:String;
+        public var n:uint;
+        public var c:uint;
+        
+        override public function tick(time:Number):Boolean
+        {
+                ++c;
+                
+                Static.log += name + c + ' ';
+                
+                return c == n;
+        }
+}

as3/BetweenAS3/trunk/tests/fp9/org/libspark/betweenas3/tickers/EnterFrameTickerTest.as

@@ -201 +201 @@
-                        assertEquals(2, l8.c);
-                }
+                
+                test function iterationOrder():void
+                {
+                        var l01:LoggingTickerListener = new LoggingTickerListener('A', 1);
+                        var l02:LoggingTickerListener = new LoggingTickerListener('B', 2);
+                        var l03:LoggingTickerListener = new LoggingTickerListener('C', 3);
+                        var l04:LoggingTickerListener = new LoggingTickerListener('D', 4);
+                        var l05:LoggingTickerListener = new LoggingTickerListener('E', 5);
+                        var l06:LoggingTickerListener = new LoggingTickerListener('F', 6);
+                        var l07:LoggingTickerListener = new LoggingTickerListener('G', 7);
+                        var l08:LoggingTickerListener = new LoggingTickerListener('H', 8);
+                        
+                        var ticker:EnterFrameTicker = new EnterFrameTicker();
+                        
+                        ticker.addTickerListener(l01);
+                        ticker.addTickerListener(l02);
+                        ticker.addTickerListener(l03);
+                        ticker.addTickerListener(l04);
+                        ticker.addTickerListener(l05);
+                        ticker.addTickerListener(l06);
+                        ticker.addTickerListener(l07);
+                        ticker.addTickerListener(l08);
+                        
+                        Static.log = '';
+                        
+                        for (var i:uint = 1; i < 10; ++i) {
+                                ticker.update(null);
+                        }
+                        
+                        var log:String = '';
+                        log += 'A1 B1 C1 D1 E1 F1 G1 H1 ';
+                        log += 'B2 C2 D2 E2 F2 G2 H2 ';
+                        log += 'C3 D3 E3 F3 G3 H3 ';
+                        log += 'D4 E4 F4 G4 H4 ';
+                        log += 'E5 F5 G5 H5 ';
+                        log += 'F6 G6 H6 ';
+                        log += 'G7 H7 ';
+                        log += 'H8 ';
+                        
+                        assertEquals(log, Static.log);
+                }
+                
+                test function insertAfterDelete():void
+                {
+                        var ticker:EnterFrameTicker = new EnterFrameTicker();
+                        
+                        var l1:MockTickerListener = new MockTickerListener(1);
+                        var l2:MockTickerListener = new MockTickerListener(1);
+                        var l3:AddingListenerTickerListener = new AddingListenerTickerListener(2, ticker, l1, 1);
+                        
+                        ticker.addTickerListener(l3);
+                        ticker.addTickerListener(l2);
+                        
+                        ticker.update(null);
+                        ticker.update(null);
+                        ticker.update(null);
+                        
+                        assertEquals(1, l1.c);
+                        assertEquals(1, l2.c);
+                        assertEquals(2, l3.c);
+                }
-        }
-}
@@ -207 +268 @@
-import org.libspark.betweenas3.core.ticker.ITicker;
-
+internal class Static
+{
+        public static var log:String;
+}
+
-internal class MockTickerListener extends TickerListener
-{
@@ -226 +292 @@
-internal class AddingListenerTickerListener extends MockTickerListener
-{
-
+, n2:uint = 0
-        {
-                super(n);
@@ -232 +298 @@
-                this.ticker = ticker;
-                this.listener = listener;
+                this.n2 = n2;
-        }
-        
-        public var ticker:ITicker;
-        public var listener:TickerListener;
+        public var n2:uint;
-        
-        override public function tick(time:Number):Boolean
-        {
-0
+n2
-                        ticker.addTickerListener(listener);
-                }
@@ -245 +313 @@
-        }
-}
+
+internal class LoggingTickerListener extends TickerListener
+{
+        public function LoggingTickerListener(name:String, n:uint)
+        {
+                this.name = name;
+                this.n = n;
+                this.c = 0;
+        }
+        
+        public var name:String;
+        public var n:uint;
+        public var c:uint;
+        
+        override public function tick(time:Number):Boolean
+        {
+                ++c;
+                
+                Static.log += name + c + ' ';
+                
+                return c == n;
+        }
+}