Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

optional MainEntry/Run #265

Merged
merged 7 commits into from
Mar 13, 2024
Merged

optional MainEntry/Run #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
79be685
getSpriteProto/getSpriteProtoByName
xushiwei Mar 13, 2024
e5059bf
game: optional MainEntry/Run
xushiwei Mar 13, 2024
e8b150c
spx test examples
xushiwei Mar 13, 2024
283a080
examples: CameraTouching/Dinosaur
xushiwei Mar 13, 2024
9078e3a
examples: Hello/Measure
xushiwei Mar 13, 2024
985bac2
workflow: GenGo
xushiwei Mar 13, 2024
4a367a2
temporary disable example Quote
xushiwei Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: github-actions
directory: /
labels:
- dependabot
- actions
schedule:
interval: daily

- package-ecosystem: "gomod" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/go.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Set up Go
uses: actions/setup-go@v3
- name: Set up Go/Go+
uses: goplus/setup-[email protected]
with:
go-version: 1.18
go-version: "1.18"
gop-version: "main"

- name: Get dependencies
run: sudo apt-get update && sudo apt-get install gcc libgl1-mesa-dev libegl1-mesa-dev libgles2-mesa-dev libx11-dev xorg-dev libasound2-dev libopenal-dev
Expand All @@ -27,3 +28,6 @@ jobs:

- name: Test
run: go test -v ./...

