21 Commits
Author SHA1 Message Date
sanspie 208875264f Stage 9.5c3: docs runtime polish
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 12m43s
ci / checks (push) Successful in 16m57s
2026-10-20 02:33:48 +03:00
sanspie 8c21400bb1 Stage 9.5c2: docs session, Try it, sandbox (D293–D294) 2026-10-20 01:31:40 +03:00
sanspie e83521a34a Stage 9.5c1: web export (D295) 2026-10-20 00:59:39 +03:00
sanspie 3f5584d062 Stage 9.5b3b: component, settings and CLI reference (D292) 2026-10-20 00:11:43 +03:00
sanspie 6ce72aa1ec Stage 9.5b3a: docs IA and site shell (D292) 2026-10-19 23:27:11 +03:00
sanspie 9ee2b0b05c Stage 9.5b2: playground with Game View (D291) 2026-10-19 23:10:55 +03:00
sanspie 99dacd7a75 Stage 9.5b1: web platform and WebGL2 backend (D289–D290) 2026-10-19 22:47:08 +03:00
sanspie 5447383f2b gitignore: aego-runtime binary and .syso resources 2026-10-19 20:39:03 +03:00
sanspie 6745d027fb Stage 9.5a: export v1 (D286–D288) 2026-10-19 20:27:58 +03:00
sanspie e7dd01371e script/abi: Parse accepts the untyped Handle<> the encoder writes 2026-10-19 20:27:40 +03:00
sanspie 68802195b6 Stage 9.0: editor workflow 2026-10-19 20:27:40 +03:00
sanspie 7cba364aed Stage 9.4d4: aego test --determinism 2026-10-19 02:18:58 +03:00
sanspie 35e9849cae Stage 9.4d3: keyframes 2026-10-19 02:15:10 +03:00
sanspie f21d455d68 Stage 9.4d3a: CloneInto, spawn pool 2026-10-19 01:51:39 +03:00
sanspie d1a16d8208 Stage 9.4d2: rewind 2026-10-19 01:47:39 +03:00
sanspie 2a1826f876 Stage 9.4d1: save games 2026-10-19 00:37:50 +03:00
sanspie 3af2d5d977 Stage 9.4c: data assets, validators 2026-10-18 22:58:02 +03:00
sanspie b61a1656ad Stage 9.4b: signals, tags, spawn 2026-10-18 22:58:02 +03:00
sanspie 0fbf22a090 Stage 9.4a: curves, tween, timers
core/curve with presets, keys, wraps; KindCurve in schema, scenes, prefabs and the inspector curve editor.
modules/tween: tweens and timers in per-world pools, game and unscaled domains, script field targets via contracts/scriptfields.
Host handle types (abi.Handle, bind.Handle, manifest v5), yield on awaitable handles via contracts/scriptwait.
Script modules aego/curve, aego/tween, aego/timer; platformer enemy uses a cooldown and a fade-out tween.
Docs: tween.md, curves.md, language reference; golden for the curve editor.
2026-10-18 21:32:39 +03:00
sanspie 5e763aa73c Stage 9.2–9.3: input and settings 2026-10-18 21:32:39 +03:00
sanspie 6093ca9d8b Stage 9.1: time and debug 2026-10-17 23:14:21 +03:00
83 changed files with 1630 additions and 6466 deletions
+1 -8
View File
File diff suppressed because one or more lines are too long
-1
View File
@@ -98,7 +98,6 @@ vet: bootstrap
lint: bootstrap
go run honnef.co/go/tools/cmd/staticcheck@$(STATICCHECK_VERSION) $(LINT_PKGS)
go run honnef.co/go/tools/cmd/staticcheck@$(STATICCHECK_VERSION) -tags aego_editor ./editor/... ./app/... ./tests/...
# All graph variants, the semantic pass and the negative rule tests.
depcheck:
+6 -2
View File
@@ -116,8 +116,12 @@ func TestPlayLeavesEditSceneByteIdentical(t *testing.T) {
t.Fatal("Spin is not registered")
}
speed, _ := td.Field("speed")
add := commands.NewMutation("Add "+td.FullName, commands.EnvFor(es),
commands.AddComp(es, spinner, td, []commands.FieldValue{{Field: speed.ID, Value: schema.Float32(3)}}))
add := &commands.AddComponent{
Node: spinner,
Type: td.ID,
Name: td.FullName,
Values: []commands.FieldValue{{Field: speed.ID, Value: schema.Float32(3)}},
}
if err := d.History.Exec(add); err != nil {
t.Fatal(err)
}
+1 -1
View File
@@ -42,7 +42,7 @@ func TestColliderFitsSprite(t *testing.T) {
}
for _, name := range []string{"Crate", "Bare"} {
id := es.ID(es.Find(es.Root(), name))
if err := d.History.Exec(commands.NewMutation("Add "+td.FullName, commands.WithOnAdd(commands.EnvFor(es), ctx.OnAdd), commands.AddComp(es, id, td, nil))); err != nil {
if err := d.History.Exec(&commands.AddComponent{Node: id, Type: td.ID, Name: td.FullName, OnAdd: ctx.OnAdd(td)}); err != nil {
t.Fatal(err)
}
}
+6 -2
View File
@@ -51,8 +51,12 @@ func openSpinner(t *testing.T) *spinFixture {
}
fd, _ := td.Field("speed")
f.typ, f.speed = td.ID, fd.ID
add := commands.NewMutation("Add "+td.FullName, commands.EnvFor(es),
commands.AddComp(es, f.spinner, td, []commands.FieldValue{{Field: fd.ID, Value: schema.Float32(3)}}))
add := &commands.AddComponent{
Node: f.spinner,
Type: td.ID,
Name: td.FullName,
Values: []commands.FieldValue{{Field: fd.ID, Value: schema.Float32(3)}},
}
if err := d.History.Exec(add); err != nil {
t.Fatal(err)
}
+11 -6
View File
@@ -3,6 +3,7 @@ package assetops
import (
"os"
"path"
"regexp"
"sort"
"strconv"
"strings"
@@ -11,8 +12,6 @@ import (
"aego/core/ids"
"aego/editor/core/context"
"aego/editor/core/document"
"aego/project/refactor"
"aego/project/rename"
)
const (
@@ -20,6 +19,8 @@ const (
opsLimit = 64
)
var packageDecl = regexp.MustCompile(`(?m)^[ \t]*package[ \t]+([A-Za-z_][A-Za-z0-9_]*)`)
type FileOp struct {
Dir bool
ID ids.AssetID
@@ -179,8 +180,8 @@ func setPackage(ctx *context.Editor, rel, pkg string) error {
return err
}
c := d.Code
if a, b, ok := refactor.PackageSpan(c.Bytes()); ok {
c.ReplaceRanges([][2]int{{a, b}}, [][]byte{[]byte(pkg)})
if m := packageDecl.FindSubmatchIndex(c.Bytes()); m != nil {
c.ReplaceRanges([][2]int{{m[2], m[3]}}, [][]byte{[]byte(pkg)})
} else {
c.ReplaceRanges([][2]int{{0, 0}}, [][]byte{[]byte("package " + pkg + "\n\n")})
}
@@ -206,7 +207,7 @@ func Stem(p string) string {
}
func ValidName(s string) bool {
return rename.ValidName(s)
return s != "" && s != "." && s != ".." && !strings.HasPrefix(s, ".") && !strings.ContainsAny(s, "/\\")
}
func ValidIdent(s string) bool {
@@ -269,7 +270,11 @@ func ScriptsRel(dir string) (string, bool) {
}
func PackageOf(ctx *context.Editor, dir string) string {
return refactor.PackageOf(ctx.Project, dir)
if rel, ok := ScriptsRel(dir); ok && rel != "" {
return path.Base(rel)
}
m := moduleOf(ctx)
return m[strings.LastIndexByte(m, '/')+1:]
}
func FileStem(name string) string {
+4 -2
View File
@@ -9,7 +9,6 @@ import (
"aego/core/ids"
"aego/editor/core/context"
"aego/editor/core/history/commands"
"aego/project/refactor"
"aego/scene/scriptcomp"
"aego/schema"
)
@@ -21,7 +20,10 @@ func shortName(full string) string {
}
func moduleOf(ctx *context.Editor) string {
return refactor.Module(ctx.Project)
if ctx.Project != nil && ctx.Project.Module != "" {
return ctx.Project.Module
}
return "game"
}
func ScriptPrefix(ctx *context.Editor, rel string) string {
+18 -22
View File
@@ -10,7 +10,6 @@ import (
"aego/editor/core/history/commands"
"aego/format/aetext"
"aego/scene"
"aego/scene/mutate"
"aego/scene/sceneio"
)
@@ -238,24 +237,12 @@ func Paste(ctx *context.Editor) error {
if err != nil {
return err
}
frags, err := commands.Fragments(data)
if err != nil {
return err
}
parent, index := pasteTarget(ctx)
ops := make([]mutate.Op, len(frags))
for i, f := range frags {
at := -1
if index >= 0 {
at = index + i
}
ops[i] = commands.Insert(parent, at, f)
}
cmd := commands.NewMutation("Create Paste", commands.EnvFor(d.Scene()), ops...)
cmd := &commands.Create{Parent: parent, Index: index, Fragment: data, Name: "Paste"}
if err := d.History.Exec(cmd); err != nil {
return err
}
ctx.Select(cmd.Created()...)
ctx.Select(append([]ids.NodeID(nil), cmd.Roots()...)...)
return nil
}
@@ -280,13 +267,17 @@ func Duplicate(ctx *context.Editor) error {
tx.Abort()
return err
}
c := commands.NewMutation("Create "+s.Name(h), commands.EnvFor(s),
commands.Insert(s.ID(s.Parent(h)), commands.ChildIndex(s, h)+1, string(data)))
c := &commands.Create{
Parent: s.ID(s.Parent(h)),
Index: commands.ChildIndex(s, h) + 1,
Fragment: data,
Name: s.Name(h),
}
if err := tx.Exec(c); err != nil {
tx.Abort()
return err
}
created = append(created, c.Created()...)
created = append(created, c.Roots()...)
}
tx.Commit()
ctx.Select(created...)
@@ -303,13 +294,18 @@ func Delete(ctx *context.Editor) error {
if len(tops) == 0 {
return nil
}
ops := make([]mutate.Op, len(tops))
targets := make([]ids.NodeID, len(tops))
for i, h := range tops {
ops[i] = mutate.RemoveNode(commands.Ref(s.ID(h)))
targets[i] = s.ID(h)
}
if err := d.History.Exec(commands.NewMutation("Delete", commands.EnvFor(s), ops...)); err != nil {
return err
tx := d.History.Begin("Delete")
for _, id := range targets {
if err := tx.Exec(&commands.Delete{Node: id}); err != nil {
tx.Abort()
return err
}
}
tx.Commit()
ctx.Select()
return nil
}
+17 -5
View File
@@ -113,7 +113,8 @@ func (e Env) encodeComponent(td *schema.TypeDescriptor, values []commands.FieldV
sc := e.scratch()
h := sc.Create(sc.Root(), "component")
sc.Flush()
if err := putComponent(sc, h, td, values); err != nil {
add := &commands.AddComponent{Node: sc.ID(h), Type: td.ID, Name: td.FullName, Values: values}
if err := add.Do(target{sc}); err != nil {
return nil, err
}
return sceneio.SaveSubtree(sc, h, true), nil
@@ -121,14 +122,18 @@ func (e Env) encodeComponent(td *schema.TypeDescriptor, values []commands.FieldV
func (e Env) decodeComponent(data []byte) (*schema.TypeDescriptor, []commands.FieldValue, error) {
sc := e.scratch()
root, err := loadScratch(sc, data)
if err != nil {
c := &commands.Create{Index: -1, Fragment: data}
if err := c.Do(target{sc}); err != nil {
return nil, nil, err
}
roots := c.Roots()
if len(roots) == 0 {
return nil, nil, errs.New(errs.EditorCommand, "clipboard component is empty")
}
reg := sc.Registry()
unknown, hasUnknown := reg.ByName("engine.Unknown")
var td *schema.TypeDescriptor
sc.ComponentsOf(sc.Handle(root), func(t schema.TypeID) {
sc.ComponentsOf(sc.Handle(roots[0]), func(t schema.TypeID) {
if td != nil || (hasUnknown && t == unknown.ID) {
return
}
@@ -137,7 +142,7 @@ func (e Env) decodeComponent(data []byte) (*schema.TypeDescriptor, []commands.Fi
if td == nil {
return nil, nil, errs.New(errs.EditorCommand, "clipboard component type is not loaded in this editor")
}
values, err := componentValues(sc, root, td)
values, err := componentValues(sc, roots[0], td)
if err != nil {
return nil, nil, err
}
@@ -184,6 +189,13 @@ func (e Env) ReadComponent() (*schema.TypeDescriptor, []commands.FieldValue, boo
return td, values, true
}
func (e Env) onAdd(td *schema.TypeDescriptor) func(*scene.Scene, scene.NodeHandle) {
if e.OnAdd == nil {
return nil
}
return e.OnAdd(td)
}
func (e Env) PasteComponent(d *document.SceneDocument, nodes []ids.NodeID) error {
td, values, ok := e.ReadComponent()
if !ok {
-28
View File
@@ -1,28 +0,0 @@
package clipboard
import (
"aego/core/errs"
"aego/core/ids"
"aego/editor/core/history/commands"
"aego/scene"
"aego/scene/sceneio"
"aego/schema"
)
func loadScratch(sc *scene.Scene, data []byte) (ids.NodeID, error) {
root := sc.Root()
created, _, err := sceneio.LoadInto(sc, root, data, "fragment", sceneio.LoadOptions{KeepIDs: true})
if err != nil {
return ids.NodeID{}, err
}
for _, h := range created {
if sc.Parent(h) == root {
return sc.ID(h), nil
}
}
return ids.NodeID{}, errs.New(errs.EditorCommand, "the fragment holds no node")
}
func putComponent(sc *scene.Scene, h scene.NodeHandle, td *schema.TypeDescriptor, list []commands.FieldValue) error {
return commands.NewMutation("", commands.EnvFor(sc), commands.AddRaw(sc, sc.ID(h), td, list)).Do(target{sc})
}
+12 -8
View File
@@ -22,7 +22,6 @@ type compData struct {
func (e Env) pasteInto(tx *history.Transaction, d *document.SceneDocument, nodes []ids.NodeID, td *schema.TypeDescriptor, values []commands.FieldValue) error {
s := d.Scene()
env := commands.WithOnAdd(commands.EnvFor(s), e.OnAdd)
for _, n := range nodes {
h := s.Handle(n)
if h.IsZero() || !s.IsAlive(h) {
@@ -32,7 +31,7 @@ func (e Env) pasteInto(tx *history.Transaction, d *document.SceneDocument, nodes
if !s.Accepts(h, td.ID) {
continue
}
if err := tx.Exec(commands.NewMutation("Add "+td.FullName, env, commands.AddComp(s, n, td, values))); err != nil {
if err := tx.Exec(&commands.AddComponent{Node: n, Type: td.ID, Name: td.FullName, Values: values, OnAdd: e.onAdd(td)}); err != nil {
return err
}
continue
@@ -95,7 +94,8 @@ func (e Env) CopyComponents(s *scene.Scene, node ids.NodeID, types []schema.Type
if err != nil {
return err
}
if err := putComponent(sc, h, td, values); err != nil {
add := &commands.AddComponent{Node: sc.ID(h), Type: td.ID, Name: td.FullName, Values: values}
if err := add.Do(target{sc}); err != nil {
return err
}
}
@@ -118,10 +118,11 @@ func (e Env) readComponents() ([]compData, bool) {
data = []byte(strings.TrimPrefix(t, componentsText))
}
sc := e.scratch()
root, err := loadScratch(sc, data)
if err != nil {
cr := &commands.Create{Index: -1, Fragment: data}
if err := cr.Do(target{sc}); err != nil || len(cr.Roots()) == 0 {
return nil, false
}
root := cr.Roots()[0]
reg := sc.Registry()
unknown, hasUnknown := reg.ByName("engine.Unknown")
var out []compData
@@ -185,11 +186,14 @@ func (e Env) EncodeScript(s *scene.Scene, node ids.NodeID, name string) ([]byte,
func (e Env) decodeScript(data []byte) (string, schema.PropertyBag, error) {
sc := e.scratch()
root, err := loadScratch(sc, data)
if err != nil {
cr := &commands.Create{Index: -1, Fragment: data}
if err := cr.Do(target{sc}); err != nil {
return "", schema.PropertyBag{}, err
}
scs, ok := scriptcomp.ScriptsOf(sc, sc.Handle(root))
if len(cr.Roots()) == 0 {
return "", schema.PropertyBag{}, errs.New(errs.EditorCommand, "the preset is empty")
}
scs, ok := scriptcomp.ScriptsOf(sc, sc.Handle(cr.Roots()[0]))
if !ok || len(scs.Attachments) == 0 {
return "", schema.PropertyBag{}, errs.New(errs.EditorCommand, "the preset holds no script")
}
File diff suppressed because it is too large Load Diff
+10 -15
View File
@@ -15,7 +15,6 @@ import (
"aego/data"
"aego/editor/core/context"
"aego/editor/core/document"
"aego/scene/mutate"
"aego/schema"
)
@@ -109,18 +108,6 @@ func (s *Service) file(id ids.AssetID) (string, []byte, error) {
return rel, raw, nil
}
func (s *Service) env() mutate.Env {
env := mutate.Env{Types: s.ctx.Types}
if pl := s.ctx.Pipeline; pl != nil {
env.Lookup = pl.Lookup
env.Assets = func(id ids.AssetID) bool {
_, ok := pl.PathOf(id)
return ok || asset.IsBuiltin(id)
}
}
return env
}
func (s *Service) Doc(id ids.AssetID) (*Doc, error) {
d := s.docs[id]
if d != nil && d.rev == s.ctx.AssetRev {
@@ -138,7 +125,11 @@ func (s *Service) Doc(id ids.AssetID) (*Doc, error) {
if err != nil {
return nil, err
}
nd, err := NewDoc(s.env(), lib, id, rel, raw)
parsed, err := data.ParseDoc(raw, rel)
if err != nil {
return nil, err
}
nd, err := NewDoc(s.reg(), lib, id, rel, parsed)
if err != nil {
return nil, err
}
@@ -160,7 +151,11 @@ func (s *Service) Table(id ids.AssetID) (*Table, error) {
t.Path, t.rev = rel, s.ctx.AssetRev
return t, nil
}
nt, err := NewTable(s.env(), id, rel, raw)
parsed, err := data.ParseTable(raw, rel)
if err != nil {
return nil, err
}
nt, err := NewTable(s.reg(), id, rel, parsed)
if err != nil {
return nil, err
}
File diff suppressed because it is too large Load Diff
+23 -2
View File
@@ -20,7 +20,6 @@ import (
"aego/editor/core/selection"
"aego/engine"
"aego/engine/module"
"aego/project"
"aego/scene"
"aego/scene/sceneio"
)
@@ -442,7 +441,29 @@ func (m *Manager) UniquePath(rel string) string {
}
func WriteAtomic(abs string, data []byte) error {
return project.WriteAtomic(abs, data)
dir := filepath.Dir(abs)
if err := os.MkdirAll(dir, 0o755); err != nil {
return err
}
tmp, err := os.CreateTemp(dir, ".aego-*.tmp")
if err != nil {
return err
}
name := tmp.Name()
if _, err := tmp.Write(data); err != nil {
tmp.Close()
os.Remove(name)
return err
}
if err := tmp.Close(); err != nil {
os.Remove(name)
return err
}
if err := os.Rename(name, abs); err != nil {
os.Remove(name)
return err
}
return nil
}
func encode(d *SceneDocument) []byte {
+2 -13
View File
@@ -1,7 +1,6 @@
package gizmo
import (
"aego/core/errs"
"aego/editor/core/history/commands"
"aego/editor/core/props"
"aego/schema"
@@ -15,25 +14,15 @@ func SetProperty(e *EditCtx, t schema.TypeID, fd *schema.FieldDescriptor, v sche
if h.IsZero() {
return
}
td, ok := e.Scene.Registry().ByID(t)
if !ok {
e.Err = errs.New(errs.SchemaUnknownType, "component type is not registered")
return
}
nv, err := props.Normalize(fd, v)
if err != nil {
e.Err = err
return
}
before, err := e.Scene.GetProperty(h, t, fd.ID)
if err != nil {
e.Err = err
return
}
if props.Equal(before, nv) {
if props.Equal(before, v) {
return
}
if err := e.Tx.Exec(commands.SetField(e.Scene, e.Node, td, fd, nv, props.Label(fd))); err != nil {
if err := e.Tx.Exec(&commands.SetProperty{Node: e.Node, Type: t, Field: fd.ID, Before: before, After: v, Name: props.Label(fd)}); err != nil {
e.Err = err
}
}
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+51
View File
@@ -3,10 +3,61 @@ package commands
import (
"aego/core/errs"
"aego/core/ids"
"aego/core/log"
"aego/editor/core/history"
"aego/scene"
"aego/scene/sceneio"
)
type Replace struct {
Node ids.NodeID
Before []byte
After []byte
Name string
Post func(s *scene.Scene)
parent ids.NodeID
index int
ready bool
}
func (c *Replace) Label() string {
if c.Name != "" {
return c.Name
}
return "Replace"
}
func (c *Replace) Do(t history.Target) error {
s := t.Scene()
if err := c.swap(s, c.After); err != nil {
return err
}
if c.Post != nil {
c.Post(s)
}
return nil
}
func (c *Replace) Undo(t history.Target) error {
return c.swap(t.Scene(), c.Before)
}
func (c *Replace) Merge(history.Command) bool {
return false
}
func (c *Replace) swap(s *scene.Scene, data []byte) error {
if !c.ready {
h := s.Handle(c.Node)
if h.IsZero() || !s.IsAlive(h) {
return errs.New(errs.SceneDeadNode, "node is not in the scene", log.F("node", c.Node.String()))
}
c.parent, c.index, c.ready = s.ID(s.Parent(h)), ChildIndex(s, h), true
}
_, err := ReplaceNode(s, c.Node, c.parent, c.index, data, nil)
return err
}
func ReplaceNode(s *scene.Scene, node, parent ids.NodeID, index int, data []byte, lib *sceneio.Library) (scene.NodeHandle, error) {
if h := s.Handle(node); !h.IsZero() && s.IsAlive(h) {
s.Destroy(h)
+4 -4
View File
@@ -18,7 +18,7 @@ func TestReparent3DPreservesWorld(t *testing.T) {
s.Flush()
before := s.World4(n)
h := history.New(target{s})
if err := h.Exec(reparent(s, n, p)); err != nil {
if err := h.Exec(&Reparent{Node: s.ID(n), NewParent: s.ID(p), NewIndex: -1, KeepWorld: true}); err != nil {
t.Fatal(err)
}
if s.Parent(n) != p {
@@ -39,7 +39,7 @@ func TestReparent3DUnderTwoDFails(t *testing.T) {
n := s.Create3D(s.Root(), "N")
s.Flush()
h := history.New(target{s})
err := h.Exec(reparent(s, n, flat))
err := h.Exec(&Reparent{Node: s.ID(n), NewParent: s.ID(flat), NewIndex: -1, KeepWorld: true})
if !errs.Has(err, errs.SceneSpaceMismatch) {
t.Fatalf("err = %v", err)
}
@@ -57,7 +57,7 @@ func TestReparent2DIntoThreeDKeepsWorld(t *testing.T) {
s.Flush()
before := s.World4(n)
h := history.New(target{s})
if err := h.Exec(reparent(s, n, p)); err != nil {
if err := h.Exec(&Reparent{Node: s.ID(n), NewParent: s.ID(p), NewIndex: -1, KeepWorld: true}); err != nil {
t.Fatal(err)
}
if !s.Under3D(n) || !s.World4(n).NearlyEqual(before, 1e-4) {
@@ -97,7 +97,7 @@ func TestDeleteUndoKeepsSpace(t *testing.T) {
s.Flush()
id := s.ID(n)
h := history.New(target{s})
if err := h.Exec(del(s, id)); err != nil {
if err := h.Exec(&Delete{Node: id}); err != nil {
t.Fatal(err)
}
h.Undo()
File diff suppressed because it is too large Load Diff
+1 -2
View File
@@ -480,7 +480,6 @@ func (c *Controller) CopyToEdit(nodes []ids.NodeID, t schema.TypeID) error {
if !ok {
return errs.New(errs.SchemaUnknownType, "component type is not registered")
}
env := commands.EnvFor(es)
tx := real.History.Begin("Copy " + td.FullName + " from Play")
for _, n := range nodes {
if _, has := es.GetByType(es.Handle(n), t); !has {
@@ -493,7 +492,7 @@ func (c *Controller) CopyToEdit(nodes []ids.NodeID, t schema.TypeID) error {
}
values = append(values, commands.FieldValue{Field: td.Fields[i].ID, Value: v})
}
if err := tx.Exec(commands.NewMutation("Add "+td.FullName, env, commands.AddComp(es, n, td, values))); err != nil {
if err := tx.Exec(&commands.AddComponent{Node: n, Type: t, Name: td.FullName, Values: values}); err != nil {
tx.Abort()
return err
}
+2 -12
View File
@@ -3,7 +3,6 @@ package playdiff
import (
"reflect"
"strconv"
"strings"
"aego/core/curve"
"aego/core/ids"
@@ -13,7 +12,6 @@ import (
"aego/editor/core/history/commands"
"aego/editor/core/props"
"aego/scene"
"aego/scene/mutate"
"aego/scene/scriptcomp"
"aego/schema"
)
@@ -96,16 +94,8 @@ func Touched(h *history.History) map[Key]bool {
}
h.Walk(func(c history.Command) {
switch c := c.(type) {
case *commands.Mutation:
for _, ch := range c.Changes() {
switch {
case ch.Op != mutate.KindSet && ch.Op != mutate.KindReset:
case ch.Type != 0:
out[Key{Node: ch.NodeID, Type: ch.Type, Field: ch.Field}] = true
case strings.HasPrefix(ch.Path, "transform."):
out[Key{Node: ch.NodeID}] = true
}
}
case *commands.SetProperty:
out[Key{Node: c.Node, Type: c.Type, Field: c.Field}] = true
case *commands.SetTransform:
out[Key{Node: c.Node}] = true
case *commands.SetTransform3D:
+1 -12
View File
@@ -45,7 +45,7 @@ func pair(t *testing.T) (*document.SceneDocument, *document.SceneDocument, ids.N
}
s.Flush()
d := m.New(rel, s)
if err := d.History.Exec(commands.NewMutation("Add "+td.FullName, commands.EnvFor(s), commands.AddComp(s, id, td, nil))); err != nil {
if err := d.History.Exec(&commands.AddComponent{Node: id, Type: td.ID, Name: td.FullName}); err != nil {
t.Fatal(err)
}
docs[i] = d
@@ -108,14 +108,3 @@ func TestApplyIsOneStep(t *testing.T) {
t.Fatal("undo must restore the edit scene")
}
}
func TestTouchedSeesInspectorEdits(t *testing.T) {
_, play, id, td := pair(t)
fd, _ := td.Field("tint")
if err := play.Props.Set(nil, []ids.NodeID{id}, td.ID, fd.ID, schema.Color(mathx.Color{G: 1, A: 1})); err != nil {
t.Fatal(err)
}
if !playdiff.Touched(play.History)[playdiff.Key{Node: id, Type: td.ID, Field: fd.ID}] {
t.Fatal("a field set through the Inspector is not touched")
}
}
@@ -1,4 +1,4 @@
package refactor
package prefabs
import (
"slices"
@@ -309,7 +309,3 @@ func (b *baker) Nearest(id ids.AssetID, key prefab.Key) (ids.AssetID, bool) {
}
return d.owner, true
}
func Nearest(lib *sceneio.Library, id ids.AssetID, key prefab.Key) (ids.AssetID, bool) {
return newBaker(lib).Nearest(id, key)
}
File diff suppressed because it is too large Load Diff
+19 -12
View File
@@ -3,6 +3,7 @@ package prefabs
import (
"os"
"slices"
"strings"
"aego/core/errs"
"aego/core/ids"
@@ -10,7 +11,6 @@ import (
"aego/editor/core/document"
"aego/editor/core/history"
"aego/editor/core/history/commands"
"aego/project/refactor"
"aego/scene"
"aego/scene/prefab"
"aego/scene/sceneio"
@@ -80,18 +80,25 @@ func readFile(abs string) ([]byte, error) {
return data, nil
}
func (s *Service) files(plan *refactor.ApplyPlan) ([]fileChange, error) {
if s.ctx.Pipeline == nil {
return nil, errs.New(errs.EditorCommand, "the asset pipeline is not available")
}
edits, err := plan.Edits(s.ctx.Types.Schema(), s.ctx.Pipeline)
if err != nil {
return nil, err
}
out := make([]fileChange, len(edits))
for i, e := range edits {
out[i] = fileChange{id: e.ID, rel: e.Path, before: e.Before, after: e.After}
func (s *Service) files(edits map[ids.AssetID]*prefab.Node) ([]fileChange, error) {
reg := s.ctx.Types.Schema()
var out []fileChange
for id, m := range edits {
rel, ok := s.pathOf(id)
if !ok {
return nil, errs.New(errs.EditorDocument, "prefab "+id.Short()+" is not in the project")
}
before, err := readFile(s.ctx.Pipeline.Abs(rel))
if err != nil {
return nil, err
}
after := sceneio.EncodePrefab(reg, m)
if string(after) == string(before) {
continue
}
out = append(out, fileChange{id: id, rel: rel, before: before, after: after})
}
slices.SortFunc(out, func(a, b fileChange) int { return strings.Compare(a.rel, b.rel) })
return out, nil
}
+1 -2
View File
@@ -3,7 +3,6 @@ package prefabs
import (
"aego/core/ids"
"aego/editor/core/document"
"aego/project/refactor"
"aego/scene"
"aego/scene/prefab"
"aego/scene/sceneio"
@@ -260,5 +259,5 @@ func (s *Service) nearestOf(d *document.SceneDocument, node ids.NodeID) (ids.Ass
if err != nil {
return ids.AssetID{}, false
}
return refactor.Nearest(s.lib(), pi.Prefab, key)
return newBaker(s.lib()).Nearest(pi.Prefab, key)
}
+1 -2
View File
@@ -2,11 +2,10 @@ package prefabs
import (
"aego/core/ids"
"aego/project/refactor"
"aego/scene/prefab"
"aego/scene/sceneio"
)
func NearestForTest(lib *sceneio.Library, id ids.AssetID, key prefab.Key) (ids.AssetID, bool) {
return refactor.Nearest(lib, id, key)
return newBaker(lib).Nearest(id, key)
}
+49 -6
View File
@@ -14,9 +14,7 @@ import (
"aego/editor/core/context"
"aego/editor/core/document"
"aego/editor/core/history/commands"
"aego/project/refactor"
"aego/scene"
"aego/scene/mutate"
"aego/scene/prefab"
"aego/scene/sceneio"
)
@@ -199,9 +197,13 @@ func (s *Service) CreateFrom(d *document.SceneDocument, nodes []ids.NodeID, dir
}
tx := d.History.Begin("Create Prefab")
for _, h := range tops {
if err := refactor.CheckCreate(sc, h); err != nil {
if pi, ok := sceneio.InstanceOf(sc, h); ok && pi.Owner {
tx.Abort()
return err
return errs.New(errs.EditorCommand, sc.Name(h)+" is already a prefab instance, use Create Variant")
}
if root, _, ok := sceneio.OwnerRoot(sc, h); ok && root != h {
tx.Abort()
return errs.New(errs.EditorCommand, sc.Name(h)+" belongs to a prefab instance, unpack it first")
}
rel := assetops.UniqueFile(s.ctx, dir, fileSafe(sc.Name(h)), document.PrefabExt)
before := sceneio.SaveSubtree(sc, h, true)
@@ -210,12 +212,12 @@ func (s *Service) CreateFrom(d *document.SceneDocument, nodes []ids.NodeID, dir
tx.Abort()
return err
}
after, err := refactor.LinkBlock(sc, h, s.lib(), id)
after, err := s.linkBlock(sc, h, id)
if err != nil {
tx.Abort()
return err
}
if err := tx.Exec(commands.NewMutation("Create Prefab", s.env(sc), mutate.Replace(commands.Ref(sc.ID(h)), string(after)))); err != nil {
if err := tx.Exec(&commands.Replace{Node: sc.ID(h), Before: before, After: after, Name: "Create Prefab"}); err != nil {
tx.Abort()
return err
}
@@ -225,6 +227,47 @@ func (s *Service) CreateFrom(d *document.SceneDocument, nodes []ids.NodeID, dir
return nil
}
func (s *Service) linkBlock(sc *scene.Scene, h scene.NodeHandle, id ids.AssetID) ([]byte, error) {
lib := s.lib()
p, ok := lib.Prefab(id)
if !ok {
return nil, errs.New(errs.EditorCommand, "the new prefab did not import")
}
tree, _, err := prefab.Expand(lib, p, nil)
if err != nil {
return nil, err
}
inst := &prefab.Instance{Prefab: id, IDs: map[prefab.Key]ids.NodeID{}}
tree.Walk(func(n, _ *prefab.Node) {
if sid, ok := sceneIDOf(sc, n.Key); ok {
inst.IDs[n.Key] = sid
}
})
return sceneio.EncodeInstance(sc.Registry(), sc.ID(h), inst), nil
}
func sceneIDOf(sc *scene.Scene, k prefab.Key) (ids.NodeID, bool) {
head, rest, nested := strings.Cut(string(k), "/")
first, err := ids.ParseNodeID(head)
if err != nil {
return ids.NodeID{}, false
}
if !nested {
return first, !sc.Handle(first).IsZero()
}
if pi, ok := sceneio.InstanceOf(sc, sc.Handle(first)); ok {
for sid, kk := range pi.Keys {
if string(kk) == rest {
return sid, true
}
}
}
if local, ok := k.Local(); ok && !sc.Handle(local).IsZero() {
return local, true
}
return ids.NodeID{}, false
}
func (s *Service) CreateVariant(id ids.AssetID) error {
if err := s.editable(); err != nil {
return err
+6 -9
View File
@@ -6,7 +6,6 @@ import (
"aego/editor/core/history"
"aego/editor/core/history/commands"
"aego/scene"
"aego/scene/mutate"
)
func (a *Access) Rename(tx *history.Transaction, node ids.NodeID, name string) error {
@@ -14,29 +13,27 @@ func (a *Access) Rename(tx *history.Transaction, node ids.NodeID, name string) e
if err != nil {
return err
}
if a.s.Name(h) == name || name == "" {
before := a.s.Name(h)
if before == name || name == "" {
return nil
}
return a.within(tx, "Rename", func(tx *history.Transaction) error {
return tx.Exec(commands.NewMutation("Rename", commands.EnvFor(a.s), mutate.Rename(commands.Ref(node), name)))
return tx.Exec(&commands.Rename{Node: node, Before: before, After: name})
})
}
func (a *Access) SetEnabled(tx *history.Transaction, nodes []ids.NodeID, v bool) error {
text := "false"
if v {
text = "true"
}
return a.within(tx, "Toggle Enabled", func(tx *history.Transaction) error {
for _, n := range nodes {
h, err := a.handle(n)
if err != nil {
return err
}
if a.s.Enabled(h) == v {
before := a.s.Enabled(h)
if before == v {
continue
}
if err := tx.Exec(commands.NewMutation("Toggle Enabled", commands.EnvFor(a.s), mutate.Set(commands.Ref(n), "enabled", text))); err != nil {
if err := tx.Exec(&commands.SetEnabled{Node: n, Before: before, After: v}); err != nil {
return err
}
}
+2 -2
View File
@@ -113,7 +113,7 @@ func (a *Access) within(tx *history.Transaction, label string, fn func(*history.
}
func (a *Access) Set(tx *history.Transaction, nodes []ids.NodeID, t schema.TypeID, f schema.FieldID, v schema.Value) error {
td, fd, err := a.Descriptor(t, f)
_, fd, err := a.Descriptor(t, f)
if err != nil {
return err
}
@@ -131,7 +131,7 @@ func (a *Access) Set(tx *history.Transaction, nodes []ids.NodeID, t schema.TypeI
if Equal(before, nv) {
continue
}
if err := tx.Exec(commands.SetField(a.s, n, td, fd, nv, name)); err != nil {
if err := tx.Exec(&commands.SetProperty{Node: n, Type: t, Field: f, Before: before, After: nv, Name: name}); err != nil {
return err
}
}
+343 -48
View File
File diff suppressed because it is too large Load Diff
+15
View File
@@ -4,6 +4,7 @@ import (
"testing"
"aego/core/ids"
"aego/format/aetext"
"aego/schema"
)
@@ -18,3 +19,17 @@ func TestRewriteNested(t *testing.T) {
t.Fatal("no old reference may remain")
}
}
func TestTextPlaces(t *testing.T) {
id := ids.AssetID{Hi: 7, Lo: 9}
src := "scene version=1 {\n node \"n1\" name=\"Player\" {\n component \"engine.SpriteRenderer\" version=1 {\n sprite = " +
string(token(id)) + "\n }\n }\n}\n"
doc, err := aetext.Parse([]byte(src), "x.aescene")
if err != nil {
t.Fatal(err)
}
got := textPlaces(doc, vAsset, id.String())
if len(got) != 1 || got[0].Path != "Player" || got[0].Owner != "engine.SpriteRenderer" || got[0].Field != "sprite" {
t.Fatalf("places = %+v", got)
}
}
+7 -3
View File
@@ -372,12 +372,16 @@ func InstantiatePlace(ctx *context.Editor, t Template, parent ids.NodeID, index
if err := place(s, scratch, h, parent, pl); err != nil {
return nil, err
}
cmd := commands.NewMutation("Create "+t.Name, commands.EnvFor(s),
commands.Insert(parent, index, string(sceneio.SaveSubtree(scratch, h, true))))
cmd := &commands.Create{
Parent: parent,
Index: index,
Fragment: sceneio.SaveSubtree(scratch, h, true),
Name: t.Name,
}
if err := d.History.Exec(cmd); err != nil {
return nil, err
}
created := cmd.Created()
created := append([]ids.NodeID(nil), cmd.Roots()...)
ctx.Select(created...)
return created, nil
}
+30 -7
View File
@@ -11,10 +11,9 @@ import (
"aego/editor/core/assetops"
"aego/editor/core/context"
"aego/editor/core/document"
"aego/editor/core/rename"
"aego/editor/core/services"
"aego/platform/input"
"aego/project/refactor"
"aego/project/rename"
"aego/ui/core"
"aego/ui/widgets"
)
@@ -301,10 +300,34 @@ func (g *Dialog) applyNodes() error {
}
func (g *Dialog) applyAssets() error {
ops := refactor.RenameOps(g.paths, g.assets, g.rows)
list := make([]assetops.FileOp, len(ops))
for i, op := range ops {
list[i] = assetops.FileOp{ID: op.ID, From: op.From, To: op.To}
finals := map[string]bool{}
sources := map[string]bool{}
var ops []assetops.FileOp
for i, rel := range g.paths {
rw := g.rows[i]
if !rw.Changed() {
continue
}
to := path.Join(path.Dir(rel), rw.To+path.Ext(rel))
finals[strings.ToLower(to)] = true
sources[strings.ToLower(rel)] = true
ops = append(ops, assetops.FileOp{ID: g.assets[i], From: rel, To: to})
}
return g.d.Move(list)
chain := false
for to := range finals {
if sources[to] {
chain = true
break
}
}
if chain {
var temp, final []assetops.FileOp
for i, op := range ops {
tmp := path.Join(path.Dir(op.From), "__rename_"+strconv.Itoa(i)+"_"+path.Base(op.From))
temp = append(temp, assetops.FileOp{ID: op.ID, From: op.From, To: tmp})
final = append(final, assetops.FileOp{ID: op.ID, From: tmp, To: op.To})
}
ops = append(temp, final...)
}
return g.d.Move(ops)
}
+5 -13
View File
@@ -236,19 +236,11 @@ func (p *Panel) act(a int, ro bool) {
}
switch a {
case actAdd:
i, err := t.AddRow()
if err != nil {
p.notify(err)
return
}
i := t.AddRow()
p.filter = ""
p.Select(t.Rows[i].ID)
case actDuplicate:
made, err := t.Duplicate(p.selected())
if err != nil {
p.notify(err)
return
}
made := t.Duplicate(p.selected())
ids := make([]string, len(made))
for k, i := range made {
ids[k] = t.Rows[i].ID
@@ -257,12 +249,12 @@ func (p *Panel) act(a int, ro bool) {
p.Select(ids...)
}
case actDelete:
p.notify(t.Delete(p.selected()))
t.Delete(p.selected())
clear(p.sel)
case actUndo:
p.notify(t.Undo())
t.Undo()
case actRedo:
p.notify(t.Redo())
t.Redo()
case actExport:
if p.d.Data == nil {
return
+13 -9
View File
@@ -681,29 +681,33 @@ func (p *Panel) move(d *document.SceneDocument, nodes []ids.NodeID, target ids.N
if n == th {
continue
}
parent, index := target, -1
cmd := &commands.Reparent{Node: s.ID(n), KeepWorld: true}
switch zone {
case zoneInto:
cmd.NewParent = target
cmd.NewIndex = -1
case zoneBefore:
ph := s.Parent(th)
parent := s.Parent(th)
idx := commands.ChildIndex(s, th)
if s.Parent(n) == ph && commands.ChildIndex(s, n) < idx {
if s.Parent(n) == parent && commands.ChildIndex(s, n) < idx {
idx--
}
parent, index = s.ID(ph), idx
cmd.NewParent = s.ID(parent)
cmd.NewIndex = idx
case zoneAfter:
ph := s.Parent(anchor)
parent := s.Parent(anchor)
idx := commands.ChildIndex(s, anchor) + 1
if s.Parent(n) == ph && commands.ChildIndex(s, n) < idx {
if s.Parent(n) == parent && commands.ChildIndex(s, n) < idx {
idx--
}
parent, index = s.ID(ph), idx
cmd.NewParent = s.ID(parent)
cmd.NewIndex = idx
}
if p.d.Prefabs != nil && parent != s.ID(s.Parent(n)) && p.d.Prefabs.Locked(d, s.ID(n)) {
if p.d.Prefabs != nil && cmd.NewParent != s.ID(s.Parent(n)) && p.d.Prefabs.Locked(d, s.ID(n)) {
tx.Abort()
p.d.Notices.Notify(context.LevelWarn, s.Name(n)+" comes from a prefab and keeps its parent, unpack the instance to move it")
return
}
cmd := commands.NewMutation("Reparent", commands.EnvFor(s), commands.Move(s.ID(n), parent, index, true))
if err := tx.Exec(cmd); err != nil {
tx.Abort()
p.d.Notices.Notify(context.LevelError, err.Error())
+4 -10
View File
@@ -647,10 +647,9 @@ func (p *Panel) component(d *document.SceneDocument, t schema.TypeID) {
func (p *Panel) remove(d *document.SceneDocument, td *schema.TypeDescriptor) {
p.confirm(d, "Remove "+p.reg.Meta(td).DisplayName, func() error {
env := commands.EnvFor(d.Scene())
tx := d.History.Begin("Remove " + td.FullName)
for _, id := range p.nodes {
if err := tx.Exec(commands.NewMutation("Remove "+td.FullName, env, commands.RemoveComp(id, td))); err != nil {
if err := tx.Exec(&commands.RemoveComponent{Node: id, Type: td.ID, Name: td.FullName}); err != nil {
tx.Abort()
return err
}
@@ -662,16 +661,13 @@ func (p *Panel) remove(d *document.SceneDocument, td *schema.TypeDescriptor) {
func (p *Panel) reset(d *document.SceneDocument, td *schema.TypeDescriptor) {
p.confirm(d, "Reset "+p.reg.Meta(td).DisplayName, func() error {
s := d.Scene()
env := commands.EnvFor(s)
defaults := p.reg.Defaults(td.ID)
tx := d.History.Begin("Reset " + td.FullName)
for _, id := range p.nodes {
if err := tx.Exec(commands.NewMutation("Remove "+td.FullName, env, commands.RemoveComp(id, td))); err != nil {
if err := tx.Exec(&commands.RemoveComponent{Node: id, Type: td.ID, Name: td.FullName}); err != nil {
tx.Abort()
return err
}
if err := tx.Exec(commands.NewMutation("Add "+td.FullName, env, commands.AddComp(s, id, td, defaults))); err != nil {
if err := tx.Exec(&commands.AddComponent{Node: id, Type: td.ID, Name: td.FullName, Values: p.reg.Defaults(td.ID)}); err != nil {
tx.Abort()
return err
}
@@ -800,14 +796,12 @@ func (p *Panel) addComponent(d *document.SceneDocument) {
func (p *Panel) add(d *document.SceneDocument, td *schema.TypeDescriptor) {
p.confirm(d, "Add "+p.reg.Meta(td).DisplayName, func() error {
s := d.Scene()
env := commands.WithOnAdd(commands.EnvFor(s), p.d.Clip.OnAdd)
defaults := p.reg.Defaults(td.ID)
tx := d.History.Begin("Add " + td.FullName)
for _, n := range p.nodes {
if _, ok := s.GetByType(s.Handle(n), td.ID); ok {
continue
}
if err := tx.Exec(commands.NewMutation("Add "+td.FullName, env, commands.AddComp(s, n, td, defaults))); err != nil {
if err := tx.Exec(&commands.AddComponent{Node: n, Type: td.ID, Name: td.FullName, Values: p.reg.Defaults(td.ID), OnAdd: p.d.Clip.OnAdd(td)}); err != nil {
tx.Abort()
return err
}
-37
View File
@@ -1,37 +0,0 @@
package project
import (
"os"
"path/filepath"
)
func WriteAtomic(abs string, data []byte) error {
dir := filepath.Dir(abs)
if err := os.MkdirAll(dir, 0o755); err != nil {
return err
}
tmp, err := os.CreateTemp(dir, ".aego-*.tmp")
if err != nil {
return err
}
name := tmp.Name()
if _, err := tmp.Write(data); err != nil {
tmp.Close()
os.Remove(name)
return err
}
if err := tmp.Chmod(0o644); err != nil {
tmp.Close()
os.Remove(name)
return err
}
if err := tmp.Close(); err != nil {
os.Remove(name)
return err
}
if err := os.Rename(name, abs); err != nil {
os.Remove(name)
return err
}
return nil
}
+1 -1
View File
@@ -282,7 +282,7 @@ func (p *Project) Encode() []byte {
}
func (p *Project) Save() error {
if err := WriteAtomic(p.FilePath(), p.Encode()); err != nil {
if err := os.WriteFile(p.FilePath(), p.Encode(), 0o644); err != nil {
return errs.Wrap(err, errs.VFSIO, "cannot write project.aego")
}
return nil
-46
View File
@@ -1,46 +0,0 @@
package refactor
import (
"aego/asset/pipeline"
"aego/core/ids"
"aego/project"
"aego/project/refs"
)
func Users(p *project.Project, src refs.Source, list []ids.AssetID) []refs.Ref {
gone := make(map[ids.AssetID]bool, len(list))
for _, id := range list {
gone[id] = true
}
seen := map[string]bool{}
var out []refs.Ref
for _, id := range list {
for _, r := range refs.Referrers(p, src, id) {
if (r.Project || !gone[r.Asset]) && !seen[r.Path] {
seen[r.Path] = true
out = append(out, r)
}
}
}
refs.Sort(out)
return out
}
func Delete(pl *pipeline.Pipeline, list []ids.AssetID) (*pipeline.Batch, error) {
all := &pipeline.Batch{Failed: map[ids.AssetID]error{}}
for _, id := range list {
b, err := pl.Delete(id)
if b != nil {
all.Imported = append(all.Imported, b.Imported...)
all.Removed = append(all.Removed, b.Removed...)
all.Retry = append(all.Retry, b.Retry...)
for k, v := range b.Failed {
all.Failed[k] = v
}
}
if err != nil {
return all, err
}
}
return all, nil
}
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff

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