Skip to content

Commit

Permalink
优化音乐室曲名显示效果
Browse files Browse the repository at this point in the history
框架跟进
  • Loading branch information
MrZ626 committed Jul 11, 2024
1 parent 3f9544c commit db3d373
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 19 deletions.
2 changes: 1 addition & 1 deletion Zenitha
Submodule Zenitha updated 3 files
+65 −58 gcExtend.lua
+1 −1 init.lua
+14 −9 text.lua
2 changes: 1 addition & 1 deletion assets/game/exteriorMap.lua
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ function map:draw()
FONT.set(30)
gc_setColor(COLOR.L)
local modeInfo=Text.exteriorModeInfo[m.name]
GC.shadedPrint(modeInfo and modeInfo[1] or m.name,0,-21,'center',2,4)
GC.strokePrint('side',2,COLOR.D,COLOR.L,modeInfo and modeInfo[1] or m.name,0,-21,'center')

-- Selecting frame
if m==selected or m.active>.001 then
Expand Down
2 changes: 1 addition & 1 deletion assets/game/mechanicLib/brik/stack.lua
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ function stack.event_drawOnPlayer(P)
GC.scale(2)
local fontSize=lineFont[min(md.stack_lines,26)]
FONT.set(fontSize,'bold')
GC.shadedPrint(md.stack_lines,0,-fontSize*.5,'center',2,8,COLOR.lD,COLOR.L)
GC.strokePrint('full',2,COLOR.lD,COLOR.L,md.stack_lines,0,-fontSize*.5,'center')
GC.pop()
end
end
Expand Down
10 changes: 5 additions & 5 deletions assets/scene/about_out.lua
Original file line number Diff line number Diff line change
Expand Up @@ -126,17 +126,17 @@ function scene.draw()
GC.mDraw(love_logo,160,300,-.785398+t*4.2-math.sin(t*4.2),.7033)

