提交: 55383ba195aa1b57a7a0c075af5d0340e9bde634 - ikemen_go (git)

Go で書き直した Ikemen

Commit MetaInfo

• 修訂: 55383ba195aa1b57a7a0c075af5d0340e9bde634 (tree)
• 時間: 2016-12-01 23:59:31
• 作者: SUEHIRO <supersuehiro@user...>
• Commiter: SUEHIRO

Log Message

作ってないところにでunimplementedを呼ぶようにした

Change Summary

• modified: script/main.lua
• add: src/char.go
• add: src/compiler.go
• modified: src/image.go
• modified: src/input.go
• modified: src/main.go
• modified: src/script.go
• modified: src/system.go

差異

--- a/script/main.lua
+++ b/script/main.lua
@@ -327,7 +327,7 @@ function p1SelSub()
       p1SelEnd = true
       if p2In == 1 then
         p2Task = p2TmSub
-        commandBufReset(p2Cmd, p2In)
+        commandBufReset(p2Cmd)
       end
     end
   end
@@ -404,7 +404,7 @@ function p2SelSub()
       p2SelEnd = true
       if p1In == 2 then
         p1Task = p1TmSub
-        commandBufReset(p1Cmd, p1In)
+        commandBufReset(p1Cmd)
       end
     end
   end
@@ -519,8 +519,8 @@ function main()
 
     refresh()
 
-    commandBufReset(p1Cmd, p1In)
-    commandBufReset(p2Cmd, p2In)
+    commandBufReset(p1Cmd)
+    commandBufReset(p2Cmd)
 
     selMode = true
     selectStart()
@@ -587,7 +587,7 @@ function modeSel()
     textImgSetText(portChange, 'Port Change(' .. getListenPort() .. ')')
 
     refresh()
-    commandBufReset(p1Cmd, 1)
+    commandBufReset(p1Cmd)
 
     while btnPalNo(p1Cmd) <= 0 do
       if commandGetState(p1Cmd, 'u') then

--- /dev/null
+++ b/src/char.go
@@ -0,0 +1,4 @@
+package main
+
+type CharGlobalInfo struct{ drawpalno int32 }
+type Char struct{}

--- /dev/null
+++ b/src/compiler.go
@@ -0,0 +1,3 @@
+package main
+
+type Compiler struct{}

--- a/src/image.go
+++ b/src/image.go
@@ -32,18 +32,27 @@ type PalFX struct {
 	Remap []int
 }
 
