Merge remote-tracking branch 'origin/master'

This commit is contained in:
artem pecheny
2012-07-30 15:07:08 +06:00
3 changed files with 149 additions and 1 deletions

View File

@@ -465,6 +465,8 @@ package alternativa.engine3d.animation {
*/
public function slice(start:Number, end:Number = Number.MAX_VALUE):AnimationClip {
var sliced:AnimationClip = new AnimationClip(name);
sliced.animated = animated;
sliced.loop = loop;
sliced._objects = (_objects == null) ? null : [].concat(_objects);
for (var i:int = 0; i < _numTracks; i++) {
sliced.addTrack(_tracks[i].slice(start, end));
@@ -477,6 +479,8 @@ package alternativa.engine3d.animation {
*/
public function clone():AnimationClip {
var cloned:AnimationClip = new AnimationClip(name);
cloned.animated = animated;
cloned.loop = loop;
cloned._objects = (_objects == null) ? null : [].concat(_objects);
for (var i:int = 0; i < _numTracks; i++) {
cloned.addTrack(_tracks[i]);

View File

@@ -1741,7 +1741,8 @@ package alternativa.engine3d.core {
*/
public function toString():String {
var className:String = getQualifiedClassName(this);
return "[" + className.substr(className.indexOf("::") + 2) + " " + name + "]";
var start:int = className.indexOf("::");
return "[" + (start < 0 ? className : className.substr(start + 2)) + " " + name + "]";
}
}