Skip to content

Added time shift parameter #2

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
MisterProper9000 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Added time shift parameter #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b57037a
Added time shift parameter
MisterProper9000 Jan 19, 2021
3f5b0e5
Added blinkContinuous function
MisterProper9000 Oct 30, 2021
1fa22e7
Merge branch 'coronalabs:master' into master
MisterProper9000 Oct 31, 2021
92d3ab7
Merge pull request #1 from MisterProper9000/hotfix-blink
MisterProper9000 Oct 31, 2021
6f16c20
Added onPause call in case of time shifted transition has delay
MisterProper9000 Nov 5, 2021
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
98 changes: 83 additions & 15 deletions transition.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ lib._hasEventListener = false
-- reserved properties that cannot be transitioned
lib._reservedProperties =
{
time = true, delay = true, delta = true, iterations = true, tag = true, transition = true,
time = true, delay = true, timeShift = true, delta = true, iterations = true, tag = true, transition = true,
onComplete = true, onPause = true, onResume = true, onCancel = true, onRepeat = true, onStart = true
}

Expand Down Expand Up @@ -208,6 +208,7 @@ lib.to = function( targetObject, transitionParams )
tween._duration = transitionParams.time or 500
tween.iterations = transitionParams.iterations or 1
tween.tag = transitionParams.tag or ""
tween._timeShift = transitionParams.timeShift or 0
tween._lastPausedTime = nil
tween._transition = transitionParams.transition or easing.linear
tween._onStart = Runtime.verifyListener( transitionParams.onStart, "onStart" )
Expand Down Expand Up @@ -584,7 +585,10 @@ function lib:enterFrame ( event )
delay = nil
end

if not delay then
-- define if object needs a single transition execution even if delayed
tween.needOneExecEvenIfDelayed = tween.needOneExecEvenIfDelayed == nil and delay > 0 and tween._timeShift ~= 0

if not delay or tween.needOneExecEvenIfDelayed then
local params = tween._delayParams
if params then
lib._initTween( tween, params )
Expand All @@ -593,7 +597,7 @@ function lib:enterFrame ( event )

local target = tween._target
local keysFinish = tween._keysFinish
local t = currentTime - tween._timeStart
local t = currentTime - tween._timeStart + tween._timeShift
if t < 0 then t = 0 end
local tMax = tween._duration
if t < tMax then
Expand All @@ -603,13 +607,18 @@ function lib:enterFrame ( event )
t = tMax*2 - t
end
end

for k,v in pairs( tween._keysStart ) do
target[k] = tween._transition( t, tMax, v, keysFinish[k] - v )
end
if tween.needOneExecEvenIfDelayed then
tween._pauseTriggered = true
tween._resumeTriggered = false
local listener = tween._onPause
Runtime.callListener( listener, "onPause", target )
end
else
-- the easing function easing.continuousLoop with infinite iterations cannot set the object keys to the finish values.
-- also, the last iteration of a transition with easing.continousLoop has to return the object to the start properties,
-- also, the last iteration of a transition with easing.continuousLoop has to return the object to the start properties,
-- not to the end ones.
if tween._transition == easing.continuousLoop or tween._isLoop then
if tween.iterations == 1 then
Expand Down Expand Up @@ -647,8 +656,8 @@ function lib:enterFrame ( event )
end
end


end
tween.needOneExecEvenIfDelayed = false
end

end
Expand Down Expand Up @@ -734,7 +743,7 @@ lib.newSequence = function( targetObject, params )
local delayValue = 0

if currentSequence.transitions[ i ].delay then
delayValue = delayValue + currentSequence.transitions[ i ].delay
delayValue = delayValue + currentSequence.transitions[ i ].delay
end

-- if we are at least at the second transition in the table
Expand Down Expand Up @@ -837,6 +846,7 @@ lib.blink = function( targetObject, params )
local actionOnRepeat = paramsTable.onRepeat or nil
local actionTag = paramsTable.tag or nil
local actionTime = actionTime or 500
local actionTimeShift = paramsTable.timeShift or nil

local addedTransition = lib.to( targetObject,
{
Expand All @@ -851,14 +861,60 @@ lib.blink = function( targetObject, params )
onStart = actionOnStart,
onRepeat = actionOnRepeat,
alpha = 0,
tag = actionTag
tag = actionTag,
timeShift = actionTimeShift,
} )
--local addedTransition = lib.to( targetObject, { time = actionTime * 0.5, alpha = 0, transition="continuousLoop", iterations = -1 } )

