Merge remote-tracking branch 'origin/dev'

SkeletonAnimationLibraryDemos/src/Example_Cyborg_AnimationMixing.as → ASLibraryDemos/src/Example_Cyborg_AnimationMixing.as

@@ -227,10 +227,10 @@ class StarlingGame extends Sprite
 
 		var animationName:String = "weapon" + (_weaponID + 1);
 
-		//Animation Mixing
-		_armature.animation.gotoAndPlay(animationName, -1, -1, NaN, 0, WEAPON_ANIMATION_GROUP, "sameGroup");
 
 		_weapon.displayController = animationName;
+		//Animation Mixing
+		_armature.animation.gotoAndPlay(animationName, -1, -1, NaN, 0, WEAPON_ANIMATION_GROUP, "sameGroup");
 	}
 
 	private function updateMovement():void 
@@ -358,5 +358,7 @@ class StarlingGame extends Sprite
 		{
 			_armL.node.rotation = r * 0.6;
 		}
+
+		_armature.invalidUpdate();
 	}
 }

SkeletonAnimationLibraryDemos/src/Example_Cyborg_SwitchWeapon.as → ASLibraryDemos/src/Example_Cyborg_SwitchWeapon.as

@@ -288,5 +288,6 @@ class StarlingGame extends Sprite {
 		}else{
 			_armL.node.rotation = _r * 0.6;
 		}
+		armature.invalidUpdate();
 	}
 }

SkeletonAnimationLibraryDemos/src/Example_DisplayListAndStarling.as → ASLibraryDemos/src/Example_DisplayListAndStarling.as

@@ -1,7 +1,7 @@
 package  {
 	import flash.display.Sprite;
 	import flash.events.Event;
-
+	
 	import dragonBones.Armature;
 	import dragonBones.animation.WorldClock;
 	import dragonBones.factorys.NativeFactory;
@@ -31,32 +31,41 @@
 			factory.parseData(new KnightData());
 			factory.parseData(new CyborgData());
 		}
-
+		
 		private function textureCompleteHandler(e:Event):void {
 			knight = factory.buildArmature("knight");
 			knight.display.x = 250;
 			knight.display.y = 200;
 			knight.animation.gotoAndPlay("run");
-			addChild(knight.display as Sprite);
+			addChild(knight.display as Sprite);			
 
-			cyborg = factory.buildArmature("cyborg");
+		    cyborg = factory.buildArmature("cyborg");
 			cyborg.display.x = 550;
 			cyborg.display.y = 200;
 			cyborg.animation.gotoAndPlay("run");
 			addChild(cyborg.display as Sprite);
 
 			WorldClock.clock.add(knight);
 			WorldClock.clock.add(cyborg);
+			addEventListener(Event.ENTER_FRAME, onEnterFrameHandler2);
+
+		}
+
+		private function onEnterFrameHandler2(_e:Event):void {
+			WorldClock.clock.advanceTime(-1);
 		}
 
+
 		private function starlingInit():void {
 			var _starling:Starling = new Starling(StarlingGame, stage);
 			//_starling.antiAliasing = 1;
 			_starling.showStats = true;
 			_starling.start();
 		}
+
 	}
 }
+
 import flash.events.Event;
 
 import starling.display.Sprite;
@@ -103,4 +112,4 @@ class StarlingGame extends Sprite {
 	private function onEnterFrameHandler(_e:EnterFrameEvent):void {
 		WorldClock.clock.advanceTime(-1);
 	}
-}
+}

SkeletonAnimationLibraryDemos/src/Example_PerformanceTesing.as → ASLibraryDemos/src/Example_PerformanceTesing.as

@@ -8,26 +8,39 @@
 
 	import starling.core.Starling;
 	import flash.text.TextFormat;
