ghost和center透明度可调，部分设置值域改为[0%,100%]，控件交互优化，滑条显示当前值

2020-08-27 03:52:13 +08:00
parent f6ff36c142
commit b9722dcca1
14 changed files with 198 additions and 144 deletions
--- a/Zframework/bgm.lua
+++ b/Zframework/bgm.lua
@@ -3,7 +3,7 @@ local rem=table.remove

 local function fadeOut(id)
 	local src=BGM.list[id]
-	local v=src:getVolume()-.025*setting.bgm*.01
+	local v=src:getVolume()-.025*setting.bgm
 	src:setVolume(v>0 and v or 0)
 	if v<=0 then
 		src:stop()
@@ -12,10 +12,10 @@ local function fadeOut(id)
 end
 local function fadeIn(id)
 	local src=BGM.list[id]
-	local v=setting.bgm*.01
+	local v=setting.bgm
 	v=min(v,src:getVolume()+.025*v)
 	src:setVolume(v)
-	if v>=setting.bgm*.01 then return true end
+	if v>=setting.bgm then return true end
 end

 local BGM={
@@ -68,7 +68,7 @@ function BGM.play(s)
 end
 function BGM.freshVolume()
 	if BGM.playing then
-		local v=setting.bgm*.01
+		local v=setting.bgm
 		if v>0 then
 			BGM.playing:setVolume(v)
 			if BGM.suspend then
@@ -76,9 +76,10 @@ function BGM.freshVolume()
 				BGM.nowPlay,BGM.suspend=BGM.suspend
 			end
 		else
-			BGM.playing:setVolume(0)
-			BGM.playing:pause()
-			BGM.suspend,BGM.nowPlay=BGM.nowPlay
+			if BGM.nowPlay then
+				BGM.playing:pause()
+				BGM.suspend,BGM.nowPlay=BGM.nowPlay
+			end
 		end
 	end
 end
--- a/Zframework/init.lua
+++ b/Zframework/init.lua
@@ -725,7 +725,7 @@ function touchDown.play(id,x,y)
 	if t then
 		players[1]:pressKey(t)
 		if setting.VKSFX>0 then
-			SFX.play("virtualKey",setting.VKSFX*.25)
+			SFX.play("virtualKey",setting.VKSFX)
 		end
 		virtualkey[t].isDown=true
 		virtualkey[t].pressTime=10
@@ -878,6 +878,7 @@ end
 function love.mousereleased(x,y,k,touch,num)
 	if touch or SCN.swapping then return end
 	mx,my=xOy:inverseTransformPoint(x,y)
+	WIDGET.release(mx,my)
 	if mouseUp[SCN.cur]then
 		mouseUp[SCN.cur](mx,my,k)
 	end
@@ -926,6 +927,7 @@ function love.touchreleased(id,x,y)
 	x,y=xOy:inverseTransformPoint(x,y)
 	if id==touching then
 		WIDGET.press(x,y)
+		WIDGET.release(x,y)
 		touching=nil
 		WIDGET.sel=nil
 	end
--- a/Zframework/paint.lua
+++ b/Zframework/paint.lua
@@ -657,9 +657,6 @@ function Pnt.setting_sound()
 	gc.translate(-x,-y)
 end

-local function timeConv(t)
-	return t.."F "..int(t*16.67).."ms"
-end
 function Pnt.setting_control()
 	--Testing grid line
 	gc.setLineWidth(4)
@@ -680,14 +677,6 @@ function Pnt.setting_control()
 	setFont(50)
 	gc.printf(text.preview,320,540,200,"right")

-	--Floating number
-	setFont(30)
-	local _=setting
-	mStr(timeConv(_.das),226+35*_.das,145)
-	mStr(timeConv(_.arr),226+35*_.arr,235)
-	mStr(timeConv(_.sddas),226+35*_.sddas,325)
-	mStr(timeConv(_.sdarr),226+35*_.sdarr,415)
-
 	--Testing O mino
 	_=blockSkin[setting.skin[6]]
 	local x=550+40*sceneTemp.pos
--- a/Zframework/sfx.lua
+++ b/Zframework/sfx.lua
@@ -52,13 +52,13 @@ function SFX.play(s,vol,pos)
 	S=S[n]--AU_SRC
 	if S:getChannelCount()==1 then
 		if pos then
-			pos=pos*setting.stereo*.1
+			pos=pos*setting.stereo
 			S:setPosition(pos,1-pos^2,0)
 		else
 			S:setPosition(0,0,0)
 		end
 	end
-	S:setVolume(((vol or 1)*setting.sfx*.01)^1.626)
+	S:setVolume(((vol or 1)*setting.sfx)^1.626)
 	S:play()
 end
 function SFX.fplay(s,vol,pos)
@@ -76,13 +76,13 @@ function SFX.fplay(s,vol,pos)
 	S=S[n]--AU_SRC
 	if S:getChannelCount()==1 then
 		if pos then
-			pos=pos*setting.stereo*.1
+			pos=pos*setting.stereo
 			S:setPosition(pos,1-pos^2,0)
 		else
 			S:setPosition(0,0,0)
 		end
 	end
-	S:setVolume((vol*.01)^1.626)
+	S:setVolume(vol^1.626)
 	S:play()
 end
 function SFX.reset()
--- a/Zframework/voice.lua
+++ b/Zframework/voice.lua
@@ -91,13 +91,13 @@ function VOC.update()
 			end
 		elseif Q.s==1 then--Waiting load source
 			Q[1]=getVoice(Q[1])
-			Q[1]:setVolume(setting.voc*.01)
+			Q[1]:setVolume(setting.voc)
 			Q[1]:play()
 			Q.s=Q[2]and 2 or 4
 		elseif Q.s==2 then--Playing 1,ready 2
 			if Q[1]:getDuration()-Q[1]:tell()<.08 then
 				Q[2]=getVoice(Q[2])
-				Q[2]:setVolume(setting.voc*.01)
+				Q[2]:setVolume(setting.voc)
 				Q[2]:play()
 				Q.s=3
 			end
--- a/Zframework/widget.lua
+++ b/Zframework/widget.lua
@@ -4,6 +4,7 @@ local int,abs=math.floor,math.abs
 local format=string.format
 local color=color
 local setFont=setFont
+local Timer=love.timer.getTime

 local button={
 	type="button",
@@ -183,6 +184,21 @@ local slider={
 	ATV=0,--Activating time(0~8)
 	pos=0,--Position shown
 }
+local sliderShowFunc={
+	int=function(S)
+		return S.disp()
+	end,
+	float=function(S)
+		return int(S.disp()*100)*.01
+	end,
+	percent=function(S)
+		return int(S.disp()*100).."%"
+	end,
+	frame_time=function(S)
+		S=S.disp()
+		return S.."F "..int(S*16.67).."ms"
+	end,
+}
 function slider:reset()
 	self.ATV=0
 	self.pos=0
@@ -212,7 +228,7 @@ function slider:draw()
 	gc.setColor(1,1,1,.5+ATV*.06)

 	--Units
-	if self.showUnit then
+	if not self.smooth then
 		gc.setLineWidth(2)
 		for p=0,self.unit do
 			local x=x+(x2-x)*p/self.unit
@@ -225,17 +241,24 @@ function slider:draw()
 	gc.line(x,y,x2,y)

 	--Block
-	local bx,by,bw,bh=x+(x2-x)*self.pos/self.unit-10-ATV*.5,y-16-ATV,20+ATV,32+2*ATV
+	local cx=x+(x2-x)*self.pos/self.unit
+	local bx,by,bw,bh=cx-10-ATV*.5,y-16-ATV,20+ATV,32+2*ATV
 	gc.setColor(.8,.8,.8)
 	gc.rectangle("fill",bx,by,bw,bh)
+
+	local t
 	if ATV>0 then
 		gc.setLineWidth(2)
 		gc.setColor(1,1,1,ATV*.16)
 		gc.rectangle("line",bx+1,by+1,bw-2,bh-2)
+		if self.show then
+			setFont(25)
+			mStr(self:show(),cx,by-30)
+		end
 	end

 	--Text
-	local t=self.text
+	t=self.text
 	if t then
 		gc.setColor(1,1,1)
 		setFont(self.font)
@@ -369,14 +392,34 @@ function WIDGET.newSlider(D)
 			D.x+D.w,D.y,
 		},

-		unit=	D.unit,
-		showUnit=not D.noUnit,
+		unit=	D.unit or 1,
+		--smooth=nil,
 		font=	D.font,
 		change=	D.change,
 		disp=	D.disp,
 		code=	D.code,
 		hide=	D.hide,
-	}for k,v in next,slider do _[k]=v end return _
+		--show=	nil,
+
+		lastTime=0,
+	}
+	if D.smooth~=nil then
+		_.smooth=D.smooth
+	else
+		_.smooth=_.unit<=1
+	end
+	if D.show then
+		if type(D.show)=="function"then
+			_.show=D.show
+		else
+			_.show=sliderShowFunc[D.show]
+		end
+	elseif _.unit<=1 then
+		_.show=sliderShowFunc.percent
+	else
+		_.show=sliderShowFunc.int
+	end
+	for k,v in next,slider do _[k]=v end return _
 end

 function WIDGET.moveCursor(x,y)
