SweetSea/Techmino
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

整理代码

Browse Source
This commit is contained in:
MrZ626
2021-08-11 16:17:12 +08:00
parent 43c8218a14
commit c37370a50a
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Zframework/scene.lua
View File

@@ -51,8 +51,8 @@ function SCN.swapUpdate()
local S=SCN.stat local S=SCN.stat
S.time=S.time-1 S.time=S.time-1
if S.time==S.changeTime then if S.time==S.changeTime then
SCN.init(S.tar,SCN.cur)
--Scene swapped this moment --Scene swapped this moment
SCN.init(S.tar,SCN.cur)
end end
if S.time==0 then if S.time==0 then
SCN.swapping=false SCN.swapping=false
@@ -68,17 +68,15 @@ function SCN.init(s,org)
WIDGET.setWidgetList(S.widgetList) WIDGET.setWidgetList(S.widgetList)
SCN.sceneInit=S.sceneInit SCN.sceneInit=S.sceneInit
SCN.sceneBack=S.sceneBack SCN.sceneBack=S.sceneBack
SCN.update=S.update
SCN.draw=S.draw
SCN.mouseClick=S.mouseClick
SCN.touchClick=S.touchClick
SCN.mouseDown=S.mouseDown SCN.mouseDown=S.mouseDown
SCN.mouseMove=S.mouseMove SCN.mouseMove=S.mouseMove
SCN.mouseUp=S.mouseUp SCN.mouseUp=S.mouseUp
SCN.mouseClick=S.mouseClick
SCN.wheelMoved=S.wheelMoved SCN.wheelMoved=S.wheelMoved
SCN.touchDown=S.touchDown SCN.touchDown=S.touchDown
SCN.touchUp=S.touchUp SCN.touchUp=S.touchUp
SCN.touchMove=S.touchMove SCN.touchMove=S.touchMove
SCN.touchClick=S.touchClick
SCN.keyDown=S.keyDown SCN.keyDown=S.keyDown
SCN.keyUp=S.keyUp SCN.keyUp=S.keyUp
SCN.gamepadDown=S.gamepadDown SCN.gamepadDown=S.gamepadDown
@@ -87,6 +85,8 @@ function SCN.init(s,org)
SCN.directoryDropped=S.directoryDropped SCN.directoryDropped=S.directoryDropped
SCN.resize=S.resize SCN.resize=S.resize
SCN.socketRead=S.socketRead SCN.socketRead=S.socketRead
SCN.update=S.update
SCN.draw=S.draw
if S.sceneInit then S.sceneInit(org)end if S.sceneInit then S.sceneInit(org)end
end end
function SCN.push(tar,style) function SCN.push(tar,style)
@@ -97,12 +97,12 @@ function SCN.push(tar,style)
end end
end end
function SCN.pop() function SCN.pop()
local _=SCN.stack local s=SCN.stack
_[#_],_[#_-1]=nil s[#s],s[#s-1]=nil
end end
local swap={ local swap={
none={duration=1,changeTime=0,draw=function()end},--swapTime, changeTime, drawFunction none={duration=1,changeTime=0,draw=function()end},
flash={duration=8,changeTime=1,draw=function()gc.clear(1,1,1)end}, flash={duration=8,changeTime=1,draw=function()gc.clear(1,1,1)end},
fade={duration=30,changeTime=15,draw=function(t) fade={duration=30,changeTime=15,draw=function(t)
t=t>15 and 2-t/15 or t/15 t=t>15 and 2-t/15 or t/15