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-05-30 16:47:19 +08:00
parent 25ad789e61
commit 57f67749dc
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Zframework/init.lua
View File

@@ -590,22 +590,25 @@ function love.run()
gc_draw(ms.isDown(1)and cursor_holdImg or cursorImg,mx,my,nil,nil,nil,8,8) gc_draw(ms.isDown(1)and cursor_holdImg or cursorImg,mx,my,nil,nil,nil,8,8)
end end
gc_replaceTransform(SCR.xOy_ul) gc_replaceTransform(SCR.xOy_ul)
LOG.draw()
gc_replaceTransform(SCR.origin)
--Draw power info. --Draw power info.
if SETTING.powerInfo then if SETTING.powerInfo then
gc_setColor(1,1,1) gc_setColor(1,1,1)
gc_draw(infoCanvas,SCR.safeX,0,0,SCR.k) gc_draw(infoCanvas,SCR.safeX,0,0,SCR.k)
end end
--Draw Logs
LOG.draw()
gc_replaceTransform(SCR.origin)
--Draw scene swapping animation --Draw scene swapping animation
if SCN.swapping then if SCN.swapping then
gc_setColor(1,1,1) gc_setColor(1,1,1)
_=SCN.stat _=SCN.stat
_.draw(_.time) _.draw(_.time)
end end
gc_replaceTransform(SCR.xOy_dm)
--Draw Version string
gc_setColor(.8,.8,.8,.4)
setFont(20)
mStr(VERSION.string,0,-30)
gc_replaceTransform(SCR.xOy_dl) gc_replaceTransform(SCR.xOy_dl)
--Draw FPS --Draw FPS
setFont(15) setFont(15)
@@ -651,11 +654,6 @@ function love.run()
gc_setColor(1,0,0,t3)gc.rectangle('fill',-20,20*i-100,-20,-20) gc_setColor(1,0,0,t3)gc.rectangle('fill',-20,20*i-100,-20,-20)
end end
end end
gc_replaceTransform(SCR.xOy_dm)
--Draw Version string
gc_setColor(.8,.8,.8,.4)
setFont(20)
mStr(VERSION.string,0,-30)
gc_present() gc_present()
--SPEED UPUPUP! --SPEED UPUPUP!

11
Zframework/log.lua
View File

@@ -1,8 +1,8 @@
local gc=love.graphics local gc=love.graphics
local gc_setColor,gc_print=gc.setColor,gc.print local gc_setColor,gc_print=gc.setColor,gc.print
local int,max,min=math.floor,math.max,math.min local int,min=math.floor,math.min
local ins,rem=table.insert,table.remove local ins,rem=table.insert,table.remove
local SCR,setFont=SCR,setFont local setFont=setFont
local mesList={} local mesList={}
local mesHistory={ local mesHistory={
@@ -27,17 +27,16 @@ function LOG.update()
end end
function LOG.draw() function LOG.draw()
if mesList[1]then if mesList[1]then
local k=SCR.w/SCR.w0 setFont(20)
setFont(max(int(4*k)*5,5))
for i=1,#mesList do for i=1,#mesList do
local M=mesList[i] local M=mesList[i]
M.rgba[4]=M.blink>0 and int(M.blink/3)%2 or min(M.time/26,1) M.rgba[4]=M.blink>0 and int(M.blink/3)%2 or min(M.time/26,1)
gc_setColor(M.rgba) gc_setColor(M.rgba)
gc_print(M.text,10+(20-min(M.time,20))^1.5/4,25*i*k) gc_print(M.text,10+(20-min(M.time,20))^1.5/4,25*i)
end end
end end
end end
function LOG.print(text,T)--text,type/time/color,color function LOG.print(text,T)--text,type/time
local color=COLOR.Z local color=COLOR.Z
local his,time local his,time
if T=='message'then if T=='message'then