Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions away3d/animators/SpriteSheetAnimator.hx
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ class SpriteSheetAnimator extends AnimatorBase implements IAnimator
/**
* @inheritDoc
*/
public function play(name:String, transition:IAnimationTransition = null, ?offset:Float = null):Void
public function play(name:String, transition:IAnimationTransition = null, ?offset:Int = 0):Void
{
if (_activeAnimationName == name)
return;
Expand All @@ -165,7 +165,7 @@ class SpriteSheetAnimator extends AnimatorBase implements IAnimator
_frame = cast(_activeState, SpriteSheetAnimationState).currentFrameData;
_activeSpriteSheetState = cast(_activeState, ISpriteSheetAnimationState);

start();
gotoAndPlay(offset);
}

/**
Expand Down
6 changes: 3 additions & 3 deletions away3d/animators/states/AnimationClipState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class AnimationClipState extends AnimationStateBase
*/
override public function update(time:Int):Void
{
if (!_animationClipNode.looping) {
if (_animationClipNode.totalDuration > 0) {
if (time > _startTime + _animationClipNode.totalDuration)
time = _startTime + _animationClipNode.totalDuration;
else if (time < _startTime)
Expand Down Expand Up @@ -135,12 +135,12 @@ class AnimationClipState extends AnimationStateBase
time += totalDuration;
}

if (!looping && time >= totalDuration) {
if (totalDuration > 0 && time >= totalDuration) {
notifyPlaybackComplete();
_currentFrame = lastFrame;
_nextFrame = lastFrame;
_blendWeight = 0;
} else if (!looping && time <= 0) {
} else if (totalDuration > 0 && time <= 0) {
_currentFrame = 0;
_nextFrame = 0;
_blendWeight = 0;
Expand Down
5 changes: 3 additions & 2 deletions away3d/textfield/RectangleBitmapTexture.hx
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ class RectangleBitmapTexture extends Texture2DBase {
private var _bitmapData:BitmapData;

public function new(bitmapData:BitmapData) {
this.bitmapData = bitmapData;
super();

this.bitmapData = bitmapData;
}

public var bitmapData(get, set):BitmapData;
Expand All @@ -22,7 +23,7 @@ class RectangleBitmapTexture extends Texture2DBase {

private function set_bitmapData(value:BitmapData):BitmapData {
if (value == _bitmapData)
return value;
return null;

invalidateContent();
setSize(value.width, value.height);
Expand Down