Skip to content

ITween - adds tween offsetting #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
r618 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ITween - adds tween offsetting #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Assets/ZestKit/Splines/SplineTween.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public SplineTween( Transform transform, Spline spline, float duration )

public void setTweenedValue( Vector3 value )
{
_transform.position = value;
_transform.position = value + this._offset;
}


Expand All @@ -49,7 +49,7 @@ protected override void updateValue()
if( _isRelativeTween )
position += _fromValue;

setTweenedValue( position );
setTweenedValue(position + this._offset);
}


Expand Down
14 changes: 7 additions & 7 deletions Assets/ZestKit/TweenTargets/TransformVector3Tween.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,20 @@ public void setTweenedValue( Vector3 value )
switch( _targetType )
{
case TransformTargetType.Position:
_transform.position = value;
_transform.position = value + this._offset;
break;
case TransformTargetType.LocalPosition:
_transform.localPosition = value;
_transform.localPosition = value + this._offset;
break;
case TransformTargetType.LocalScale:
_transform.localScale = value;
_transform.localScale = value + this._offset;
break;
case TransformTargetType.EulerAngles:
_transform.eulerAngles = value;
break;
_transform.eulerAngles = value + this._offset;
break;
case TransformTargetType.LocalEulerAngles:
_transform.localEulerAngles = value;
break;
_transform.localEulerAngles = value + this._offset;
break;
default:
throw new System.ArgumentOutOfRangeException();
}
Expand Down
9 changes: 9 additions & 0 deletions Assets/ZestKit/Tweens/ITween.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,15 @@ public interface ITween<T> : ITweenControl where T : struct
/// <returns>The next tween.</returns>
/// <param name="nextTween">Next tween.</param>
ITween<T> setNextTween( ITweenable nextTween );

/// <summary>
/// Allows to apply any arbitrary value at any time to current tweened value but preserving the tween.
/// Can be used for e.g. more advanced tween composition or add noise to otherwise steady nature of tween values.
/// When not changed adds T.Zero to tween values.
/// </summary>
/// <param name="offset"></param>
/// <returns></returns>
ITween<T> setOffset(T offset);
}


Expand Down
7 changes: 7 additions & 0 deletions Assets/ZestKit/Tweens/Tween.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ protected enum TweenState
protected Action<ITween<T>> _completionHandler;
protected Action<ITween<T>> _loopCompleteHandler;
protected ITweenable _nextTween;
protected T _offset;

// tween state
protected TweenState _tweenState = TweenState.Complete;
Expand Down Expand Up @@ -166,6 +167,12 @@ public ITween<T> setNextTween( ITweenable nextTween )
return this;
}

public ITween<T> setOffset( T offset)
{
this._offset = offset;
return this;
}

#endregion


Expand Down
69 changes: 43 additions & 26 deletions Assets/ZestKit/Tweens/Tweens.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ public override ITween<int> setIsRelative()
protected override void updateValue()
{
if( _animationCurve != null )
_target.setTweenedValue( (int)Zest.ease( _animationCurve, _fromValue, _toValue, _elapsedTime, _duration ) );
_target.setTweenedValue( (int)Zest.ease( _animationCurve, _fromValue, _toValue, _elapsedTime, _duration) + this._offset);
else
_target.setTweenedValue( (int)Zest.ease( _easeType, _fromValue, _toValue, _elapsedTime, _duration ) );
_target.setTweenedValue( (int)Zest.ease( _easeType, _fromValue, _toValue, _elapsedTime, _duration) + this._offset);
}


Expand Down Expand Up @@ -82,9 +82,9 @@ public override ITween<float> setIsRelative()
protected override void updateValue()
{
if( _animationCurve != null )
_target.setTweenedValue( Zest.ease( _animationCurve, _fromValue, _toValue, _elapsedTime, _duration ) );
_target.setTweenedValue( Zest.ease( _animationCurve, _fromValue, _toValue, _elapsedTime, _duration) + this._offset);
else
_target.setTweenedValue( Zest.ease( _easeType, _fromValue, _toValue, _elapsedTime, _duration ) );
_target.setTweenedValue( Zest.ease( _easeType, _fromValue, _toValue, _elapsedTime, _duration) + this._offset);
}


Expand Down Expand Up @@ -127,9 +127,9 @@ public override ITween<Vector2> setIsRelative()
protected override void updateValue()
{
if( _animationCurve != null )
_target.setTweenedValue( Zest.ease( _animationCurve, _fromValue, _toValue, _elapsedTime, _duration ) );
_target.setTweenedValue( Zest.ease( _animationCurve, _fromValue, _toValue, _elapsedTime, _duration) + this._offset);
else
_target.setTweenedValue( Zest.ease( _easeType, _fromValue, _toValue, _elapsedTime, _duration ) );
_target.setTweenedValue( Zest.ease( _easeType, _fromValue, _toValue, _elapsedTime, _duration) + this._offset);
}