+	import flash.events.Event;
+	import flash.geom.Rectangle;
 
     [SWF(width="800", height="600", frameRate="60", backgroundColor="#cccccc")]
 	public class Example_PerformanceTesing extends flash.display.Sprite {
 
 		public static var changeHandler:Function;
 
 		private var input:TextField;
+		private var _starling:Starling;
 
 		public function Example_PerformanceTesing() {
 			starlingInit();
 			addInputText();
 		}
 
 		private function starlingInit():void {
-			var _starling:Starling = new Starling(StarlingGame, stage);
+			Starling.handleLostContext = true;
+			_starling = new Starling(StarlingGame, stage);
 			//_starling.antiAliasing = 1;
 			_starling.showStats = true;
 			_starling.start();
 
 			stage.addEventListener(KeyboardEvent.KEY_UP, stage_onKeyUp);
+
+			stage.addEventListener(Event.RESIZE, stateResizeHandler);
+		}
+
+		private function stateResizeHandler(e:Event):void
+		{
+			_starling.viewPort = new Rectangle(0,0,stage.stageWidth, stage.stageHeight);
+			_starling.stage.stageWidth = stage.stageWidth;
+			_starling.stage.stageHeight = stage.stageHeight;
 		}
 
 		private function addInputText():void

JSLibraryDemos/assets/cyborg/texture.json

@@ -0,0 +1 @@
+{"imagePath":"texture.png","name":"Cyborg(AnimationMixing)","SubTexture":[{"name":"CyborgFolder/RightArm","x":16,"width":10,"y":89,"height":19},{"name":"CyborgFolder/RightHand","x":119,"width":7,"y":11,"height":9},{"name":"CyborgFolder/RightShoulder","x":72,"width":14,"y":71,"height":19},{"name":"CyborgFolder/weapon4","x":0,"width":101,"y":0,"height":23},{"name":"CyborgFolder/weapon3","x":0,"width":92,"y":25,"height":22},{"name":"CyborgFolder/weapon2","x":0,"width":91,"y":49,"height":20},{"name":"CyborgFolder/weapon1","x":0,"width":70,"y":71,"height":16},{"name":"CyborgFolder/RightThigh","x":93,"width":14,"y":64,"height":28},{"name":"CyborgFolder/Head","x":94,"width":32,"y":44,"height":18},{"name":"CyborgFolder/Chest","x":40,"width":18,"y":89,"height":9},{"name":"CyborgFolder/Hip","x":119,"width":4,"y":22,"height":4},{"name":"CyborgFolder/Trunk","x":60,"width":10,"y":89,"height":16},{"name":"CyborgFolder/Leg","x":103,"width":14,"y":0,"height":42},{"name":"CyborgFolder/LeftThigh","x":109,"width":14,"y":64,"height":28},{"name":"CyborgFolder/LeftShoulder","x":0,"width":14,"y":89,"height":19},{"name":"CyborgFolder/LeftArm","x":28,"width":10,"y":89,"height":19},{"name":"CyborgFolder/LeftHand","x":119,"width":7,"y":0,"height":9}]}

JSLibraryDemos/assets/dragon/texture.json

@@ -0,0 +1 @@
+{"imagePath":"texture.png","name":"DragonBoy","SubTexture":[{"name":"parts/clothes3","x":171,"width":104,"y":175,"height":87},{"name":"parts/clothes2","x":290,"width":104,"y":140,"height":87},{"name":"parts/clothes1","x":0,"width":104,"y":198,"height":87},{"name":"parts/eye","x":490,"width":19,"y":0,"height":29},{"name":"parts/beardR","x":57,"width":69,"y":304,"height":18},{"name":"parts/headC","x":0,"width":170,"y":0,"height":196},{"name":"parts/hair","x":399,"width":62,"y":117,"height":141},{"name":"parts/beardL","x":127,"width":60,"y":311,"height":18},{"name":"parts/handR","x":462,"width":49,"y":157,"height":29},{"name":"parts/armR","x":487,"width":23,"y":187,"height":39},{"name":"parts/armUpperR","x":163,"width":80,"y":263,"height":47},{"name":"parts/legR","x":399,"width":90,"y":0,"height":116},{"name":"parts/clothes4","x":277,"width":104,"y":228,"height":87},{"name":"parts/body","x":171,"width":118,"y":0,"height":174},{"name":"parts/tail","x":290,"width":108,"y":0,"height":139},{"name":"parts/tailM","x":106,"width":56,"y":198,"height":105},{"name":"parts/legL","x":382,"width":102,"y":259,"height":90},{"name":"parts/handL","x":462,"width":48,"y":117,"height":39},{"name":"parts/armL","x":462,"width":24,"y":187,"height":40},{"name":"parts/armUpperL","x":0,"width":56,"y":286,"height":43}]}

JSLibraryDemos/assets/knight/texture.json

@@ -0,0 +1 @@
+{"imagePath":"texture.png","name":"Knight","SubTexture":[{"name":"knightFolder/arrow_3","x":0,"width":83,"y":207,"height":25},{"name":"knightFolder/arrow_2","x":84,"width":83,"y":216,"height":18},{"name":"knightFolder/bow_3","x":182,"width":30,"y":0,"height":64},{"name":"knightFolder/bow_2","x":160,"width":20,"y":34,"height":50},{"name":"knightFolder/axe_2","x":0,"width":104,"y":125,"height":50},{"name":"knightFolder/axe_3","x":0,"width":106,"y":60,"height":64},{"name":"knightFolder/pike_3","x":0,"width":180,"y":0,"height":32},{"name":"knightFolder/pike_2","x":0,"width":159,"y":34,"height":24},{"name":"knightFolder/sword_3","x":106,"width":105,"y":136,"height":36},{"name":"knightFolder/sword_2","x":0,"width":90,"y":177,"height":28},{"name":"knightFolder/bow_a","x":243,"width":8,"y":80,"height":8},{"name":"knightFolder/bow_1","x":214,"width":14,"y":50,"height":50},{"name":"knightFolder/arrow_1","x":0,"width":82,"y":234,"height":10},{"name":"knightFolder/bow_b","x":230,"width":1,"y":50,"height":30},{"name":"knightFolder/axe_1","x":106,"width":85,"y":174,"height":40},{"name":"knightFolder/pike_1","x":108,"width":139,"y":118,"height":16},{"name":"knightFolder/sword_1","x":168,"width":80,"y":216,"height":18},{"name":"knightFolder/horseEye","x":182,"width":13,"y":66,"height":13},{"name":"knightFolder/horseHead_","x":214,"width":40,"y":0,"height":48},{"name":"knightFolder/body","x":233,"width":14,"y":62,"height":16},{"name":"knightFolder/leg","x":196,"width":8,"y":66,"height":16},{"name":"knightFolder/head","x":108,"width":44,"y":60,"height":40},{"name":"knightFolder/arm","x":233,"width":20,"y":50,"height":10},{"name":"knightFolder/horseBody","x":154,"width":40,"y":96,"height":20},{"name":"knightFolder/horseTail","x":233,"width":8,"y":80,"height":12},{"name":"knightFolder/horseLeg","x":182,"width":8,"y":80,"height":14}]}