FONT.set(35)
GC.shadedPrint(Text.about_module,300,230,'left',2,4)
GC.strokePrint('side',2,COLOR.D,COLOR.L,Text.about_module,300,230,'left')
local m=modules[math.floor(t)%#modules+1]
FONT.set(50)
GC.shadedPrint(m[1],300,270,'left',2,4)
GC.strokePrint('side',2,COLOR.D,COLOR.L,m[1],300,270,'left')
FONT.set(30)
GC.shadedPrint(m[2],300,330,'left',2,4)
GC.strokePrint('side',2,COLOR.D,COLOR.L,m[2],300,330,'left')

FONT.set(35)
GC.shadedPrint(Text.about_toolchain,942,230,'left',2,4)
GC.strokePrint('side',2,COLOR.D,COLOR.L,Text.about_toolchain,942,230,'left')
FONT.set(50)
GC.shadedPrint(toolchain[math.floor(t)%#toolchain+1],942,270,'left',2,4)
GC.strokePrint('side',2,COLOR.D,COLOR.L,toolchain[math.floor(t)%#toolchain+1],942,270,'left')
end

scene.widgetList={
Expand Down
10 changes: 5 additions & 5 deletions assets/scene/app_dropper.lua
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ function scene.draw()

if state=='menu' or state=='dead' then
setFont(100)
GC.shadedPrint("DROPPER",800,150,'center',4,8,COLOR.L,COLOR.L)
GC.strokePrint('full',4,COLOR.L,COLOR.L,"DROPPER",800,150,'center')
gc.setColor(COLOR.rainbow_light(love.timer.getTime()*2.6))
mStr("DROPPER",800,150)

Expand All @@ -215,13 +215,13 @@ function scene.draw()
gc.line(-overflowWidth,y,SCR.w0+overflowWidth,y)

setFont(60)
GC.shadedPrint(floor+1,move.x+move.w+10,move.y-15,'left',3,8,COLOR.L,COLOR.D)
GC.shadedPrint(floor,base.x+base.w+10,base.y-15,'left',3,8,COLOR.L,COLOR.D)
GC.strokePrint('full',3,COLOR.L,COLOR.D,floor+1,move.x+move.w+10,move.y-15,'left')
GC.strokePrint('full',3,COLOR.L,COLOR.D,floor,base.x+base.w+10,base.y-15,'left')

GC.shadedPrint(message,800,0,'center',3,8,COLOR.L,COLOR.D)
GC.strokePrint('full',3,COLOR.L,COLOR.D,message,800,0,'center')

setFont(70)
GC.shadedPrint(score,100,40,'center',3,8,COLOR.L,COLOR.D)
GC.strokePrint('full',3,COLOR.L,COLOR.D,score,100,40,'center')

gc.setColor(COLOR.L)
gc.rectangle('fill',move.x-brickStroke,move.y-brickStroke,move.w+2*brickStroke,brickHeight+2*brickStroke)
Expand Down
2 changes: 1 addition & 1 deletion assets/scene/app_schulteG.lua
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ function scene.draw()
gc.setColor(COLOR.L)
gc.rectangle('line',area.x+(j-1)*width,area.y+(i-1)*width,width,width)
if not mono then
GC.shadedPrint(N,area.x+(j-.5)*width,area.y+(i-.5)*width-f*.67,'center',3,8,COLOR.D)
GC.strokePrint('full',3,COLOR.D,COLOR.L,N,area.x+(j-.5)*width,area.y+(i-.5)*width-f*.67,'center')
end
end
end
Expand Down
6 changes: 3 additions & 3 deletions assets/scene/keyset_press.lua
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ function scene.draw()
end

GC.replaceTransform(SCR.xOy_m)
FONT.set(100) GC.shadedPrint(Text[keyLangStr],0,-200,'center',4,8)
FONT.set(60) GC.shadedPrint(result or Text.keyset_pressKey,0,-40,'center',2,8)
FONT.set(35) GC.shadedPrint(Text.keyset_info,0,80,'center',2,8)
FONT.set(100) GC.strokePrint('full',4,COLOR.D,COLOR.L,Text[keyLangStr],0,-200,'center')
FONT.set(60) GC.strokePrint('full',2,COLOR.D,COLOR.L,result or Text.keyset_pressKey,0,-40,'center')
FONT.set(35) GC.strokePrint('full',2,COLOR.D,COLOR.L,Text.keyset_info,0,80,'center')

GC.replaceTransform(SCR.xOy)
if SETTINGS.system.touchControl then VCTRL.draw() end
Expand Down
12 changes: 10 additions & 2 deletions assets/scene/musicroom.lua
Original file line number Diff line number Diff line change
Expand Up @@ -266,10 +266,18 @@ function scene.draw()
local t=love.timer.getTime()
if SONGBOOK[selected].inside then
gc_setColor(1,1,1,MATH.roundUnit(.5+sin(6.2*t)*.26,.26))
gc.draw(titleTextObj,-100,-100,0,min(1,650/titleTextObj:getWidth()),nil,titleTextObj:getWidth(),titleTextObj:getHeight())
else
gc_setColor(sin(t*.5)*.2+.8,sin(t*.7)*.2+.8,sin(t)*.2+.8)
local ox,oy=titleTextObj:getWidth(),titleTextObj:getHeight()
local sx=min(1,650/ox)
local r,g,b=sin(t*.5)*.2+.8,sin(t*.7)*.2+.8,sin(t)*.2+.8
gc_setColor(r*.2,g*.2,b*.2)
GC.strokeDraw('full',4,titleTextObj,-100,-100,0,sx,nil,ox,oy)
gc_setColor(r*.4,g*.4,b*.4)
GC.strokeDraw('side',2,titleTextObj,-100,-100,0,sx,nil,ox,oy)
gc_setColor(r,g,b)
gc.draw(titleTextObj,-100,-100,0,sx,nil,ox,oy)
end
gc.draw(titleTextObj,-100,-100,0,min(1,650/titleTextObj:getWidth()),nil,titleTextObj:getWidth(),titleTextObj:getHeight())

-- Author and message
setFont(50)
Expand Down

0 comments on commit db3d373

Please sign in to comment.