@@ -402,11 +445,7 @@ function WIDGET.press(x,y)
 		W.code()
 		SFX.play("move",.6)
 	elseif W.type=="slider"then
-		if not x then return end
-		local p,P=W.disp(),x<W.x and 0 or x>W.x+W.w and W.unit or int((x-W.x)*W.unit/W.w+.5)
-		if p==P then return end
-		W.code(P)
-		if W.change then W.change()end
+		WIDGET.drag(x,y)
 	end
 	if W.hide and W.hide()then WIDGET.sel=nil end
 end
@@ -414,14 +453,32 @@ function WIDGET.drag(x,y,dx,dy)
 	local W=WIDGET.sel
 	if not W then return end
 	if W.type=="slider"then
-		local p,P=W.disp(),x<W.x and 0 or x>W.x+W.w and W.unit or int((x-W.x)*W.unit/W.w+.5)
-		if p==P then return end
-		W.code(P)
-		if W.change then W.change()end
+		if not x then return end
+		local p=W.disp()
+		local P=x<W.x and 0 or x>W.x+W.w and W.unit or(x-W.x)/W.w*W.unit
+		if not W.smooth then
+			P=int(P+.5)
+		end
+		if p~=P then
+			W.code(P)
+		end
+		if W.change and Timer()-W.lastTime>.18 then
+			W.lastTime=Timer()
+			W.change()
+		end
 	elseif not W:isAbove(x,y)then
 		WIDGET.sel=nil
 	end
 end
