移除电池、旋转中心的图片改用DOGC,一些框架init中用到的可绘制素材移出TEXTURE模块

This commit is contained in:
MrZ626
2021-05-12 09:16:06 +08:00
parent dd767aa088
commit 71a2bfe284
6 changed files with 59 additions and 48 deletions

View File

@@ -40,6 +40,16 @@ local multiple=DOGC{15,15,
{'line',2,2,12,12},
{'line',2,12,12,2},
}
local spinCenterImg=DOGC{9,9,
{'setCL',.17,.17,.17},
{'fRect',0,0,9,9},
{'setCL',.57,.57,.57},
{'fRect',1,1,7,7},
{'setCL',.81,.81,.81},
{'fRect',2,2,5,5},
{'setCL',1,1,1},
{'fRect',3,3,3,3},
}
local gridLines do
local L={300,640,{'setLW',2}}
for x=1,9 do table.insert(L,{'line',30*x,0,30*x,640})end
@@ -576,7 +586,7 @@ function draw.norm(P)
drawGhost(P,curColor)
if ENV.center then
gc_setColor(1,1,1,trans*ENV.center)
gc_draw(IMG.spinCenter,centerX,-30*(P.ghoY+P.cur.sc[1])+15,nil,nil,nil,4,4)
gc_draw(spinCenterImg,centerX,-30*(P.ghoY+P.cur.sc[1])+15,nil,nil,nil,4,4)
end
end
@@ -588,7 +598,7 @@ function draw.norm(P)
drawBlock(P,curColor)
if ENV.center then
gc_setColor(1,1,1,ENV.center)
gc_draw(IMG.spinCenter,centerX,-30*(P.curY+P.cur.sc[1])+15,nil,nil,nil,4,4)
gc_draw(spinCenterImg,centerX,-30*(P.curY+P.cur.sc[1])+15,nil,nil,nil,4,4)
end
end
gc_translate(0,dy)
@@ -742,7 +752,7 @@ function draw.norm_remote(P)
drawGhost(P,curColor)
if ENV.center then
gc_setColor(1,1,1,trans*ENV.center)
gc_draw(IMG.spinCenter,centerX,-30*(P.ghoY+P.cur.sc[1])+15,nil,nil,nil,4,4)
gc_draw(spinCenterImg,centerX,-30*(P.ghoY+P.cur.sc[1])+15,nil,nil,nil,4,4)
end
end
@@ -754,7 +764,7 @@ function draw.norm_remote(P)
drawBlock(P,curColor)
if ENV.center then
gc_setColor(1,1,1,ENV.center)
gc_draw(IMG.spinCenter,centerX,-30*(P.curY+P.cur.sc[1])+15,nil,nil,nil,4,4)
gc_draw(spinCenterImg,centerX,-30*(P.curY+P.cur.sc[1])+15,nil,nil,nil,4,4)
end
end
gc_translate(0,dy)

View File

@@ -65,20 +65,6 @@ for i=0,9 do
}
end
--Cursor
TEXTURE.cursor=DOGC{16,16,
{"fCirc",8,8,4},
{"setCL",1,1,1,.7},
{"fCirc",8,8,6},
}
--Cursor while hold
TEXTURE.cursor_hold=DOGC{16,16,
{"setLW",2},
{"dCirc",8,8,7},
{"fCirc",8,8,3},
}
--Level icons
TEXTURE.lvIcon=setmetatable({},{__index=function(self,lv)
local img={25,25}
@@ -165,21 +151,5 @@ for i=1,8 do
gc.translate(-12*i,i==1 and -8 or -14)
end
--WS icons
setFont(20)
TEXTURE.ws_dead=DOGC{20,20,
{'setCL',1,.3,.3},
{'print',"X",3,-4},
}
TEXTURE.ws_connecting=DOGC{20,20,
{'setLW',3},
{'dArc',11.5,10,6.26,1,5.28},
}
TEXTURE.ws_running=DOGC{20,20,
{'setCL',.5,1,0},
{'print',"R",3,-4},
}
gc.setCanvas()
return TEXTURE