From 3a5bff36b2ef9a988d87a02565b4bad4aeb7c25e Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Sun, 25 Apr 2021 10:25:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=8C=89=E9=94=AE=E7=B4=A0?=
 =?UTF-8?q?=E6=9D=90=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81=E7=94=B1TEXTURE?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=A7=BB=E8=87=B3=E8=99=9A=E6=8B=9F=E6=8C=89?=
 =?UTF-8?q?=E9=94=AE=E6=A8=A1=E5=9D=97=E5=86=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/texture.lua    |  8 --------
 parts/virtualKey.lua | 27 ++++++++++++++++-----------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/parts/texture.lua b/parts/texture.lua
index 42e4c80d..953a7c44 100644
--- a/parts/texture.lua
+++ b/parts/texture.lua
@@ -12,14 +12,6 @@ local TEXTURE={}
 gc.setDefaultFilter("nearest","nearest")
 
 
---Virtualkey icons
-gc.setColor(1,1,1)
-local VKI=gc.newImage("media/image/virtualkey.png")
-TEXTURE.VKIcon={}
-for i=1,20 do
-	TEXTURE.VKIcon[i]=NSC(36,36)
-	gc.draw(VKI,(i-1)%5*-36,math.floor((i-1)*.2)*-36)
-end
 
 --Mini blocks
 gc.setColor(1,1,1)
diff --git a/parts/virtualKey.lua b/parts/virtualKey.lua
index 8b9db4f1..53be454e 100644
--- a/parts/virtualKey.lua
+++ b/parts/virtualKey.lua
@@ -1,11 +1,19 @@
+local gc=love.graphics
+
 local SETTING=SETTING
 
-local keys={}
-for i=1,#VK_org do keys[i]={}end--In-game virtualkey layout
+--Virtualkey icons
+local VKIcon={}
+gc.setDefaultFilter("nearest","nearest")
+local VKI=gc.newImage("media/image/virtualkey.png")
+for i=1,20 do VKIcon[i]=DOGC{36,36,{"draw",VKI,(i-1)%5*-36,math.floor((i-1)*.2)*-36}}end
+gc.setDefaultFilter("linear","linear")
 
-local VK={}
+--In-game virtualkey layout data
+local keys={}for i=1,#VK_org do keys[i]={}end
+
+local VK={keys=keys}
 
-VK.keys=keys
 
 function VK.on(x,y)
 	local dist,nearest=1e10
@@ -95,14 +103,11 @@ function VK.update()
 	end
 end
 
-local gc=love.graphics
 local gc_circle,gc_draw,gc_setColor,gc_setLineWidth=gc.circle,gc.draw,gc.setColor,gc.setLineWidth
 function VK.draw()
 	if SETTING.VKSwitch then
 		local a=SETTING.VKAlpha
-		local _
 		if SETTING.VKIcon then
-			local icons=TEXTURE.VKIcon
 			for i=1,#keys do
 				if keys[i].ava then
 					local B=keys[i]
@@ -113,10 +118,10 @@ function VK.draw()
 					gc_circle("line",B.x,B.y,B.r,10)
 
 					--Icon
-					_=keys[i].pressTime
+					local _=keys[i].pressTime
 					local c=B.color
 					gc_setColor(c[1],c[2],c[3],a)
-					gc_draw(icons[i],B.x,B.y,nil,B.r*.026+_*.08,nil,18,18)
+					gc_draw(VKIcon[i],B.x,B.y,nil,B.r*.026+_*.08,nil,18,18)
 
 					--Ripple
 					if _>0 then
@@ -138,7 +143,7 @@ function VK.draw()
 					gc_setColor(1,1,1,a)
 					gc_setLineWidth(B.r*.07)
 					gc_circle("line",B.x,B.y,B.r,10)
-					_=keys[i].pressTime
+					local _=keys[i].pressTime
 					if _>0 then
 						gc_setColor(1,1,1,a*_*.08)
 						gc_circle("fill",B.x,B.y,B.r*.94,10)
@@ -164,7 +169,7 @@ function VK.preview(selected)
 				if SETTING.VKIcon then
 					local c=B.color
 					gc_setColor(c[1],c[2],c[3],SETTING.VKAlpha)
-					gc_draw(TEXTURE.VKIcon[i],B.x,B.y,nil,B.r*.025,nil,18,18)
+					gc_draw(VKIcon[i],B.x,B.y,nil,B.r*.025,nil,18,18)
 				end
 			end
 		end