From 276a37361ed8fec1729b4719714d61144be4e261 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Wed, 26 May 2021 18:43:25 +0800
Subject: [PATCH] =?UTF-8?q?aDraw=E5=92=8CDOGC=E6=A8=A1=E5=9D=97=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=91=BD=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Zframework/aDraw.lua |  7 +++++++
 Zframework/doGC.lua  | 10 +++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Zframework/aDraw.lua b/Zframework/aDraw.lua
index 89754383..14fa7d27 100644
--- a/Zframework/aDraw.lua
+++ b/Zframework/aDraw.lua
@@ -7,4 +7,11 @@ 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 ba1b7a93..228d519e 100644
--- a/Zframework/doGC.lua
+++ b/Zframework/doGC.lua
@@ -4,6 +4,7 @@ local cmds={
 	move="translate",
 	scale="scale",
 	rotate="rotate",
+	shear="shear",
 	clear="clear",
 
 	setCL="setColor",
@@ -12,10 +13,11 @@ local cmds={
 	setLS="setLineStyle",
 	setLJ="setLineJoin",
 
-	setFT=setFont,
 	print="print",
-	mText=function(...)ADRAW.str(...)end,
-	mDraw=function(...)ADRAW.draw(...)end,
+	setFT=setFont,
+	mText=ADRAW.str,
+	mDraw=ADRAW.draw,
+	mOutDraw=ADRAW.outDraw,
 
 	draw="draw",
 	line="line",
@@ -23,6 +25,8 @@ local cmds={
 	dRect=function(...)gc.rectangle('line',...)end,
 	fCirc=function(...)gc.circle('fill',...)end,
 	dCirc=function(...)gc.circle('line',...)end,
+	fElps=function(...)gc.ellipse('fill',...)end,
+	dElps=function(...)gc.ellipse('line',...)end,
 	fPoly=function(...)gc.polygon('fill',...)end,
 	dPoly=function(...)gc.polygon('line',...)end,