チェンジセット 4599
- コミット日時:
- 2011/08/11 23:32:11 (10 ヶ月前)
- ファイル:
-
- air/clayg/jp/clayg/display/Alert.as (更新) (1 diff)
- air/clayg/jp/clayg/display/DisplayFps.as (更新) (1 diff)
- air/clayg/jp/clayg/display/ScrollBox.as (更新) (4 diffs)
- air/clayg/jp/clayg/display/VerticalScrollBox.as (削除)
- air/clayg/jp/clayg/framework (削除)
- air/clayg/jp/clayg/lisp/DefParameterFunc.as (削除)
- air/clayg/jp/clayg/lisp/DefmacroFunc.as (更新) (3 diffs)
- air/clayg/jp/clayg/lisp/DefunFunc.as (更新) (2 diffs)
- air/clayg/jp/clayg/lisp/Lisp.as (更新) (5 diffs)
- air/clayg/jp/clayg/lisp/LispObj.as (更新) (3 diffs)
- air/clayg/jp/clayg/net/MultiLoader.as (更新) (2 diffs)
- air/clayg/jp/clayg/net/QuickLoad.as (更新) (1 diff)
- air/clayg/jp/clayg/system/MouseState.as (更新) (1 diff)
- air/clayg/jp/clayg/system/SoundManager.as (更新) (2 diffs)
- air/clayg/jp/clayg/utils/Capture.as (更新) (1 diff)
- air/clayg/jp/clayg/utils/SliceMaker.as (更新) (1 diff)
- air/clayg/jp/clayg/utils/Strings.as (更新) (1 diff)
凡例:
- 変更無し
- 追加
- 削除
- 更新
- コピー
- 移動
air/clayg/jp/clayg/display/Alert.as
r4562 r4599 37 37 okButton.buttonMode = true; 38 38 addChild( okButton ); 39 okButton.addEventListener( "click", function() 39 okButton.addEventListener( "click", function():void{ visible = false; } ); 40 40 41 41 var t:TextField = new TextField(); air/clayg/jp/clayg/display/DisplayFps.as
r4562 r4599 29 29 addChild( textField ); 30 30 31 addEventListener( Event.ADDED, function() { addEventListener( Event.ENTER_FRAME, enterFrame ); });32 addEventListener( Event.REMOVED, function() 31 addEventListener( Event.ADDED, function():void{ addEventListener( Event.ENTER_FRAME, enterFrame ); }); 32 addEventListener( Event.REMOVED, function():void{ removeEventListener( Event.ENTER_FRAME, enterFrame ); } ); 33 33 } 34 34 air/clayg/jp/clayg/display/ScrollBox.as
r4565 r4599 6 6 import flash.geom.Point; 7 7 import flash.geom.Rectangle; 8 import net.kawa.tween.KTween;9 8 10 9 /** … … 95 94 override public function addChild(child:DisplayObject):DisplayObject 96 95 { 97 KTween.fromTo( child, 1, { alpha:0 }, { alpha:1 } );96 // KTween.fromTo( child, 1, { alpha:0 }, { alpha:1 } ); 98 97 return container.addChild(child); 99 98 } … … 106 105 override public function addChildAt(child:DisplayObject, index:int):DisplayObject 107 106 { 108 KTween.fromTo( child, 1, { alpha:0 }, { alpha:1 } );107 // KTween.fromTo( child, 1, { alpha:0 }, { alpha:1 } ); 109 108 return container.addChildAt(child, index); 110 109 } … … 115 114 } 116 115 117 public function removeChildAll() 116 public function removeChildAll():void 118 117 { 119 118 for ( var i:int = container.numChildren - 1; i >= 0; i-- ) air/clayg/jp/clayg/lisp/DefmacroFunc.as
r4582 r4599 39 39 class MacroFunc implements ILispFunc 40 40 { 41 private var l isp:Lisp;41 private var lp:Lisp; 42 42 private var params:Array; 43 43 private var body:LispObj; … … 45 45 public function MacroFunc( lisp:Lisp, params:Array, body:LispObj ) 46 46 { 47 this.l isp = lisp;47 this.lp = lisp; 48 48 this.params = params; 49 49 this.body = body; … … 57 57 var result:LispObj = body; 58 58 for (var i:int = 0; i < params.length; i++) result = replace( result, params[i], args.shift() ); 59 return l isp.eval(result);59 return lp.eval(result); 60 60 61 61 function replace(lobj:LispObj, t:String, r:String):LispObj 62 62 { 63 return new LispObj( lobj.toLispArray().map(function(e:LispObj, i:int, a:Array) 63 return new LispObj( lobj.toLispArray().map(function(e:LispObj, i:int, a:Array):LispObj 64 64 { 65 65 if ( e.listp() ) return replace( e, t, r ); air/clayg/jp/clayg/lisp/DefunFunc.as
r4595 r4599 39 39 class FuncFunc implements ILispFunc 40 40 { 41 var lisp:Lisp;42 var vars:Array;43 var values:LispObj;44 var code:LispObj;41 private var lp:Lisp; 42 private var vars:Array; 43 private var values:LispObj; 44 private var code:LispObj; 45 45 46 46 public function FuncFunc( lisp:Lisp, vars:Array, values:LispObj, code:LispObj ) 47 47 { 48 this.l isp = lisp;48 this.lp = lisp; 49 49 this.vars = vars; 50 50 this.values = values; … … 61 61 vars.push( object ) 62 62 63 lobj = l isp.eval( code );63 lobj = lp.eval( code ); 64 64 vars.pop(); 65 65 air/clayg/jp/clayg/lisp/Lisp.as
r4596 r4599 154 154 155 155 // 引数を評価 156 args = new LispObj( args.toLispArray().map( function(e:LispObj, i:int, a:Array) 156 args = new LispObj( args.toLispArray().map( function(e:LispObj, i:int, a:Array):LispObj{ return eval(e); } )); 157 157 158 158 try … … 201 201 202 202 var result:String = execute( loader.data ); 203 if( callback != undefined) callback( result );203 if( callback != null ) callback( result ); 204 204 } 205 205 … … 269 269 270 270 // 省略形を置換 271 code = (function(code:String) 271 code = (function(code:String):String 272 272 { 273 273 var listp:Boolean; … … 360 360 throw new Error(lobj.toString() + "は、シンボルではありません！"); 361 361 362 var name = lobj.toString();362 var name:String = lobj.toString(); 363 363 if ( vars[0][name] != undefined ) return t; 364 if ( constantp( name) ) return t;364 if ( constantp(lobj) ) return t; 365 365 return nil; 366 366 } … … 376 376 if ( lobj.numberp() || lobj.strberp() ) return t; 377 377 378 var name = lobj.toString();378 var name:String = lobj.toString(); 379 379 if ( consts[name] != undefined ) return t; 380 380 return nil; air/clayg/jp/clayg/lisp/LispObj.as
r4596 r4599 24 24 else if ( d is LispObj ) return d.toString(); 25 25 else if ( d is Boolean ) return d ? "t" : "nil"; 26 else if ( d is Array ) return d.length ? Lisp.aryToCode(d.map(function(e:*,i:int,a:Array) {return convert(e);})) : "nil";26 else if ( d is Array ) return d.length ? Lisp.aryToCode(d.map(function(e:*,i:int,a:Array):String{return convert(e);})) : "nil"; 27 27 28 28 new Error(d + "はLispに変換できない形式です！"); … … 95 95 public function toNumberArray():Array 96 96 { 97 return toLispArray().map(function(e:LispObj, i:int, a:Array) 97 return toLispArray().map(function(e:LispObj, i:int, a:Array):Number{ return e.toNumber() } ); 98 98 } 99 99 … … 104 104 public function toLispArray():Array 105 105 { 106 return toStringArray().map(function(e:String, i:int, a:Array) 106 return toStringArray().map(function(e:String, i:int, a:Array):LispObj{ return new LispObj(e); } ); 107 107 } 108 108 air/clayg/jp/clayg/net/MultiLoader.as
r4562 r4599 32 32 * @param param 読み込んだオブジェクトに代入するパラメータ. 33 33 */ 34 public function load( path:String, name:String = null, param:Object = null ) 34 public function load( path:String, name:String = null, param:Object = null ):void 35 35 { 36 36 if ( onComplete == null ) throw new Error("MultiLoaderは読み込み完了後、再び使用することはできません！"); … … 39 39 ql.load( path, complete( path, name, param ) ) 40 40 41 function complete( path:String, name:String, param )41 function complete( path:String, name:String, param:Object ):Function 42 42 { 43 return function( o:Object ) 43 return function( o:Object ):void 44 44 { 45 45 // パラメータを代入 air/clayg/jp/clayg/net/QuickLoad.as
r4562 r4599 22 22 { 23 23 if ( take == null ) take = defaultTakeFunction; 24 if ( take == null ) take = function( data:* ) {};24 if ( take == null ) take = function( data:* ):void{}; 25 25 26 26 if ( error == null ) error = defaultErrorFunction; 27 if ( error == null ) error = function( path:String ) 27 if ( error == null ) error = function( path:String ):void{ throw new Error( path + "の読み込みに失敗しました！"); }; 28 28 29 29 switch( filePathToFileExt( path ).toLocaleLowerCase() ) air/clayg/jp/clayg/system/MouseState.as
r4565 r4599 58 58 }); 59 59 60 stage.addEventListener( Event.ENTER_FRAME, function() 60 stage.addEventListener( Event.ENTER_FRAME, function():void 61 61 { 62 62 oldX = stage.mouseX; air/clayg/jp/clayg/system/SoundManager.as
r4565 r4599 20 20 * @param sound 21 21 */ 22 public function add( name:String, sound:Sound ) 22 public function add( name:String, sound:Sound ):void 23 23 { 24 24 soundHash[name] = sound; … … 41 41 function deleteSoundChannel( name:String ):Function 42 42 { 43 return function() { delete sndCnlHash[name] };43 return function():void{ delete sndCnlHash[name] }; 44 44 } 45 45 air/clayg/jp/clayg/utils/Capture.as
r4562 r4599 23 23 public function capt( disp:DisplayObject, container:DisplayObjectContainer = null ):Sprite 24 24 { 25 var spr = new Sprite();25 var spr:Sprite = new Sprite(); 26 26 if ( disp == null ) return spr; 27 27 air/clayg/jp/clayg/utils/SliceMaker.as
r4565 r4599 76 76 77 77 78 function createSprite( rect:Rectangle ) 78 function createSprite( rect:Rectangle ):Sprite 79 79 { 80 80 var spr:Sprite = new Sprite(); air/clayg/jp/clayg/utils/Strings.as
r4565 r4599 9 9 private var strings:Object = {}; 10 10 11 public function setString(key:String, str:String) 11 public function setString(key:String, str:String):String 12 12 { 13 strings[key] = str;13 return strings[key] = str; 14 14 } 15 15 16 public function getString(key:String) 16 public function getString(key:String):String 17 17 { 18 18 if ( strings[key] == undefined ) return "";
