renamed animation library to animation set

src/away3d/animators/AnimationLibraryBase.as → src/away3d/animators/AnimationSetBase.as

@@ -1,6 +1,6 @@
 package away3d.animators
 {
-	import away3d.errors.AnimationLibraryError;
+	import away3d.errors.AnimationSetError;
 	import flash.utils.Dictionary;
 	import away3d.library.assets.AssetType;
 	import away3d.library.assets.NamedAssetBase;
@@ -12,7 +12,7 @@ package away3d.animators
 	/**
 	 * @author robbateman
 	 */
-	public class AnimationLibraryBase extends NamedAssetBase implements IAsset
+	public class AnimationSetBase extends NamedAssetBase implements IAsset
 	{
 		arcane var _usesCPU:Boolean;
 		private var _states:Vector.<IAnimationState> = new Vector.<IAnimationState>();
@@ -68,7 +68,7 @@ package away3d.animators
 		public function addState(stateName:String, animationState:IAnimationState):void
 		{
 			if (_stateDictionary[stateName])
-				throw new AnimationLibraryError("Animation state name already exists");
+				throw new AnimationSetError("Animation state name already exists");
 
 			_stateDictionary[stateName] = animationState;
 

src/away3d/animators/AnimationStateBase.as

@@ -11,7 +11,7 @@ package away3d.animators
 	public class AnimationStateBase extends NamedAssetBase implements IAsset
 	{
 		private var _rootNode:IAnimationNode;
-		private var _owner:IAnimationLibrary;
+		private var _owner:IAnimationSet;
 		private var _stateName:String;
 
 		public function get rootNode():IAnimationNode
@@ -38,7 +38,7 @@ package away3d.animators
 			return AssetType.ANIMATION_STATE;
 		}
 
-		public function addOwner(owner:IAnimationLibrary, stateName:String):void
+		public function addOwner(owner:IAnimationSet, stateName:String):void
 		{
 			_owner = owner;
 			_stateName = stateName;

src/away3d/animators/AnimatorBase.as

@@ -20,7 +20,7 @@ package away3d.animators
 	public class AnimatorBase extends EventDispatcher
 	{
 		private var _broadcaster : Sprite = new Sprite();
-		private var _animationLibrary : IAnimationLibrary;
+		private var _animationSet : IAnimationSet;
 		private var _isPlaying : Boolean;
 		private var _startEvent : AnimatorEvent;
 		private var _stopEvent : AnimatorEvent;
@@ -30,14 +30,14 @@ package away3d.animators
 		protected var _stateInvalid:Boolean;
 		protected var _owners : Vector.<Mesh> = new Vector.<Mesh>();
 
-		public function get animationLibrary() : IAnimationLibrary
+		public function get animationSet() : IAnimationSet
 		{
-			return _animationLibrary;
+			return _animationSet;
 		}
 
-		public function AnimatorBase(animationLibrary:IAnimationLibrary)
+		public function AnimatorBase(animationSet:IAnimationSet)
 		{
-			_animationLibrary = animationLibrary;
+			_animationSet = animationSet;
 //			start();
 		}
 

src/away3d/animators/BlendingSkeletonAnimator.as

@@ -28,9 +28,9 @@ package away3d.animators
 		/**
 		 * Creates a new AnimationSequenceController object.
 		 */
-		public function BlendingSkeletonAnimator(skeletonAnimationLibrary:SkeletonAnimationLibrary, skeleton : Skeleton, forceCPU : Boolean = false)
+		public function BlendingSkeletonAnimator(skeletonAnimationSet:SkeletonAnimationSet, skeleton : Skeleton, forceCPU : Boolean = false)
 		{
-			super(skeletonAnimationLibrary, skeleton, forceCPU);
+			super(skeletonAnimationSet, skeleton, forceCPU);
 			_clips = [];
 			_activeAbsClips = new Vector.<int>();
 			_blendWeights = new Vector.<Number>();

src/away3d/animators/IAnimationLibrary.as → src/away3d/animators/IAnimationSet.as

@@ -7,7 +7,7 @@ package away3d.animators
 	/**
 	 * @author robbateman
 	 */
-	public interface IAnimationLibrary
+	public interface IAnimationSet
 	{
 		function get states():Vector.<IAnimationState>;
 

src/away3d/animators/IAnimationState.as

@@ -10,6 +10,6 @@ package away3d.animators
 
 		function get stateName():String;
 
-		function addOwner(owner:IAnimationLibrary, stateName:String):void;
+		function addOwner(owner:IAnimationSet, stateName:String):void;
 	}
 }

src/away3d/animators/IAnimator.as

@@ -9,7 +9,7 @@ package away3d.animators
 	 */
 	public interface IAnimator
 	{
-		function get animationLibrary() : IAnimationLibrary
+		function get animationSet() : IAnimationSet
 
 		/**
 		 * Sets the GPU render state required by the animation that is dependent of the rendered object.

src/away3d/animators/SkeletonAnimationLibrary.as → src/away3d/animators/SkeletonAnimationSet.as

@@ -7,7 +7,7 @@ package away3d.animators
 	/**
 	 * @author robbateman
 	 */
-	public class SkeletonAnimationLibrary extends AnimationLibraryBase implements IAnimationLibrary
+	public class SkeletonAnimationSet extends AnimationSetBase implements IAnimationSet
 	{
 		private var _jointsPerVertex : uint;
 
@@ -17,7 +17,7 @@ package away3d.animators
 			return _jointsPerVertex;
 		}
 
-		public function SkeletonAnimationLibrary(jointsPerVertex : uint = 4)
+		public function SkeletonAnimationSet(jointsPerVertex : uint = 4)
 		{
 			_jointsPerVertex = jointsPerVertex;
 		}

src/away3d/animators/SkeletonAnimator.as

@@ -37,7 +37,7 @@ package away3d.animators
 		private var _animationStates : Dictionary = new Dictionary();
 		private var _condensedMatrices : Vector.<Number>;
 
-		private var _skeletonAnimationLibrary:SkeletonAnimationLibrary;
+		private var _skeletonAnimationSet:SkeletonAnimationSet;
         private var _skeleton : Skeleton;
 		private var _forceCPU : Boolean;
 		private var _useCondensedIndices : Boolean;
@@ -48,14 +48,14 @@ package away3d.animators
 		/**
 		 * Creates a new AnimationSequenceController object.
 		 */
-		public function SkeletonAnimator(skeletonAnimationLibrary:SkeletonAnimationLibrary, skeleton : Skeleton, forceCPU : Boolean = false)
+		public function SkeletonAnimator(skeletonAnimationSet:SkeletonAnimationSet, skeleton : Skeleton, forceCPU : Boolean = false)
 		{
-			super(skeletonAnimationLibrary);
+			super(skeletonAnimationSet);
 
-			_skeletonAnimationLibrary = skeletonAnimationLibrary;
+			_skeletonAnimationSet = skeletonAnimationSet;
 			_skeleton = skeleton;
 			_forceCPU = forceCPU;
-			_jointsPerVertex = _skeletonAnimationLibrary.jointsPerVertex;
+			_jointsPerVertex = _skeletonAnimationSet.jointsPerVertex;
 
 			_numJoints = _skeleton.numJoints;
 			_globalMatrices = new Vector.<Number>(_numJoints*12, true);
@@ -125,7 +125,7 @@ package away3d.animators
 				stage3DProxy._context3D.setProgramConstantsFromVector(Context3DProgramType.VERTEX, vertexConstantOffset, _condensedMatrices, numCondensedJoints*3);
 			}
 			else {
-				if (_skeletonAnimationLibrary.usesCPU) {
+				if (_skeletonAnimationSet.usesCPU) {
 					var subGeomAnimState : SubGeomAnimationState = _animationStates[skinnedGeom] ||= new SubGeomAnimationState(skinnedGeom);
 
 					if (!subGeomAnimState.valid) {
@@ -343,7 +343,7 @@ package away3d.animators
         public function testGPUCompatibility(pass : MaterialPassBase) : void
         {
 			if (!_useCondensedIndices && (_forceCPU || _jointsPerVertex > 4 || pass.numUsedVertexConstants + _numJoints * 3 > 128)) {
-				_skeletonAnimationLibrary._usesCPU = true;
+				_skeletonAnimationSet._usesCPU = true;
 			}
         }
 	}

src/away3d/animators/SmoothSkeletonAnimator.as

@@ -27,9 +27,9 @@ package away3d.animators
 		/**
 		 * Creates a new AnimationSequenceController object.
 		 */
-		public function SmoothSkeletonAnimator(skeletonAnimationLibrary:SkeletonAnimationLibrary, skeleton : Skeleton, forceCPU : Boolean = false)
+		public function SmoothSkeletonAnimator(skeletonAnimationSet:SkeletonAnimationSet, skeleton : Skeleton, forceCPU : Boolean = false)
 		{
-			super(skeletonAnimationLibrary, skeleton, forceCPU);
+			super(skeletonAnimationSet, skeleton, forceCPU);
 			_clips = [];
 			_fadeOutClips = new Vector.<int>();
 			_fadeOutSpeeds = new Vector.<Number>();

src/away3d/animators/UVAnimationLibrary.as → src/away3d/animators/UVAnimationSet.as

@@ -1,13 +1,13 @@
 package away3d.animators
 {
-	import away3d.animators.IAnimationLibrary;
+	import away3d.animators.IAnimationSet;
 	import away3d.materials.passes.MaterialPassBase;
 	import away3d.core.managers.Stage3DProxy;
 
 	/**
 	 * @author robbateman
 	 */
-	public class UVAnimationLibrary extends AnimationLibraryBase implements IAnimationLibrary
+	public class UVAnimationSet extends AnimationSetBase implements IAnimationSet
 	{
 		public function getAGALVertexCode(pass:MaterialPassBase, sourceRegisters:Array, targetRegisters:Array):String
 		{

src/away3d/animators/VertexAnimationLibrary.as → src/away3d/animators/VertexAnimationSet.as

@@ -8,7 +8,7 @@ package away3d.animators
 	/**
 	 * @author robbateman
 	 */
-	public class VertexAnimationLibrary extends AnimationLibraryBase implements IAnimationLibrary
+	public class VertexAnimationSet extends AnimationSetBase implements IAnimationSet
 	{
 
 		private var _numPoses : uint;
@@ -40,7 +40,7 @@ package away3d.animators
 		/**
 		 * Creates a new AnimationSequenceController object.
 		 */
-		public function VertexAnimationLibrary(numPoses : uint = 2, blendMode : String = "absolute" )
+		public function VertexAnimationSet(numPoses : uint = 2, blendMode : String = "absolute" )
 		{
 			super();
 			_numPoses = numPoses;

src/away3d/animators/VertexAnimator.as

@@ -19,7 +19,7 @@ package away3d.animators
 		private var _activeNode : VertexClipNode;
 		private var _absoluteTime : Number;
 
-		private var _vertexAnimationLibrary:VertexAnimationLibrary;
+		private var _vertexAnimationSet:VertexAnimationSet;
 		private var _poses : Vector.<Geometry> = new Vector.<Geometry>();
 		private var _weights : Vector.<Number> = Vector.<Number>([1, 0, 0, 0]);
 		private var _numPoses : uint;
@@ -29,13 +29,13 @@ package away3d.animators
 		/**
 		 * Creates a new AnimationSequenceController object.
 		 */
-		public function VertexAnimator(vertexAnimationLibrary:VertexAnimationLibrary )
+		public function VertexAnimator(vertexAnimationSet:VertexAnimationSet )
 		{
-			super(vertexAnimationLibrary);
+			super(vertexAnimationSet);
 
-			_vertexAnimationLibrary = vertexAnimationLibrary;
-			_numPoses = vertexAnimationLibrary.numPoses;
-			_blendMode = vertexAnimationLibrary.blendMode;
+			_vertexAnimationSet = vertexAnimationSet;
+			_numPoses = vertexAnimationSet.numPoses;
+			_blendMode = vertexAnimationSet.blendMode;
 		}
 
 		/**
@@ -44,7 +44,7 @@ package away3d.animators
 		 */
 		public function play(stateName : String) : void
 		{
-			_activeNode = (_vertexAnimationLibrary.getState(stateName) as VertexAnimationState).rootNode as VertexClipNode;
+			_activeNode = (_vertexAnimationSet.getState(stateName) as VertexAnimationState).rootNode as VertexClipNode;
 
 			if (!_activeNode)
 				throw new Error("Clip not found!");
@@ -81,7 +81,7 @@ package away3d.animators
 			// todo: add code for when running on cpu
 			var i : uint;
 			var len : uint = _numPoses;
-			var index : uint = _vertexAnimationLibrary.streamIndex;
+			var index : uint = _vertexAnimationSet.streamIndex;
 			var context : Context3D = stage3DProxy._context3D;
 
 			// if no poses defined, set temp data
@@ -91,7 +91,7 @@ package away3d.animators
 						stage3DProxy.setSimpleVertexBuffer(index + (j++), renderable.getVertexBuffer(stage3DProxy), Context3DVertexBufferFormat.FLOAT_3, renderable.vertexBufferOffset);
 						context.setProgramConstantsFromVector(Context3DProgramType.VERTEX, vertexConstantOffset, _weights, 1);
 
-						if (_vertexAnimationLibrary.useNormals)
+						if (_vertexAnimationSet.useNormals)
 							stage3DProxy.setSimpleVertexBuffer(index + (j++), renderable.getVertexNormalBuffer(stage3DProxy), Context3DVertexBufferFormat.FLOAT_3, renderable.normalBufferOffset);
 					}
 				}
@@ -119,7 +119,7 @@ package away3d.animators
 				stage3DProxy.setSimpleVertexBuffer(index + (j++), subGeom.getVertexBuffer(stage3DProxy), Context3DVertexBufferFormat.FLOAT_3, subGeom.vertexBufferOffset);
 				context.setProgramConstantsFromVector(Context3DProgramType.VERTEX, vertexConstantOffset, _weights, 1);
 
-				if (_vertexAnimationLibrary.useNormals)
+				if (_vertexAnimationSet.useNormals)
 					stage3DProxy.setSimpleVertexBuffer(index + (j++), subGeom.getVertexNormalBuffer(stage3DProxy), Context3DVertexBufferFormat.FLOAT_3, subGeom.normalBufferOffset);
 
 			}

src/away3d/errors/AnimationSetError.as

@@ -0,0 +1,10 @@
+package away3d.errors
+{
+    public class AnimationSetError extends Error
+    {
+        public function AnimationSetError(message:String)
+        {
+            super(message);
+        }
+    }
+}

src/away3d/events/AssetEvent.as

@@ -16,7 +16,7 @@ package away3d.events
 		public static const ANIMATION_COMPLETE : String = "animationComplete";
 		public static const TEXTURE_COMPLETE : String = "textureComplete";
 		public static const MATERIAL_COMPLETE : String = "materialComplete";
-		public static const ANIMATION_LIBRARY_COMPLETE : String = "animationLibraryComplete";
+		public static const ANIMATION_LIBRARY_COMPLETE : String = "animationSetComplete";
 		public static const ANIMATION_STATE_COMPLETE : String = "animationStateComplete";
 		public static const ANIMATION_NODE_COMPLETE : String = "animationNodeComplete";
 

src/away3d/library/assets/AssetType.as

@@ -11,7 +11,7 @@ package away3d.library.assets
 		public static const ANIMATION : String = 'animation';
 		public static const TEXTURE : String = 'texture';
 		public static const MATERIAL : String = 'material';
-		public static const ANIMATION_LIBRARY : String = 'animationLibrary';
+		public static const ANIMATION_LIBRARY : String = 'animationSet';
 		public static const ANIMATION_STATE : String = 'animationState';
 		public static const ANIMATION_NODE : String = 'animationNode';
 	}

src/away3d/loaders/parsers/MD2Parser.as

@@ -2,7 +2,7 @@ package away3d.loaders.parsers
 {
 	import away3d.animators.nodes.VertexClipNode;
 	import away3d.animators.VertexAnimationState;
-	import away3d.animators.VertexAnimationLibrary;
+	import away3d.animators.VertexAnimationSet;
 	import flash.utils.Dictionary;
 	import away3d.arcane;
 	import away3d.core.base.Geometry;
@@ -58,7 +58,7 @@ package away3d.loaders.parsers
 		private var _vertIndices : Vector.<Number>;
 
 		// the current subgeom being built
-		private var _animationLibrary : VertexAnimationLibrary = new VertexAnimationLibrary();
+		private var _animationSet : VertexAnimationSet = new VertexAnimationSet();
 		private var _firstSubGeom : SubGeometry;
 		private var _uvs : Vector.<Number>;
 		private var _finalUV : Vector.<Number>;
@@ -431,7 +431,7 @@ package away3d.loaders.parsers
 					clip = new VertexClipNode();
 					var state : VertexAnimationState = new VertexAnimationState(clip);
 
-					_animationLibrary.addState(name, state);
+					_animationSet.addState(name, state);
 					_clipNodes[name] = clip;
 					// If another sequence was parsed before this one, starting
 					// a new sequence measn the previuos one is complete and can
@@ -450,7 +450,7 @@ package away3d.loaders.parsers
 
 			// Force finalizeAsset() to decide name
 			//_animator.name = "";
-			finalizeAsset(_animationLibrary);
+			finalizeAsset(_animationSet);
 
 			_parsedFrames = true;
 		}

src/away3d/loaders/parsers/MD5MeshParser.as

@@ -1,7 +1,7 @@
 package away3d.loaders.parsers
 {
 	import away3d.animators.SkeletonAnimator;
-	import away3d.animators.SkeletonAnimationLibrary;
+	import away3d.animators.SkeletonAnimationSet;
 	import away3d.animators.skeleton.Skeleton;
 	import away3d.animators.skeleton.SkeletonJoint;
 	import away3d.arcane;
@@ -59,7 +59,7 @@ package away3d.loaders.parsers
 		private var _geometry : Geometry;
 
 		private var _skeleton : Skeleton;
-		private var _animationLibrary : SkeletonAnimationLibrary;
+		private var _animationSet : SkeletonAnimationSet;
 
 		private var _rotationQuat : Quaternion;
 
@@ -157,7 +157,7 @@ package away3d.loaders.parsers
 
 				if (_reachedEOF) {
 					calculateMaxJointCount();
-					_animationLibrary = new SkeletonAnimationLibrary(_maxJointCount);
+					_animationSet = new SkeletonAnimationSet(_maxJointCount);
 
 					_mesh = new Mesh();
 					_geometry = _mesh.geometry;
@@ -171,7 +171,7 @@ package away3d.loaders.parsers
 
 					finalizeAsset(_mesh);
 					finalizeAsset(_skeleton);
-					finalizeAsset(_animationLibrary);
+					finalizeAsset(_animationSet);
 					return ParserBase.PARSING_DONE;
 				}
 			}