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

优化主循环内绘图函数调用，添加ws状态显示

Browse Source
This commit is contained in:
MrZ626
2021-02-23 02:03:04 +08:00
parent d060f15e83
commit b86d085519
2 changed files with 97 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

144
Zframework/init.lua
View File

@@ -38,9 +38,16 @@ FILE= require"Zframework/file"
PROFILE=require"Zframework/profile" PROFILE=require"Zframework/profile"
local ms,kb=love.mouse,love.keyboard local ms,kb=love.mouse,love.keyboard
local gc=love.graphics local gc=love.graphics
local gc_push,gc_pop=gc.push,gc.pop
local gc_discard,gc_present=gc.discard,gc.present
local gc_setColor,gc_draw,gc_rectangle=gc.setColor,gc.draw,gc.rectangle
local gc_print,gc_printf=gc.print,gc.printf
local setFont=setFont
local int,rnd,abs=math.floor,math.random,math.abs local int,rnd,abs=math.floor,math.random,math.abs
local min=math.min local min,sin=math.min,math.sin
local ins,rem=table.insert,table.remove local ins,rem=table.insert,table.remove
local SCR=SCR local SCR=SCR
@@ -54,39 +61,39 @@ local devMode
local infoCanvas=gc.newCanvas(108,27) local infoCanvas=gc.newCanvas(108,27)
local function updatePowerInfo() local function updatePowerInfo()
local state,pow=love.system.getPowerInfo() local state,pow=love.system.getPowerInfo()
gc.setCanvas(infoCanvas)gc.push("transform")gc.origin() gc.setCanvas(infoCanvas)gc_push("transform")gc.origin()
gc.clear(0,0,0,.25) gc.clear(0,0,0,.25)
if state~="unknown"then if state~="unknown"then
gc.setLineWidth(4) gc.setLineWidth(4)
local charging=state=="charging" local charging=state=="charging"
if state=="nobattery"then if state=="nobattery"then
gc.setColor(1,1,1) gc_setColor(1,1,1)
gc.setLineWidth(2) gc.setLineWidth(2)
gc.line(74,SCR.safeX+5,100,22) gc.line(74,SCR.safeX+5,100,22)
elseif pow then elseif pow then
if charging then gc.setColor(0,1,0) if charging then gc_setColor(0,1,0)
elseif pow>50 then gc.setColor(1,1,1) elseif pow>50 then gc_setColor(1,1,1)
elseif pow>26 then gc.setColor(1,1,0) elseif pow>26 then gc_setColor(1,1,0)
elseif pow<26 then gc.setColor(1,0,0) elseif pow<26 then gc_setColor(1,0,0)
else gc.setColor(.5,0,1) else gc_setColor(.5,0,1)
end end
gc.rectangle("fill",76,6,pow*.22,14) gc_rectangle("fill",76,6,pow*.22,14)
if pow<100 then if pow<100 then
setFont(15) setFont(15)
gc.setColor(0,0,0) gc_setColor(0,0,0)
gc.print(pow,77,1) gc_print(pow,77,1)
gc.print(pow,77,3) gc_print(pow,77,3)
gc.print(pow,79,1) gc_print(pow,79,1)
gc.print(pow,79,3) gc_print(pow,79,3)
gc.setColor(1,1,1) gc_setColor(1,1,1)
gc.print(pow,78,2) gc_print(pow,78,2)
end end
end end
gc.draw(IMG.batteryImage,73,3) gc_draw(IMG.batteryImage,73,3)
end end
setFont(25) setFont(25)
gc.print(os.date("%H:%M"),3,-5) gc_print(os.date("%H:%M"),3,-5)
gc.pop()gc.setCanvas() gc_pop()gc.setCanvas()
end end
------------------------------------------------------------- -------------------------------------------------------------
local lastX,lastY=0,0--Last click pos local lastX,lastY=0,0--Last click pos
@@ -405,29 +412,36 @@ function love.errorhandler(msg)
end end
end end
if needDraw then if needDraw then
gc.discard() gc_discard()
gc.clear(BGcolor) gc.clear(BGcolor)
gc.setColor(1,1,1) gc_setColor(1,1,1)
gc.push("transform") gc_push("transform")
gc.replaceTransform(xOy) gc.replaceTransform(xOy)
gc.draw(errScrShot,100,365,nil,512/errScrShot:getWidth(),288/errScrShot:getHeight()) gc_draw(errScrShot,100,365,nil,512/errScrShot:getWidth(),288/errScrShot:getHeight())
setFont(100)gc.print(":(",100,40,0,1.2) setFont(100)gc_print(":(",100,40,0,1.2)
setFont(40)gc.printf(text.errorMsg,100,200,SCR.w0-100) setFont(40)gc_printf(text.errorMsg,100,200,SCR.w0-100)
setFont(20) setFont(20)
gc.print(SYSTEM.."-"..VERSION_NAME,100,660) gc_print(SYSTEM.."-"..VERSION_NAME,100,660)
gc.print("scene:"..SCN.cur,400,660) gc_print("scene:"..SCN.cur,400,660)
gc.printf(err[1],626,360,1260-626) gc_printf(err[1],626,360,1260-626)
gc.print("TRACEBACK",626,426) gc_print("TRACEBACK",626,426)
for i=4,#err-2 do for i=4,#err-2 do
gc.print(err[i],626,370+20*i) gc_print(err[i],626,370+20*i)
end end
gc.pop() gc_pop()
gc.present() gc_present()
needDraw=false needDraw=false
end end
love.timer.sleep(.26) love.timer.sleep(.26)
end end
end end
local WSnames={"app","chat","play","stream"}
local WScolor={
{1,0,0,.26},
{0,.7,1,.26},
{0,1,0,.26},
{1,1,0,.26}
}
local devColor={ local devColor={
COLOR.white, COLOR.white,
COLOR.lMagenta, COLOR.lMagenta,
@@ -444,8 +458,6 @@ function love.run()
local FPS=love.timer.getFPS local FPS=love.timer.getFPS
local MINI=love.window.isMinimized local MINI=love.window.isMinimized
local PUMP,POLL=love.event.pump,love.event.poll local PUMP,POLL=love.event.pump,love.event.poll
local DISCARD=gc.discard
local PRESENT=gc.present
local frameTimeList={} local frameTimeList={}
@@ -497,7 +509,7 @@ function love.run()
--Draw background --Draw background
BG.draw() BG.draw()
gc.push("transform") gc_push("transform")
gc.replaceTransform(xOy) gc.replaceTransform(xOy)
--Draw scene contents --Draw scene contents
@@ -510,20 +522,20 @@ function love.run()
if mouseShow then if mouseShow then
local R=int((t+1)/2)%7+1 local R=int((t+1)/2)%7+1
_=SKIN.libColor[SETTING.skin[R]] _=SKIN.libColor[SETTING.skin[R]]
gc.setColor(_[1],_[2],_[3],min(abs(1-t%2),.3)) gc_setColor(_[1],_[2],_[3],min(abs(1-t%2),.3))
_=spinCenters[R][0] _=spinCenters[R][0]
gc.draw(TEXTURE.miniBlock[R],mx,my,t%3.14159265359*4,16,16,_[2]+.5,#BLOCKS[R][0]-_[1]-.5) gc_draw(TEXTURE.miniBlock[R],mx,my,t%3.14159265359*4,16,16,_[2]+.5,#BLOCKS[R][0]-_[1]-.5)
gc.setColor(1,1,1) gc_setColor(1,1,1)
gc.draw(TEXTURE.cursor,mx,my,nil,nil,nil,6,6) gc_draw(TEXTURE.cursor,mx,my,nil,nil,nil,6,6)
end end
SYSFX.draw() SYSFX.draw()
TEXT.draw() TEXT.draw()
gc.pop() gc_pop()
--Draw power info. --Draw power info.
gc.setColor(1,1,1) gc_setColor(1,1,1)
if SETTING.powerInfo then if SETTING.powerInfo then
gc.draw(infoCanvas,SCR.safeX,0,0,SCR.k) gc_draw(infoCanvas,SCR.safeX,0,0,SCR.k)
end end
--Draw scene swapping animation --Draw scene swapping animation
@@ -532,31 +544,45 @@ function love.run()
_.draw(_.time) _.draw(_.time)
end end
--Draw network working --Draw network working status
if TASK.netTaskCount()>0 then gc_push("transform")
setFont(30) gc.translate(SCR.w,0)
gc.setColor(COLOR.rainbow(t*5)) gc.scale(SCR.k)
gc.print("E",SCR.safeW-18,17,.26+.355*math.sin(t*6.26),nil,nil,8,20) for i=1,4 do
local status=WS.status(WSnames[i])
gc_setColor(WScolor[i])
gc_rectangle("fill",0,20*i,-20,-20)
if status=="dead"then
gc_setColor(.8,.8,.8)
gc_draw(TEXTURE.ws_dead,-20,20*i-20)
elseif status=="connecting"then
gc_setColor(.8,.8,.8,.5+.3*sin(t*6.26))
gc_draw(TEXTURE.ws_connecting,-20,20*i-20)
elseif status=="running"then
gc_setColor(.8,.8,.8)
gc_draw(TEXTURE.ws_running,-20,20*i-20)
end
end end
gc_pop()
--Draw FPS --Draw FPS
gc.setColor(1,1,1) gc_setColor(1,1,1)
setFont(15) setFont(15)
_=SCR.h _=SCR.h
gc.print(FPS(),SCR.safeX+5,_-20) gc_print(FPS(),SCR.safeX+5,_-20)
--Debug info. --Debug info.
if devMode then if devMode then
gc.setColor(devColor[devMode]) gc_setColor(devColor[devMode])
gc.print("MEM "..gcinfo(),SCR.safeX+5,_-40) gc_print("MEM "..gcinfo(),SCR.safeX+5,_-40)
gc.print("Lines "..FREEROW.getCount(),SCR.safeX+5,_-60) gc_print("Lines "..FREEROW.getCount(),SCR.safeX+5,_-60)
gc.print("Cursor "..int(mx+.5).." "..int(my+.5),SCR.safeX+5,_-80) gc_print("Cursor "..int(mx+.5).." "..int(my+.5),SCR.safeX+5,_-80)
gc.print("Voices "..VOC.getQueueCount(),SCR.safeX+5,_-100) gc_print("Voices "..VOC.getQueueCount(),SCR.safeX+5,_-100)
gc.print("Tasks "..TASK.getCount(),SCR.safeX+5,_-120) gc_print("Tasks "..TASK.getCount(),SCR.safeX+5,_-120)
ins(frameTimeList,1,dt)rem(frameTimeList,126) ins(frameTimeList,1,dt)rem(frameTimeList,126)
gc.setColor(1,1,1,.3) gc_setColor(1,1,1,.3)
for i=1,#frameTimeList do for i=1,#frameTimeList do
gc.rectangle("fill",150+2*i,_-20,2,-frameTimeList[i]*4000) gc_rectangle("fill",150+2*i,_-20,2,-frameTimeList[i]*4000)
end end
if devMode==3 then WAIT(.1) if devMode==3 then WAIT(.1)
elseif devMode==4 then WAIT(.5) elseif devMode==4 then WAIT(.5)
@@ -564,8 +590,8 @@ function love.run()
end end
LOG.draw() LOG.draw()
PRESENT() gc_present()
DISCARD()--SPEED UPUPUP! gc_discard()--SPEED UPUPUP!
end end
end end

12
parts/texture.lua
View File

@@ -97,6 +97,18 @@ for i=1,8 do
gc.translate(-12*i,i==1 and -8 or -14) gc.translate(-12*i,i==1 and -8 or -14)
end end
setFont(20)
TEXTURE.ws_dead=C(20,20)
gc.setColor(1,.4,.3)
gc.print("X",3,-4)
TEXTURE.ws_connecting=C(20,20)
gc.setLineWidth(3)
gc.setColor(1,1,1)
gc.arc("line","open",11.5,10,6.26,1,5.28)
TEXTURE.ws_running=C(20,20)
gc.setColor(0,.9,0)
gc.print("R",3,-4)
gc.setCanvas() gc.setCanvas()
return TEXTURE return TEXTURE