Commit: 150fe933407d67a972cd92c574632faa7888d97f - ikemen_go (git)

Go で書き直した Ikemen

Commit MetaInfo

• Revisão: 150fe933407d67a972cd92c574632faa7888d97f (tree)
• Hora: 2019-03-02 19:33:55
• Autor: neatunsou <sisiy4excite@gmai...>
• Commiter: neatunsou

Mensagem de Log

mp3にリサンプル処理をしてなかったのを修正
animにtileを記述してなおかつtilespacingが0だとtileを無効にするようにした
アルファ入りpngの表示が微妙に暗くなっていたのを修正
Windblade氏の更新を適応

Mudança Sumário

• modified: get.sh
• modified: src/render.go
• modified: src/script.go
• modified: src/sound.go
• modified: src/stage.go

Diff

--- a/get.sh
+++ b/get.sh
@@ -11,3 +11,5 @@ go get -u github.com/faiface/beep
 go get -u github.com/hajimehoshi/oto
 go get -u github.com/hajimehoshi/go-mp3
 go get -u github.com/pkg/errors
+go get -u github.com/jfreymuth/oggvorbis
+go get -u github.com/mewkiz/flac

--- a/src/render.go
+++ b/src/render.go
@@ -75,8 +75,8 @@ func RenderInit() {
 		"texcoord[0] = left / (left + right);" + // ここまで
 		"}" +
 		"vec4 c = texture2D(tex, texcoord);" +
-		"if(neg) c.rgb = vec3(1.0) - c.rgb;" +
-		"c.rgb += (vec3((c.r + c.g + c.b) / 3.0) - c.rgb) * gray + add;" +
+		"if(neg) c.rgb = vec3(1.0 * c.a) - c.rgb;" +
+		"c.rgb += (vec3((c.r + c.g + c.b) / 3.0) - c.rgb) * gray + add * c.a;" +
 		"c.rgb *= mul;" +
 		"c.a *= a;" +
 		"gl_FragColor = c;" +
@@ -359,7 +359,11 @@ func rmMainSub(a int32, size [2]uint16, x, y float32, tl *[4]int32,
 			agl, yagl, xagl, rcx, rcy)
 	case trans < 512:
 		gl.Uniform1fARB(a, 1)
-		gl.BlendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA)
+		if renderMode == 1 {
+			gl.BlendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA)
+		} else {
+			gl.BlendFunc(gl.ONE, gl.ONE_MINUS_SRC_ALPHA)
+		}
 		gl.BlendEquation(gl.FUNC_ADD)
 		rmTileSub(size[0], size[1], x, y, tl, renderMode, xts, xbs, ys, vs, rxadd,
 			agl, yagl, xagl, rcx, rcy)

--- a/src/script.go
+++ b/src/script.go
@@ -313,13 +313,15 @@ func systemScriptInit(l *lua.LState) {
 		}
 		ts.text = strArg(l, 2)
 		return 0
-	})
+	})  
 	luaRegister(l, "textImgSetPos", func(*lua.LState) int {
 		ts, ok := toUserData(l, 1).(*TextSprite)
 		if !ok {
 			userDataError(l, 1, ts)
 		}
+		if boolArg(l, 3) {
 		ts.x, ts.y = float32((numArg(l, 2)/sys.luaSpriteScale)+sys.luaSpriteOffsetX), float32(numArg(l, 3)/sys.luaSpriteScale)
+		}
 		return 0
 	})
 	luaRegister(l, "textImgSetScale", func(*lua.LState) int {

--- a/src/sound.go
+++ b/src/sound.go
@@ -12,6 +12,7 @@ import (
 	"github.com/timshannon/go-openal/openal"
 
 	"github.com/faiface/beep"
+	"github.com/faiface/beep/flac"
 	"github.com/faiface/beep/mp3"
 	"github.com/faiface/beep/speaker"
 )
@@ -352,6 +353,10 @@ func (bgm *Bgm) IsMp3() bool {
 	return filepath.Ext(bgm.filename) == ".mp3"
 }
 
+func (bgm *Bgm) IsFLAC() bool {
+	return filepath.Ext(bgm.filename) == ".flac"
+}
+
 func (bgm *Bgm) Open(filename string) {
 	if filepath.Base(bgm.filename) != filepath.Base(filename) {
 		bgm.filename = filename
@@ -361,21 +366,39 @@ func (bgm *Bgm) Open(filename string) {
 			bgm.vorbis.Open(filename)
 		} else if bgm.IsMp3() {
 			bgm.ReadMp3()
+		} else if bgm.IsFLAC() {
+			bgm.ReadFLAC()
 		}
+
 	}
 }
 
 func (bgm *Bgm) ReadMp3() {
 	f, _ := os.Open(bgm.filename)
-	s, _, err := mp3.Decode(f)
+	s, format, err := mp3.Decode(f)
 	if err != nil {
 		return
 	}
 	streamer := beep.Loop(-1, s)
-	bgm.ctrlmp3 = &beep.Ctrl{Streamer: streamer}
+	resample := beep.Resample(int(3), format.SampleRate, beep.SampleRate(Mp3SampleRate), streamer)
+	bgm.ctrlmp3 = &beep.Ctrl{Streamer: resample}
 	speaker.Play(bgm.ctrlmp3)
 	return
 }
+
+func (bgm *Bgm) ReadFLAC() {
+	f, _ := os.Open(bgm.filename)
+	s, format, err := flac.Decode(f)
+	if err != nil {
+		return
+	}
+	streamer := beep.Loop(-1, s)
+	resample := beep.Resample(int(3), format.SampleRate, beep.SampleRate(Mp3SampleRate), streamer)
+	bgm.ctrlmp3 = &beep.Ctrl{Streamer: resample}
+	speaker.Play(bgm.ctrlmp3)
+	return
+}
+
 func (bgm *Bgm) Mp3Paused() {
 	speaker.Lock()
 	bgm.ctrlmp3.Paused = true

--- a/src/stage.go
+++ b/src/stage.go
@@ -256,6 +256,13 @@ func readBackGround(is IniSection, link *backGround,
 				bg.anim.tile[0] += int32(spr.Size[0])
 				bg.anim.tile[1] += int32(spr.Size[1])
 			}
+		} else {
+			if bg.anim.tile[0] == 0 {
+				bg.anim.tile[2] = 0
+			}
+			if bg.anim.tile[1] == 0 {
+				bg.anim.tile[3] = 0
+			}
 		}
 	}
 	if is.readI32ForStage("window", &bg.startrect[0], &bg.startrect[1],