return addedTransition

end

-----------------------------------------------------------------------------------------
-- blinkContinuous( targetObject, actionDuration )
-- blinks the targetObject with the transition duration actionDuration with continuous alpha-channel changes
-----------------------------------------------------------------------------------------
lib.blinkContinuous = function( targetObject, params )
if targetObject == nil then
if lib.debugEnabled then
error( DEBUG_STRING .. " you have to pass a target object to a transition.blinkContinuous call." )
end
end

local paramsTable = params or {}

local actionTime = paramsTable.time or 500
local actionDelay = paramsTable.delay or 0
local actionEasing = paramsTable.transition or easing.linear
local actionOnComplete = paramsTable.onComplete or nil
local actionOnPause = paramsTable.onPause or nil
local actionOnResume = paramsTable.onResume or nil
local actionOnCancel = paramsTable.onCancel or nil
local actionOnStart = paramsTable.onStart or nil
local actionOnRepeat = paramsTable.onRepeat or nil
local actionTag = paramsTable.tag or nil
local actionTime = actionTime or 500

local addedTransition = lib.to( targetObject,
{
delay = actionDelay,
time = actionTime * 0.5,
transition = easing.continuousLoop,
iterations = -1,
onComplete = actionOnComplete,
onPause = actionOnPause,
onResume = actionOnResume,
onCancel = actionOnCancel,
onStart = actionOnStart,
onRepeat = actionOnRepeat,
alpha = 0,
tag = actionTag
} )

return addedTransition

end

-----------------------------------------------------------------------------------------
-- moveTo( targetObject, xCoord, yCoord, actionTime, actionDelay )
-- moves the targetObject to the xCoord, yCoord coordinates with the transition duration actionDuration and delay actionDelay
Expand Down Expand Up @@ -890,6 +946,7 @@ lib.moveTo = function( targetObject, params )
local actionTag = paramsTable.tag or nil
local actionX = paramsTable.x or nil
local actionY = paramsTable.y or nil
local actionTimeShift = paramsTable.timeShift or nil

addedTransition = lib.to( targetObject,
{
Expand All @@ -907,14 +964,15 @@ lib.moveTo = function( targetObject, params )
yScale = actionYScale,
x = actionX,
y = actionY,
tag = actionTag
tag = actionTag,
timeShift = actionTimeShift,
} )

end

return addedTransition

end
end

-----------------------------------------------------------------------------------------
-- moveBy( targetObject, xCoord, yCoord, actionTime, actionDelay )
Expand Down Expand Up @@ -947,6 +1005,7 @@ lib.moveBy = function( targetObject, params )
local actionTag = paramsTable.tag or nil
local actionX = paramsTable.x or 0
local actionY = paramsTable.y or 0
local actionTimeShift = paramsTable.timeShift or nil

addedTransition = lib.to( targetObject,
{
Expand All @@ -964,7 +1023,8 @@ lib.moveBy = function( targetObject, params )
yScale = actionYScale,
x = targetObject.x + actionX,
y = targetObject.y + actionY,
tag = actionTag
tag = actionTag,
timeShift = actionTimeShift,
} )

end
Expand Down Expand Up @@ -1004,6 +1064,7 @@ lib.scaleTo = function( targetObject, params )
local actionX = paramsTable.x or nil
local actionY = paramsTable.y or nil
local actionTag = paramsTable.tag or nil
local actionTimeShift = paramsTable.timeShift or nil

addedTransition = lib.to( targetObject,
{
Expand All @@ -1021,7 +1082,8 @@ lib.scaleTo = function( targetObject, params )
yScale = actionYScale,
x = actionX,
y = actionY,
tag = actionTag
tag = actionTag,
timeShift = actionTimeShift,
} )

end
Expand Down Expand Up @@ -1061,6 +1123,7 @@ lib.scaleBy = function( targetObject, params )
local actionX = paramsTable.x or nil
local actionY = paramsTable.y or nil
local actionTag = paramsTable.tag or nil
local actionTimeShift = paramsTable.timeShift or nil

