コミット: 72a56b9d103b64c74e5232544867925793d88a1b - ikemen_go (git)

Go で書き直した Ikemen

コミットメタ情報

• リビジョン: 72a56b9d103b64c74e5232544867925793d88a1b (tree)
• 日時: 2019-02-25 20:13:41
• 作者: neatunsou <sisiy4excite@gmai...>
• コミッター: neatunsou

ログメッセージ

ProjectileがPauseで止まらないのを修正
Explod、Projectile、Helperのremappalが機能するようにした
localcoordが違うキャラにKOされた時吹っ飛び量がおかしいのを修正
Superpauseのデフォルトanim番号が実際は100だったので修正
スクリーンパックが描画されない不具合を修正

変更サマリ

• modified: src/bytecode.go
• modified: src/char.go
• modified: src/compiler.go
• modified: src/render.go

差分

--- a/src/bytecode.go
+++ b/src/bytecode.go
@@ -2220,6 +2220,7 @@ const (
 	helper_pausemovetime
 	helper_supermovetime
 	helper_redirectid
+	helper_remappal
 )
 
 func (sc helper) Run(c *Char, _ []int32) bool {
@@ -2230,6 +2231,7 @@ func (sc helper) Run(c *Char, _ []int32) bool {
 	var f, st int32 = 1, 0
 	op := false
 	var x, y float32 = 0, 0
+	rp := [...]int32{-1, 0}
 	StateControllerBase(sc).run(c, func(id byte, exp []BytecodeExp) bool {
 		if h == nil {
 			if id == helper_redirectid {
@@ -2301,6 +2303,11 @@ func (sc helper) Run(c *Char, _ []int32) bool {
 			h.pauseMovetime = exp[0].evalI(c)
 		case helper_supermovetime:
 			h.superMovetime = exp[0].evalI(c)
+		case helper_remappal:
+			rp[0] = exp[0].evalI(c)
+			if len(exp) > 1 {
+				rp[1] = exp[1].evalI(c)
+			}
 		}
 		return true
 	})
@@ -2314,7 +2321,7 @@ func (sc helper) Run(c *Char, _ []int32) bool {
 		h.localscl = crun.localscl
 		h.localcoord = crun.localcoord
 	}
-	crun.helperInit(h, st, pt, x, y, f, op)
+	crun.helperInit(h, st, pt, x, y, f, op, rp)
 	return false
 }
 
@@ -4591,7 +4598,7 @@ func (sc superPause) Run(c *Char, _ []int32) bool {
 	crun := c
 	var t, mt int32 = 30, 0
 	uh := true
-	sys.superanim, sys.superpmap.remap = crun.getAnim(30, true), nil
+	sys.superanim, sys.superpmap.remap = crun.getAnim(100, true), nil
 	sys.superpos, sys.superfacing = [...]float32{crun.pos[0] * crun.localscl, crun.pos[1] * crun.localscl}, crun.facing
 	sys.superpausebg, sys.superendcmdbuftime, sys.superdarken = true, 0, true
 	sys.superp2defmul = sys.super_TargetDefenceMul

--- a/src/char.go
+++ b/src/char.go
@@ -1124,17 +1124,17 @@ func (p *Projectile) setPos(pos [2]float32) {
 	p.pos, p.oldPos, p.newPos = pos, pos, pos
 }
 func (p *Projectile) paused(playerNo int) bool {
-	if !sys.chars[playerNo][0].pause() {
-		if sys.super > 0 {
-			if p.supermovetime == 0 {
-				return true
-			}
-		} else if sys.pause > 0 {
-			if p.pausemovetime == 0 {
-				return true
-			}
+	//if !sys.chars[playerNo][0].pause() {
+	if sys.super > 0 {
+		if p.supermovetime == 0 {
+			return true
+		}
+	} else if sys.pause > 0 {
+		if p.pausemovetime == 0 {
+			return true
 		}
 	}
+	//}
 	return false
 }
 func (p *Projectile) update(playerNo int) {
@@ -2854,7 +2854,7 @@ func (c *Char) helperPos(pt PosType, pos [2]float32, facing int32,
 	return
 }
 func (c *Char) helperInit(h *Char, st int32, pt PosType, x, y float32,
-	facing int32, ownpal bool) {
+	facing int32, ownpal bool, rp [2]int32) {
 	p := c.helperPos(pt, [...]float32{x, y}, facing, &h.facing, h.localscl, false)
 	h.setX(p[0])
 	h.setY(p[1])
@@ -2864,6 +2864,7 @@ func (c *Char) helperInit(h *Char, st int32, pt PosType, x, y float32,
 		tmp := c.getPalfx().remap
 		h.palfx.remap = make([]int, len(tmp))
 		copy(h.palfx.remap, tmp)
+		c.forceRemapPal(h.palfx, rp)
 	}
 	h.changeStateEx(st, c.playerNo, 0, 1)
 }
@@ -2905,7 +2906,7 @@ func (c *Char) insertExplodEx(i int, rp [2]int32) {
 		copy(remap, e.palfx.remap)
 		e.palfx = newPalFX()
 		e.palfx.remap = remap
-		c.remapPal(e.palfx, [...]int32{1, 1}, rp)
+		c.forceRemapPal(e.palfx, rp)
 	}
 	if e.ontop {
 		td := &sys.topexplDrawlist[c.playerNo]
@@ -3115,7 +3116,7 @@ func (c *Char) projInit(p *Projectile, pt PosType, x, y float32,
 		copy(remap, p.palfx.remap)
 		p.palfx = newPalFX()
 		p.palfx.remap = remap
-		c.remapPal(p.palfx, [...]int32{1, 1}, [...]int32{rpg, rpn})
+		c.forceRemapPal(p.palfx, [...]int32{rpg, rpn})
 	}
 }
 func (c *Char) setHitdefDefault(hd *HitDef, proj bool) {
@@ -3794,6 +3795,22 @@ func (c *Char) remapPal(pfx *PalFX, src [2]int32, dst [2]int32) {
 		c.gi().sff.palList.SwapPalMap(&pfx.remap)
 	}
 }
+func (c *Char) forceRemapPal(pfx *PalFX, dst [2]int32) {
+	if dst[0] < 0 || dst[1] < 0 {
+		return
+	}
+	di, ok := c.gi().sff.palList.PalTable[[...]int16{int16(dst[0]),
+		int16(dst[1])}]
+	if !ok {
+		return
+	}
+	if pfx.remap == nil {
+		pfx.remap = c.gi().sff.palList.GetPalMap()
+	}
+	for i := range pfx.remap {
+		pfx.remap[i] = di
+	}
+}
 func (c *Char) inGuardState() bool {
 	return c.ss.no == 120 || (c.ss.no >= 130 && c.ss.no <= 132) ||
 		c.ss.no == 140 || (c.ss.no >= 150 && c.ss.no <= 155)
@@ -5039,12 +5056,12 @@ func (cl *CharList) clsn(getter *Char, proj bool) {
 					}
 					if getter.ss.stateType == ST_A {
 						if getter.ghv.xvel < 0 {
-							getter.ghv.xvel -= 2 / c.localscl * getter.localscl
+							getter.ghv.xvel -= 2 * getter.localscl
 						}
 						if getter.ghv.yvel <= 0 {
-							getter.ghv.yvel -= 2 / c.localscl * getter.localscl
-							if getter.ghv.yvel > -3 {
-								getter.ghv.yvel = -3 / c.localscl * getter.localscl
+							getter.ghv.yvel -= 2 * getter.localscl
+							if getter.ghv.yvel > -3*getter.localscl {
+								getter.ghv.yvel = -3 * getter.localscl
 							}
 						}
 					} else {
@@ -5052,12 +5069,12 @@ func (cl *CharList) clsn(getter *Char, proj bool) {
 							getter.ghv.xvel *= 0.66
 						}
 						if getter.ghv.xvel < 0 {
-							getter.ghv.xvel -= 2.5 / c.localscl * getter.localscl
+							getter.ghv.xvel -= 2.5 * getter.localscl
 						}
 						if getter.ghv.yvel <= 0 {
-							getter.ghv.yvel -= 2 / c.localscl * getter.localscl
-							if getter.ghv.yvel > -6 {
-								getter.ghv.yvel = -6 / c.localscl * getter.localscl
+							getter.ghv.yvel -= 2 * getter.localscl
+							if getter.ghv.yvel > -6*getter.localscl {
+								getter.ghv.yvel = -6 * getter.localscl
 							}
 						}
 					}

--- a/src/compiler.go
+++ b/src/compiler.go
@@ -3471,6 +3471,10 @@ func (c *Compiler) helper(is IniSection, sc *StateControllerBase,
 			helper_supermovetime, VT_Int, 1, false); err != nil {
 			return err
 		}
+		if err := c.paramValue(is, sc, "remappal",
+			helper_remappal, VT_Int, 2, false); err != nil {
+			return err
+		}
 		return nil
 	})
 	return *ret, err

--- a/src/render.go
+++ b/src/render.go
@@ -132,8 +132,6 @@ func RenderInit() {
 	mugenShader = link(vertObj, fragObj)
 	posattLocation = gl.GetAttribLocationARB(mugenShader, gl.Str("position\x00"))
 	uvattLocation = gl.GetAttribLocationARB(mugenShader, gl.Str("uv\x00"))
-	gl.EnableVertexAttribArrayARB(uint32(posattLocation))
-	gl.EnableVertexAttribArrayARB(uint32(uvattLocation))
 	uniformA = gl.GetUniformLocationARB(mugenShader, gl.Str("a\x00"))
 	uniformPal = gl.GetUniformLocationARB(mugenShader, gl.Str("pal\x00"))
 	uniformMsk = gl.GetUniformLocationARB(mugenShader, gl.Str("msk\x00"))
@@ -169,6 +167,8 @@ func drawQuads(x1, y1, x2, y2, x3, y3, x4, y4 float32, renderMode int32) {
 	case 2:
 		gl.Uniform4fARB(uniformX1x2x4x3, x1, x2, x4, x3)
 	}
+	gl.EnableVertexAttribArrayARB(uint32(posattLocation))
+	gl.EnableVertexAttribArrayARB(uint32(uvattLocation))
 	gl.VertexAttribPointerARB(uint32(posattLocation), 2, gl.FLOAT, false, 0, unsafe.Pointer(&vertexPosition[0]))
 	gl.VertexAttribPointerARB(uint32(uvattLocation), 2, gl.FLOAT, false, 0, unsafe.Pointer(&vertexUv[0]))