SKIN模块升级，其他多媒体模块微调

Zframework/bgm.lua

@@ -89,6 +89,7 @@ function BGM.init(list)
 			BGM.nowPlay,BGM.playing=nil
 		end
 	end
+
 	BGM.loadOne=coroutine.wrap(load)
 	function BGM.loadAll()load(true)end
 end

Zframework/image.lua

@@ -1,4 +1,6 @@
-local IMG={}
+local IMG={
+	getCount=function()return 0 end,
+}
 function IMG.init(list)
 	IMG.init=nil
 	local count=0
@@ -16,6 +18,7 @@ function IMG.init(list)
 		end
 		IMG.loadOne=nil
 	end
+
 	IMG.loadOne=coroutine.wrap(load)
 	function IMG.loadAll()load(true)end
 end

main.lua

@@ -51,7 +51,7 @@ AIFUNC=	require"parts/ai"
 MODES=	require"parts/modes"
 TICK=	require"parts/tick"
 
---Initialize image lib
+--Initialize image libs
 IMG.init{
 	batteryImage="/mess/power.png",
 	title="mess/title.png",
@@ -75,7 +75,30 @@ IMG.init{
 	electric="mess/electric.png",
 	hbm="mess/hbm.png",
 }
-
+SKIN.init{
+	"normal(mrz)",
+	"smooth(mrz)",
+	"contrast(mrz)",
+	"glow(mrz)",
+	"plastic(mrz)",
+	"jelly(miya)",
+	"steel(kulumi)",
+	"pure(mrz)",
+	"ball(shaw)",
+	"paper(mrz)",
+	"gem(notypey)",
+	"classic(_)",
+	"brick(notypey)",
+	"brick_light(notypey)",
+	"cartoon_cup(earety)",
+	"crack(earety)",
+	"retro(notypey)",
+	"retro_grey(notypey)",
+	"text_bone(mrz)",
+	"colored_bone(mrz)",
+	"white_bone(mrz)",
+	"WTF",
+}
 --Initialize sound libs
 SFX.init{
 	--Stereo sfxs(cannot set position)

parts/scenes/load.lua

@@ -128,7 +128,7 @@ function scene.update()
 		elseif S.phase==5 then
 			getFont(15+5*S.cur)
 		elseif S.phase==6 then
-			SKIN.loadOne(S.cur)
+			SKIN.loadOne()
 		elseif S.phase==7 then
 			local m=MODES[S.cur]--Mode template
 			local M=require("parts/modes/"..m.name)--Mode file

parts/skin.lua

@@ -1,3 +1,13 @@
+local SKIN={
+	getCount=function()return 0 end,
+	prevSet=NULL,
+	nextSet=NULL,
+	prev=NULL,
+	next=NULL,
+	rotate=NULL,
+	change=NULL,
+}
+function SKIN.init(list)
 	local gc=love.graphics
 	local int=math.floor
 	local function C(x,y)
@@ -5,32 +15,7 @@ local function C(x,y)
 		gc.setCanvas(_)
 		return _
 	end
-local list={
-	"normal(mrz)",
-	"smooth(mrz)",
-	"contrast(mrz)",
-	"glow(mrz)",
-	"plastic(mrz)",
-	"jelly(miya)",
-	"steel(kulumi)",
-	"pure(mrz)",
-	"ball(shaw)",
-	"paper(mrz)",
-	"gem(notypey)",
-	"classic(_)",
-	"brick(notypey)",
-	"brick_light(notypey)",
-	"cartoon_cup(earety)",
-	"crack(earety)",
-	"retro(notypey)",
-	"retro_grey(notypey)",
-	"text_bone(mrz)",
-	"colored_bone(mrz)",
-	"white_bone(mrz)",
-	"WTF",
-}
-local count=#list
-local SKIN={}
+	local count=#list function SKIN.getCount()return count end
 	SKIN.lib={}
 	SKIN.libMini={}
 	SKIN.libColor={
@@ -59,41 +44,40 @@ SKIN.libColor={
 		COLOR.dRed,
 		COLOR.dGreen,
 	}
-function SKIN.getCount()
-	return count
-end
-function SKIN.loadOne(_)
+
+	local function load(skip)
+		for i=1,count do
 			gc.push()
 			gc.origin()
 			gc.setDefaultFilter("nearest","nearest")
 			gc.setColor(1,1,1)
-	SKIN.lib[_],SKIN.libMini[_]={},{}
-	local N="media/image/skin/"..list[_]..".png"
+			SKIN.lib[i],SKIN.libMini[i]={},{}
+			local N="media/image/skin/"..list[i]..".png"
 			local I
 			if love.filesystem.getInfo(N)then
 				I=gc.newImage(N)
 			else
 				I=gc.newImage("media/image/skin/"..list[1]..".png")
-		LOG.print("No skin file: "..list[_],"warn")
+				LOG.print("No skin file: "..list[i],"warn")
 			end
-	for i=0,2 do
-		for j=1,8 do
-			SKIN.lib[_][8*i+j]=C(30,30)
-			gc.draw(I,30-30*j,-30*i)
+			for y=0,2 do
+				for x=1,8 do
+					SKIN.lib[i][8*y+x]=C(30,30)
+					gc.draw(I,30-30*x,-30*y)
 
-			SKIN.libMini[_][8*i+j]=C(6,6)
-			gc.draw(I,6-6*j,-6*i,nil,.2)
+					SKIN.libMini[i][8*y+x]=C(6,6)
+					gc.draw(I,6-6*x,-6*y,nil,.2)
 				end
 			end
 			I:release()
 			gc.setCanvas()
 			gc.pop()
-end
-function SKIN.loadAll()
-	for i=1,count do
-		SKIN.loadOne(i)
+			if not skip and i~=count then
+				coroutine.yield()
 			end
 		end
+		SKIN.loadOne=nil
+
 		function SKIN.prevSet()--Prev skin_set
 			local _=(SETTING.skinSet-2)%count+1
 			SETTING.skinSet=_
@@ -124,4 +108,9 @@ function SKIN.change(i)--Change to skin_set[i]
 			SKIN.curText=SKIN.lib[i]
 			SKIN.curTextMini=SKIN.libMini[i]
 		end
+	end
+
+	SKIN.loadOne=coroutine.wrap(load)
+	function SKIN.loadAll()load(true)end
+end
 return SKIN