diff --git a/Zframework/doGC.lua b/Zframework/doGC.lua index c0e42bfe..48193c2e 100644 --- a/Zframework/doGC.lua +++ b/Zframework/doGC.lua @@ -1,16 +1,23 @@ local gc=love.graphics local cmds={ + reset="origin", trans="translate", scale="scale", + rotat="rotate", + setCL="setColor", + setCM="setColorMask", setLW="setLineWidth", + setLS="setLineStyle", + setLJ="setLineJoin", + draw="draw", dLine="line", fRect=function(...)gc.rectangle("fill",...)end, dRect=function(...)gc.rectangle("line",...)end, fCirc=function(...)gc.circle("fill",...)end, dCirc=function(...)gc.circle("line",...)end, - fPoly=function(...)gc.polygon("line",...)end, + fPoly=function(...)gc.polygon("fill",...)end, dPoly=function(...)gc.polygon("line",...)end, } return function(L) diff --git a/media/image/modeicon/classic.png b/media/image/modeicon/classic.png deleted file mode 100644 index e8c92191..00000000 Binary files a/media/image/modeicon/classic.png and /dev/null differ diff --git a/parts/scenes/load.lua b/parts/scenes/load.lua index 8803ede0..5b9372e2 100644 --- a/parts/scenes/load.lua +++ b/parts/scenes/load.lua @@ -80,13 +80,6 @@ local loadingThread=coroutine.wrap(function() {"fPoly",10,4,24,10,10,16.5}, {"fRect",4,24,10,3}, }YIELD() - modeIcons.tsd=DOGC{64,64, - {"fRect",7,7,16,16}, - {"fRect",7,41,16,16}, - {"fRect",41,41,16,16}, - {"trans",.5,.5}, - {"dPoly",7,24,56,24,56,39,39,39,39,56,24,56,24,39,7,39}, - }YIELD() modeIcons.infinite=DOGC{64,64, {"setLW",4}, {"dCirc",32,32,28}, @@ -98,6 +91,20 @@ local loadingThread=coroutine.wrap(function() {"fRect",52,30,4,4}, {"fRect",30,52,4,4}, }YIELD() + modeIcons.classic=DOGC{64,64, + {"setLW",6}, + {"dRect",10,24,12,12}, + {"dRect",26,24,12,12}, + {"dRect",42,24,12,12}, + {"dRect",26,40,12,12}, + }YIELD() + modeIcons.tsd=DOGC{64,64, + {"fRect",7,7,16,16}, + {"fRect",7,41,16,16}, + {"fRect",41,41,16,16}, + {"trans",.5,.5}, + {"fPoly",7,24,56,24,56,39,39,39,39,56,24,56,24,39,7,39}, + }YIELD() modeIcons.t49=DOGC{64,64, {"setLW",2}, {"dRect",05,05,10,20},{"dRect",49,05,10,20},