- name: GenGo
run: gop go ./...
151 changes: 88 additions & 63 deletions game.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"log"
"math/rand"
"os"
"path/filepath"
"reflect"
"sync/atomic"
"time"
Expand Down Expand Up @@ -78,8 +79,9 @@ type Game struct {

sounds soundMgr
turtle turtleCanvas
shapes map[string]Spriter // sprite prototypes
items []Shape // sprites on stage
typs map[string]reflect.Type // map: name => sprite type, for all sprites
sprs map[string]Spriter // map: name => sprite prototype, for loaded sprites
items []Shape // shapes on stage (in Zorder), not only sprites

tickMgr tickMgr
input inputMgr
Expand All @@ -100,12 +102,16 @@ type Game struct {

sinkMgr eventSinkMgr
isLoaded bool
isRunned bool
}

type Spriter = Shape
type Spriter interface {
Shape
Main()
}

type Gamer interface {
initGame()
initGame(sprites []Spriter) *Game
}

func (p *Game) getSharedImgs() *sharedImages {
Expand All @@ -115,24 +121,66 @@ func (p *Game) getSharedImgs() *sharedImages {
return p.shared
}

func (p *Game) newSpriteAndLoad(name string, tySpr reflect.Type, g reflect.Value) Spriter {
spr := reflect.New(tySpr).Interface().(Spriter)
if err := p.loadSprite(spr, name, g); err != nil {
panic(err)
}
// p.sprs[name] = spr (has been set by loadSprite)
return spr
}

func (p *Game) getSpriteProto(tySpr reflect.Type, g reflect.Value) Spriter {
name := tySpr.Name()
spr, ok := p.sprs[name]
if !ok {
spr = p.newSpriteAndLoad(name, tySpr, g)
}
return spr
}

func (p *Game) getSpriteProtoByName(name string, g reflect.Value) Spriter {
spr, ok := p.sprs[name]
if !ok {
tySpr, ok := p.typs[name]
if !ok {
log.Panicf("sprite %s is not defined\n", name)
}
spr = p.newSpriteAndLoad(name, tySpr, g)
}
return spr
}

func (p *Game) reset() {
p.sinkMgr.reset()
p.input.reset()
p.Stop(AllOtherScripts)
p.items = nil
p.isLoaded = false
p.shapes = make(map[string]Spriter)
p.sprs = make(map[string]Spriter)
}

func (p *Game) initGame() {
func (p *Game) initGame(sprites []Spriter) *Game {
p.tickMgr.init()
p.eventSinks.init(&p.sinkMgr, p)
p.sprs = make(map[string]Spriter)
p.typs = make(map[string]reflect.Type)
for _, spr := range sprites {
tySpr := reflect.TypeOf(spr).Elem()
p.typs[tySpr.Name()] = tySpr
}
return p
}

// Gopt_Game_Main is required by Go+ compiler as the entry of a .gmx project.
func Gopt_Game_Main(game Gamer) { // TODO(xsw): sprites ...Spriter) {
game.initGame()
game.(interface{ MainEntry() }).MainEntry()
func Gopt_Game_Main(game Gamer, sprites ...Spriter) {
g := game.initGame(sprites)
if me, ok := game.(interface{ MainEntry() }); ok {
me.MainEntry()
}
if !g.isRunned {
Gopt_Game_Run(game, "assets")
}
}

// Gopt_Game_Run runs the game.
Expand All @@ -149,8 +197,8 @@ func Gopt_Game_Run(game Gamer, resource interface{}, gameConf ...*Config) {
conf = *gameConf[0]
err = loadProjConfig(&proj, fs, conf.Index)
} else {
// load Config from index.json
if err = loadProjConfig(&proj, fs, nil); err == nil {
err = loadProjConfig(&proj, fs, nil)
if proj.Run != nil { // load Config from index.json
conf = *proj.Run
}
}
Expand All @@ -174,6 +222,11 @@ func Gopt_Game_Run(game Gamer, resource interface{}, gameConf ...*Config) {
}
conf.FullScreen = *fullscreen
}
if conf.Title == "" {
dir, _ := os.Getwd()
appName := filepath.Base(dir)
conf.Title = appName + " (by Go+ Builder)"
}

key := conf.ScreenshotKey
if key == "" {
Expand All @@ -191,9 +244,7 @@ func Gopt_Game_Run(game Gamer, resource interface{}, gameConf ...*Config) {
if debugLoad {
log.Println("==> StartLoad", resource)
}
if err := g.startLoad(fs, &conf); err != nil {
panic(err)
}
g.startLoad(fs, &conf)
for i, n := 0, v.NumField(); i < n; i++ {
name, val := getFieldPtrOrAlloc(v, i)
switch fld := val.(type) {
Expand All @@ -207,6 +258,7 @@ func Gopt_Game_Run(game Gamer, resource interface{}, gameConf ...*Config) {
if err := g.loadSprite(fld, name, v); err != nil {
panic(err)
}
// p.sprs[name] = fld (has been set by loadSprite)
}
}
if err := g.endLoad(v, &proj); err != nil {
Expand Down Expand Up @@ -252,7 +304,7 @@ func getFieldPtrOrAlloc(v reflect.Value, i int) (name string, val interface{}) {
typ := tFld.Type
word := unsafe.Pointer(vFld.Addr().Pointer())
ret := reflect.NewAt(typ, word).Interface()
if vFld.Kind() == reflect.Ptr && typ.Implements(tyShape) {
if vFld.Kind() == reflect.Ptr && typ.Implements(tySpriter) {
obj := reflect.New(typ.Elem())
reflect.ValueOf(ret).Elem().Set(obj)
ret = obj.Interface()
Expand Down Expand Up @@ -290,20 +342,17 @@ func findObjPtr(v reflect.Value, name string, from int) interface{} {
return nil
}

func (p *Game) startLoad(fs spxfs.Dir, cfg *Config) (err error) {
func (p *Game) startLoad(fs spxfs.Dir, cfg *Config) {
var keyDuration int
if cfg != nil {
keyDuration = cfg.KeyDuration
}
p.initGame()
p.input.init(p, keyDuration)
p.sounds.init(p)
p.shapes = make(map[string]Spriter)
p.events = make(chan event, 16)
p.fs = fs
p.windowWidth_ = cfg.Width
p.windowHeight_ = cfg.Height
return
}

func (p *Game) loadSprite(sprite Spriter, name string, gamer reflect.Value) error {
Expand All @@ -322,7 +371,7 @@ func (p *Game) loadSprite(sprite Spriter, name string, gamer reflect.Value) erro
vSpr.Set(reflect.Zero(vSpr.Type()))
base := vSpr.Field(0).Addr().Interface().(*Sprite)
base.init(baseDir, p, name, &conf, gamer, p.getSharedImgs())
p.shapes[name] = sprite
p.sprs[name] = sprite
//
// init gamer pointer (field 1)
*(*uintptr)(unsafe.Pointer(vSpr.Field(1).Addr().Pointer())) = gamer.Addr().Pointer()
Expand All @@ -334,10 +383,6 @@ func spriteOf(sprite Spriter) *Sprite {
return vSpr.Field(0).Addr().Interface().(*Sprite)
}

type initer interface {
Main()
}

func (p *Game) loadIndex(g reflect.Value, proj *projConfig) (err error) {
if scenes := proj.getScenes(); len(scenes) > 0 {
p.baseObj.init("", scenes, proj.getSceneIndex())
Expand All @@ -355,17 +400,15 @@ func (p *Game) loadIndex(g reflect.Value, proj *projConfig) (err error) {
p.world = ebiten.NewImage(p.worldWidth_, p.worldHeight_)
p.mapMode = toMapMode(proj.Map.Mode)

inits := make([]initer, 0, len(proj.Zorder))
inits := make([]Spriter, 0, len(proj.Zorder))
for _, v := range proj.Zorder {
if name, ok := v.(string); !ok { // not a prototype sprite
inits = p.addSpecialShape(g, v.(specsp), inits)
} else if sp, ok := p.shapes[name]; ok {
if name, ok := v.(string); ok {
sp := p.getSpriteProtoByName(name, g)
p.addShape(spriteOf(sp))
if ini, ok := sp.(initer); ok {
inits = append(inits, ini)
}
inits = append(inits, sp)
} else {
return fmt.Errorf("sprite %s is not found", name)
// not a prototype sprite
inits = p.addSpecialShape(g, v.(specsp), inits)
}
}
for _, ini := range inits {
Expand All @@ -385,14 +428,14 @@ func (p *Game) loadIndex(g reflect.Value, proj *projConfig) (err error) {
}
p.Camera.init(p, float64(p.windowWidth_), float64(p.windowHeight_), float64(p.worldWidth_), float64(p.worldHeight_))

ebiten.SetWindowResizable(true)
ebiten.SetWindowResizingMode(ebiten.WindowResizingModeOnlyFullscreenEnabled)
if proj.Camera != nil && proj.Camera.On != "" {
p.Camera.On(proj.Camera.On)
}
if loader, ok := g.Addr().Interface().(interface{ OnLoaded() }); ok {
loader.OnLoaded()
}
//game load success
// game load success
p.isLoaded = true
return
}
Expand Down Expand Up @@ -427,7 +470,7 @@ func Gopt_Game_Reload(game Gamer, index interface{}) (err error) {

type specsp = map[string]interface{}

func (p *Game) addSpecialShape(g reflect.Value, v specsp, inits []initer) []initer {
func (p *Game) addSpecialShape(g reflect.Value, v specsp, inits []Spriter) []Spriter {
switch typ := v["type"].(string); typ {
case "stageMonitor":
if sm, err := newStageMonitor(g, v); err == nil {
Expand All @@ -445,16 +488,14 @@ func (p *Game) addSpecialShape(g reflect.Value, v specsp, inits []initer) []init
return inits
}

func (p *Game) addStageSprite(g reflect.Value, v specsp, inits []initer) []initer {
func (p *Game) addStageSprite(g reflect.Value, v specsp, inits []Spriter) []Spriter {
target := v["target"].(string)
if val := findObjPtr(g, target, 0); val != nil {
if sp, ok := val.(Shape); ok {
if sp, ok := val.(Spriter); ok {
dest := spriteOf(sp)
applySpriteProps(dest, v)
p.addShape(dest)
if ini, ok := val.(initer); ok {
inits = append(inits, ini)
}
inits = append(inits, sp)
return inits
}
}
Expand All @@ -477,7 +518,7 @@ func (p *Game) addStageSprite(g reflect.Value, v specsp, inits []initer) []inite
]
}
*/
func (p *Game) addStageSprites(g reflect.Value, v specsp, inits []initer) []initer {
func (p *Game) addStageSprites(g reflect.Value, v specsp, inits []Spriter) []Spriter {
target := v["target"].(string)
if val := findFieldPtr(g, target, 0); val != nil {
fldSlice := reflect.ValueOf(val).Elem()
Expand All @@ -491,16 +532,8 @@ func (p *Game) addStageSprites(g reflect.Value, v specsp, inits []initer) []init
} else {
typItemPtr = reflect.PtrTo(typItem)
}
if typItemPtr.Implements(tyShape) {
name := typItem.Name()
spr, ok := p.shapes[name]
if !ok {
spr = reflect.New(typItem).Interface().(Spriter)
if err := p.loadSprite(spr, name, g); err != nil {
panic(err)
}
p.shapes[name] = spr
}
if typItemPtr.Implements(tySpriter) {
spr := p.getSpriteProto(typItem, g)
items := v["items"].([]interface{})
n := len(items)
newSlice := reflect.MakeSlice(typSlice, n, n)
Expand All @@ -512,9 +545,7 @@ func (p *Game) addStageSprites(g reflect.Value, v specsp, inits []initer) []init
}
dest, sp := applySprite(newItem, spr, items[i].(specsp))
p.addShape(dest)
if ini, ok := sp.(initer); ok {
inits = append(inits, ini)
}
inits = append(inits, sp)
}
fldSlice.Set(newSlice)
return inits
Expand All @@ -525,7 +556,7 @@ func (p *Game) addStageSprites(g reflect.Value, v specsp, inits []initer) []init
}

var (
tyShape = reflect.TypeOf((*Shape)(nil)).Elem()
tySpriter = reflect.TypeOf((*Spriter)(nil)).Elem()
)

// -----------------------------------------------------------------------------
Expand All @@ -534,21 +565,15 @@ func (p *Game) runLoop(cfg *Config) (err error) {
if debugLoad {
log.Println("==> RunLoop")
}
if cfg == nil {
cfg = &Config{}
}
if !cfg.DontRunOnUnfocused {
ebiten.SetRunnableOnUnfocused(true)
}
if cfg.FullScreen {
ebiten.SetFullscreen(true)
}
p.isRunned = true
p.initEventLoop()
title := cfg.Title
if title == "" {
title = "Game powered by Go+"
}
ebiten.SetWindowTitle(title)
ebiten.SetWindowTitle(cfg.Title)
return ebiten.RunGame(p)
}

Expand Down
Loading
Loading