Expand Down Expand Up @@ -172,9 +172,9 @@ public override ITween<Vector3> setIsRelative()
protected override void updateValue()
{
if( _animationCurve != null )
_target.setTweenedValue( Zest.ease( _animationCurve, _fromValue, _toValue, _elapsedTime, _duration ) );
_target.setTweenedValue( Zest.ease( _animationCurve, _fromValue, _toValue, _elapsedTime, _duration) + this._offset);
else
_target.setTweenedValue( Zest.ease( _easeType, _fromValue, _toValue, _elapsedTime, _duration ) );
_target.setTweenedValue( Zest.ease( _easeType, _fromValue, _toValue, _elapsedTime, _duration) + this._offset);
}


Expand Down Expand Up @@ -217,9 +217,9 @@ public override ITween<Vector4> setIsRelative()
protected override void updateValue()
{
if( _animationCurve != null )
_target.setTweenedValue( Zest.ease( _animationCurve, _fromValue, _toValue, _elapsedTime, _duration ) );
_target.setTweenedValue( Zest.ease( _animationCurve, _fromValue, _toValue, _elapsedTime, _duration) + this._offset);
else
_target.setTweenedValue( Zest.ease( _easeType, _fromValue, _toValue, _elapsedTime, _duration ) );
_target.setTweenedValue( Zest.ease( _easeType, _fromValue, _toValue, _elapsedTime, _duration) + this._offset);
}


Expand Down Expand Up @@ -262,9 +262,9 @@ public override ITween<Quaternion> setIsRelative()
protected override void updateValue()
{
if( _animationCurve != null )
_target.setTweenedValue( Zest.ease( _animationCurve, _fromValue, _toValue, _elapsedTime, _duration ) );
_target.setTweenedValue( Zest.ease( _animationCurve, _fromValue, _toValue, _elapsedTime, _duration) * this._offset);
else
_target.setTweenedValue( Zest.ease( _easeType, _fromValue, _toValue, _elapsedTime, _duration ) );
_target.setTweenedValue( Zest.ease( _easeType, _fromValue, _toValue, _elapsedTime, _duration) * this._offset);
}


Expand Down Expand Up @@ -307,9 +307,9 @@ public override ITween<Color> setIsRelative()
protected override void updateValue()
{
if( _animationCurve != null )
_target.setTweenedValue( Zest.ease( _animationCurve, _fromValue, _toValue, _elapsedTime, _duration ) );
_target.setTweenedValue( Zest.ease( _animationCurve, _fromValue, _toValue, _elapsedTime, _duration) + this._offset);
else
_target.setTweenedValue( Zest.ease( _easeType, _fromValue, _toValue, _elapsedTime, _duration ) );
_target.setTweenedValue( Zest.ease( _easeType, _fromValue, _toValue, _elapsedTime, _duration) + this._offset);
}


Expand Down Expand Up @@ -351,14 +351,25 @@ public override ITween<Color32> setIsRelative()

protected override void updateValue()
{
if( _animationCurve != null )
_target.setTweenedValue( Zest.ease( _animationCurve, _fromValue, _toValue, _elapsedTime, _duration ) );
else
_target.setTweenedValue( Zest.ease( _easeType, _fromValue, _toValue, _elapsedTime, _duration ) );
}
Color32 newColor;

if (_animationCurve != null)
newColor = Zest.ease(_animationCurve, _fromValue, _toValue, _elapsedTime, _duration);
else
newColor = Zest.ease(_easeType, _fromValue, _toValue, _elapsedTime, _duration);

public override void recycleSelf()
newColor = new Color32(
(byte)(newColor.r + this._offset.r)
, (byte)(newColor.g + this._offset.g)
, (byte)(newColor.b + this._offset.b)
, (byte)(newColor.a + this._offset.a)
);

_target.setTweenedValue(newColor);
}


public override void recycleSelf()
{
base.recycleSelf();

Expand Down Expand Up @@ -403,14 +414,20 @@ public override ITween<Rect> setIsRelative()

protected override void updateValue()
{
if( _animationCurve != null )
_target.setTweenedValue( Zest.ease( _animationCurve, _fromValue, _toValue, _elapsedTime, _duration ) );
else
_target.setTweenedValue( Zest.ease( _easeType, _fromValue, _toValue, _elapsedTime, _duration ) );
}
Rect newRect;

if (_animationCurve != null)
newRect = Zest.ease(_animationCurve, _fromValue, _toValue, _elapsedTime, _duration);
else
newRect = Zest.ease(_easeType, _fromValue, _toValue, _elapsedTime, _duration);

public override void recycleSelf()
newRect = new Rect(newRect.x + this._offset.x, newRect.y + this._offset.y, newRect.width + this._offset.width, newRect.height + this._offset.height);

_target.setTweenedValue(newRect);
}


public override void recycleSelf()
{
base.recycleSelf();

Expand Down