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

Simplify ispx #825

Merged
merged 1 commit into from
Aug 29, 2024
Merged

Simplify ispx #825

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 5 additions & 27 deletions tools/ispx/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
_ "github.com/goplus/igop/pkg/fmt"
_ "github.com/goplus/igop/pkg/math"
_ "github.com/goplus/reflectx/icall/icall8192"
"github.com/goplus/spx"
spxfs "github.com/goplus/spx/fs"
)

var dataChannel = make(chan []byte)
Expand All @@ -44,6 +44,10 @@ func main() {
log.Fatalln("Failed to read zip data:", err)
}
fs := zipfs.NewZipFsFromReader(zipReader)
// Configure spx to load project files from zip-based file system.
spxfs.RegisterSchema("", func(path string) (spxfs.Dir, error) {
return fs.Chrooted(path), nil
})

var mode igop.Mode
ctx := igop.NewContext(mode)
Expand Down Expand Up @@ -75,32 +79,6 @@ func Gopt_Game_Gopx_GetWidget[T any](sg ShapeGetter, name string) *T {
log.Fatalln("Failed to build Go+ source:", err)
}

// Definition of `Gamer` here should be the same as `Gamer` in `github.com/goplus/spx`
// otherwise, it produces: "fatal error: unreachable method called. linker bug?"
// TODO: consider better solution to avoid replacing `Gopy_Game_Main` and `Gopy_Game_Run`, see details in https://github.com/goplus/builder/issues/824
type Gamer interface {
initGame(sprites []spx.Spriter) *spx.Game
}
gameRun := func(game spx.Gamer, resource interface{}, gameConf ...*spx.Config) {
path := resource.(string)
gameFs := fs.Chrooted(path)
spx.Gopt_Game_Run(game, gameFs, gameConf...)
}

igop.RegisterExternal("github.com/goplus/spx.Gopt_Game_Main", func(game Gamer, sprites ...spx.Spriter) {
game.initGame(sprites)
if me, ok := game.(interface{ MainEntry() }); ok {
me.MainEntry()
}
if me, ok := game.(interface{ IsRunned() bool }); ok {
if !me.IsRunned() {
gameRun(game.(spx.Gamer), "assets")
}
}
})

igop.RegisterExternal("github.com/goplus/spx.Gopt_Game_Run", gameRun)

code, err := ctx.RunFile("main.go", source, nil)
if err != nil {
log.Fatalln("Failed to run Go+ source:", err, " Code:", code)
Expand Down
Loading