diff --git a/main.lua b/main.lua index bcaf15d5..aa32b31f 100644 --- a/main.lua +++ b/main.lua @@ -122,8 +122,6 @@ if SETTING.fullscreen then love.window.setFullscreen(true)end --Initialize image libs IMG.init{ batteryImage="mess/power.png", - title="mess/title.png", - title_color="mess/title_colored.png", lock="mess/lock.png", dialCircle="mess/dialCircle.png", dialNeedle="mess/dialNeedle.png", diff --git a/media/image/mess/title.png b/media/image/mess/title.png deleted file mode 100644 index 07d48602..00000000 Binary files a/media/image/mess/title.png and /dev/null differ diff --git a/media/image/mess/title_colored.png b/media/image/mess/title_colored.png deleted file mode 100644 index b94c7c6a..00000000 Binary files a/media/image/mess/title_colored.png and /dev/null differ diff --git a/media/image/mess/title_new.png b/media/image/mess/title_new.png deleted file mode 100644 index 4f03872d..00000000 Binary files a/media/image/mess/title_new.png and /dev/null differ diff --git a/parts/scenes/help.lua b/parts/scenes/help.lua index add2d5c4..d40280d8 100644 --- a/parts/scenes/help.lua +++ b/parts/scenes/help.lua @@ -22,7 +22,7 @@ function scene.draw() local t=TIME() --Sponsor code - gc.draw(IMG.title,280,610,.1,1+.05*sin(t*2.6),nil,206,35) + gc.draw(TEXTURE.title,280,610,.1,.4+.03*sin(t*2.6),nil,580,118) gc.setLineWidth(3) gc.rectangle("line",18,18,263,263) gc.rectangle("line",1012,18,250,250) diff --git a/parts/scenes/main.lua b/parts/scenes/main.lua index dc3f5d14..45ba169b 100644 --- a/parts/scenes/main.lua +++ b/parts/scenes/main.lua @@ -79,7 +79,7 @@ function scene.draw() gc.setColor(1,1,1) --Title - gc.draw(IMG.title_color,60,30,nil,1.3) + gc.draw(TEXTURE.title_color,20,20,nil,.5) --Quick play setFont(30) diff --git a/parts/scenes/music.lua b/parts/scenes/music.lua index ff9ef1c6..6e67c52a 100644 --- a/parts/scenes/music.lua +++ b/parts/scenes/music.lua @@ -59,7 +59,7 @@ function scene.draw() if selected>2 then gc.print(bgmList[selected-2],320,350-50)end if selected55 then gc.print("CLICK ME →",50,550,-.5)end end diff --git a/parts/scenes/stat.lua b/parts/scenes/stat.lua index 20008aa0..6396548d 100644 --- a/parts/scenes/stat.lua +++ b/parts/scenes/stat.lua @@ -87,7 +87,7 @@ function scene.draw() end local t=TIME() - gc.draw(IMG.title,260,615,.2+.04*sin(t*3),nil,nil,206,35) + gc.draw(TEXTURE.title,260,615,.2+.04*sin(t*3),.4,nil,580,118) local r=t*2 local R=int(r)%7+1 diff --git a/parts/texture.lua b/parts/texture.lua index 577048a4..38c7ec12 100644 --- a/parts/texture.lua +++ b/parts/texture.lua @@ -33,6 +33,63 @@ gc.setLineWidth(4) gc.line(0,20,40,20) gc.line(20,0,20,40) + gc.setDefaultFilter("linear","linear") + + +local titleTriangles={} +for i=1,8 do titleTriangles[i]=love.math.triangulate(title[i])end + +--Middle: 580,118 +TEXTURE.title=C(1160,236) +for i=1,8 do + gc.translate(12*i,i==1 and 8 or 14) + + gc.setLineWidth(16) + gc.setColor(1,1,1) + gc.polygon("line",title[i]) + + gc.setColor(0,0,0) + for j=1,#titleTriangles[i]do + gc.polygon("fill",titleTriangles[i][j]) + end + + gc.translate(-12*i,i==1 and -8 or -14) +end +TEXTURE.title_color=C(1160,236) +local titleColor={ + COLOR.lGrape, + COLOR.lCyan, + COLOR.lBlue, + COLOR.lOrange, + COLOR.lFire, + COLOR.lMagenta, + COLOR.lGreen, + COLOR.lYellow, +} +for i=1,8 do + gc.translate(12*i,i==1 and 8 or 14) + + gc.setLineWidth(16) + gc.setColor(1,1,1) + gc.polygon("line",title[i]) + + gc.setLineWidth(4) + gc.setColor(0,0,0) + for j=1,#titleTriangles[i]do + gc.polygon("fill",titleTriangles[i][j]) + end + + gc.setColor(titleColor[i]) + gc.translate(-4,-4) + for j=1,#titleTriangles[i]do + gc.polygon("fill",titleTriangles[i][j]) + end + gc.translate(4,4) + + gc.translate(-12*i,i==1 and -8 or -14) +end + + gc.setCanvas() return TEXTURE \ No newline at end of file