From 6fff9298566bc63525a5ca9e59ca55d8fa74be63 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Mon, 26 Jul 2021 17:30:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A1=86=E6=9E=B6=EF=BC=8CaD?=
 =?UTF-8?q?raw=E6=A8=A1=E5=9D=97=E6=94=B9=E5=90=8DgcExtend?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Zframework/aDraw.lua    | 17 -----------------
 Zframework/doGC.lua     |  6 +++---
 Zframework/gcExtend.lua | 34 ++++++++++++++++++++++++++++++++++
 Zframework/init.lua     | 12 ++++++------
 Zframework/widget.lua   |  4 ++--
 5 files changed, 45 insertions(+), 28 deletions(-)
 delete mode 100644 Zframework/aDraw.lua
 create mode 100644 Zframework/gcExtend.lua

diff --git a/Zframework/aDraw.lua b/Zframework/aDraw.lua
deleted file mode 100644
index 14fa7d27..00000000
--- a/Zframework/aDraw.lua
+++ /dev/null
@@ -1,17 +0,0 @@
-local printf=love.graphics.printf
-local draw=love.graphics.draw
-local aDraw={}
-function aDraw.str(obj,x,y)printf(obj,x-626,y,1252,'center')end
-function aDraw.simpX(obj,x,y)draw(obj,x-obj:getWidth()*.5,y)end
-function aDraw.simpY(obj,x,y)draw(obj,x,y-obj:getHeight()*.5)end
-function aDraw.X(obj,x,y,a,k)draw(obj,x,y,a,k,nil,obj:getWidth()*.5,0)end
-function aDraw.Y(obj,x,y,a,k)draw(obj,x,y,a,k,nil,0,obj:getHeight()*.5)end
-function aDraw.draw(obj,x,y,a,k)draw(obj,x,y,a,k,nil,obj:getWidth()*.5,obj:getHeight()*.5)end
-function aDraw.outDraw(obj,div,x,y,a,k)
-	local w,h=obj:getWidth()*.5,obj:getHeight()*.5
-	draw(obj,x-div,y-div,a,k,nil,w,h)
-	draw(obj,x-div,y+div,a,k,nil,w,h)
-	draw(obj,x+div,y-div,a,k,nil,w,h)
-	draw(obj,x+div,y+div,a,k,nil,w,h)
-end
-return aDraw
\ No newline at end of file
diff --git a/Zframework/doGC.lua b/Zframework/doGC.lua
index be6e7c7d..f41131a8 100644
--- a/Zframework/doGC.lua
+++ b/Zframework/doGC.lua
@@ -15,9 +15,9 @@ local cmds={
 
 	print="print",
 	setFT=setFont,
-	mText=ADRAW.str,
-	mDraw=ADRAW.draw,
-	mOutDraw=ADRAW.outDraw,
+	mText=GC.str,
+	mDraw=GC.draw,
+	mOutDraw=GC.outDraw,
 
 	draw="draw",
 	line="line",
diff --git a/Zframework/gcExtend.lua b/Zframework/gcExtend.lua
new file mode 100644
index 00000000..be81626e
--- /dev/null
+++ b/Zframework/gcExtend.lua
@@ -0,0 +1,34 @@
+local setColor=love.graphics.setColor
+local printf=love.graphics.printf
+local draw=love.graphics.draw
+local GC={}
+function GC.str(obj,x,y)printf(obj,x-626,y,1252,'center')end
+function GC.simpX(obj,x,y)draw(obj,x-obj:getWidth()*.5,y)end
+function GC.simpY(obj,x,y)draw(obj,x,y-obj:getHeight()*.5)end
+function GC.X(obj,x,y,a,k)draw(obj,x,y,a,k,nil,obj:getWidth()*.5,0)end
+function GC.Y(obj,x,y,a,k)draw(obj,x,y,a,k,nil,0,obj:getHeight()*.5)end
+function GC.draw(obj,x,y,a,k)draw(obj,x,y,a,k,nil,obj:getWidth()*.5,obj:getHeight()*.5)end
+function GC.outDraw(obj,div,x,y,a,k)
+	local w,h=obj:getWidth()*.5,obj:getHeight()*.5
+	draw(obj,x-div,y-div,a,k,nil,w,h)
+	draw(obj,x-div,y+div,a,k,nil,w,h)
+	draw(obj,x+div,y-div,a,k,nil,w,h)
+	draw(obj,x+div,y+div,a,k,nil,w,h)
+end
+function GC.shadedPrint(str,x,y,mode,d,clr1,clr2)
+	local w=1280
+	if mode=='center'then
+		x=x-w*.5
+	elseif mode=='right'then
+		x=x-w
+	end
+	if not d then d=1 end
+	setColor(clr1 or COLOR.D)
+	printf(str,x-d,y-d,w,mode)
+	printf(str,x-d,y+d,w,mode)
+	printf(str,x+d,y-d,w,mode)
+	printf(str,x+d,y+d,w,mode)
+	setColor(clr2 or COLOR.Z)
+	printf(str,x,y,w,mode)
+end
+return GC
\ No newline at end of file
diff --git a/Zframework/init.lua b/Zframework/init.lua
index 9f5c3a71..793afd81 100644
--- a/Zframework/init.lua
+++ b/Zframework/init.lua
@@ -3,17 +3,17 @@ EDITING=""
 LOADED=false
 ERRDATA={}
 
-require'Zframework.setFont'
-ADRAW=require'Zframework.aDraw'
-	mStr=ADRAW.str
-	mText=ADRAW.simpX
-	mDraw=ADRAW.draw
-
 SCR=	require'Zframework.screen'
 COLOR=	require'Zframework.color'
 SCN=	require'Zframework.scene'
 WS=		require'Zframework.websocket'
 
+require'Zframework.setFont'
+GC=require'Zframework.gcExtend'
+	mStr=GC.str
+	mText=GC.simpX
+	mDraw=GC.draw
+
 LOADLIB=require'Zframework.loadLib'
 WHEELMOV=require'Zframework.wheelScroll'
 
diff --git a/Zframework/widget.lua b/Zframework/widget.lua
index 50e821ac..92e89d2b 100644
--- a/Zframework/widget.lua
+++ b/Zframework/widget.lua
@@ -16,7 +16,7 @@ local int,ceil,abs=math.floor,math.ceil,math.abs
 local max,min=math.max,math.min
 local sub,ins,rem=string.sub,table.insert,table.remove
 local getFont,setFont,mStr=getFont,setFont,mStr
-local mDraw,mDraw_X,mDraw_Y=ADRAW.draw,ADRAW.simpX,ADRAW.simpY
+local mDraw,mDraw_X,mDraw_Y=GC.draw,GC.simpX,GC.simpY
 local xOy=SCR.xOy
 
 local downArrowIcon=DOGC{40,25,{'fPoly',0,0,20,25,40,0}}
@@ -681,7 +681,7 @@ function selector:draw()
 
 	--Drawable
 	gc_setColor(self.color)
-	ADRAW.simpX(self.obj,x+w*.5,y+17-21)
+	GC.simpX(self.obj,x+w*.5,y+17-21)
 	gc_setColor(1,1,1)
 	setFont(30)
 	mStr(self.selText,x+w*.5,y+43-21)