整理代码,texture文件添加注释,移除一个素材创建

This commit is contained in:
MrZ626
2021-03-22 16:06:30 +08:00
parent d018b9fba0
commit d168304a6d
3 changed files with 21 additions and 14 deletions

View File

@@ -299,7 +299,11 @@ function scene.draw()
end end
if mapCam.keyCtrl then if mapCam.keyCtrl then
gc.setColor(1,1,1) gc.setColor(1,1,1)
gc.draw(TEXTURE.mapCross,640-20,360-20) gc.setLineWidth(4)
gc.translate(640,360)
gc.line(-20,0,20,0)
gc.line(0,-20,0,20)
gc.translate(-640,-360)
end end
end end

View File

@@ -23,7 +23,6 @@ function SKIN.init(list)
for i=1,count do for i=1,count do
gc.push() gc.push()
gc.origin() gc.origin()
gc.setDefaultFilter("nearest","nearest")
gc.setColor(1,1,1) gc.setColor(1,1,1)
SKIN.lib[i],SKIN.libMini[i]={},{} SKIN.lib[i],SKIN.libMini[i]={},{}
local N="media/image/skin/"..list[i]..".png" local N="media/image/skin/"..list[i]..".png"

View File

@@ -1,5 +1,4 @@
local gc=love.graphics local gc=love.graphics
local int=math.floor
local function NSC(x,y)--New & Set Canvas local function NSC(x,y)--New & Set Canvas
local _=gc.newCanvas(x,y) local _=gc.newCanvas(x,y)
gc.setCanvas(_) gc.setCanvas(_)
@@ -7,15 +6,21 @@ local function NSC(x,y)--New & Set Canvas
end end
local TEXTURE={} local TEXTURE={}
gc.setDefaultFilter("nearest","nearest") gc.setDefaultFilter("nearest","nearest")
--Virtualkey icons
gc.setColor(1,1,1) gc.setColor(1,1,1)
local VKI=gc.newImage("media/image/virtualkey.png") local VKI=gc.newImage("media/image/virtualkey.png")
TEXTURE.VKIcon={} TEXTURE.VKIcon={}
for i=1,20 do for i=1,20 do
TEXTURE.VKIcon[i]=NSC(36,36) TEXTURE.VKIcon[i]=NSC(36,36)
gc.draw(VKI,(i-1)%5*-36,int((i-1)*.2)*-36) gc.draw(VKI,(i-1)%5*-36,math.floor((i-1)*.2)*-36)
end end
--Mini blocks
gc.setColor(1,1,1)
TEXTURE.miniBlock={} TEXTURE.miniBlock={}
for i=1,29 do for i=1,29 do
local b=BLOCKS[i][0] local b=BLOCKS[i][0]
@@ -27,6 +32,7 @@ for i=1,29 do
end end end end
end end
--Texture of puzzle mode
TEXTURE.puzzleMark={} TEXTURE.puzzleMark={}
gc.setLineWidth(3) gc.setLineWidth(3)
for i=1,17 do for i=1,17 do
@@ -51,14 +57,9 @@ gc.draw(_)
_:release() _:release()
gc.setCanvas() gc.setCanvas()
TEXTURE.mapCross=NSC(40,40) --A simple pixel font
gc.setColor(1,1,1)
gc.setLineWidth(4)
gc.line(0,20,40,20)
gc.line(20,0,20,40)
TEXTURE.pixelNum={} TEXTURE.pixelNum={}
gc.setLineWidth(4) gc.setColor(1,1,1)
for i=0,9 do for i=0,9 do
TEXTURE.pixelNum[i]=NSC(5,9) TEXTURE.pixelNum[i]=NSC(5,9)
if("1011011111"):byte(i+1)==49 then gc.rectangle("fill",1,0,3,1)end--up if("1011011111"):byte(i+1)==49 then gc.rectangle("fill",1,0,3,1)end--up
@@ -70,11 +71,14 @@ for i=0,9 do
if("1101111111"):byte(i+1)==49 then gc.rectangle("fill",4,5,1,3)end--down-right if("1101111111"):byte(i+1)==49 then gc.rectangle("fill",4,5,1,3)end--down-right
end end
--Cursor
TEXTURE.cursor=NSC(16,16) TEXTURE.cursor=NSC(16,16)
gc.setColor(1,1,1,.7) gc.setColor(1,1,1,.7)
gc.circle("fill",8,8,6) gc.circle("fill",8,8,6)
gc.setColor(1,1,1) gc.setColor(1,1,1)
gc.circle("fill",8,8,4) gc.circle("fill",8,8,4)
--Cursor while hold
TEXTURE.cursor_hold=NSC(16,16) TEXTURE.cursor_hold=NSC(16,16)
gc.setLineWidth(2) gc.setLineWidth(2)
gc.setColor(1,1,1) gc.setColor(1,1,1)
@@ -85,11 +89,10 @@ gc.circle("fill",8,8,3)
gc.setDefaultFilter("linear","linear") gc.setDefaultFilter("linear","linear")
--Title image
local titleTriangles={} local titleTriangles={}
for i=1,8 do titleTriangles[i]=love.math.triangulate(title[i])end for i=1,8 do titleTriangles[i]=love.math.triangulate(title[i])end
TEXTURE.title=NSC(1160,236)--Middle: 580,118
--Middle: 580,118
TEXTURE.title=NSC(1160,236)
for i=1,8 do for i=1,8 do
gc.translate(12*i,i==1 and 8 or 14) gc.translate(12*i,i==1 and 8 or 14)
@@ -138,6 +141,7 @@ for i=1,8 do
gc.translate(-12*i,i==1 and -8 or -14) gc.translate(-12*i,i==1 and -8 or -14)
end end
--WS icons
setFont(20) setFont(20)
TEXTURE.ws_dead=NSC(20,20) TEXTURE.ws_dead=NSC(20,20)
gc.setColor(1,.4,.3) gc.setColor(1,.4,.3)