Commit: f64b8ff3eeb77dfd02b61800f423c11a94c3bba1 - ikemen_go (git)

Go で書き直した Ikemen

Commit MetaInfo

• Revision: f64b8ff3eeb77dfd02b61800f423c11a94c3bba1 (tree)
• Time: 2018-12-20 22:35:21
• Author: neatunsou <sisiy4excite@gmai...>
• Commiter: neatunsou

Log Message

判定表示が透明になっていたのを修正
bgctrlでアニメを変えるとタイルと透過の情報がリセットされていたのを修正
Interpolate Blendで加算処理が減算処理になる場合があったのを修正

Change Summary

• modified: src/anim.go
• modified: src/stage.go
• modified: src/system.go

Incremental Difference

--- a/src/anim.go
+++ b/src/anim.go
@@ -600,9 +600,9 @@ func (a *Animation) alpha() int32 {
 	} else {
 		sa = byte(a.interpolate_blend_srcalpha)
 		da = byte(a.interpolate_blend_dstalpha)
-		//if sa == 255 && da == 1 {
-		//	da = 255
-		//}
+		if sa == 1 && da == 255 {
+			sa = 0
+		}
 	}
 	if sa == 1 && da == 255 {
 		return -2

--- a/src/stage.go
+++ b/src/stage.go
@@ -812,8 +812,16 @@ func (s *Stage) runBgCtrl(bgc *bgCtrl) {
 		a := s.at.get(bgc.v[0])
 		if a != nil {
 			for i := range bgc.bg {
+				masktemp := bgc.bg[i].anim.mask
+				srcAlphatemp := bgc.bg[i].anim.srcAlpha
+				dstAlphatemp := bgc.bg[i].anim.dstAlpha
+				tiletmp := bgc.bg[i].anim.tile
 				bgc.bg[i].actionno = bgc.v[0]
 				bgc.bg[i].anim = *a
+				bgc.bg[i].anim.tile = tiletmp
+				bgc.bg[i].anim.dstAlpha = dstAlphatemp
+				bgc.bg[i].anim.srcAlpha = srcAlphatemp
+				bgc.bg[i].anim.mask = masktemp
 			}
 		}
 	case BT_Visible:

--- a/src/system.go
+++ b/src/system.go
@@ -1212,15 +1212,15 @@ func (s *System) draw(x, y, scl float32) {
 	}
 	s.brightness = ob
 	if s.clsnDraw {
-		s.clsnSpr.Pal[0] = 0x0000ff
+		s.clsnSpr.Pal[0] = 0xff0000ff
 		s.drawc1.draw(0x3feff)
-		s.clsnSpr.Pal[0] = 0xff0000
+		s.clsnSpr.Pal[0] = 0xffff0000
 		s.drawc2.draw(0x3feff)
-		s.clsnSpr.Pal[0] = 0x00ff00
+		s.clsnSpr.Pal[0] = 0xff00ff00
 		s.drawc2sp.draw(0x3feff)
-		s.clsnSpr.Pal[0] = 0x002000
+		s.clsnSpr.Pal[0] = 0xff002000
 		s.drawc2mtk.draw(0x3feff)
-		s.clsnSpr.Pal[0] = 0x404040
+		s.clsnSpr.Pal[0] = 0xff404040
 		s.drawwh.draw(0x3feff)
 	}
 }