Skip to content

Commit 9018098

Browse files
JiepengTanJiepengTan
authored
Merge pull request #754 from JiepengTan/pr_update_ai_version
ISPX: Update ai pack version
2 parents 091822d + 33d2d01 commit 9018098

6 files changed

Lines changed: 58 additions & 27 deletions

File tree

‎cmd/igox/embedded_pkgs.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package main
22

33
//go:generate go tool qexp -outdir pkg github.com/goplus/spx/v2
44
//go:generate go tool qexp -outdir pkg github.com/goplus/spx/v2/pkg/gdspx/pkg/engine
5+
//go:generate go tool qexp -outdir pkg github.com/goplus/spx/v2/pkg/spx
56
//go:generate go tool qexp -outdir pkg github.com/goplus/builder/tools/ai
67

78
// All packages available in the ispx Wasm runtime.

‎cmd/igox/go.mod‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,19 @@ go 1.24.0
55
tool github.com/goplus/ixgo/cmd/qexp
66

77
require (
8-
github.com/goplus/builder/tools/ai v0.0.0-20250522033218-53c368333ac2
8+
github.com/goplus/builder/tools/ai v0.0.0-20250808083237-2338f2f4b06e
99
github.com/goplus/ixgo v0.52.0
1010
github.com/goplus/mod v0.17.1
1111
github.com/goplus/reflectx v1.4.2
12-
github.com/goplus/spx/v2 v2.0.0-00010101000000-000000000000
12+
github.com/goplus/spx/v2 v2.0.0-pre.3
1313
)
1414

