Skip to content

Commit dde04fd

Browse files
MrZ626MrZ626
committed
修改两个设置项的内部和外部名称
滑条默认永久显示当前值 框架跟进
1 parent 04d38d0 commit dde04fd

File tree

10 files changed

+42
-40
lines changed

10 files changed

+42
-40
lines changed

‎Zenitha‎

‎assets/language/lang_en.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ local L={
121121
setting_autoMute="Mute when idle",
122122
setting_showTouch="Show touches",
123123

124-
setting_maxFPS="Max FPS",
125-
setting_updRate="Update rate",
126-
setting_drawRate="Draw rate",
124+
setting_maxTPS="Max TPS",
125+
setting_updateRate="Update rate",
126+
setting_renderRate="Render rate",
127127
setting_msaa="MSAA",
128128
setting_fmod_maxChannel="Max Channel",
129129
setting_fmod_DSPBufferCount="DSPBufferCount",

‎assets/language/lang_eo.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ local L={
121121
setting_autoMute="Silentas kiam la fenestro ne estas fokusita",
122122
setting_showTouch="Montru tuŝajn kontrolojn",
123123

124-
setting_maxFPS=">Maksimuma FPS",
125-
setting_updRate="Update Rate",
126-
setting_drawRate="rapido de ĝisdatigo",
124+
setting_maxTPS="Maksimuma TPS",
125+
setting_updateRate="rapido de aggiornamento",
126+
setting_renderRate="rapido de ĝisdatigo",
127127
setting_msaa="MSAA",
128128
setting_fmod_maxChannel="Maksimumaj kanaloj",
129129
setting_fmod_DSPBufferCount="DSPBufferCount",

‎assets/language/lang_it.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ local L={
121121
setting_autoMute="Muta quando la finestra non è focalizzata",
122122
setting_showTouch="Mostra controlli touch",
123123

124-
setting_maxFPS="FPS Massimi",
125-
setting_updRate="Indice di aggiornamento",
126-
setting_drawRate="Velocità di aggiornamento",
124+
setting_maxTPS="TPS Massimi",
125+
setting_updateRate="Indice di aggiornamento",
126+
setting_renderRate="Velocità di aggiornamento",
127127
setting_msaa="MSAA",
128128
setting_fmod_maxChannel="Canali massimi",
129129
setting_fmod_DSPBufferCount="DSPBufferCount",

‎assets/language/lang_zh.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ local L={
121121
setting_autoMute="闲时静音",
122122
setting_showTouch="显示触摸位置",
123123

124-
setting_maxFPS="最大帧数",
125-
setting_updRate="更新比率",
126-
setting_drawRate="绘制比率",
124+
setting_maxTPS="最大刻数",
125+
setting_updateRate="更新比率",
126+
setting_renderRate="绘制比率",
127127
setting_msaa="抗锯齿",
128128
setting_fmod_maxChannel="最大音频数",
129129
setting_fmod_DSPBufferCount="DSP缓冲区数量",

‎assets/scene/error.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ local scene={}
1616

1717
function scene.load()
1818
ZENITHA.setMaxFPS(60)
19-
ZENITHA.setUpdateFreq(62)
20-
ZENITHA.setDrawFreq(26)
19+
ZENITHA.setUpdateRate(62)
20+
ZENITHA.setRenderRate(26)
2121
FMOD.destroy()
2222
time=0
2323
err=ZENITHA.getErr('#') or {

‎assets/scene/musicroom.lua‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,17 +202,17 @@ function scene.touchDown() scene.focus(true) end
202202
function scene.focus(f) -- Reduce carbon footprint for music lovers
203203
if f then
204204
if noResponseTimer<=0 then
205-
ZENITHA.setMaxFPS(SETTINGS.system.maxFPS)
206-
ZENITHA.setUpdateFreq(SETTINGS.system.updRate)
207-
ZENITHA.setDrawFreq(SETTINGS.system.drawRate)
205+
ZENITHA.setMaxFPS(SETTINGS.system.maxTPS)
206+
ZENITHA.setUpdateRate(SETTINGS.system.updateRate)
207+
ZENITHA.setRenderRate(SETTINGS.system.renderRate)
208208
end
209209
noResponseTimer=6.26
210210
else
211-
ZENITHA.hideCursor()
211+
ZENITHA.setCursorVis()
212212
noResponseTimer=-1
213213
ZENITHA.setMaxFPS(26)
214-
ZENITHA.setUpdateFreq(26)
215-
ZENITHA.setDrawFreq(26)
214+
ZENITHA.setUpdateRate(26)
215+
ZENITHA.setRenderRate(26)
216216
end
217217
end
218218

‎assets/scene/setting_out.lua‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,9 @@ function scene.draw()
5555
end
5656

5757
local function sliderShow_time(S) return S.disp().." ms" end
58-
local function sliderShow_fps(S) return S.disp().." FPS" end
59-
local function sliderShow_mul(S) return S.disp().."%" end
58+
local function sliderShow_maxTPS(S) return S.disp().." TPS" end
59+
local function sliderShow_update(S) return S.disp().."% "..(S.disp()*SETTINGS.system.maxTPS/100).."UPS" end
60+
local function sliderShow_render(S) return S.disp().."% "..(S.disp()*SETTINGS.system.maxTPS/100).."FPS" end
6061

6162
scene.widgetList={
6263
{type='button_fill',pos={0,0},x=120,y=60,w=180,h=70,fillColor='B',cornerR=15,sound_trigger='button_back',fontSize=40,text=backText,code=WIDGET.c_backScn'fadeHeader'},
@@ -107,17 +108,17 @@ scene.widgetList={
107108
end},
108109

109110
-- Video
110-
{name='3',type='slider_fill',pos={0,0},x=340, y=220,w=500,h=30,text=LANG'setting_hitWavePower',widthLimit=260,axis={0,1}, disp=TABLE.func_getVal(SETTINGS.system,'hitWavePower'), code=TABLE.func_setVal(SETTINGS.system,'hitWavePower')},
111-
{name='3',type='slider', pos={0,0},x=340, y=300,w=500, text=LANG'setting_maxFPS', widthLimit=260,axis={120,400,10},smooth=true,disp=TABLE.func_getVal(SETTINGS.system,'maxFPS'), valueShow=sliderShow_fps, code=TABLE.func_setVal(SETTINGS.system,'maxFPS')},
112-
{name='3',type='slider', pos={0,0},x=340, y=380,w=500, text=LANG'setting_updRate', widthLimit=260,axis={20,100,10}, disp=TABLE.func_getVal(SETTINGS.system,'updRate'), valueShow=sliderShow_mul, code=TABLE.func_setVal(SETTINGS.system,'updRate')},
113-
{name='3',type='slider', pos={0,0},x=340, y=460,w=500, text=LANG'setting_drawRate', widthLimit=260,axis={20,100,10}, disp=TABLE.func_getVal(SETTINGS.system,'drawRate'), valueShow=sliderShow_mul, code=TABLE.func_setVal(SETTINGS.system,'drawRate')},
114-
{name='3',type='slider', pos={0,0},x=340, y=540,w=250, text=LANG'setting_msaa', widthLimit=260,axis={0,4,1}, disp=function() return SETTINGS.system.msaa==0 and 0 or math.log(SETTINGS.system.msaa,2) end, valueShow=function(S) return (S.disp()==0 and 0 or 2^S.disp()).."x" end, code=function(v) SETTINGS.system.msaa=v==0 and 0 or 2^v; saveSettings(); if TASK.lock('warnMessage',6.26) then MSG('warn',Text.setting_needRestart,6.26) end end},
115-
{name='3',type='switch', pos={1,0},x=-500,y=220,h=45, text=LANG'setting_sysCursor', widthLimit=260,labelPos='right', disp=TABLE.func_getVal(SETTINGS.system,'sysCursor'), code=TABLE.func_revVal(SETTINGS.system,'sysCursor')},
116-
{name='3',type='switch', pos={1,0},x=-500,y=290,h=45, text=LANG'setting_power', widthLimit=260,labelPos='right', disp=TABLE.func_getVal(SETTINGS.system,'powerInfo'), code=TABLE.func_revVal(SETTINGS.system,'powerInfo')},
117-
{name='3',type='switch', pos={1,0},x=-500,y=360,h=45, text=LANG'setting_clean', widthLimit=260,labelPos='right', disp=TABLE.func_getVal(SETTINGS.system,'cleanCanvas'), code=TABLE.func_revVal(SETTINGS.system,'cleanCanvas')},
118-
{name='3f',type='switch', pos={1,0},x=-500,y=430,h=45, text=LANG'setting_fullscreen', widthLimit=260,labelPos='right', disp=TABLE.func_getVal(SETTINGS.system,'fullscreen'), code=TABLE.func_revVal(SETTINGS.system,'fullscreen')},
119-
{name='3p',type='switch', pos={1,0},x=-500,y=430,h=45, text=LANG'setting_portrait', widthLimit=260,labelPos='right', disp=TABLE.func_getVal(SETTINGS.system,'portrait'), code=function() SETTINGS.system.portrait = not SETTINGS.system.portrait; saveSettings(); if TASK.lock('warnMessage',6.26) then MSG('warn',Text.setting_needRestart,6.26) end end},
120-
{name='3',type='switch', pos={1,0},x=-500,y=500,h=45, text=LANG'setting_showTouch', widthLimit=260,labelPos='right', disp=TABLE.func_getVal(SETTINGS.system,'showTouch'), code=TABLE.func_revVal(SETTINGS.system,'showTouch')},
111+
{name='3', type='slider_fill',pos={0,0},x=340, y=220,w=500,h=30,text=LANG'setting_hitWavePower',widthLimit=260,axis={0,1}, disp=TABLE.func_getVal(SETTINGS.system,'hitWavePower'), code=TABLE.func_setVal(SETTINGS.system,'hitWavePower')},
112+
{name='3', type='slider', pos={0,0},x=340, y=300,w=500, text=LANG'setting_maxTPS', widthLimit=260,axis={120,400,10},smooth=true,disp=TABLE.func_getVal(SETTINGS.system,'maxTPS'), valueShow=sliderShow_maxTPS, code=TABLE.func_setVal(SETTINGS.system,'maxTPS')},
113+
{name='3', type='slider', pos={0,0},x=340, y=380,w=500, text=LANG'setting_updateRate', widthLimit=260,axis={20,100,10}, disp=TABLE.func_getVal(SETTINGS.system,'updateRate'),valueShow=sliderShow_update, code=TABLE.func_setVal(SETTINGS.system,'updateRate')},
114+
{name='3', type='slider', pos={0,0},x=340, y=460,w=500, text=LANG'setting_renderRate', widthLimit=260,axis={20,100,10}, disp=TABLE.func_getVal(SETTINGS.system,'renderRate'),valueShow=sliderShow_render, code=TABLE.func_setVal(SETTINGS.system,'renderRate')},
115+
{name='3', type='slider', pos={0,0},x=340, y=540,w=250, text=LANG'setting_msaa', widthLimit=260,axis={0,4,1}, disp=function() return SETTINGS.system.msaa==0 and 0 or math.log(SETTINGS.system.msaa,2) end, valueShow=function(S) return (S.disp()==0 and 0 or 2^S.disp()).."x" end, code=function(v) SETTINGS.system.msaa=v==0 and 0 or 2^v; saveSettings(); if TASK.lock('warnMessage',6.26) then MSG('warn',Text.setting_needRestart,6.26) end end},
116+
{name='3', type='switch', pos={1,0},x=-500,y=220,h=45, text=LANG'setting_sysCursor', widthLimit=260,labelPos='right', disp=TABLE.func_getVal(SETTINGS.system,'sysCursor'), code=TABLE.func_revVal(SETTINGS.system,'sysCursor')},
117+
{name='3', type='switch', pos={1,0},x=-500,y=290,h=45, text=LANG'setting_power', widthLimit=260,labelPos='right', disp=TABLE.func_getVal(SETTINGS.system,'powerInfo'), code=TABLE.func_revVal(SETTINGS.system,'powerInfo')},
118+
{name='3', type='switch', pos={1,0},x=-500,y=360,h=45, text=LANG'setting_clean', widthLimit=260,labelPos='right', disp=TABLE.func_getVal(SETTINGS.system,'cleanCanvas'), code=TABLE.func_revVal(SETTINGS.system,'cleanCanvas')},
119+
{name='3f',type='switch', pos={1,0},x=-500,y=430,h=45, text=LANG'setting_fullscreen', widthLimit=260,labelPos='right', disp=TABLE.func_getVal(SETTINGS.system,'fullscreen'), code=TABLE.func_revVal(SETTINGS.system,'fullscreen')},
120+
{name='3p',type='switch', pos={1,0},x=-500,y=430,h=45, text=LANG'setting_portrait', widthLimit=260,labelPos='right', disp=TABLE.func_getVal(SETTINGS.system,'portrait'), code=function() SETTINGS.system.portrait = not SETTINGS.system.portrait; saveSettings(); if TASK.lock('warnMessage',6.26) then MSG('warn',Text.setting_needRestart,6.26) end end},
121+
{name='3', type='switch', pos={1,0},x=-500,y=500,h=45, text=LANG'setting_showTouch', widthLimit=260,labelPos='right', disp=TABLE.func_getVal(SETTINGS.system,'showTouch'), code=TABLE.func_revVal(SETTINGS.system,'showTouch')},
121122

122123
-- Gameplay
123124
-- ?

‎assets/settings.lua‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ local settings={
1616
hitWavePower=.6,
1717
fullscreen=true,
1818
portrait=false,
19-
maxFPS=300,
20-
updRate=100,
21-
drawRate=30,
19+
maxTPS=300,
20+
updateRate=100,
21+
renderRate=30,
2222
msaa=4,
2323

2424
-- Gameplay
@@ -77,9 +77,9 @@ local settingTriggers={ -- Changing values in SETTINGS.system will trigger these
7777

7878
-- Video
7979
fullscreen= function(v) love.window.setFullscreen(v); love.resize(love.graphics.getWidth(),love.graphics.getHeight()) end,
80-
maxFPS= function(v) ZENITHA.setMaxFPS(v) end,
81-
updRate= function(v) ZENITHA.setUpdateFreq(v) end,
82-
drawRate= function(v) ZENITHA.setDrawFreq(v) end,
80+
maxTPS= function(v) ZENITHA.setMaxFPS(v) end,
81+
updateRate= function(v) ZENITHA.setUpdateRate(v) end,
82+
renderRate= function(v) ZENITHA.setRenderRate(v) end,
8383
sysCursor= function(v) love.mouse.setVisible(v) end,
8484
clean= function(v) ZENITHA.setCleanCanvas(v) end,
8585

‎main.lua‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@ WIDGET.setDefaultOption{
298298
sound_drag='slider_drag',
299299
soundInterval=.042,
300300
soundPitchRange=7.02,
301+
textAlwaysShow=true,
301302
},
302303
slider_fill={
303304
sound_drag='slider_fill_drag',

0 commit comments

Comments
 (0)