-func NewPalFX() *PalFX                                      { return &PalFX{} }
-func (pfx *PalFX) GetFxPal(pal []uint32, neg bool) []uint32 { return pal }
+func NewPalFX() *PalFX { return &PalFX{} }
+func (pfx *PalFX) GetFxPal(pal []uint32, neg bool) []uint32 {
+	if pfx == nil || pfx.Time == 0 {
+		return pal
+	}
+	unimplemented()
+	return nil
+}
 func (pfx *PalFX) GetFcPalFx(trans int32) (neg bool, color float32,
 	add, mul [3]float32) {
-	neg = false
-	color = 1
-	for i := range add {
-		add[i] = 0
-	}
-	for i := range mul {
-		mul[i] = 1
+	if pfx == nil || pfx.Time == 0 {
+		neg = false
+		color = 1
+		for i := range add {
+			add[i] = 0
+		}
+		for i := range mul {
+			mul[i] = 1
+		}
 	}
+	unimplemented()
 	return
 }
 

--- a/src/input.go
+++ b/src/input.go
@@ -422,11 +422,17 @@ type NetBuffer struct {
 }
 type NetInput struct{ buf []NetBuffer }
 
-func (ni *NetInput) Close() {}
+func (ni *NetInput) Close() { unimplemented() }
+func (ni *NetInput) Input(cb *CommandBuffer, i, facing int32) {
+	unimplemented()
+}
 
 type FileInput struct{ ib []InputBits }
 
-func (ni *FileInput) Close() {}
+func (ni *FileInput) Close() { unimplemented() }
+func (ni *FileInput) Input(cb *CommandBuffer, i, facing int32) {
+	unimplemented()
+}
 
 type AiInput struct {
 	dir, dt, at, bt, ct, xt, yt, zt, st int32
@@ -902,7 +908,7 @@ func (c *Command) bufTest(cbuf *CommandBuffer, ai bool,
 		}
 	}
 	foo := false
-	for _, k := range c.cmd[c.cmdi-1].key {
+	for _, k := range c.cmd[c.cmdi].key {
 		n := cbuf.State2(k)
 		if c.cmd[c.cmdi].slash {
 			foo = foo || n > 0
@@ -966,8 +972,81 @@ type CommandList struct {
 	DefaultBufferTime int32
 }
 
-func NewCommandList() *CommandList {
-	return &CommandList{Names: make(map[string]int)}
+func NewCommandList(cb *CommandBuffer) *CommandList {
+	return &CommandList{Buffer: cb, Names: make(map[string]int)}
+}
+func (cl *CommandList) Input(i, facing int32) bool {
+	if cl.Buffer == nil {
+		return false
+	}
+	step := cl.Buffer.Bb != 0
+	if i < 0 && int(^i) < len(sys.aiInput) {
+		sys.aiInput[^i].Update() // 乱数を使うので同期がずれないようここで
+	}
+	_else := i < 0
+	if _else {
+	} else if sys.fileInput != nil {
+		sys.fileInput.Input(cl.Buffer, i, facing)
+	} else if sys.netInput != nil {
+		sys.netInput.Input(cl.Buffer, i, facing)
+	} else {
+		_else = true
+	}
+	if _else {
+		var l, r, u, d, a, b, c, x, y, z, s bool
+		if i < 0 {
+			i = ^i
+			if int(i) < len(sys.aiInput) {
+				l = sys.aiInput[i].L()
+				r = sys.aiInput[i].R()
+				u = sys.aiInput[i].U()
+				d = sys.aiInput[i].D()
+				a = sys.aiInput[i].A()
+				b = sys.aiInput[i].B()
+				c = sys.aiInput[i].C()
+				x = sys.aiInput[i].X()
+				y = sys.aiInput[i].Y()
+				z = sys.aiInput[i].Z()
+				s = sys.aiInput[i].S()
+			}
+		} else if int(i) < len(sys.inputRemap) {
+			in := sys.inputRemap[i]
+			if in < len(sys.keyConfig) {
+				joy := sys.keyConfig[in].Joy
+				if joy >= -1 {
+					l = JoystickState(joy, sys.keyConfig[in].L)
+					r = JoystickState(joy, sys.keyConfig[in].R)
+					u = JoystickState(joy, sys.keyConfig[in].U)
+					d = JoystickState(joy, sys.keyConfig[in].D)
+					a = JoystickState(joy, sys.keyConfig[in].A)
+					b = JoystickState(joy, sys.keyConfig[in].B)
+					c = JoystickState(joy, sys.keyConfig[in].C)
+					x = JoystickState(joy, sys.keyConfig[in].X)
+					y = JoystickState(joy, sys.keyConfig[in].Y)
+					z = JoystickState(joy, sys.keyConfig[in].Z)
+					s = JoystickState(joy, sys.keyConfig[in].S)
+				}
+			}
+		}
+		var B, F bool
+		if facing < 0 {
+			B, F = r, l
+		} else {
+			B, F = l, r
+		}
+		cl.Buffer.Input(B, d, F, u, a, b, c, x, y, z, s)
+	}
+	return step
+}
+func (cl *CommandList) Step(facing int32, ai, hitpause bool,
+	buftime int32) {
+	if cl.Buffer != nil {
+		for i := range cl.Commands {
+			for j := range cl.Commands[i] {
+				cl.Commands[i][j].Step(cl.Buffer, ai, hitpause, buftime)
+			}
+		}
+	}
 }
 func (cl *CommandList) BufReset() {
 	if cl.Buffer != nil {
@@ -988,3 +1067,24 @@ func (cl *CommandList) Add(c Command) {
 	cl.Commands[i] = append(cl.Commands[i], c)
 	cl.Names[c.name] = i
 }
+func (cl *CommandList) At(i int) []Command {
+	if i < 0 || i >= len(cl.Commands) {
+		return []Command{}
+	}
+	return cl.Commands[i]
+}
+func (cl *CommandList) Get(name string) []Command {
+	i, ok := cl.Names[name]
+	if !ok {
+		return []Command{}
+	}
+	return cl.At(i)
+}
+func (cl *CommandList) GetState(name string) bool {
+	for _, c := range cl.Get(name) {
+		if c.curbuftime > 0 {
+			return true
+		}
+	}
+	return false
+}

--- a/src/main.go
+++ b/src/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"fmt"
 	"github.com/go-gl/glfw/v3.2/glfw"
 	"github.com/yuin/gopher-lua"
 	"runtime"
@@ -15,6 +16,10 @@ func chk(err error) {
 		panic(err)
 	}
 }
+func unimplemented() {
+	_, fn, line, _ := runtime.Caller(1)
+	panic(Error(fmt.Sprintf("%v:%v: unimplemented", fn, line)))
+}
 func main() {
 	chk(glfw.Init())
 	defer glfw.Terminate()

--- a/src/script.go
+++ b/src/script.go
@@ -73,7 +73,7 @@ func scriptCommonInit(l *lua.LState) {
 		return 1
 	})
 	luaRegister(l, "commandNew", func(l *lua.LState) int {
-		l.Push(newUserData(l, NewCommandList()))
+		l.Push(newUserData(l, NewCommandList(&CommandBuffer{})))
 		return 1
 	})
 	luaRegister(l, "commandAdd", func(l *lua.LState) int {
@@ -88,6 +88,24 @@ func scriptCommonInit(l *lua.LState) {
 		cl.Add(*c)
 		return 0
 	})
+	luaRegister(l, "commandGetState", func(l *lua.LState) int {
+		cl, ok := toUserData(l, 1).(*CommandList)
+		if !ok {
+			userDataError(l, 1, cl)
+		}
+		l.Push(lua.LBool(cl.GetState(strArg(l, 2))))
+		return 1
+	})
+	luaRegister(l, "commandInput", func(l *lua.LState) int {
+		cl, ok := toUserData(l, 1).(*CommandList)
+		if !ok {
+			userDataError(l, 1, cl)
+		}
+		if cl.Input(int32(numArg(l, 2))-1, 1) {
+			cl.Step(1, false, false, 0)
+		}
+		return 0
+	})
 	luaRegister(l, "commandBufReset", func(l *lua.LState) int {
 		cl, ok := toUserData(l, 1).(*CommandList)
 		if !ok {
@@ -356,7 +374,7 @@ func systemScriptInit(l *lua.LState) {
 		return 0
 	})
 	luaRegister(l, "setStage", func(*lua.LState) int {
-		l.Push(lua.LNumber(sys.sel.setStageNo(int(numArg(l, 1)))))
+		l.Push(lua.LNumber(sys.sel.SetStageNo(int(numArg(l, 1)))))
 		return 1
 	})
 	luaRegister(l, "refresh", func(*lua.LState) int {
@@ -418,4 +436,13 @@ func systemScriptInit(l *lua.LState) {
 		sys.resetRemapInput()
 		return 0
 	})
+	luaRegister(l, "loadStart", func(l *lua.LState) int {
+		sys.loadStart()
+		return 0
+	})
+	luaRegister(l, "selectStart", func(l *lua.LState) int {
+		sys.sel.ClearSelected()
+		sys.loadStart()
+		return 0
+	})
 }

--- a/src/system.go
+++ b/src/system.go
@@ -17,8 +17,8 @@ var sys = System{
 	gameWidth: 320, gameHeight: 240,
 	widthScale: 1, heightScale: 1,
 	brightness: 256,
-	introTime:  0, roundTime: -1,
-	lifeMul: 1, team1VS2Life: 1,
+	roundTime:  -1,
+	lifeMul:    1, team1VS2Life: 1,
 	turnsRecoveryRate: 1.0 / 300,
 	zoomMin:           1, zoomMax: 1, zoomSpeed: 1,
 	lifebarFontScale: 1,
@@ -29,7 +29,8 @@ var sys = System{
 	sel:              *newSelect(),
 	match:            1,
 	inputRemap:       [...]int{0, 1, 2, 3, 4, 5, 6, 7},
-	listenPort:       "7500"}
+	listenPort:       "7500",
+	loader:           *newLoader()}
 
 type System struct {
 	randseed                    int32
@@ -58,7 +59,7 @@ type System struct {
 	sel                         Select
 	netInput                    *NetInput
 	fileInput                   *FileInput
-	aiInput                     []AiInput
+	aiInput                     [MaxSimul * 2]AiInput
 	keyConfig                   []*KeyConfig
 	com                         [MaxSimul * 2]int32
 	autolevel                   bool
@@ -66,6 +67,12 @@ type System struct {
 	match                       int32
 	inputRemap                  [MaxSimul * 2]int
 	listenPort                  string
+	round                       int32
+	wins                        [2]int32
+	rexisted                    [2]int32
+	loader                      Loader
+	chars                       [MaxSimul * 2][]*Char
+	cgi                         [MaxSimul * 2]CharGlobalInfo
 }
 
 func (s *System) init(w, h int32) *lua.LState {
@@ -138,6 +145,14 @@ func (s *System) resetRemapInput() {
 		s.inputRemap[i] = i
 	}
 }
+func (s *System) loaderReset() {
+	s.round, s.wins, s.rexisted = 1, [2]int32{0, 0}, [2]int32{0, 0}
+	s.loader.reset()
+}
+func (s *System) loadStart() {
+	s.loaderReset()
+	s.loader.runTread()
+}
 
 type SelectChar struct {
 	def, name            string
@@ -147,27 +162,31 @@ type SelectStage struct {
 	def, name string
 }
 type Select struct {
-	columns, rows int32
-	cellsize      [2]float32
-	cellscale     [2]float32
-	randomspr     *Sprite
-	randomscl     [2]float32
-	charlist      []SelectChar
-	stagelist     []SelectStage
-	curStageNo    int
+	columns, rows   int32
+	cellsize        [2]float32
+	cellscale       [2]float32
+	randomspr       *Sprite
+	randomscl       [2]float32
+	charlist        []SelectChar
+	stagelist       []SelectStage
+	curStageNo      int
+	selected        [2][][2]int
+	selectedStageNo int
 }
 
 func newSelect() *Select {
 	return &Select{columns: 5, rows: 2, randomscl: [2]float32{1, 1},
-		cellsize: [2]float32{29, 29}, cellscale: [2]float32{1, 1}}
+		cellsize: [2]float32{29, 29}, cellscale: [2]float32{1, 1},
+		selectedStageNo: -1}
 }
-func (s *Select) setStageNo(n int) int {
+func (s *Select) SetStageNo(n int) int {
 	s.curStageNo = n % (len(s.stagelist) + 1)
 	if s.curStageNo < 0 {
 		s.curStageNo += len(s.stagelist) + 1
 	}
 	return s.curStageNo
 }
+func (s *Select) SelectStage(n int) { s.selectedStageNo = n }
 func (s *Select) AddCahr(def string) {
 	s.charlist = append(s.charlist, SelectChar{})
 	sc := &s.charlist[len(s.charlist)-1]
@@ -260,3 +279,71 @@ func (s *Select) AddStage(def string) error {
 	}
 	return nil
 }
+func (s *Select) ClearSelected() {
+	s.selected = [2][][2]int{[][2]int{}, [][2]int{}}
+	s.selectedStageNo = -1
+}
+
+type LoaderState int32
+
+const (
+	LS_NotYet LoaderState = iota
+	LS_Loading
+	LS_Complete
+	LS_Error
+	LS_Cancel
+)
+
+type Loader struct {
+	state    LoaderState
+	loadExit chan LoaderState
+	compiler *Compiler
+	err      error
+}
+
+func newLoader() *Loader {
+	return &Loader{state: LS_NotYet, loadExit: make(chan LoaderState, 1)}
+}
+func (l *Loader) load() {
+	defer func() { l.loadExit <- l.state }()
+	charDone, codeDone, stageDone := make([]bool, len(sys.chars)), false, false
+	allCharDone := func() bool {
+		for _, b := range charDone {
+			if !b {
+				return false
+			}
+		}
+		return true
+	}
+	for !codeDone || !stageDone || !allCharDone() {
+		unimplemented()
+		if sys.gameEnd {
+			l.state = LS_Cancel
+		}
+		if l.state == LS_Cancel {
+			return
+		}
+	}
+	l.state = LS_Complete
+}
+func (l *Loader) reset() {
+	if l.state != LS_NotYet {
+		l.state = LS_Cancel
+		<-l.loadExit
+		l.state = LS_NotYet
+	}
+	l.compiler, l.err = nil, nil
+	for i := range sys.cgi {
+		if sys.rexisted[i&1] == 0 {
+			sys.cgi[i].drawpalno = -1
+		}
+	}
+}
+func (l *Loader) runTread() bool {
+	if l.state != LS_NotYet {
+		return false
+	}
+	l.state = LS_Loading
+	go l.load()
+	return true
+}