+function WIDGET.release(x,y)
+	local W=WIDGET.sel
+	if not W then return end
+	if W.type=="slider"then
+		W.lastTime=0
+		WIDGET.drag(x,y)
+	end
+	WIDGET.sel=nil
+end
 function WIDGET.keyPressed(i)
 	if i=="space"or i=="return"then
 		if WIDGET.sel then
--- a/Zframework/widgetList.lua
+++ b/Zframework/widgetList.lua
@@ -1,3 +1,4 @@
+local rnd=math.random
 local ins,rem=table.insert,table.remove
 local mobileHide=(system=="Android"or system=="iOS")and function()return true end
 local function BACK()SCN.back()end
@@ -138,7 +139,7 @@ local Widgets={
 		newButton({name="back",		x=1200,y=655,w=120,h=80,color="white",	font=40,code=BACK}),
 	},
 	music={
-		newSlider({name="bgm",		x=760,	y=80,	w=400,unit=100,	noUnit=true,	font=35,change=function()BGM.freshVolume()end,disp=SETval("bgm"),code=SETsto("bgm")}),
+		newSlider({name="bgm",		x=760,	y=80,	w=400,							font=35,disp=SETval("bgm"),code=function(v)setting.bgm=v;BGM.freshVolume()end}),
 		newButton({name="up",		x=1100,	y=200,	w=120,h=120,	color="white",	font=55,code=pressKey("up")}),
 		newButton({name="play",		x=1100,	y=340,	w=120,h=120,	color="white",	font=35,code=pressKey("space"),hide=function()return setting.bgm==0 end}),
 		newButton({name="down",		x=1100,	y=480,	w=120,h=120,	color="white",	font=55,code=pressKey("down")}),
@@ -241,7 +242,7 @@ local Widgets={
 		newButton({name="ctrl",		x=290,	y=220,	w=320,h=80,	color="lYellow",font=35,code=function()SCN.go("setting_control")end}),
 		newButton({name="key",		x=640,	y=220,	w=320,h=80,	color="lGreen",	font=35,code=function()SCN.go("setting_key")end}),
 		newButton({name="touch",	x=990,	y=220,	w=320,h=80,	color="lBlue",	font=35,code=function()SCN.go("setting_touch")end}),
-		newSlider({name="reTime",	x=350,	y=340,	w=300,unit=10,				font=30,disp=SETval("reTime"),	code=SETsto("reTime")}),
+		newSlider({name="reTime",	x=350,	y=340,	w=300,unit=10,				font=30,disp=SETval("reTime"),	code=SETsto("reTime"),show=function(S)return(.5+S.disp()*.25).."s"end}),
 		newSlider({name="maxNext",	x=350,	y=440,	w=300,unit=6,				font=30,disp=SETval("maxNext"),	code=SETsto("maxNext")}),
 		newButton({name="layout",	x=460,	y=540,	w=140,h=70,color="white",	font=35,code=function()
 			SCN.go("setting_skin")
@@ -255,11 +256,11 @@ local Widgets={
 	setting_video={
 		newButton({name="sound",	x=200,	y=80,w=240,h=80,color="lCyan",font=35,code=function()SCN.swapTo("setting_sound","swipe")end}),
 		newButton({name="game",		x=1080,	y=80,w=240,h=80,color="lCyan",font=35,code=function()SCN.swapTo("setting_game","swipe")end}),
-		newSwitch({name="ghost",	x=250,	y=180,font=35,				disp=SETval("ghost"),	code=SETrev("ghost")}),
-		newSwitch({name="smooth",	x=250,	y=260,font=25,				disp=SETval("smooth"),	code=SETrev("smooth")}),
-		newSwitch({name="center",	x=500,	y=180,font=35,				disp=SETval("center"),	code=SETrev("center")}),
-		newSwitch({name="grid",		x=500,	y=260,font=35,				disp=SETval("grid"),	code=SETrev("grid")}),
-		newSwitch({name="bagLine",	x=730,	y=180,font=30,				disp=SETval("bagLine"),	code=SETrev("bagLine")}),
+		newSlider({name="ghost",	x=250,	y=180,w=200,unit=.6,noUnit=true,font=35,disp=SETval("ghost"),show="percent",code=SETsto("ghost")}),
+		newSlider({name="center",	x=600,	y=180,w=200,unit=1,	font=35,disp=SETval("center"),	code=SETsto("center")}),
+		newSwitch({name="smooth",	x=260,	y=260,				font=25,disp=SETval("smooth"),	code=SETrev("smooth")}),
+		newSwitch({name="grid",		x=480,	y=260,				font=35,disp=SETval("grid"),	code=SETrev("grid")}),
+		newSwitch({name="bagLine",	x=700,	y=260,				font=30,disp=SETval("bagLine"),	code=SETrev("bagLine")}),
 		newSlider({name="lockFX",	x=350,	y=340,w=373,unit=5,	font=32,disp=SETval("lockFX"),	code=SETsto("lockFX")}),
 		newSlider({name="dropFX",	x=350,	y=390,w=373,unit=5,	font=32,disp=SETval("dropFX"),	code=SETsto("dropFX")}),
 		newSlider({name="moveFX",	x=350,	y=440,w=373,unit=5,	font=32,disp=SETval("moveFX"),	code=SETsto("moveFX")}),
@@ -294,21 +295,21 @@ local Widgets={
 		newButton({name="back",		x=1140,	y=650,w=200,h=80,color="white",font=40,code=BACK}),
 	},
 	setting_sound={
-		newButton({name="game",		x=200,	y=80,w=240,h=80,color="lCyan",font=35,code=function()SCN.swapTo("setting_game","swipe")end}),
-		newButton({name="graphic",	x=1080,	y=80,w=240,h=80,color="lCyan",font=35,code=function()SCN.swapTo("setting_video","swipe")end}),
-		newSlider({name="sfx",		x=180,	y=200,w=400,unit=100,noUnit=true,font=35,change=function()SFX.play("blip_1")end,						disp=SETval("sfx"),		code=SETsto("sfx")}),
-		newSlider({name="stereo",	x=180,	y=500,w=400,unit=10,			font=35,change=function()SFX.play("move",1,-1)SFX.play("lock",1,1)end,	disp=SETval("stereo"),	code=SETsto("stereo"),hide=function()return setting.sfx==0 end}),
-		newSlider({name="spawn",	x=180,	y=300,w=400,unit=100,noUnit=true,font=30,change=function()SFX.fplay("spawn_1",setting.spawn)end,		disp=SETval("spawn"),	code=SETsto("spawn")}),
-		newSlider({name="bgm",		x=180,	y=400,w=400,unit=100,noUnit=true,font=35,change=function()BGM.freshVolume()end,							disp=SETval("bgm"),		code=SETsto("bgm")}),
-		newSlider({name="vib",		x=750,	y=200,w=400,unit=5,				font=28,change=function()VIB(2)end,										disp=SETval("vib"),		code=SETsto("vib")}),
-		newSlider({name="voc",		x=750,	y=300,w=400,unit=100,noUnit=true,font=32,change=function()VOC.play("nya")end,							disp=SETval("voc"),		code=SETsto("voc")}),
-		newButton({name="back",		x=1140,	y=650,w=200,h=80,color="white",font=40,code=BACK}),
+		newButton({name="game",		x=200,	y=80,w=240,h=80,color="lCyan",	font=35,code=function()SCN.swapTo("setting_game","swipe")end}),
+		newButton({name="graphic",	x=1080,	y=80,w=240,h=80,color="lCyan",	font=35,code=function()SCN.swapTo("setting_video","swipe")end}),
+		newSlider({name="sfx",		x=180,	y=200,w=400,					font=35,change=function()SFX.play("blip_1")end,						disp=SETval("sfx"),		code=SETsto("sfx")}),
+		newSlider({name="stereo",	x=180,	y=500,w=400,					font=35,change=function()SFX.play("move",1,-1)SFX.play("lock",1,1)end,disp=SETval("stereo"),code=SETsto("stereo"),hide=function()return setting.sfx==0 end}),
+		newSlider({name="spawn",	x=180,	y=300,w=400,					font=30,change=function()SFX.fplay("spawn_"..rnd(7),setting.spawn)end,disp=SETval("spawn"),	code=SETsto("spawn")}),
+		newSlider({name="bgm",		x=180,	y=400,w=400,					font=35,change=function()BGM.freshVolume()end,						disp=SETval("bgm"),		code=SETsto("bgm")}),
+		newSlider({name="vib",		x=750,	y=200,w=400,	unit=5,			font=28,change=function()VIB(2)end,									disp=SETval("vib"),		code=SETsto("vib")}),
+		newSlider({name="voc",		x=750,	y=300,w=400,					font=32,change=function()VOC.play("nya")end,						disp=SETval("voc"),		code=SETsto("voc")}),
+		newButton({name="back",		x=1140,	y=650,w=200,h=80,color="white",	font=40,code=BACK}),
 	},
 	setting_control={
-		newSlider({name="das",		x=226,	y=200,w=910,	unit=26,	font=30,disp=SETval("das"),		code=SETsto("das")}),
-		newSlider({name="arr",		x=226,	y=290,w=525,	unit=15,	font=30,disp=SETval("arr"),		code=SETsto("arr")}),
-		newSlider({name="sddas",	x=226,	y=380,w=350,	unit=10,	font=30,disp=SETval("sddas"),	code=SETsto("sddas")}),
-		newSlider({name="sdarr",	x=226,	y=470,w=140,	unit=4,		font=30,disp=SETval("sdarr"),	code=SETsto("sdarr")}),
+		newSlider({name="das",		x=226,	y=200,w=910,	unit=26,	font=30,disp=SETval("das"),		show="frame_time",code=SETsto("das")}),
+		newSlider({name="arr",		x=226,	y=290,w=525,	unit=15,	font=30,disp=SETval("arr"),		show="frame_time",code=SETsto("arr")}),
+		newSlider({name="sddas",	x=226,	y=380,w=350,	unit=10,	font=30,disp=SETval("sddas"),	show="frame_time",code=SETsto("sddas")}),
+		newSlider({name="sdarr",	x=226,	y=470,w=140,	unit=4,		font=30,disp=SETval("sdarr"),	show="frame_time",code=SETsto("sdarr")}),
 		newSwitch({name="ihs",		x=1100,	y=290,font=30,				disp=SETval("ihs"),				code=SETrev("ihs")}),
 		newSwitch({name="irs",		x=1100,	y=380,font=30,				disp=SETval("irs"),				code=SETrev("irs")}),
 		newSwitch({name="ims",		x=1100,	y=470,font=30,				disp=SETval("ims"),				code=SETrev("ims")}),
@@ -394,7 +395,7 @@ local Widgets={
 				SCN.go("setting_touchSwitch")
 			end}),
 		newButton({name="back",		x=760,y=180,w=170,h=80,color="white",font=40,code=BACK}),
-		newSlider({name="size",		x=450,y=265,w=460,unit=14,font=40,
+		newSlider({name="size",		x=450,y=265,w=460,unit=14,font=40,show="vkSize",
 			disp=function()
 				return VK_org[sceneTemp.sel].r/10-1
 			end,
@@ -432,8 +433,8 @@ local Widgets={
 		newButton({name="pro",		x=1120,	y=100,	w=240,h=80,color="white",font=35,code=function()for i=1,20 do VK_org[i].ava=true end end}),
 		newSwitch({name="hide",		x=1170,	y=200,	font=40,disp=SETval("VKSwitch"),code=SETrev("VKSwitch")}),
 		newSwitch({name="track",	x=1170,	y=300,	font=35,disp=SETval("VKTrack"),code=SETrev("VKTrack")}),
-		newSlider({name="sfx",		x=800,	y=380,	w=180,unit=4,font=40,change=function()SFX.play("virtualKey",setting.VKSFX*.25)end,disp=SETval("VKSFX"),code=SETsto("VKSFX")}),
-		newSlider({name="vib",		x=800,	y=460,	w=180,unit=2,font=40,change=function()VIB(setting.VKVIB)end,disp=SETval("VKVIB"),code=SETsto("VKVIB")}),
+		newSlider({name="sfx",		x=800,	y=380,	w=180,			font=40,change=function()SFX.play("virtualKey",setting.VKSFX)end,disp=SETval("VKSFX"),code=SETsto("VKSFX")}),
+		newSlider({name="vib",		x=800,	y=460,	w=180,unit=2,	font=40,change=function()VIB(setting.VKVIB)end,disp=SETval("VKVIB"),code=SETsto("VKVIB")}),
 		newSwitch({name="icon",		x=850,	y=300,	font=40,disp=SETval("VKIcon"),code=SETrev("VKIcon")}),
 		newButton({name="tkset",	x=1120,	y=420,	w=240,h=80,color="white",font=32,
 			code=function()
@@ -442,7 +443,7 @@ local Widgets={
 			hide=function()
 				return not setting.VKTrack
 			end}),
-		newSlider({name="alpha",	x=840,	y=540,	w=400,unit=10,font=40,disp=SETval("VKAlpha"),code=SETsto("VKAlpha")}),
+		newSlider({name="alpha",	x=840,	y=540,	w=400,font=40,disp=SETval("VKAlpha"),code=SETsto("VKAlpha")}),
 		newButton({name="back",		x=1120,	y=620,	w=200,h=80,color="white",font=45,code=BACK}),
 	},
 	setting_trackSetting={