Commit: 69944c7414994b41b670671299fa689e338d81eb - ikemen_go (git)

Go で書き直した Ikemen

Commit MetaInfo

• Révision: 69944c7414994b41b670671299fa689e338d81eb (tree)
• l'heure: 2018-10-18 20:14:33
• Auteur: neatunsou <sisiy4excite@gmai...>
• Commiter: neatunsou

Message de Log

AIRの透過処理が影に反映されるようにした（MUGEN1.1の仕様）
影に反映される透過の基準をデスティネーションアルファにした
maskwindowの幅が1ドットズレてるのを修正した
windowの縁がズームアウトすると正確でなくなるのを修正した
winmugen仕様キャラと判定するとangledrawでAIRの透過が外れる処理を無くした
（新MUGENでの動作を前提としながらmugenversionをwinmugenのままにしているキャラで不具合が起きるため）

Change Summary

• modified: src/anim.go
• modified: src/char.go
• modified: src/render.go
• modified: src/stage.go

Modification

--- a/src/anim.go
+++ b/src/anim.go
@@ -591,7 +591,7 @@ func (a *Animation) alpha() int32 {
 	if a.srcAlpha >= 0 {
 		sa = byte(a.srcAlpha)
 		if a.dstAlpha < 0 {
-			da = byte((^a.dstAlpha + int16(a.frames[a.drawidx].DstAlpha)) >> 1)
+			da = byte((^a.dstAlpha + int16(a.interpolate_blend_dstalpha)) >> 1)
 			if sa == 1 && da == 255 {
 				sa = 0
 			}
@@ -885,6 +885,9 @@ func (sl ShadowList) draw(x, y, scl float32) {
 	for _, s := range sl {
 		intensity := sys.stage.sdw.intensity
 		color, alpha := s.shadowColor, s.shadowAlpha
+		if alpha >= 255 {
+			alpha = int32(255 - s.anim.interpolate_blend_dstalpha)
+		}
 		fend := float32(sys.stage.sdw.fadeend) * sys.stage.localscl
 		fbgn := float32(sys.stage.sdw.fadebgn) * sys.stage.localscl
 		if fbgn <= fend {

--- a/src/char.go
+++ b/src/char.go
@@ -962,7 +962,7 @@ func (e *Explod) update(oldVer bool, playerNo int) {
 	if (e.facing < 0) != (e.vfacing < 0) {
 		agl *= -1
 	}
-	sdwalp := alp[0]
+	sdwalp := 255 - alp[1]
 	if sdwalp < 0 {
 		sdwalp = 256
 	}
@@ -4378,10 +4378,10 @@ func (c *Char) cueDraw() {
 				c.aimg.recAfterImg(sdf())
 			}
 		} else {
-			if c.gi().ver[0] != 1 && c.sf(CSF_angledraw) && !c.sf(CSF_trans) {
-				c.setSF(CSF_trans)
-				c.alpha = [...]int32{255, 0}
-			}
+			//if c.gi().ver[0] != 1 && c.sf(CSF_angledraw) && !c.sf(CSF_trans) {
+			//	c.setSF(CSF_trans)
+			//	c.alpha = [...]int32{255, 0}
+			//}
 			sd := sdf()
 			c.aimg.recAndCue(sd, rec)
 			if c.ghv.hitshaketime > 0 && c.ss.time&1 != 0 {
@@ -4392,7 +4392,7 @@ func (c *Char) cueDraw() {
 				sc = 0
 			}
 			if c.sf(CSF_trans) {
-				sa = c.alpha[0]
+				sa = 255 - c.alpha[1]
 			}
 			sys.sprites.add(sd, sc, sa, float32(c.size.shadowoffset), c.offsetY())
 		}

--- a/src/render.go
+++ b/src/render.go
@@ -1,9 +1,10 @@
 package main
 
 import (
-	"github.com/go-gl/gl/v2.1/gl"
 	"math"
 	"unsafe"
+
+	"github.com/go-gl/gl/v2.1/gl"
 )
 
 var notiling = [4]int32{0, 0, 0, 0}

--- a/src/stage.go
+++ b/src/stage.go
@@ -266,8 +266,8 @@ func readBackGround(is IniSection, link *backGround,
 	}
 	if is.readI32ForStage("maskwindow", &bg.startrect[0], &bg.startrect[1],
 		&bg.startrect[2], &bg.startrect[3]) {
-		bg.startrect[2] = Max(0, bg.startrect[2]+1-bg.startrect[0])
-		bg.startrect[3] = Max(0, bg.startrect[3]+1-bg.startrect[1])
+		bg.startrect[2] = Max(0, bg.startrect[2]-bg.startrect[0])
+		bg.startrect[3] = Max(0, bg.startrect[3]-bg.startrect[1])
 		bg.notmaskwindow = 0
 	}
 	is.readF32ForStage("windowdelta", &bg.windowdelta[0], &bg.windowdelta[1])
@@ -370,15 +370,12 @@ func (bg backGround) draw(pos [2]float32, scl, bgscl, lclscl float32,
 				bgscl * lscl[i]
 		}
 	}
-	rect[0] = int32(math.Floor(float64((float32(rect[0]) -
-		(pos[0]+bg.camstartx)*bg.windowdelta[0] + (float32(sys.gameWidth)/2/sclx - float32(bg.notmaskwindow)*160*(1/lscl[0]))) * sys.widthScale * wscl[0])))
-	rect[1] = int32(math.Floor(float64(((float32(rect[1])-
-		pos[1]*bg.windowdelta[1]+(float32(sys.gameHeight)/scly-240))*wscl[1] - shakeY) *
-		sys.heightScale)))
-	rect[2] = int32(math.Ceil(float64(float32(rect[2]) * sys.widthScale *
-		wscl[0])))
-	rect[3] = int32(math.Ceil(float64(float32(rect[3]) * sys.heightScale *
-		wscl[1])))
+	startrect0 := (float32(rect[0]) - (pos[0]+bg.camstartx)*bg.windowdelta[0] + (float32(sys.gameWidth)/2/sclx - float32(bg.notmaskwindow)*160*(1/lscl[0]))) * sys.widthScale * wscl[0]
+	startrect1 := ((float32(rect[1])-pos[1]*bg.windowdelta[1]+(float32(sys.gameHeight)/scly-240))*wscl[1] - shakeY) * sys.heightScale
+	rect[0] = int32(math.Floor(float64(startrect0)))
+	rect[1] = int32(math.Floor(float64(startrect1)))
+	rect[2] = int32(math.Floor(float64(startrect0 + (float32(rect[2]) * sys.widthScale * wscl[0]) - float32(rect[0]))))
+	rect[3] = int32(math.Floor(float64(startrect1 + (float32(rect[3]) * sys.heightScale * wscl[1]) - float32(rect[1]))))
 	bg.anim.Draw(&rect, x, y, sclx, scly, bg.xscale[0]*bgscl*(bg.scalestart[0]+xs)*xs3, xbs*bgscl*(bg.scalestart[0]+xs)*xs3, ys*(bg.scalestart[1]+ys2)*ys3,
 		xras*x/(AbsF(ys*ys3)*lscl[1]*float32(bg.anim.spr.Size[1]))*sclx_recip,
 		0, float32(sys.gameWidth)/2, &sys.bgPalFX, true)