addedTransition = lib.to( targetObject,
{
Expand All @@ -1078,7 +1141,8 @@ lib.scaleBy = function( targetObject, params )
alpha = actionAlpha,
xScale = targetObject.xScale + actionXScale,
yScale = targetObject.yScale + actionYScale,
tag = actionTag
tag = actionTag,
timeShift = actionTimeShift,
} )

end
Expand Down Expand Up @@ -1115,6 +1179,7 @@ lib.fadeIn = function( targetObject, params )
local actionX = paramsTable.x or nil
local actionY = paramsTable.y or nil
local actionTag = paramsTable.tag or nil
local actionTimeShift = paramsTable.timeShift or nil

addedTransition = lib.to( targetObject,
{
Expand All @@ -1130,7 +1195,8 @@ lib.fadeIn = function( targetObject, params )
x = actionX,
y = actionY,
alpha = 1.0,
tag = actionTag
tag = actionTag,
timeShift = actionTimeShift,
} )

end
Expand Down Expand Up @@ -1167,6 +1233,7 @@ lib.fadeOut = function( targetObject, params )
local actionX = paramsTable.x or nil
local actionY = paramsTable.y or nil
local actionTag = paramsTable.tag or nil
local actionTimeShift = paramsTable.timeShift or nil

addedTransition = lib.to( targetObject,
{
Expand All @@ -1182,7 +1249,8 @@ lib.fadeOut = function( targetObject, params )
tag = actionTag,
x = actionX,
y = actionY,
alpha = 0.0
alpha = 0.0,
timeShift = actionTimeShift,
} )

end
Expand Down
61 changes: 55 additions & 6 deletions unit_test/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,14 @@ package.preload.transition = nil

-------------------------------------------------------------------------------

local W = display.contentWidth
local H = display.contentHeight

local isPause = false
local transitionNew = require("transition")

local w = 0.5*display.contentWidth
local h = 0.5*display.contentHeight
local w = 0.5*W
local h = 0.25*H
local r1 = display.newRect(1,1, w, h)
r1:setFillColor(255,0,0)
local executions = 0
Expand All @@ -51,22 +54,30 @@ r2:setFillColor( 0, 255, 0)
r1.onComplete = onComplete
r2.onComplete = onComplete

local r3 = display.newRect( 1, 2*h, w, h )
r3:setFillColor( 0, 0, 255 )
transitionNew.blink( r3, { time = 3000 } )

local r4 = display.newRect( 2 * w, 2 * h, w, h )
r4:setFillColor( 0, 0, 255 )
transitionNew.blinkContinuous( r4, { time = 3000 } )

function touchHandler (event)
if (event.phase == "began") then
transitionNew.cancel( event.target.t )
print( "Cancelled!")
print( "Rect cancelled!")
end
end

function touchHandlerPause (event)
if (event.phase == "began") then
if false == isPause then
transitionNew.pause( event.target.t )
print( "Paused!" )
print( "Rect paused!" )
isPause = true
elseif true == isPause then
transitionNew.resume ( event.target.t )
print( "Resumed!" )
print( "Rect resumed!" )
isPause = false
end
end
Expand All @@ -78,4 +89,42 @@ r2:addEventListener("touch", touchHandlerPause)
-- Starts the repeating transition. Each time the transition completes,
-- it restarts with an increasing delay
r1:onComplete()
r2:onComplete()
r2:onComplete()


local arr_r = {}
local isArrPause = false
local pauseKey = "p"
local count = 100
for i = 1, count do
local r_i = display.newRect(W/(count+1) * i, H, W/(count+1), 20)
r_i.anchorY = 1

-- example of shifted transition with delay
r_i.i = i
transitionNew.scaleTo(r_i, {yScale = 10, time = 10000, timeShift = i * 10000/count, transition = easing.outInBounce, delay = 3000, onPause = function(obj) print("paused " .. obj.i) end})

r_i:setFillColor(0, (i%2 == 1 and 0 or 1), (i%2 == 0 and 0 or 1))
arr_r[#arr_r+1] = r_i
end

function keuHandlePause(event)
if event.keyName == pauseKey and event.phase == "down" then
if false == isArrPause then
for i = 1, count do
transitionNew.pause(arr_r[i])
end
print( "Array paused!" )
isArrPause = true
elseif true == isArrPause then
for i = 1, count do
transitionNew.resume(arr_r[i])
end
print( "Array resumed!" )
isArrPause = false
end
end
end


Runtime:addEventListener("key", keuHandlePause)