1515
require (
1616
github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 // indirect
1717
github.com/goplus/gogen v1.19.0 // indirect
1818
github.com/goplus/xgo v1.5.0 // indirect
1919
github.com/h2non/filetype v1.1.3 // indirect
20+
github.com/petermattis/goid v0.0.0-20250721140440-ea1c0173183e // indirect
2021
github.com/pkg/errors v0.9.1 // indirect
2122
github.com/qiniu/x v1.15.1 // indirect
2223
github.com/realdream-ai/mathf v0.0.0-20250513071532-e55e1277a8c5 // indirect

‎cmd/igox/go.sum‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
55
github.com/gopherjs/gopherjs v0.0.0-20180708170036-38b413be4187/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
66
github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 h1:l5lAOZEym3oK3SQ2HBHWsJUfbNBiTXJDeW2QDxw9AQ0=
77
github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
8-
github.com/goplus/builder/tools/ai v0.0.0-20250522033218-53c368333ac2 h1:cVwgM/GQS0ZWFXu13Ob3cQOigs04MRT0obOOvGqVvQo=
9-
github.com/goplus/builder/tools/ai v0.0.0-20250522033218-53c368333ac2/go.mod h1:OdE9w1flcUYMkwvA3Vn4DS59fxjFMiLFIHvNa4jLOPw=
8+
github.com/goplus/builder/tools/ai v0.0.0-20250808083237-2338f2f4b06e h1:IKiMgUTGKSkzPfJkSeMsmD1/zAPMu71itSk9ZDZ5nZ0=
9+
github.com/goplus/builder/tools/ai v0.0.0-20250808083237-2338f2f4b06e/go.mod h1:QUXlV+86pVvEgkMYTjObE44LnAnsgpAbv7j9blb/D2c=
1010
github.com/goplus/gogen v1.19.0 h1:eRi3pEDfICO6saw+JZ/jWPfBYTP7CkV6cjTsNjhhC4k=
1111
github.com/goplus/gogen v1.19.0/go.mod h1:owX2e1EyU5WD+Nm6oH2m/GXjLdlBYcwkLO4wN8HHXZI=
1212
github.com/goplus/ixgo v0.52.0 h1:nSx/FseDyKhAaFKcBSezQ6t2B9Q8U1UjMZDn1bHDTII=
@@ -19,6 +19,8 @@ github.com/goplus/xgo v1.5.0 h1:cOSGtJOUfBkSFa6e9K8HCrJDtiNp0sRos5ZGoCOtEZQ=
1919
github.com/goplus/xgo v1.5.0/go.mod h1:v9VsPjlFeO3EWafE8Qz8iwMoqNqNwlX9uSZL5+ZGlVg=
2020
github.com/h2non/filetype v1.1.3 h1:FKkx9QbD7HR/zjK1Ia5XiBsq9zdLi5Kf3zGyFTAFkGg=
2121
github.com/h2non/filetype v1.1.3/go.mod h1:319b3zT68BvV+WRj7cwy856M2ehB3HqNOt6sy1HndBY=
22+
github.com/petermattis/goid v0.0.0-20250721140440-ea1c0173183e h1:D0bJD+4O3G4izvrQUmzCL80zazlN7EwJ0PPDhpJWC/I=
23+
github.com/petermattis/goid v0.0.0-20250721140440-ea1c0173183e/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4=
2224
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
2325
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
2426
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

‎cmd/igox/main.go‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -234,16 +234,6 @@ func Gopt_Player_Gopx_OnCmd[T any](p *Player, handler func(cmd T) error) {
234234
ai.SetDefaultKnowledgeBase(map[string]any{
235235
"AI-generated descriptive summary of the game world": aiDescription,
236236
})
237-
ai.SetDefaultTaskRunner(func(task func()) {
238-
var done bool
239-
go func() {
240-
task()
241-
done = true
242-
}()
243-
for !done {
244-
spxEngineWaitNextFrame()
245-
}
246-
})
247237

248238
ctx.RegisterExternal("fmt.Print", func(frame *ixgo.Frame, a ...any) (n int, err error) {
249239
msg := fmt.Sprint(a...)
@@ -273,6 +263,3 @@ func Gopt_Player_Gopx_OnCmd[T any](p *Player, handler func(cmd T) error) {
273263
return
274264
}
275265
}
276-
277-
//go:linkname spxEngineWaitNextFrame github.com/goplus/spx/v2/internal/engine.WaitNextFrame
278-
func spxEngineWaitNextFrame() float64

‎cmd/igox/pkg/github.com/goplus/builder/tools/ai/export.go‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,23 @@ func init() {
1616
Name: "ai",
1717
Path: "github.com/goplus/builder/tools/ai",
1818
Deps: map[string]string{
19-
"context": "context",
20-
"errors": "errors",
21-
"fmt": "fmt",
22-
"log": "log",
23-
"math": "math",
24-
"math/rand/v2": "rand",
25-
"reflect": "reflect",
26-
"slices": "slices",
27-
"sync": "sync",
28-
"time": "time",
19+
"context": "context",
20+
"errors": "errors",
21+
"fmt": "fmt",
22+
"github.com/goplus/spx/v2/pkg/spx": "spx",
23+
"log": "log",
24+
"math": "math",
25+
"math/rand/v2": "rand",
26+
"reflect": "reflect",
27+
"slices": "slices",
28+
"sync": "sync",
29+
"time": "time",
2930
},
3031
Interfaces: map[string]reflect.Type{
3132
"Transport": reflect.TypeOf((*q.Transport)(nil)).Elem(),
3233
},
3334
NamedTypes: map[string]reflect.Type{
35+
"ArchivedHistory": reflect.TypeOf((*q.ArchivedHistory)(nil)).Elem(),
3436
"CommandParamSpec": reflect.TypeOf((*q.CommandParamSpec)(nil)).Elem(),
3537
"CommandResult": reflect.TypeOf((*q.CommandResult)(nil)).Elem(),
3638
"CommandSpec": reflect.TypeOf((*q.CommandSpec)(nil)).Elem(),

‎cmd/igox/pkg/github.com/goplus/spx/v2/pkg/spx/export.go‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
// export by github.com/goplus/ixgo/cmd/qexp
2+
3+
package spx
4+
5+
import (
6+
q "github.com/goplus/spx/v2/pkg/spx"
7+
8+
"reflect"
9+
10+
"github.com/goplus/ixgo"
11+
)
12+
13+
func init() {
14+
ixgo.RegisterPackage(&ixgo.Package{
15+
Name: "spx",
16+
Path: "github.com/goplus/spx/v2/pkg/spx",
17+
Deps: map[string]string{
18+
"github.com/goplus/spx/v2/internal/engine": "engine",
19+
"sync/atomic": "atomic",
20+
"time": "time",
21+
},
22+
Interfaces: map[string]reflect.Type{},
23+
NamedTypes: map[string]reflect.Type{},
24+
AliasTypes: map[string]reflect.Type{},
25+
Vars: map[string]reflect.Value{},
26+
Funcs: map[string]reflect.Value{
27+
"Execute": reflect.ValueOf(q.Execute),
28+
"ExecuteNative": reflect.ValueOf(q.ExecuteNative),
29+
"Go": reflect.ValueOf(q.Go),
30+
"IsAbortThreadError": reflect.ValueOf(q.IsAbortThreadError),
31+
"IsInCoroutine": reflect.ValueOf(q.IsInCoroutine),
32+
"Wait": reflect.ValueOf(q.Wait),
33+
"WaitNextFrame": reflect.ValueOf(q.WaitNextFrame),
34+
},
35+
TypedConsts: map[string]ixgo.TypedConst{},
36+
UntypedConsts: map[string]ixgo.UntypedConst{},
37+
})
38+
}

0 commit comments

Comments
 (0)