コミット: 9304ddb84d0a2893606fb9ced7d0d0891d9f1508 - ikemen_go (git)

Go で書き直した Ikemen

コミットメタ情報

• リビジョン: 9304ddb84d0a2893606fb9ced7d0d0891d9f1508 (tree)
• 日時: 2019-05-15 20:38:07
• 作者: neatunsou <sisiy4excite@gmai...>
• コミッター: neatunsou

ログメッセージ

config.jsonにMasterVolume、WavVolume、BgmVolume、AudioDuckingを追加
MasterVolume、WavVolume、BgmVolumeはMUGENのと似たような機能
AudioDuckingは元々あった音量のノーマライザーをオプション化したもので、有効にするとWavVolumeが無効になる

変更サマリ

• modified: src/main.go
• modified: src/sound.go
• modified: src/system.go

差分

--- a/src/main.go
+++ b/src/main.go
@@ -79,6 +79,9 @@ func main() {
   "PlayerProjectileMax":256,
   "ExplodMax":512,
   "AfterImageMax":128,
+  "MasterVolume":100,
+  "WavVolume":100,
+  "BgmVolume":100,
   "Attack.LifeToPowerMul":0.7,
   "GetHit.LifeToPowerMul":0.6,
   "Width":640,
@@ -126,6 +129,7 @@ func main() {
   "TeamPowerShare":false,
   "TeamLifeShare":false,
   "Fullscreen":false,
+  "AudioDucking":false,
   "AllowDebugKeys":true,
   "PostProcessingShader":0,
   "IP":{
@@ -137,6 +141,9 @@ func main() {
 		PlayerProjectileMax    int
 		ExplodMax              int
 		AfterImageMax          int32
+		MasterVolume           int
+		WavVolume              int
+		BgmVolume              int
 		Attack_LifeToPowerMul  float32 `json:"Attack.LifeToPowerMul"`
 		GetHit_LifeToPowerMul  float32 `json:"GetHit.LifeToPowerMul"`
 		Width                  int32
@@ -152,15 +159,16 @@ func main() {
 			Joystick int
 			Buttons  []interface{}
 		}
-		NumTag         int
-		TeamLifeShare  bool
-		AIRandomColor  bool
-		Fullscreen     bool
-		AllowDebugKeys bool
+		NumTag               int
+		TeamLifeShare        bool
+		AIRandomColor        bool
+		Fullscreen           bool
+		AudioDucking         bool
+		AllowDebugKeys       bool
 		PostProcessingShader int32
-		CommonAir      string
-		CommonCmd      string
-		QuickLaunch    bool
+		CommonAir            string
+		CommonCmd            string
+		QuickLaunch          bool
 	}{}
 	chk(json.Unmarshal(defcfg, &tmp))
 	const configFile = "data/config.json"
@@ -185,6 +193,10 @@ func main() {
 	sys.super_TargetDefenceMul = tmp.Super_TargetDefenceMul
 	sys.lifebarFontScale = tmp.LifebarFontScale
 	sys.quickLaunch = tmp.QuickLaunch
+	sys.masterVolume = tmp.MasterVolume
+	sys.wavVolume = tmp.WavVolume
+	sys.bgmVolume = tmp.BgmVolume
+	sys.AudioDucking = tmp.AudioDucking
 	stoki := func(key string) int {
 		return int(StringToKey(key))
 	}

--- a/src/sound.go
+++ b/src/sound.go
@@ -10,6 +10,7 @@ import (
 	"github.com/timshannon/go-openal/openal"
 
 	"github.com/faiface/beep"
+	"github.com/faiface/beep/effects"
 	"github.com/faiface/beep/flac"
 	"github.com/faiface/beep/mp3"
 	"github.com/faiface/beep/speaker"
@@ -179,13 +180,17 @@ func NewNormalizer() *Normalizer {
 func (n *Normalizer) Process(l, r float32) (float32, float32) {
 	lmul := n.l.process(n.mul, &l)
 	rmul := n.r.process(n.mul, &r)
-	if lmul < rmul {
-		n.mul = lmul
+	if sys.AudioDucking {
+		if lmul < rmul {
+			n.mul = lmul
+		} else {
+			n.mul = rmul
+		}
+		if n.mul > 16 {
+			n.mul = 16
+		}
 	} else {
-		n.mul = rmul
-	}
-	if n.mul > 16 {
-		n.mul = 16
+		n.mul = 0.5 * (float64(sys.wavVolume) * float64(sys.masterVolume) * 0.0001)
 	}
 	return l, r
 }
@@ -303,6 +308,8 @@ func (bgm *Bgm) ReadVorbis() {
 
 func (bgm *Bgm) ReadFormat(s beep.StreamSeekCloser, format beep.Format) {
 	streamer := beep.Loop(-1, s)
+	volume := -5 + float64(sys.bgmVolume)*0.05*(float64(sys.masterVolume)/100)
+	streamer = &effects.Volume{Streamer: streamer, Base: 2, Volume: volume, Silent: volume <= -5}
 	resample := beep.Resample(int(3), format.SampleRate, beep.SampleRate(Mp3SampleRate), streamer)
 	bgm.ctrl = &beep.Ctrl{Streamer: resample}
 	speaker.Play(bgm.ctrl)

--- a/src/system.go
+++ b/src/system.go
@@ -240,6 +240,10 @@ type System struct {
 	timerCount              []int32
 	cmdFlags                map[string]string
 	quickLaunch             bool
+	masterVolume            int
+	wavVolume               int
+	bgmVolume               int
+	AudioDucking            bool
 	// Localcoord sceenpack
 	luaSpriteScale        float64
 	luaSmallPortraitScale float32