23 Commits
Author SHA1 Message Date
sanspie 3d8e3b2fd3 Web export: the page build key covers the runtime and scripts, so a new engine gets new immutable URLs
ci-platforms / build (amd64, windows, windows-2022) (push) Skipped
ci-platforms / build (arm64, darwin, macos-15) (push) Skipped
ci-platforms / build (amd64, darwin, macos-15-intel) (push) Skipped
ci / release (push) Successful in 5m0s
ci / checks (push) Successful in 3m50s
ci / build (amd64, linux, ubuntu-24.04) (push) Successful in 4m21s
2026-10-22 19:26:12 +03:00
sanspie c6a24ba393 Try it: scene keys in the hint, J label on Health and Hurtbox, faster Respawn, sound starts with the Try click; lighter web audio pump; release notes from tools/release/notes
ci-platforms / build (amd64, windows, windows-2022) (push) Skipped
ci-platforms / build (amd64, darwin, macos-15-intel) (push) Skipped
ci-platforms / build (arm64, darwin, macos-15) (push) Skipped
ci / release (push) Successful in 7m34s
ci / checks (push) Successful in 2m53s
ci / build (amd64, linux, ubuntu-24.04) (push) Successful in 5m2s
2026-10-22 18:55:33 +03:00
sanspie 7dca06e4b1 Icons in the engine style for gameplay, shake, clips, curves, dice, debug draw and install; web loader retries a stalled download
ci-platforms / build (amd64, darwin, macos-15-intel) (push) Skipped
ci-platforms / build (amd64, windows, windows-2022) (push) Skipped
ci-platforms / build (arm64, darwin, macos-15) (push) Skipped
ci / build (amd64, linux, ubuntu-24.04) (push) Successful in 17m5s
ci / release (push) Successful in 9m30s
ci / checks (push) Successful in 2m25s
2026-10-22 17:38:02 +03:00
sanspie 6dfdb824e2 Stage 10d3b: physics debug layers follow Game View overlays, PHY diagnostics pages
ci / checks (push) Successful in 3m4s
ci-platforms / build (amd64, darwin, macos-15-intel) (push) Skipped
ci-platforms / build (amd64, windows, windows-2022) (push) Skipped
ci-platforms / build (arm64, darwin, macos-15) (push) Skipped
ci / build (amd64, linux, ubuntu-24.04) (push) Successful in 3m53s
ci / release (push) Successful in 5m37s
2026-10-22 16:25:06 +03:00
sanspie de49a53172 Stage 10d3: docs, site demo, check levels, boundary audit (D316)
ci-platforms / build (amd64, windows, windows-2022) (push) Skipped
ci-platforms / build (arm64, darwin, macos-15) (push) Skipped
ci / checks (push) Successful in 21m50s
ci / build (amd64, linux, ubuntu-24.04) (push) Successful in 6m46s
ci-platforms / build (amd64, darwin, macos-15-intel) (push) Skipped
ci / release (push) Successful in 17m42s
2026-10-22 16:00:33 +03:00
sanspie 1030dc9a43 Stage 10d2: audio fast path, shutdown order, profiler and monitor sections
ci-platforms / build (amd64, darwin, macos-15-intel) (push) Skipped
ci-platforms / build (amd64, windows, windows-2022) (push) Skipped
ci-platforms / build (arm64, darwin, macos-15) (push) Skipped
ci / checks (push) Successful in 4m58s
ci / build (amd64, linux, ubuntu-24.04) (push) Successful in 27m47s
ci / release (push) Successful in 11m57s
2026-10-22 14:41:24 +03:00
sanspie 3d25734dfa Stage 10d1: add-component requirements, play diff from history, node labels; one sound button on the web
ci-platforms / build (amd64, darwin, macos-15-intel) (push) Skipped
ci-platforms / build (amd64, windows, windows-2022) (push) Skipped
ci-platforms / build (arm64, darwin, macos-15) (push) Skipped
ci / build (amd64, linux, ubuntu-24.04) (push) Failing after 1s
ci / checks (push) Failing after 1s
ci / release (push) Skipped
2026-10-22 13:29:11 +03:00
sanspie 12f628c469 Stage 10c3: platformer and top-down examples on the gameplay kit, new music 2026-10-22 12:16:37 +03:00
sanspie 1529213434 Stage 10c2: health, hitboxes, zones, respawn, pickups, lifetime, templates, StateMachine, gameplay editor tools (D313, D330, D332) 2026-10-22 10:53:54 +03:00
sanspie f8bb865920 Stage 10c1: shape casts and Motion2D (D312, D328, D329) 2026-10-22 03:01:46 +03:00
sanspie f5fb32565e Stage 10b3: desktop onboarding, app icon, clip inspector, asset grid audio cards, web audio and docs fixes (D327) 2026-10-22 03:01:46 +03:00
sanspie f1a8f538d3 Stage 10b: audio mixer, codecs, clips, events, sources, zones and mixer UI (D307–D311, D321–D326) 2026-10-21 20:33:25 +03:00
sanspie 963b01a011 Docs: Try it for every component, quieter design, self-hosted fonts, OS downloads, page meta 2026-10-21 19:20:52 +03:00
sanspie 6aec9dc544 Stage 10a: virtual cameras, blends and zones (D305, D306); release 0.9.0-beta.1
ci / build (amd64, linux, ubuntu-24.04) (push) Failing after 1s
ci / checks (push) Failing after 1s
ci / release (push) Skipped
2026-10-21 02:37:55 +03:00
sanspie 70a0111deb Docs overhaul: redesigned site, Try it, runnable Script API examples, edge deploy (D301–D303) 2026-10-20 20:11:47 +03:00
sanspie 0da2549d91 Stage 9.6d: agent layer, CLI and MCP server, external edits in the editor (D297, D299, D300) 2026-10-20 14:06:22 +03:00
sanspie 810984ae7a Stage 9.6c: project refs, refactorings, prefab apply and data editing without the editor (D298) 2026-10-20 13:05:10 +03:00
sanspie 62c8129364 Stage 9: gameplay toolkit, export and web, agent tooling 2026-10-20 12:06:56 +03:00
sanspie 674af03a65 Stage 8: physics and module boundaries; CI on master 2026-10-16 12:10:43 +03:00
sanspie 6b0d006467 Stage 7: documentation, help, playground; templates, aego new/bootstrap/icons, launcher; push-to-deploy site 2026-10-14 22:40:20 +03:00
sanspie ff7e95afe4 Stage 6: coroutines, signals, ScriptRef, workspace CLI, editor tooling 2026-10-12 14:22:08 +03:00
sanspie 67b16d3da5 Stage 2–5: assets, scene/ECS, editor, 3D, and Aego Script 2026-10-08 13:31:21 +03:00
sanspie 56ca1c638e Stage 1: engine core, platform, gpu, vfs 2026-09-26 16:32:40 +03:00
546 changed files with 33488 additions and 1035 deletions
+4
View File
@@ -37,6 +37,10 @@ jobs:
- run: go vet ./platform/sdl - run: go vet ./platform/sdl
- run: make lint - run: make lint
- run: make depcheck - run: make depcheck
- name: packaging tools
run: sudo apt-get install -y nsis squashfs-tools
- name: installer dry run
run: make nsis-check
build: build:
strategy: strategy:
+142 -26
View File
File diff suppressed because it is too large Load Diff
+55 -6
View File
File diff suppressed because it is too large Load Diff
+8
View File
@@ -0,0 +1,8 @@
# Aego
A 2D and 3D game engine with an editor, a scripting language and a web export, written in Go.
- Documentation and the playground: <https://aego.akarpov.ru>
- Installing and building from source: [engine/res/docs/install.md](engine/res/docs/install.md)
- Contributing, check levels and rules for engine code: [docs/contributing.md](docs/contributing.md)
- Architecture and decisions: [ARCHITECTURE.md](ARCHITECTURE.md)
+49 -3
View File
@@ -2,6 +2,7 @@ package agent
import ( import (
"errors" "errors"
"maps"
"os" "os"
"path" "path"
"slices" "slices"
@@ -65,9 +66,8 @@ func sceneCommands() []*Command {
{Name: "scene.rename", Doc: "rename a node", Write: true, Args: []Arg{argFile, argNode, {Name: "name", Type: "string", Doc: "new name", Required: true, Pos: true}}, Run: func(s *Session, a Args) (*Output, error) { {Name: "scene.rename", Doc: "rename a node", Write: true, Args: []Arg{argFile, argNode, {Name: "name", Type: "string", Doc: "new name", Required: true, Pos: true}}, Run: func(s *Session, a Args) (*Output, error) {
return s.sceneTx(a, "Rename", mutate.Rename(a.Str("node"), a.Str("name"))) return s.sceneTx(a, "Rename", mutate.Rename(a.Str("node"), a.Str("name")))
}}, }},
{Name: "scene.add-comp", Doc: "add a component with its defaults", Write: true, Args: []Arg{argFile, argNode, {Name: "comp", Type: "string", Doc: "component name, full or a unique suffix (Body2D)", Required: true, Pos: true}}, Run: func(s *Session, a Args) (*Output, error) { {Name: "scene.add-comp", Doc: "add a component with its defaults and the components it requires", Write: true, Args: []Arg{argFile, argNode, {Name: "comp", Type: "string", Doc: "component name, full or a unique suffix (Body2D)", Required: true, Pos: true},
return s.sceneTx(a, "Add Component", mutate.AddComp(a.Str("node"), a.Str("comp"))) {Name: "no-required", Type: "boolean", Doc: "add only this component; missing requirements stay as problems"}}, Run: (*Session).sceneAddComp},
}},
{Name: "scene.remove-comp", Doc: "remove a component", Write: true, Args: []Arg{argFile, argNode, {Name: "comp", Type: "string", Doc: "component name", Required: true, Pos: true}}, Run: func(s *Session, a Args) (*Output, error) { {Name: "scene.remove-comp", Doc: "remove a component", Write: true, Args: []Arg{argFile, argNode, {Name: "comp", Type: "string", Doc: "component name", Required: true, Pos: true}}, Run: func(s *Session, a Args) (*Output, error) {
return s.sceneTx(a, "Remove Component", mutate.RemoveComp(a.Str("node"), a.Str("comp"))) return s.sceneTx(a, "Remove Component", mutate.RemoveComp(a.Str("node"), a.Str("comp")))
}}, }},
@@ -93,6 +93,49 @@ func (s *Session) scene(a Args) (string, []byte, *mutate.Document, error) {
return rel, src, doc, err return rel, src, doc, err
} }
// sceneAddComp adds a component and, unless no-required is set, the components it requires first, in one transaction (D144).
func (s *Session) sceneAddComp(a Args) (*Output, error) {
rel, src, doc, err := s.scene(a)
if err != nil {
return nil, err
}
node, comp := a.Str("node"), a.Str("comp")
ops := []mutate.Op{mutate.AddComp(node, comp)}
var notes []string
if !a.Bool("no-required") {
td, err := doc.Component(comp)
if err != nil {
return nil, err
}
h, err := doc.Node(node)
if err != nil {
return nil, err
}
req, err := mutate.Required(doc.Scene, td, h)
if err != nil {
return nil, err
}
ops = ops[:0]
for _, r := range req {
ops = append(ops, mutate.AddComp(node, r.FullName))
notes = append(notes, "added "+label(r)+" (required by "+label(td)+")")
}
ops = append(ops, mutate.AddComp(node, td.FullName))
}
out, err := s.applyDoc(a, rel, src, doc, mutate.Tx{Label: "Add Component", Ops: ops})
if out != nil {
out.Notes = append(notes, out.Notes...)
}
return out, err
}
func label(td *schema.TypeDescriptor) string {
if td.DisplayName != "" {
return td.DisplayName
}
return td.FullName
}
func (s *Session) sceneTx(a Args, label string, ops ...mutate.Op) (*Output, error) { func (s *Session) sceneTx(a Args, label string, ops ...mutate.Op) (*Output, error) {
rel, src, doc, err := s.scene(a) rel, src, doc, err := s.scene(a)
if err != nil { if err != nil {
@@ -245,6 +288,9 @@ func (s *Session) sceneRun(a Args) (*Output, error) {
} }
var b strings.Builder var b strings.Builder
b.WriteString("frames: " + strconv.Itoa(rep.Frames) + "\nhash: " + rep.Hash + "\n") b.WriteString("frames: " + strconv.Itoa(rep.Frames) + "\nhash: " + rep.Hash + "\n")
for _, k := range slices.Sorted(maps.Keys(rep.Counters)) {
b.WriteString(k + ": " + strconv.FormatUint(rep.Counters[k], 10) + "\n")
}
for _, l := range rep.Log { for _, l := range rep.Log {
b.WriteString(l + "\n") b.WriteString(l + "\n")
} }
+56
View File
@@ -1,6 +1,7 @@
package agent package agent
import ( import (
"aego/script/abi"
"errors" "errors"
"strings" "strings"
@@ -34,6 +35,14 @@ type TypeView struct {
Requires []string `json:"requires,omitempty"` Requires []string `json:"requires,omitempty"`
Doc string `json:"doc,omitempty"` Doc string `json:"doc,omitempty"`
Fields []FieldView `json:"fields,omitempty"` Fields []FieldView `json:"fields,omitempty"`
Methods []CallView `json:"methods,omitempty"`
Signals []CallView `json:"signals,omitempty"`
}
type CallView struct {
Name string `json:"name"`
Sig string `json:"sig"`
Doc string `json:"doc,omitempty"`
} }
func schemaCommands() []*Command { func schemaCommands() []*Command {
@@ -90,6 +99,7 @@ func (s *Session) lookupType(name string) (*schema.TypeDescriptor, error) {
found = append(found, td) found = append(found, td)
} }
} }
found = schema.PreferProject(found)
switch len(found) { switch len(found) {
case 1: case 1:
return found[0], nil return found[0], nil
@@ -162,5 +172,51 @@ func (s *Session) schemaShow(a Args) (*Output, error) {
} }
b.WriteString("\n") b.WriteString("\n")
} }
if s.kit != nil {
for _, cm := range s.kit.methods(td.FullName) {
v.Methods = append(v.Methods, CallView{Name: cm.Name, Sig: methodSig(cm.Sig, cm.Params), Doc: summary(cm.Doc)})
}
}
for _, sg := range td.Signals {
params := make([]string, len(sg.Params))
for i, p := range sg.Params {
params[i] = p
if i < len(sg.Names) && sg.Names[i] != "" {
params[i] = sg.Names[i] + " " + p
}
}
v.Signals = append(v.Signals, CallView{Name: sg.Name, Sig: "(" + strings.Join(params, ", ") + ")", Doc: summary(sg.Doc)})
}
for _, sec := range []struct {
title string
list []CallView
}{{"methods", v.Methods}, {"signals", v.Signals}} {
if len(sec.list) == 0 {
continue
}
b.WriteString(sec.title + ":\n")
for _, c := range sec.list {
b.WriteString(" " + c.Name + c.Sig)
if c.Doc != "" {
b.WriteString(" — " + c.Doc)
}
b.WriteString("\n")
}
}
return &Output{Value: v, Text: b.String()}, nil return &Output{Value: v, Text: b.String()}, nil
} }
func methodSig(sig abi.Signature, names []string) string {
params := make([]string, len(sig.Params))
for i, p := range sig.Params {
params[i] = p.String()
if i < len(names) && names[i] != "" {
params[i] = names[i] + " " + params[i]
}
}
out := "(" + strings.Join(params, ", ") + ")"
if sig.Result.Kind != abi.Void {
out += " " + sig.Result.String()
}
return out
}
+25 -4
View File
@@ -28,6 +28,7 @@ import (
"aego/scene/sceneio" "aego/scene/sceneio"
"aego/schema" "aego/schema"
"aego/script/bind" "aego/script/bind"
"aego/script/bind/manifest"
"aego/script/reload" "aego/script/reload"
"aego/script/runtime" "aego/script/runtime"
"aego/script/workspace" "aego/script/workspace"
@@ -46,10 +47,11 @@ type RunRequest struct {
} }
type RunReport struct { type RunReport struct {
Frames int `json:"frames"` Frames int `json:"frames"`
Hash string `json:"hash"` Hash string `json:"hash"`
Log []string `json:"log,omitempty"` Counters map[string]uint64 `json:"counters,omitempty"`
Error string `json:"error,omitempty"` Log []string `json:"log,omitempty"`
Error string `json:"error,omitempty"`
} }
type Runner func(p *project.Project, r RunRequest) (RunReport, error) type Runner func(p *project.Project, r RunRequest) (RunReport, error)
@@ -79,6 +81,25 @@ type Kit struct {
ws *workspace.Workspace ws *workspace.Workspace
binds *bind.Registry binds *bind.Registry
opt Options opt Options
man *manifest.Manifest
}
// methods lists the script methods the bindings give a component type, built once per kit.
func (k *Kit) methods(comp string) []manifest.CompMethod {
if k.man == nil {
m, err := manifest.FromRegistry(k.binds, k.Types.Schema())
if err != nil {
return nil
}
k.man = m
}
var out []manifest.CompMethod
for _, cm := range k.man.CompMethods {
if cm.Comp == comp {
out = append(out, cm)
}
}
return out
} }
func NewKit(p *project.Project, opt Options) (*Kit, error) { func NewKit(p *project.Project, opt Options) (*Kit, error) {
+6 -1
View File
@@ -10,6 +10,7 @@ import (
"aego/modules/dataasset" "aego/modules/dataasset"
"aego/modules/debug" "aego/modules/debug"
"aego/modules/display" "aego/modules/display"
"aego/modules/gameplay"
inputmod "aego/modules/input" inputmod "aego/modules/input"
"aego/modules/physics" "aego/modules/physics"
"aego/modules/render2d" "aego/modules/render2d"
@@ -76,6 +77,10 @@ func cameraEntry() assembly.Entry {
return assembly.Entry{ID: camera.ID, Requires: []string{scripting.ID}, New: func(assembly.Options) module.Module { return camera.New() }} return assembly.Entry{ID: camera.ID, Requires: []string{scripting.ID}, New: func(assembly.Options) module.Module { return camera.New() }}
} }
func gameplayEntry() assembly.Entry {
return assembly.Entry{ID: gameplay.ID, Requires: []string{physics.ID, scripting.ID}, New: func(assembly.Options) module.Module { return gameplay.New() }}
}
func dataEntry() assembly.Entry { func dataEntry() assembly.Entry {
return assembly.Entry{ID: dataasset.ID, New: func(assembly.Options) module.Module { return dataasset.New() }} return assembly.Entry{ID: dataasset.ID, New: func(assembly.Options) module.Module { return dataasset.New() }}
} }
@@ -90,5 +95,5 @@ func savegameEntry() assembly.Entry {
func Default() assembly.Catalog { func Default() assembly.Catalog {
return assembly.Catalog{core(), dataEntry(), inputEntry(), render2dEntry(), render3dEntry(), scriptEntry(), physicsEntry(), debugEntry(), return assembly.Catalog{core(), dataEntry(), inputEntry(), render2dEntry(), render3dEntry(), scriptEntry(), physicsEntry(), debugEntry(),
displayEntry(), audioEntry(), accessibilityEntry(), settingsEntry(), tweenEntry(), cameraEntry(), spawnEntry(), savegameEntry()} displayEntry(), audioEntry(), accessibilityEntry(), settingsEntry(), tweenEntry(), cameraEntry(), gameplayEntry(), spawnEntry(), savegameEntry()}
} }
+6
View File
@@ -2,10 +2,14 @@ package editors
import ( import (
"aego/app/assembly" "aego/app/assembly"
"aego/modules/audio"
audioeditor "aego/modules/audio/editor"
"aego/modules/camera" "aego/modules/camera"
cameraeditor "aego/modules/camera/editor" cameraeditor "aego/modules/camera/editor"
"aego/modules/debug" "aego/modules/debug"
debugeditor "aego/modules/debug/editor" debugeditor "aego/modules/debug/editor"
"aego/modules/gameplay"
gameplayeditor "aego/modules/gameplay/editor"
inputmod "aego/modules/input" inputmod "aego/modules/input"
inputeditor "aego/modules/input/editor" inputeditor "aego/modules/input/editor"
"aego/modules/physics" "aego/modules/physics"
@@ -23,5 +27,7 @@ func With(c assembly.Catalog) assembly.Catalog {
With(render3d.ID, render3deditor.Hook). With(render3d.ID, render3deditor.Hook).
With(physics.ID, physicseditor.Hook). With(physics.ID, physicseditor.Hook).
With(camera.ID, cameraeditor.Hook). With(camera.ID, cameraeditor.Hook).
With(gameplay.ID, gameplayeditor.Hook).
With(audio.ID, audioeditor.Hook).
With(debug.ID, debugeditor.Hook) With(debug.ID, debugeditor.Hook)
} }
+4
View File
@@ -4,8 +4,10 @@ import (
"aego/app/assembly" "aego/app/assembly"
"aego/engine/base" "aego/engine/base"
"aego/engine/module" "aego/engine/module"
"aego/modules/audio"
"aego/modules/camera" "aego/modules/camera"
"aego/modules/debug" "aego/modules/debug"
"aego/modules/gameplay"
inputmod "aego/modules/input" inputmod "aego/modules/input"
"aego/modules/physics" "aego/modules/physics"
"aego/modules/render2d" "aego/modules/render2d"
@@ -30,9 +32,11 @@ func Catalog() assembly.Catalog {
{ID: debug.ID, New: func(assembly.Options) module.Module { return debug.New() }}, {ID: debug.ID, New: func(assembly.Options) module.Module { return debug.New() }},
{ID: tween.ID, Requires: []string{scripting.ID}, New: func(assembly.Options) module.Module { return tween.New() }}, {ID: tween.ID, Requires: []string{scripting.ID}, New: func(assembly.Options) module.Module { return tween.New() }},
{ID: camera.ID, Requires: []string{scripting.ID}, New: func(assembly.Options) module.Module { return camera.New() }}, {ID: camera.ID, Requires: []string{scripting.ID}, New: func(assembly.Options) module.Module { return camera.New() }},
{ID: gameplay.ID, Requires: []string{physics.ID, scripting.ID}, New: func(assembly.Options) module.Module { return gameplay.New() }},
{ID: render3d.ID, New: func(assembly.Options) module.Module { return render3d.New() }}, {ID: render3d.ID, New: func(assembly.Options) module.Module { return render3d.New() }},
{ID: spawn.ID, New: func(assembly.Options) module.Module { return spawn.New() }}, {ID: spawn.ID, New: func(assembly.Options) module.Module { return spawn.New() }},
{ID: savegame.ID, Requires: []string{scripting.ID, spawn.ID}, New: func(assembly.Options) module.Module { return savegame.New() }}, {ID: savegame.ID, Requires: []string{scripting.ID, spawn.ID}, New: func(assembly.Options) module.Module { return savegame.New() }},
{ID: audio.ID, New: func(assembly.Options) module.Module { return audio.New() }},
} }
} }
+2
View File
@@ -9,6 +9,7 @@ import (
"sort" "sort"
"strings" "strings"
"aego/app/proc"
"aego/core/errs" "aego/core/errs"
"aego/core/log" "aego/core/log"
"aego/project" "aego/project"
@@ -169,6 +170,7 @@ func Build(p *project.Project, t Target, mode Mode, engineVersion string, lg *lo
cmd := exec.Command("go", args...) cmd := exec.Command("go", args...)
cmd.Dir = p.Root cmd.Dir = p.Root
cmd.Env = append(os.Environ(), "GOOS="+t.OS, "GOARCH="+t.Arch) cmd.Env = append(os.Environ(), "GOOS="+t.OS, "GOARCH="+t.Arch)
proc.Hide(cmd)
output, err := cmd.CombinedOutput() output, err := cmd.CombinedOutput()
if err != nil { if err != nil {
os.RemoveAll(outDir) os.RemoveAll(outDir)
+3
View File
@@ -8,6 +8,7 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"aego/app/proc"
"aego/core/errs" "aego/core/errs"
"aego/core/log" "aego/core/log"
"aego/project" "aego/project"
@@ -32,12 +33,14 @@ func RunIcons(p *project.Project, engineVersion string, out io.Writer) (int, err
defer os.Remove(bin) defer os.Remove(bin)
build := exec.Command("go", "build", "-tags", strings.Join(t.Tags, ","), "-o", bin, "./.aego/generated/icons") build := exec.Command("go", "build", "-tags", strings.Join(t.Tags, ","), "-o", bin, "./.aego/generated/icons")
build.Dir = p.Root build.Dir = p.Root
proc.Hide(build)
if output, err := build.CombinedOutput(); err != nil { if output, err := build.CombinedOutput(); err != nil {
return 2, errs.New(errs.BuildFailed, "native icons helper does not compile", return 2, errs.New(errs.BuildFailed, "native icons helper does not compile",
log.F("output", strings.TrimSpace(string(output)))) log.F("output", strings.TrimSpace(string(output))))
} }
run := exec.Command(bin) run := exec.Command(bin)
run.Dir, run.Stdout, run.Stderr = p.Root, out, out run.Dir, run.Stdout, run.Stderr = p.Root, out, out
proc.Hide(run)
err = run.Run() err = run.Run()
var ee *exec.ExitError var ee *exec.ExitError
if errors.As(err, &ee) { if errors.As(err, &ee) {
+3
View File
@@ -6,6 +6,7 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"aego/app/proc"
"aego/core/errs" "aego/core/errs"
"aego/core/log" "aego/core/log"
"aego/project" "aego/project"
@@ -52,6 +53,7 @@ func BuildManifest(p *project.Project, engineVersion string, lg *log.Logger) (st
defer os.Remove(bin) defer os.Remove(bin)
build := exec.Command("go", "build", "-tags", strings.Join(t.Tags, ","), "-o", bin, "./.aego/generated/manifest") build := exec.Command("go", "build", "-tags", strings.Join(t.Tags, ","), "-o", bin, "./.aego/generated/manifest")
build.Dir = p.Root build.Dir = p.Root
proc.Hide(build)
if output, err := build.CombinedOutput(); err != nil { if output, err := build.CombinedOutput(); err != nil {
return "", errs.New(errs.BuildFailed, "native bindings helper does not compile", return "", errs.New(errs.BuildFailed, "native bindings helper does not compile",
log.F("output", strings.TrimSpace(string(output)))) log.F("output", strings.TrimSpace(string(output))))
@@ -59,6 +61,7 @@ func BuildManifest(p *project.Project, engineVersion string, lg *log.Logger) (st
tmp := out + ".tmp" tmp := out + ".tmp"
run := exec.Command(bin, tmp) run := exec.Command(bin, tmp)
run.Dir = p.Root run.Dir = p.Root
proc.Hide(run)
if output, err := run.CombinedOutput(); err != nil { if output, err := run.CombinedOutput(); err != nil {
os.Remove(tmp) os.Remove(tmp)
return "", errs.New(errs.BuildFailed, "native module Register failed", return "", errs.New(errs.BuildFailed, "native module Register failed",
+33
View File
@@ -0,0 +1,33 @@
package brand
import (
"bytes"
"embed"
"image"
"image/png"
"strconv"
)
//go:embed png/aego-*.png
var files embed.FS
var windowSizes = []int{16, 24, 32, 48, 64, 128, 256}
func PNG(n int) ([]byte, bool) {
data, err := files.ReadFile("png/aego-" + strconv.Itoa(n) + ".png")
return data, err == nil
}
func Window() []image.Image {
out := make([]image.Image, 0, len(windowSizes))
for _, n := range windowSizes {
data, ok := PNG(n)
if !ok {
continue
}
if img, err := png.Decode(bytes.NewReader(data)); err == nil {
out = append(out, img)
}
}
return out
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 52 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 563 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 878 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

+5 -3
View File
@@ -41,6 +41,7 @@ type Config struct {
Editor bool Editor bool
FailOnScriptErrors bool FailOnScriptErrors bool
Catalog assembly.Catalog Catalog assembly.Catalog
Platform platform.Platform
Profile string Profile string
NoProfile bool NoProfile bool
} }
@@ -98,6 +99,9 @@ func (h *Host) build(cfg Config, mods []module.Module) error {
ecfg.LoopScope = cfg.LoopScope ecfg.LoopScope = cfg.LoopScope
} }
builder := engine.NewBuilder(ecfg).WithLogger(lg).Use(rmod) builder := engine.NewBuilder(ecfg).WithLogger(lg).Use(rmod)
if cfg.Platform != nil {
builder.WithPlatform(cfg.Platform)
}
if h.Types, err = assembly.NewTypes(); err != nil { if h.Types, err = assembly.NewTypes(); err != nil {
return err return err
} }
@@ -187,6 +191,7 @@ func (h *Host) build(cfg Config, mods []module.Module) error {
} }
h.Settings.SetNames(h.Sections.Names) h.Settings.SetNames(h.Sections.Names)
h.Engine.SetService(settings.ServiceID, h.Settings) h.Engine.SetService(settings.ServiceID, h.Settings)
h.Engine.OnClose(h.Modules.Shutdown)
if err = h.Modules.Init(&module.InitContext{Engine: h.Engine, Assets: h.Loader, Log: lg, Editor: cfg.Editor, Sections: h.Sections, Problems: h.Problems, Settings: h.Settings}); err != nil { if err = h.Modules.Init(&module.InitContext{Engine: h.Engine, Assets: h.Loader, Log: lg, Editor: cfg.Editor, Sections: h.Sections, Problems: h.Problems, Settings: h.Settings}); err != nil {
return err return err
} }
@@ -227,9 +232,6 @@ func (h *Host) Close() {
return return
} }
h.closed = true h.closed = true
if h.Modules != nil {
h.Modules.Shutdown()
}
if h.Engine != nil { if h.Engine != nil {
h.Engine.Close() h.Engine.Close()
} }
+70
View File
@@ -0,0 +1,70 @@
package docstool
import (
"fmt"
"io"
"strings"
"aego/app/playground"
"aego/engine/docs"
"aego/engine/module"
)
// CheckExamples loads the example scene of every module code, validates it and runs it headless; the code must be among the problems it reports (D146).
func CheckExamples(reg *docs.Registry, w io.Writer) int {
pg, err := playground.New()
if err != nil {
fmt.Fprintln(w, "examples: cannot start the docs runtime:", err)
return 1
}
pg.SetGame(playground.GameConfig{Headless: true, FrameTime: 1.0 / 60})
defer func() {
if g := pg.Game(); g != nil {
g.Close()
}
}()
bad := 0
for _, e := range reg.All() {
if e.Kind != docs.Code || e.Diag == nil || e.Diag.Example == "" {
continue
}
found, why := false, ""
code := ""
if e.Diag.ExampleScript != "" {
c, err := pg.TryCode(e.Diag.ExampleScript)
if err != nil {
fmt.Fprintf(w, "%s: error: example script does not compile: %v\n", e.ID, err)
bad++
continue
}
code = c
}
if res := pg.PlayScene("example-"+e.ID, []byte(e.Diag.Example), code, nil); !res.Started {
why = "does not load: " + res.Error
} else {
for _, d := range module.ValidateScene(pg.Game().Scene(), nil) {
found = found || d.Code == e.ID
}
if err := pg.Game().Step(tryFrames); err != nil {
why = "stops the engine: " + err.Error()
}
}
poll := pg.Poll()
for _, f := range poll.Faults {
found = found || f.Code == e.ID
}
for _, l := range poll.Log {
found = found || strings.Contains(l.Text, e.ID)
}
switch {
case why != "":
fmt.Fprintf(w, "%s: error: example %s %s\n", e.ID, e.Diag.ExampleFile, why)
bad++
case !found:
fmt.Fprintf(w, "%s: error: example of %s does not produce %s\n", e.ID, e.ID, e.ID)
bad++
}
}
pg.Stop()
return bad
}
+3
View File
@@ -76,6 +76,9 @@ func (e *Env) Check(strict bool) int {
if CheckTry(reg, e.Stdout) > 0 && code == 0 { if CheckTry(reg, e.Stdout) > 0 && code == 0 {
code = 1 code = 1
} }
if CheckExamples(reg, e.Stdout) > 0 && code == 0 {
code = 1
}
return code return code
} }
+13
View File
@@ -19,6 +19,7 @@ type request struct {
Component string `json:"component"` Component string `json:"component"`
Field string `json:"field"` Field string `json:"field"`
Value float64 `json:"value"` Value float64 `json:"value"`
Node string `json:"node"`
} }
type Reply struct { type Reply struct {
@@ -27,6 +28,7 @@ type Reply struct {
Error string `json:"error,omitempty"` Error string `json:"error,omitempty"`
State *docsession.State `json:"state,omitempty"` State *docsession.State `json:"state,omitempty"`
Log []Line `json:"log,omitempty"` Log []Line `json:"log,omitempty"`
Pose []float64 `json:"pose,omitempty"`
} }
func (a *App) Call(method string, payload []byte) Reply { func (a *App) Call(method string, payload []byte) Reply {
@@ -64,6 +66,17 @@ func (a *App) Call(method string, payload []byte) Reply {
case "state": case "state":
st := s.State() st := s.State()
return Reply{State: &st} return Reply{State: &st}
case "pose":
sc := s.Controller().Scene()
if sc == nil {
return Reply{Error: "the scene is not running"}
}
h := sc.Find(sc.Root(), req.Node)
if h.IsZero() || !sc.IsAlive(h) {
return Reply{Error: "no node " + strconv.Quote(req.Node)}
}
p := sc.WorldPosition(h)
return Reply{Pose: []float64{float64(p.X), float64(p.Y)}}
case "log": case "log":
out := Reply{Log: a.lines} out := Reply{Log: a.lines}
a.lines = nil a.lines = nil
+27
View File
@@ -0,0 +1,27 @@
package edit
import (
"os"
"os/exec"
"runtime"
"strings"
"aego/engine"
"aego/platform"
)
func startBoot(verb string) {
wd, _ := os.Getwd()
exe, _ := os.Executable()
gobin, err := exec.LookPath("go")
if err != nil {
gobin = "not on PATH"
}
_ = platform.StartBoot(platform.DefaultBootPath(),
"aego "+engine.Version+" "+runtime.GOOS+"/"+runtime.GOARCH+" "+verb,
"exe "+exe,
"args "+strings.Join(os.Args[1:], " "),
"cwd "+wd,
"go "+gobin,
)
}
+12 -48
View File
File diff suppressed because it is too large Load Diff
+163
View File
File diff suppressed because it is too large Load Diff
+49
View File
@@ -1,14 +1,19 @@
package edit package edit
import ( import (
"net"
"net/http"
"os/exec" "os/exec"
"path/filepath"
"runtime" "runtime"
"sync"
"aego/app/bootstrap" "aego/app/bootstrap"
"aego/app/export" "aego/app/export"
"aego/app/projects" "aego/app/projects"
"aego/asset/pipeline" "aego/asset/pipeline"
"aego/editor/core/services" "aego/editor/core/services"
"aego/editor/core/sysopen"
"aego/engine/problems" "aego/engine/problems"
"aego/project" "aego/project"
) )
@@ -87,3 +92,47 @@ func (x *exporter) Reveal(path string) error {
} }
return cmd.Start() return cmd.Start()
} }
var webServers sync.Map
func serveWeb(dir string) (string, error) {
if u, ok := webServers.Load(dir); ok {
return u.(string), nil
}
ln, err := net.Listen("tcp", "127.0.0.1:0")
if err != nil {
return "", err
}
files := http.FileServer(http.Dir(dir))
h := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Cross-Origin-Opener-Policy", "same-origin")
w.Header().Set("Cross-Origin-Embedder-Policy", "require-corp")
w.Header().Set("Cache-Control", "no-store")
files.ServeHTTP(w, r)
})
go http.Serve(ln, h)
u := "http://" + ln.Addr().String() + "/"
webServers.Store(dir, u)
return u, nil
}
func (x *exporter) Run(out, target string) error {
path, err := export.Launchable(x.p, target, out)
if err != nil {
return err
}
t, _ := export.ParseTarget(target)
switch {
case t.Web():
u, err := serveWeb(path)
if err != nil {
return err
}
return sysopen.Open(u)
case t.OS == "darwin":
return exec.Command("open", path).Start()
}
cmd := exec.Command(path)
cmd.Dir = filepath.Dir(path)
return cmd.Start()
}
+84 -7
View File
File diff suppressed because it is too large Load Diff
+50
View File
@@ -0,0 +1,50 @@
package edit
import (
"path/filepath"
"testing"
"aego/app/projects"
"aego/editor/shell/launcher"
"aego/project"
)
func TestLauncherCreatesAndOpens(t *testing.T) {
recent := filepath.Join(t.TempDir(), "recent")
ls, err := OpenLauncher(Config{Headless: true, Recent: recent})
if err != nil {
t.Fatal(err)
}
ls.UI.SetTab(launcher.TabNew)
dir := filepath.Join(t.TempDir(), "Aego Projects", "game")
if _, err := ls.UI.Create(dir, projects.Template2D, "", ""); err != nil {
ls.Close()
t.Fatal(err)
}
for i := 0; i < 3 && ls.Step(); i++ {
}
ls.Close()
root, ok := ls.UI.Result()
if !ok {
t.Fatal("the launcher has no result")
}
p, err := project.Load(root)
if err != nil {
t.Fatal(err)
}
s, err := Open(p, Config{Headless: true, NoWatch: true, Recent: recent})
if err != nil {
t.Fatal(err)
}
defer s.Close()
for i := 0; i < 3; i++ {
s.Step()
}
if s.App.Context().Docs.Active() == nil {
t.Fatal("no scene is open after creating the project")
}
list, _ := launcher.LoadRecent(recent)
if len(list) == 0 || list[0].Path != root {
t.Fatalf("recent list %+v", list)
}
}
+78
View File
@@ -0,0 +1,78 @@
package edit
import (
"io"
"os"
"path/filepath"
"sort"
"strconv"
"strings"
"time"
"aego/core/log"
)
const keepLogs = 10
type logFile struct {
f *os.File
}
func LogsDir() string {
dir, err := os.UserCacheDir()
if err != nil {
return ""
}
return filepath.Join(dir, "aego", "logs")
}
func attachLogs(cfg *Config) *logFile {
if cfg.Logger == nil {
cfg.Logger = log.New(log.NewTextSink(os.Stderr))
if cfg.Debug {
cfg.Logger.SetLevel(log.Debug)
}
}
dir := LogsDir()
if dir == "" || os.MkdirAll(dir, 0o755) != nil {
return &logFile{}
}
name := "editor-" + time.Now().Format("20060102-150405") + "-" + strconv.Itoa(os.Getpid()) + ".log"
f, err := os.Create(filepath.Join(dir, name))
if err != nil {
return &logFile{}
}
cfg.Logger.AddSink(log.NewTextSink(f))
pruneLogs(dir)
return &logFile{f: f}
}
func (l *logFile) writer(w io.Writer) io.Writer {
if l.f == nil {
return w
}
return io.MultiWriter(w, l.f)
}
func (l *logFile) close() {
if l.f != nil {
l.f.Close()
}
}
func pruneLogs(dir string) {
entries, err := os.ReadDir(dir)
if err != nil {
return
}
var names []string
for _, e := range entries {
if !e.IsDir() && strings.HasSuffix(e.Name(), ".log") {
names = append(names, e.Name())
}
}
sort.Strings(names)
for i := 0; i+keepLogs < len(names); i++ {
os.Remove(filepath.Join(dir, names[i]))
}
}
+1 -1
View File
@@ -179,7 +179,7 @@ func TestProfilerSectionsFollowPlay(t *testing.T) {
s.Step() s.Step()
} }
drawPanel(s, prof) drawPanel(s, prof)
expectSections(t, prof.Sections(), "Frame", "Memory", "Game", "Scripts", "Physics") expectSections(t, prof.Sections(), "Frame", "Memory", "Game", "Scripts", "Physics", "Audio", "Camera", "Gameplay")
if _, err := ctx.Docs.Open("scenes/other.aescene"); err != nil { if _, err := ctx.Docs.Open("scenes/other.aescene"); err != nil {
t.Fatal(err) t.Fatal(err)
} }
+77
View File
@@ -0,0 +1,77 @@
package edit
import (
"os"
"os/exec"
"strings"
"aego/app/proc"
"aego/editor/core/session"
)
const (
EnvEditorExe = "AEGO_EDITOR_EXE"
EnvEditorVerb = "AEGO_EDITOR_VERB"
)
func markEntry(verb string) {
if os.Getenv(EnvEditorExe) != "" {
return
}
if img := os.Getenv("APPIMAGE"); img != "" {
os.Setenv(EnvEditorExe, img)
os.Setenv(EnvEditorVerb, "")
return
}
exe, err := os.Executable()
if err != nil {
return
}
os.Setenv(EnvEditorExe, exe)
os.Setenv(EnvEditorVerb, verb)
}
func relaunchArgs(verb, target, tab string) []string {
if verb != "" {
args := []string{verb}
if target != "" {
args = append(args, target)
}
if tab != "" {
args = append(args, "--launcher", tab)
}
return args
}
var args []string
if tab != "" {
args = append(args, "-launcher", tab)
}
if target != "" {
args = append(args, target)
}
return args
}
func withoutEnv(env []string, key string) []string {
out := env[:0:0]
for _, kv := range env {
if !strings.HasPrefix(kv, key+"=") {
out = append(out, kv)
}
}
return out
}
func Relaunch(target, tab string) error {
exe := os.Getenv(EnvEditorExe)
if exe == "" {
var err error
if exe, err = os.Executable(); err != nil {
return err
}
}
cmd := exec.Command(exe, relaunchArgs(os.Getenv(EnvEditorVerb), target, tab)...)
cmd.Env = withoutEnv(os.Environ(), session.EnvSupervised)
proc.Hide(cmd)
return cmd.Start()
}
+77
View File
@@ -0,0 +1,77 @@
package edit
import (
"os"
"path/filepath"
"slices"
"testing"
"aego/project"
)
func TestRelaunchArgs(t *testing.T) {
cases := []struct {
verb, target, tab string
want []string
}{
{"", "/p", "", []string{"/p"}},
{"", "", "recent", []string{"-launcher", "recent"}},
{"edit", "/p", "", []string{"edit", "/p"}},
{"edit", "", "new", []string{"edit", "--launcher", "new"}},
}
for _, c := range cases {
if got := relaunchArgs(c.verb, c.target, c.tab); !slices.Equal(got, c.want) {
t.Errorf("%q %q %q: %v, want %v", c.verb, c.target, c.tab, got, c.want)
}
}
env := withoutEnv([]string{"A=1", "AEGO_SUPERVISED=1", "B=2"}, "AEGO_SUPERVISED")
if !slices.Equal(env, []string{"A=1", "B=2"}) {
t.Fatal(env)
}
}
func TestResolveArg(t *testing.T) {
root := t.TempDir()
os.WriteFile(filepath.Join(root, project.FileName), []byte("project version=1 {\n}\n"), 0o644)
os.MkdirAll(filepath.Join(root, "scenes"), 0o755)
scene := filepath.Join(root, "scenes", "main.aescene")
os.WriteFile(scene, []byte("scene version=1 {\n}\n"), 0o644)
if dir, file := resolveArg(filepath.Join(root, project.FileName)); dir != root || file != "" {
t.Fatalf("project.aego: %q %q", dir, file)
}
dir, file := resolveArg(scene)
if dir != filepath.Join(root, "scenes") || file != scene {
t.Fatalf("scene: %q %q", dir, file)
}
if rel, ok := relInside(root, file); !ok || rel != "scenes/main.aescene" {
t.Fatalf("rel %q %v", rel, ok)
}
}
func TestNewer(t *testing.T) {
cases := []struct {
latest, current string
want bool
}{
{"v0.9.0", "0.9.0-beta.1", true},
{"v0.9.0-beta.1", "0.9.0-beta.1", false},
{"v0.9.0-beta.2", "0.9.0-beta.1", true},
{"v0.8.5", "0.9.0-beta.1", false},
{"v1.0.0", "0.9.0", true},
{"nightly", "0.9.0", false},
{"", "0.9.0", false},
}
for _, c := range cases {
if got := newer(c.latest, c.current); got != c.want {
t.Errorf("newer(%q, %q) = %v", c.latest, c.current, got)
}
}
file := filepath.Join(t.TempDir(), "update")
st := updateState{Enabled: false, Latest: "v1.2.3"}
if err := saveUpdate(file, st); err != nil {
t.Fatal(err)
}
if back := loadUpdate(file); back.Enabled || back.Latest != "v1.2.3" {
t.Fatalf("round trip %+v", back)
}
}
+67 -1
View File
@@ -7,8 +7,10 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"aego/core/ids"
"aego/editor/core/command" "aego/editor/core/command"
"aego/editor/core/context" "aego/editor/core/context"
"aego/editor/core/vectors"
"aego/editor/core/workspace" "aego/editor/core/workspace"
"aego/editor/panels/gameview" "aego/editor/panels/gameview"
"aego/editor/shell" "aego/editor/shell"
@@ -56,7 +58,60 @@ func (s *Session) shots(dir string) error {
} }
return selectNamed(ctx, "Player") return selectNamed(ctx, "Player")
}}, }},
{name: "hitbox-gizmo", frames: 60, setup: func(s *Session) error {
sc := ctx.Scene()
var span []ids.NodeID
for _, n := range []string{"EnemyLeft", "PatrolA1", "PatrolB1"} {
span = append(span, sc.ID(sc.Find(sc.Root(), n)))
}
ctx.Select(span...)
if err := ctx.Commands.Run(command.SceneFrame); err != nil {
return err
}
for i := 0; i < 30; i++ {
s.Step()
}
return selectNamed(ctx, "EnemyLeft")
}},
{name: "camera-follow", frames: 60, setup: func(s *Session) error {
sc := ctx.Scene()
ctx.Select(sc.ID(sc.Find(sc.Root(), "Camera")), sc.ID(sc.Find(sc.Root(), "Player")))
if err := ctx.Commands.Run(command.SceneFrame); err != nil {
return err
}
for i := 0; i < 30; i++ {
s.Step()
}
return selectNamed(ctx, "Camera")
}},
{name: "camera-zone", frames: 60, setup: func(s *Session) error {
sc := ctx.Scene()
ctx.Select(sc.ID(sc.Find(sc.Root(), "ArenaZone")), sc.ID(sc.Find(sc.Root(), "PatrolA2")), sc.ID(sc.Find(sc.Root(), "PatrolB2")), sc.ID(sc.Find(sc.Root(), "GroundRight")))
if err := ctx.Commands.Run(command.SceneFrame); err != nil {
return err
}
for i := 0; i < 30; i++ {
s.Step()
}
return selectNamed(ctx, "ArenaZone")
}},
{name: "clip-inspector", frames: 60, setup: func(s *Session) error {
id, ok := s.Pipeline.Lookup("assets/audio/music.ogg")
if !ok {
return fmt.Errorf("no assets/audio/music.ogg")
}
s.App.Data().Inspect(id)
return nil
}},
{name: "add-required", frames: 30, setup: func(s *Session) error {
if err := selectNamed(ctx, "PatrolA1"); err != nil {
return err
}
s.App.Inspector().OpenAdd("follow")
return nil
}},
{name: "tags", frames: 60, setup: func(s *Session) error { {name: "tags", frames: 60, setup: func(s *Session) error {
ctx.UI.CloseAllPopups()
return selectNamed(ctx, "Player") return selectNamed(ctx, "Player")
}}, }},
{name: "prefab", frames: 60, setup: func(s *Session) error { {name: "prefab", frames: 60, setup: func(s *Session) error {
@@ -83,12 +138,23 @@ func (s *Session) shots(dir string) error {
scene() scene()
return ctx.Commands.Run(command.PlayStart) return ctx.Commands.Run(command.PlayStart)
}}, }},
{name: "motion-play", frames: 30, setup: func(s *Session) error {
s.App.Workspace().Show(workspace.Inspector)
s.App.Inspector().ScrollTo("gameplay.Motion2D")
return selectNamed(ctx, "Player")
}},
{name: "mixer", frames: 120, setup: func(s *Session) error {
s.App.Workspace().Switch(workspace.Audio)
s.App.Workspace().Show(workspace.Mixer)
return nil
}},
{name: "physics-debug", frames: 30, setup: func(s *Session) error { {name: "physics-debug", frames: 30, setup: func(s *Session) error {
s.App.Workspace().Switch(workspace.Design)
ctx.Overlay.Set("physics.debug.contacts", true) ctx.Overlay.Set("physics.debug.contacts", true)
return ctx.Commands.Run(gameview.CommandOverlays) return ctx.Commands.Run(gameview.CommandOverlays)
}}, }},
{name: "demo", frames: 60, inset: 2, bottom: 28, setup: func(s *Session) error { {name: "demo", frames: 60, inset: 2, bottom: 28, setup: func(s *Session) error {
for _, f := range []string{"physics.debug", "physics.debug.shapes", "physics.debug.contacts", "physics.debug.joints"} { for _, f := range []string{gameview.CommandOverlays, vectors.CommandToggle} {
ctx.Overlay.Set(f, false) ctx.Overlay.Set(f, false)
} }
return ctx.Commands.Run(shell.CommandFullscreenPlay) return ctx.Commands.Run(shell.CommandFullscreenPlay)
+17
View File
@@ -0,0 +1,17 @@
package edit
import (
"bytes"
"aego/app/run"
)
func (s *Session) runTests(done func(out string, failed bool)) error {
p, mods := s.Project, s.mods
go func() {
var buf bytes.Buffer
code := run.Tool(p, []string{"test", "-v"}, &buf, &buf, mods...)
s.Engine.Jobs().OnMain(func() { done(buf.String(), code != 0) })
}()
return nil
}
+194
View File
File diff suppressed because it is too large Load Diff
+3 -1
View File
@@ -12,6 +12,7 @@ import (
"aego/app/export/icon" "aego/app/export/icon"
"aego/app/export/winres" "aego/app/export/winres"
"aego/app/proc"
"aego/core/errs" "aego/core/errs"
"aego/core/log" "aego/core/log"
"aego/runtime/bundle" "aego/runtime/bundle"
@@ -121,7 +122,7 @@ func (j *job) resources(dir string) error {
var icons []winres.Icon var icons []winres.Icon
if j.icon != nil { if j.icon != nil {
for _, n := range winres.IconSizes { for _, n := range winres.IconSizes {
data, err := icon.PNG(icon.Resize(j.icon, n, n)) data, err := icon.PNG(icon.Sized(j.icon, n))
if err != nil { if err != nil {
return err return err
} }
@@ -175,6 +176,7 @@ func (j *job) build() error {
args = append(args, pkg) args = append(args, pkg)
cmd := exec.Command("go", args...) cmd := exec.Command("go", args...)
cmd.Dir = root cmd.Dir = root
proc.Hide(cmd)
cgo := "CGO_ENABLED=1" cgo := "CGO_ENABLED=1"
if j.t.Web() { if j.t.Web() {
cgo = "CGO_ENABLED=0" cgo = "CGO_ENABLED=0"
+3 -2
View File
@@ -189,8 +189,9 @@ func (j *job) license(lib bundle.Lib, src, name string) bundle.Lib {
} }
func (j *job) libs() []bundle.Lib { func (j *job) libs() []bundle.Lib {
vorbis := j.license(bundle.Lib{Name: "oggvorbis", Link: "static"}, filepath.Join(j.opt.Engine, "audio", "codec", "vorbis", "internal", "oggvorbis", "LICENSE"), "oggvorbis.txt")
if j.t.Web() { if j.t.Web() {
return []bundle.Lib{j.license(bundle.Lib{Name: "Go wasm_exec.js", Link: "script", File: webExec}, filepath.Join(j.goroot, "LICENSE"), "Go.txt")} return []bundle.Lib{j.license(bundle.Lib{Name: "Go wasm_exec.js", Link: "script", File: webExec}, filepath.Join(j.goroot, "LICENSE"), "Go.txt"), vorbis}
} }
return []bundle.Lib{j.license(bundle.Lib{Name: "SDL3", Link: "static"}, j.sdlLicense(), "SDL3.txt")} return []bundle.Lib{j.license(bundle.Lib{Name: "SDL3", Link: "static"}, j.sdlLicense(), "SDL3.txt"), vorbis}
} }
+18
View File
@@ -307,3 +307,21 @@ func (j *job) prepareOut() error {
} }
return nil return nil
} }
func Launchable(p *project.Project, target, out string) (string, error) {
t, err := ParseTarget(target)
if err != nil {
return "", err
}
if !t.Web() && !t.Host() {
return "", errs.New(errs.EngineConfig, "the build is for "+t.String()+"; copy it to that system to run it")
}
l := layoutFor(t, out, p)
switch {
case t.Web():
return l.root, nil
case t.OS == "darwin":
return l.app, nil
}
return l.binary(), nil
}
File diff suppressed because it is too large Load Diff
+25 -1
View File
@@ -13,6 +13,12 @@ import (
"aego/core/errs" "aego/core/errs"
) )
type DocType struct {
Name string
Extensions []string
Role string
}
type Info struct { type Info struct {
Name string Name string
Executable string Executable string
@@ -22,6 +28,7 @@ type Info struct {
MinOS string MinOS string
Category string Category string
Copyright string Copyright string
Documents []DocType
} }
var icnsTypes = []struct { var icnsTypes = []struct {
@@ -80,6 +87,23 @@ func Plist(i Info, iconFile string) []byte {
str("LSMinimumSystemVersion", i.MinOS) str("LSMinimumSystemVersion", i.MinOS)
str("LSApplicationCategoryType", i.Category) str("LSApplicationCategoryType", i.Category)
str("NSHumanReadableCopyright", i.Copyright) str("NSHumanReadableCopyright", i.Copyright)
if len(i.Documents) > 0 {
b.WriteString("\t<key>CFBundleDocumentTypes</key>\n\t<array>\n")
for _, d := range i.Documents {
role := d.Role
if role == "" {
role = "Editor"
}
b.WriteString("\t\t<dict>\n\t\t\t<key>CFBundleTypeName</key>\n\t\t\t<string>" + esc(d.Name) + "</string>\n")
b.WriteString("\t\t\t<key>CFBundleTypeRole</key>\n\t\t\t<string>" + esc(role) + "</string>\n")
b.WriteString("\t\t\t<key>CFBundleTypeExtensions</key>\n\t\t\t<array>\n")
for _, e := range d.Extensions {
b.WriteString("\t\t\t\t<string>" + esc(e) + "</string>\n")
}
b.WriteString("\t\t\t</array>\n\t\t</dict>\n")
}
b.WriteString("\t</array>\n")
}
b.WriteString("\t<key>NSHighResolutionCapable</key>\n\t<true/>\n") b.WriteString("\t<key>NSHighResolutionCapable</key>\n\t<true/>\n")
b.WriteString("</dict>\n</plist>\n") b.WriteString("</dict>\n</plist>\n")
return []byte(b.String()) return []byte(b.String())
@@ -92,7 +116,7 @@ func ICNS(src image.Image) ([]byte, error) {
data, ok := cache[t.size] data, ok := cache[t.size]
if !ok { if !ok {
var err error var err error
if data, err = icon.PNG(icon.Resize(src, t.size, t.size)); err != nil { if data, err = icon.PNG(icon.Sized(src, t.size)); err != nil {
return nil, err return nil, err
} }
cache[t.size] = data cache[t.size] = data
+9
View File
@@ -23,3 +23,12 @@ func TestPlistEscapesAndBundleID(t *testing.T) {
t.Fatal(p) t.Fatal(p)
} }
} }
func TestPlistDocumentTypes(t *testing.T) {
out := string(Plist(Info{Name: "Aego", Executable: "aego", ID: "ru.akarpov.aego", Documents: []DocType{{Name: "Aego Scene", Extensions: []string{"aescene"}}}}, ""))
for _, want := range []string{"<key>CFBundleDocumentTypes</key>", "<string>Aego Scene</string>", "<string>Editor</string>", "<string>aescene</string>"} {
if !strings.Contains(out, want) {
t.Fatalf("plist has no %s:\n%s", want, out)
}
}
}
+1 -1
View File
@@ -29,7 +29,7 @@ func (j *job) pack() error {
func (j *job) packLinux() error { func (j *job) packLinux() error {
if j.icon != nil { if j.icon != nil {
data, err := icon.PNG(icon.Resize(j.icon, 256, 256)) data, err := icon.PNG(icon.Sized(j.icon, 256))
if err != nil { if err != nil {
return err return err
} }
+26 -4
View File
@@ -3,7 +3,9 @@ package export
import ( import (
"bytes" "bytes"
"compress/gzip" "compress/gzip"
"crypto/sha256"
"embed" "embed"
"encoding/hex"
"encoding/json" "encoding/json"
"html/template" "html/template"
"io/fs" "io/fs"
@@ -26,6 +28,7 @@ var webFS embed.FS
const ( const (
CodeWebAsset = "EXP010" CodeWebAsset = "EXP010"
CodeWebNative = "EXP011" CodeWebNative = "EXP011"
CodeWebMP3 = "EXP012"
WebWasm = "game.wasm" WebWasm = "game.wasm"
WebFiles = "files.json" WebFiles = "files.json"
WebBudget = 8 << 20 WebBudget = 8 << 20
@@ -68,7 +71,11 @@ func CheckWeb(s *Snapshot, native bool) []problems.Diagnostic {
out = append(out, diag(CodeWebNative, problems.Warning, out = append(out, diag(CodeWebNative, problems.Warning,
"the native Go module is compiled to WebAssembly: it must build without cgo and must not use files, processes or the network", "native/")) "the native Go module is compiled to WebAssembly: it must build without cgo and must not use files, processes or the network", "native/"))
} }
_, ffmpegErr := exec.LookPath("ffmpeg")
s.idx.Each(func(e *asset.Entry) { s.idx.Each(func(e *asset.Entry) {
if ffmpegErr != nil && strings.EqualFold(filepath.Ext(e.Source), ".mp3") {
out = append(out, diag(CodeWebMP3, problems.Warning, e.Source+" is an mp3; it is converted to ogg on import, which needs ffmpeg in PATH", e.Source))
}
if e.Missing || exportSkip(e.Kind) || !webUnsupported(e.Kind) { if e.Missing || exportSkip(e.Kind) || !webUnsupported(e.Kind) {
return return
} }
@@ -136,6 +143,21 @@ func (j *job) webTitle() string {
return AppName(j.p) return AppName(j.p)
} }
// webBuild keys the page's ?v= URLs on the data, the runtime and both scripts, so a new engine gets new URLs under immutable caching.
func (j *job) webBuild(scripts ...[]byte) (string, error) {
wasm, err := os.ReadFile(j.l.binary())
if err != nil {
return "", errs.Wrap(err, errs.VFSIO, "cannot read the web runtime")
}
h := sha256.New()
h.Write([]byte(j.rep.Hash))
h.Write(wasm)
for _, s := range scripts {
h.Write(s)
}
return hex.EncodeToString(h.Sum(nil))[:buildKeyLen], nil
}
func (j *job) packWeb() error { func (j *job) packWeb() error {
src, err := wasmExecPath(j.goroot) src, err := wasmExecPath(j.goroot)
if err != nil { if err != nil {
@@ -156,7 +178,7 @@ func (j *job) packWeb() error {
return err return err
} }
if j.icon != nil { if j.icon != nil {
data, err := icon.PNG(icon.Resize(j.icon, webIconSize, webIconSize)) data, err := icon.PNG(icon.Sized(j.icon, webIconSize))
if err != nil { if err != nil {
return err return err
} }
@@ -171,9 +193,9 @@ func (j *job) packWeb() error {
if err := writeFile(filepath.Join(j.l.data, WebFiles), list, WebFiles); err != nil { if err := writeFile(filepath.Join(j.l.data, WebFiles), list, WebFiles); err != nil {
return err return err
} }
build := j.rep.Hash build, err := j.webBuild(exec, loader)
if len(build) > buildKeyLen { if err != nil {
build = build[:buildKeyLen] return err
} }
var page bytes.Buffer var page bytes.Buffer
if err := webIndexTmpl.Execute(&page, webPage{Title: j.webTitle(), Build: build, Icon: j.icon != nil}); err != nil { if err := webIndexTmpl.Execute(&page, webPage{Title: j.webTitle(), Build: build, Icon: j.icon != nil}); err != nil {
+8 -3
View File
@@ -18,10 +18,14 @@ canvas { display: block; width: 100%; height: 100%; outline: none; touch-action:
#status { color: #9a9890; font-size: 13px; } #status { color: #9a9890; font-size: 13px; }
.loader.failed #bar { background: #f0776c; } .loader.failed #bar { background: #f0776c; }
#error { max-width: min(640px, 90vw); max-height: 40vh; overflow: auto; margin: 0; padding: 10px 12px; white-space: pre-wrap; color: #f0776c; background: #1d1f23; border-radius: 6px; font: 12px/1.5 ui-monospace, Menlo, Consolas, monospace; } #error { max-width: min(640px, 90vw); max-height: 40vh; overflow: auto; margin: 0; padding: 10px 12px; white-space: pre-wrap; color: #f0776c; background: #1d1f23; border-radius: 6px; font: 12px/1.5 ui-monospace, Menlo, Consolas, monospace; }
#fullscreen { position: fixed; top: 10px; right: 10px; width: 36px; height: 36px; border: 0; border-radius: 6px; background: rgba(0, 0, 0, 0.45); color: #fff; font-size: 18px; cursor: pointer; opacity: 0.5; } #fullscreen { position: fixed; top: 10px; right: 10px; width: 36px; height: 36px; border: 0; border-radius: 6px; background: rgba(0, 0, 0, 0.45); color: #fff; padding: 0; cursor: pointer; opacity: 0.5; }
#fullscreen:hover { opacity: 1; } #fullscreen:hover { opacity: 1; }
#mute { position: fixed; top: 10px; right: 52px; width: 36px; height: 36px; border: 0; border-radius: 6px; background: rgba(0, 0, 0, 0.45); color: #fff; padding: 0; cursor: pointer; opacity: 0.5; }
#mute:hover { opacity: 1; }
#fullscreen svg, #mute svg { display: block; width: 18px; height: 18px; margin: auto; }
#mute .off, #mute.muted .on { display: none; }
#mute.muted .off { display: inline; }
</style> </style>
<link rel="preload" href="game.wasm?v={{.Build}}" as="fetch" type="application/wasm" crossorigin>
</head> </head>
<body> <body>
<canvas id="game" data-aego tabindex="0" aria-label="{{.Title}}"></canvas> <canvas id="game" data-aego tabindex="0" aria-label="{{.Title}}"></canvas>
@@ -31,7 +35,8 @@ canvas { display: block; width: 100%; height: 100%; outline: none; touch-action:
<div id="status">Loading…</div> <div id="status">Loading…</div>
<pre id="error" hidden></pre> <pre id="error" hidden></pre>
</div> </div>
<button id="fullscreen" type="button" title="Fullscreen" aria-label="Fullscreen" hidden>⛶</button> <button id="fullscreen" type="button" title="Fullscreen" aria-label="Fullscreen" hidden><svg viewBox="0 0 16 16" aria-hidden="true"><path fill="currentColor" d="M9.92 13.44L10.25 13.38L13.38 13.38L13.38 10.25L13.44 9.92L13.76 9.52L14.08 9.39L14.58 9.44L14.98 9.76L15.12 10.25L15.12 14.25L15.06 14.58L14.74 14.98L14.25 15.12L10.25 15.12L9.92 15.06L9.52 14.74L9.38 14.25L9.52 13.76ZM13.44 6.08L13.38 5.75L13.38 2.62L10.25 2.62L9.92 2.56L9.52 2.24L9.39 1.92L9.44 1.42L9.76 1.02L10.25 0.88L14.25 0.88L14.58 0.94L14.98 1.26L15.12 1.75L15.12 5.75L15.06 6.08L14.74 6.48L14.25 6.62L13.76 6.48ZM2.56 9.92L2.62 10.25L2.62 13.38L5.75 13.38L6.08 13.44L6.48 13.76L6.62 14.25L6.56 14.58L6.24 14.98L5.75 15.12L1.75 15.12L1.42 15.06L1.02 14.74L0.88 14.25L0.88 10.25L0.94 9.92L1.26 9.52L1.75 9.38L2.24 9.52ZM6.08 2.56L5.75 2.62L2.62 2.62L2.62 5.75L2.56 6.08L2.24 6.48L1.75 6.62L1.42 6.56L1.02 6.24L0.88 5.75L0.88 1.75L0.94 1.42L1.26 1.02L1.75 0.88L5.75 0.88L6.08 0.94L6.48 1.26L6.62 1.75L6.48 2.24Z"/></svg></button>
<button id="mute" type="button" title="Mute" aria-label="Mute" hidden><svg viewBox="0 0 16 16" aria-hidden="true"><path fill="currentColor" d="M1.81 6.04L4 6L6.74 3.47L7.11 3.41L7.36 3.55L7.5 3.9L7.5 12.1L7.36 12.45L7.11 12.59L6.74 12.53L4 10L2 10L1.65 9.85L1.5 9.5L1.5 6.5L1.58 6.22Z"/><path class="on" fill="currentColor" d="M12.53 5.89L11.97 4.96L11.01 3.9L10.95 3.62L10.99 3.33L11.15 3.08L11.39 2.91L11.82 2.86L12.21 3.05L12.72 3.54L13.53 4.59L13.91 5.29L14.17 5.95L14.35 6.63L14.5 7.96L14.46 8.75L14.34 9.45L14.14 10.13L13.58 11.34L13.18 11.92L12.67 12.52L12.09 13.04L11.67 13.15L11.39 13.09L11.15 12.92L10.99 12.67L10.95 12.38L11.09 11.97L11.61 11.46L12.27 10.59L12.73 9.61L12.88 9.08L12.97 8.54L12.97 7.46L12.73 6.39ZM10.05 7.09L9.82 6.68L9.38 6.19L9.26 5.77L9.31 5.48L9.48 5.24L9.72 5.08L10.01 5.02L10.29 5.08L10.54 5.24L11.01 5.76L11.27 6.16L11.66 7.18L11.75 8.04L11.58 9.12L11.23 9.91L10.54 10.76L10.29 10.92L10.01 10.98L9.72 10.92L9.48 10.76L9.31 10.52L9.26 10.23L9.38 9.81L9.95 9.12L10.2 8.47L10.24 7.76Z"/><path class="off" fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" d="M10.25 5.75l4.5 4.5M14.75 5.75l-4.5 4.5"/></svg></button>
<script src="wasm_exec.js?v={{.Build}}"></script> <script src="wasm_exec.js?v={{.Build}}"></script>
<script src="loader.js?v={{.Build}}"></script> <script src="loader.js?v={{.Build}}"></script>
</body> </body>

Some files were not shown because too many files have changed in this diff Show More