From f6e7e993f5efc5b76f61d52dc1d65a82b09f25d8 Mon Sep 17 00:00:00 2001 From: MrZ_26 <1046101471@qq.com> Date: Mon, 4 Nov 2024 11:01:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AEmsaa=E6=BB=91=E6=9D=A1=E5=9C=A8?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E5=B9=B3=E5=8F=B0=E6=9C=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf.lua | 1 + main.lua | 1 + parts/scenes/setting_video.lua | 9 ++++++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/conf.lua b/conf.lua index 9fd1e2f8..fe854140 100644 --- a/conf.lua +++ b/conf.lua @@ -23,6 +23,7 @@ function love.conf(t) local fileData=fs.read('conf/settings') if fileData then msaa=tonumber(fileData:match('"msaa":(%d+)')) or 0; + msaa=msaa==0 and 0 or 2*msaa portrait=MOBILE and fileData:find('"portrait":true') and true end end diff --git a/main.lua b/main.lua index 85a687f5..7bfe6b96 100644 --- a/main.lua +++ b/main.lua @@ -440,6 +440,7 @@ do if SETTING.reTime>3 or SETTING.reTime<.5 then SETTING.reTime=2 end if SETTING.locale=='zh_full' then SETTING.locale='zh' end if SETTING.vocPack=='rin' then SETTING.vocPack='miku' end + if SETTING.msaa>4 then SETTING.msaa=4 end if RANKS.infinite then RANKS.infinite=0 end if RANKS.infinite_dig then RANKS.infinite_dig=0 end if not RANKS.sprint_10l then RANKS.sprint_10l=0 end diff --git a/parts/scenes/setting_video.lua b/parts/scenes/setting_video.lua index 6b8f947b..6c8ec220 100644 --- a/parts/scenes/setting_video.lua +++ b/parts/scenes/setting_video.lua @@ -91,7 +91,14 @@ scene.widgetList={ WIDGET.newSwitch{name='clean', x=950,y=1100,lim=360,disp=SETval('cleanCanvas'), code=function() SETTING.cleanCanvas=not SETTING.cleanCanvas; applySettings() end}, WIDGET.newSwitch{name='fullscreen', x=950,y=1150,lim=360,disp=SETval('fullscreen'), code=function() SETTING.fullscreen=not SETTING.fullscreen; applySettings() end,hideF=function() return MOBILE end}, WIDGET.newSwitch{name='portrait', x=950,y=1150,lim=360,disp=SETval('portrait'), code=function() SETTING.portrait=not SETTING.portrait; saveSettings(); MES.new('warn',text.settingWarn2,6.26) end,hideF=function() return not MOBILE end}, - WIDGET.newSlider{name='msaa', x=950,y=1220,lim=360,w=200,axis={0,4,1},show=_msaaShow,disp=function() return SETTING.msaa==0 and 0 or math.log(SETTING.msaa,2) end,code=function(v) SETTING.msaa=v==0 and 0 or 2^v; saveSettings(); if TASK.lock('warnMessage',6.26) then MES.new('warn',text.settingWarn2,6.26) end end}, + WIDGET.newSlider{name='msaa', x=950,y=1220,lim=360,w=200,axis={0,4,1},disp=SETval('msaa'),show=_msaaShow, + code=function(v) + SETTING.msaa=v + if TASK.lock('warnMessage',6.26) then + MES.new('warn',text.settingWarn2,6.26) + end + end + }, WIDGET.newKey{name='bg_on', x=680,y=1290,w=200,h=60,font=25,code=function() SETTING.bg='on' ; applySettings() end}, WIDGET.newKey{name='bg_off', x=900,y=1290,w=200,h=60,font=25,code=function() SETTING.bg='off'; applySettings() end},