@typeonce/ritmo-render 0.21.0 → 0.23.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +82 -0
- package/README.md +30 -0
- package/dist/RenderSync.d.ts +43 -10
- package/dist/RenderSync.d.ts.map +1 -1
- package/dist/RenderSync.js +121 -18
- package/dist/RenderSync.js.map +1 -1
- package/package.json +2 -2
- package/src/RenderSync.ts +176 -28
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,87 @@
|
|
|
1
1
|
# @typeonce/ritmo-render
|
|
2
2
|
|
|
3
|
+
## 0.23.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- 3037822: **Breaking, and it still compiles: a renderable a system writes with a new value now destroys and makes its node again on every write.** Count your `create` calls after upgrading: a town whose houses, trees, and fields kept writing their renderables went from 142 nodes made in 5 minutes of play to 59,445, and every effect on those nodes restarted each time.
|
|
8
|
+
|
|
9
|
+
**A `RenderSync` node follows its renderable.** A node used to be made once per entity id from the renderable's value at that time and only applied after, so an entity whose renderable a system changed (a relabel, an evolve) kept the node of its old value, and after a rewind an entity spawned under an id already drawn (an enemy where a predicted bullet was) was drawn with the other entity's node for its whole life. Now, when an entity's renderable value is no longer the one its node was made from, `RenderSync.system` destroys the node, calls `create` with the new value, and then `apply`. Writing an equal value keeps the node and runs no extra `apply`: values are compared as plain data (arrays and plain objects by their entries). Nothing changes for a renderable that is set at spawn and never written.
|
|
10
|
+
|
|
11
|
+
What a game sees differently: a renderable written with a new value each tick now makes its node again each tick. Move data that changes while the node lives (an animation `frame`, a `tint`, a facing) out of the renderable into its own component, list it in `redrawOn`, and set it in `apply`:
|
|
12
|
+
|
|
13
|
+
```diff
|
|
14
|
+
-const Sprite = Descriptor.Component<{ texture: string; frame: number }>()("Game/Sprite")
|
|
15
|
+
+const Sprite = Descriptor.Component<{ texture: string }>()("Game/Sprite")
|
|
16
|
+
+const Frame = Descriptor.Component<number>()("Game/Frame")
|
|
17
|
+
|
|
18
|
+
RenderSync.system(Game, {
|
|
19
|
+
renderable: Sprite,
|
|
20
|
+
+ select: { frame: Game.Query.read(Frame) },
|
|
21
|
+
+ redrawOn: [Frame],
|
|
22
|
+
- apply: (node, { renderable }) => node.gotoAndStop(renderable.frame)
|
|
23
|
+
+ apply: (node, { data }) => node.gotoAndStop(data.frame.get())
|
|
24
|
+
})
|
|
25
|
+
```
|
|
26
|
+
|
|
27
|
+
Or key the sync on a component that never changes after spawn, and read the one systems write through a required `select` slot:
|
|
28
|
+
|
|
29
|
+
```diff
|
|
30
|
+
RenderSync.system(Game, {
|
|
31
|
+
- renderable: House,
|
|
32
|
+
+ renderable: Tile,
|
|
33
|
+
+ select: { house: Game.Query.read(House) },
|
|
34
|
+
+ redrawOn: [House],
|
|
35
|
+
- apply: (node, { renderable }) => node.update(renderable)
|
|
36
|
+
+ apply: (node, { data }) => node.update(data.house.get())
|
|
37
|
+
})
|
|
38
|
+
```
|
|
39
|
+
|
|
40
|
+
A game that listed its renderable in `redrawOn` and wrote an `apply` redoing what `create` did can drop both: a new value makes the node again.
|
|
41
|
+
|
|
42
|
+
### Patch Changes
|
|
43
|
+
|
|
44
|
+
- ca0544d: `RenderSync` finds a node's parent with `lookup.related`, since core removed `lookup.parent`. No change for games.
|
|
45
|
+
- d2970e8: `RenderSync` stays correct across `runtime.restore`, which no longer reports the replaced world's entities as despawned: when its removal reads are lagged it destroys every node whose entity no longer matches, as before, and also the node of every entity added since, so an id the save gave to another entity gets a new node made from that entity's values. No change for games.
|
|
46
|
+
- 6704ce1: The `RenderSync.interpolate` example declares its game's root and passes it to `Schema.bind`, which now takes one.
|
|
47
|
+
- Updated dependencies [5a16a40]
|
|
48
|
+
- Updated dependencies [148ec5f]
|
|
49
|
+
- Updated dependencies [4df0496]
|
|
50
|
+
- Updated dependencies [4df0496]
|
|
51
|
+
- Updated dependencies [0dd0a84]
|
|
52
|
+
- Updated dependencies [51a0b7f]
|
|
53
|
+
- Updated dependencies [dff932a]
|
|
54
|
+
- Updated dependencies [dfe3432]
|
|
55
|
+
- Updated dependencies [52d6a6f]
|
|
56
|
+
- Updated dependencies [02ca2a4]
|
|
57
|
+
- Updated dependencies [7e416f5]
|
|
58
|
+
- Updated dependencies [40f60e7]
|
|
59
|
+
- Updated dependencies [51efba5]
|
|
60
|
+
- Updated dependencies [5f9fe33]
|
|
61
|
+
- Updated dependencies [1b83e0c]
|
|
62
|
+
- Updated dependencies [ca0544d]
|
|
63
|
+
- Updated dependencies [4a32ad1]
|
|
64
|
+
- Updated dependencies [917001b]
|
|
65
|
+
- Updated dependencies [0f4a5fe]
|
|
66
|
+
- Updated dependencies [4df0496]
|
|
67
|
+
- Updated dependencies [02b8683]
|
|
68
|
+
- Updated dependencies [791517f]
|
|
69
|
+
- Updated dependencies [4fc0728]
|
|
70
|
+
- Updated dependencies [207e611]
|
|
71
|
+
- Updated dependencies [d2970e8]
|
|
72
|
+
- Updated dependencies [c99b968]
|
|
73
|
+
- Updated dependencies [08c0c91]
|
|
74
|
+
- Updated dependencies [78683e7]
|
|
75
|
+
- Updated dependencies [04d2a9d]
|
|
76
|
+
- @typeonce/ritmo@0.23.0
|
|
77
|
+
|
|
78
|
+
## 0.22.0
|
|
79
|
+
|
|
80
|
+
### Patch Changes
|
|
81
|
+
|
|
82
|
+
- Updated dependencies [82a11f4]
|
|
83
|
+
- @typeonce/ritmo@0.22.0
|
|
84
|
+
|
|
3
85
|
## 0.21.0
|
|
4
86
|
|
|
5
87
|
### Minor Changes
|
package/README.md
CHANGED
|
@@ -35,6 +35,36 @@ const runtime = Game.Runtime.make({
|
|
|
35
35
|
|
|
36
36
|
`attach` receives the node to add and the node to add it under (`undefined` for the root). It is also called to move an attached node to another parent, so it must take the node out of the parent it is in, as Three.js's `add` and Pixi's `addChild` do. Declare both parameters: a one-parameter `attach` still compiles but puts every node on the root.
|
|
37
37
|
|
|
38
|
+
## What goes in the renderable
|
|
39
|
+
|
|
40
|
+
A node follows its renderable. `create` builds the node from the renderable's value, and when an entity's value is no longer the one its node was made from (a system wrote another one, or after a rewind another entity holds an id already drawn), the node is destroyed and made again from the new value, then `apply` runs. Writing an equal value keeps the node: values are compared as plain data.
|
|
41
|
+
|
|
42
|
+
Making a node costs more than applying one, so split the data by how often it changes:
|
|
43
|
+
|
|
44
|
+
- The renderable holds what decides which node to make: a kind, a texture, a mesh, a material.
|
|
45
|
+
- What changes while the node lives (an animation frame, a tint, a facing) goes in other components, listed in `redrawOn` and set by `apply`.
|
|
46
|
+
|
|
47
|
+
```ts
|
|
48
|
+
const Look = Descriptor.Component<{ character: Character }>()("Game/Look") // which sprite sheet
|
|
49
|
+
const Frame = Descriptor.Component<number>()("Game/Frame") // changes every few ticks
|
|
50
|
+
|
|
51
|
+
const Render = RenderSync.system(Game, {
|
|
52
|
+
name: "Game/Render",
|
|
53
|
+
renderable: Look,
|
|
54
|
+
transform: Position,
|
|
55
|
+
registry: Sprites,
|
|
56
|
+
select: { frame: Game.Query.read(Frame) },
|
|
57
|
+
redrawOn: [Frame],
|
|
58
|
+
create: ({ renderable }) => new AnimatedSprite(sheets[renderable.character]),
|
|
59
|
+
apply: (sprite, { transform, data }) => {
|
|
60
|
+
sprite.position.set(transform.x, transform.y)
|
|
61
|
+
sprite.gotoAndStop(data.frame.get())
|
|
62
|
+
}
|
|
63
|
+
})
|
|
64
|
+
```
|
|
65
|
+
|
|
66
|
+
A `frame` field inside `Look` would make the sprite again each time it moved on.
|
|
67
|
+
|
|
38
68
|
## Hierarchies
|
|
39
69
|
|
|
40
70
|
A part that moves with its entity (a turret on a tank, a name over a head) is a child entity in a `Descriptor.Hierarchy`. Pass the hierarchy to `RenderSync.system` and each child's node is attached under its parent's node, so the renderer composes the transforms:
|
package/dist/RenderSync.d.ts
CHANGED
|
@@ -9,8 +9,11 @@
|
|
|
9
9
|
* in a safe order (destroy, create, update), for one bound `Game`. What a
|
|
10
10
|
* node looks like and how state is applied stay caller-defined. The registry
|
|
11
11
|
* belongs to the system: when removals were dropped before it read them
|
|
12
|
-
* (`lagged()`, after it did not run for long
|
|
13
|
-
* entity no longer matches,
|
|
12
|
+
* (`lagged()`, after it did not run for long or after a `runtime.restore`),
|
|
13
|
+
* it destroys every node whose entity no longer matches, and the node of
|
|
14
|
+
* every entity added since, which a load may have given to another entity
|
|
15
|
+
* under the same id: that entity gets a new node. So give each
|
|
16
|
+
* `RenderSync.system` its own registry.
|
|
14
17
|
*
|
|
15
18
|
* Change detection is per system, so the system sees every addition, change,
|
|
16
19
|
* and removal exactly once, wherever it sits in the schedule, and applies each
|
|
@@ -20,6 +23,16 @@
|
|
|
20
23
|
* interpolation). Place the system after the `applyDeferred()` that commits
|
|
21
24
|
* spawns to render new entities in the same tick.
|
|
22
25
|
*
|
|
26
|
+
* A node follows its renderable: when the entity's renderable value is no
|
|
27
|
+
* longer the one its node was made from (a system wrote another one, or
|
|
28
|
+
* after a rewind another entity holds an id the system drew), the node is
|
|
29
|
+
* destroyed and made again from the new value, then applied. An equal value,
|
|
30
|
+
* compared as plain data, keeps the node. Making a node costs more than
|
|
31
|
+
* applying one, so the renderable holds what decides which node to make (a
|
|
32
|
+
* kind, a texture, a mesh), and what changes while the node lives (a frame,
|
|
33
|
+
* a tint, a facing) goes in other components, listed in `redrawOn` and set by
|
|
34
|
+
* `apply`.
|
|
35
|
+
*
|
|
23
36
|
* `create` and `apply` receive one context: the renderable and transform
|
|
24
37
|
* values, the entity id, extra read-only slots declared in `select` (as read
|
|
25
38
|
* cells in `data`), resources declared in `resources` (as read cells), and extra
|
|
@@ -110,7 +123,16 @@ export interface NodeContext<S extends Schema.Any, Root, Renderable extends Sche
|
|
|
110
123
|
export interface Options<S extends Schema.Any, Root, Renderable extends Schema.ComponentDescriptor<S>, Transform extends Schema.ComponentDescriptor<S> | undefined, Registry extends RegistryService, Select extends Selection<S>, Services extends Readonly<Record<string, ServiceDescriptor>>, Resources extends Readonly<Record<string, Schema.ResourceDescriptor<S>>> = {}, When extends ReadonlyArray<Condition> = readonly [], Hierarchy extends Relation.Any | undefined = undefined> {
|
|
111
124
|
/** The system name. */
|
|
112
125
|
readonly name: string;
|
|
113
|
-
/**
|
|
126
|
+
/**
|
|
127
|
+
* The component whose presence means "this entity has a node", and whose
|
|
128
|
+
* value decides which node `create` makes. When the entity's value is no
|
|
129
|
+
* longer the one its node was made from, the node is destroyed and made
|
|
130
|
+
* again from the new value; an equal value (compared as plain data) keeps
|
|
131
|
+
* it. Keep here only what decides which node to make (a kind, a texture, a
|
|
132
|
+
* mesh): a field written while the node lives (a frame, a tint) would make
|
|
133
|
+
* the node again each time. Put that in its own component, listed in
|
|
134
|
+
* `redrawOn` and set by `apply`.
|
|
135
|
+
*/
|
|
114
136
|
readonly renderable: Renderable;
|
|
115
137
|
/**
|
|
116
138
|
* The component applied to the node on creation and whenever it changes.
|
|
@@ -129,9 +151,12 @@ export interface Options<S extends Schema.Any, Root, Renderable extends Schema.C
|
|
|
129
151
|
readonly resources?: Resources;
|
|
130
152
|
/**
|
|
131
153
|
* More components whose changes re-run `apply`, for node state other than
|
|
132
|
-
* the transform: animation frames, tints, interpolation.
|
|
133
|
-
*
|
|
134
|
-
*
|
|
154
|
+
* the transform: animation frames, tints, interpolation. This is where data
|
|
155
|
+
* that changes while the node lives belongs, not in the renderable, whose
|
|
156
|
+
* new values make the node again (listing the renderable here only re-runs
|
|
157
|
+
* `apply` when it is written with an equal value). `apply` then runs once
|
|
158
|
+
* per changed entity per sync, however many of these changed, so it should
|
|
159
|
+
* set the node's state rather than increment it.
|
|
135
160
|
*/
|
|
136
161
|
readonly redrawOn?: ReadonlyArray<Schema.ComponentDescriptor<S>>;
|
|
137
162
|
/**
|
|
@@ -155,11 +180,18 @@ export interface Options<S extends Schema.Any, Root, Renderable extends Schema.C
|
|
|
155
180
|
* parent, so the cost grows with the number of children, not of changes.
|
|
156
181
|
*/
|
|
157
182
|
readonly hierarchy?: HierarchyOption<S, Hierarchy>;
|
|
158
|
-
/**
|
|
183
|
+
/**
|
|
184
|
+
* Builds the node for a new renderable entity, and again whenever the
|
|
185
|
+
* entity's renderable takes a value other than the one its node was made
|
|
186
|
+
* from (the old node is destroyed first). Build from the renderable what
|
|
187
|
+
* stays for the node's life; `apply` runs right after and sets the rest.
|
|
188
|
+
*/
|
|
159
189
|
readonly create: (context: NodeContext<S, Root, Renderable, Transform, Select, Services, Resources>) => NodeOf<Registry>;
|
|
160
190
|
/**
|
|
161
|
-
* Applies the current state to the node: on creation
|
|
162
|
-
*
|
|
191
|
+
* Applies the current state to the node: on creation (also of a node made
|
|
192
|
+
* again for a new renderable value), and whenever the transform or a
|
|
193
|
+
* `redrawOn` component changes. Set here everything that changes while the
|
|
194
|
+
* node lives, from the transform and the `redrawOn` components.
|
|
163
195
|
*/
|
|
164
196
|
readonly apply: (node: NodeOf<Registry>, context: NodeContext<S, Root, Renderable, Transform, Select, Services, Resources>) => void;
|
|
165
197
|
}
|
|
@@ -260,7 +292,8 @@ interface InterpolateBase<S extends Schema.Any, Root, Previous extends Schema.Co
|
|
|
260
292
|
* const PrevPosition = Descriptor.Component<{ x: number; y: number }>()("Game/PrevPosition")
|
|
261
293
|
* const Position3 = Descriptor.Component<{ x: number; y: number; z: number }>()("Game/Position3")
|
|
262
294
|
* const PrevPosition3 = Descriptor.Component<{ x: number; y: number; z: number }>()("Game/PrevPosition3")
|
|
263
|
-
* const
|
|
295
|
+
* const Root = Schema.defineRoot("Game")
|
|
296
|
+
* const Game = Schema.bind(Schema.fragment({ components: { Position, PrevPosition, Position3, PrevPosition3 } }), Root)
|
|
264
297
|
* const Sprites = Descriptor.Service<NodeRegistry.NodeRegistry<Sprite>>()("Game/Sprites")
|
|
265
298
|
* const Meshes = Descriptor.Service<NodeRegistry.NodeRegistry<Mesh>>()("Game/Meshes")
|
|
266
299
|
* // The loop's render alpha, provided by the host each frame:
|
package/dist/RenderSync.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RenderSync.d.ts","sourceRoot":"","sources":["../src/RenderSync.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"RenderSync.d.ts","sourceRoot":"","sources":["../src/RenderSync.ts"],"names":[],"mappings":"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"}
|
package/dist/RenderSync.js
CHANGED
|
@@ -62,24 +62,91 @@ export const system = (Game, options) => {
|
|
|
62
62
|
// Despawns are recorded as removals of every component, so these cover them too.
|
|
63
63
|
removedReads[`removed${index}`] = Game.System.readRemoved(descriptor);
|
|
64
64
|
});
|
|
65
|
-
//
|
|
66
|
-
|
|
67
|
-
const filters = [
|
|
65
|
+
// When `apply` runs: a required component was added, or a trigger changed.
|
|
66
|
+
const applyFilters = [
|
|
68
67
|
...additions.map((descriptor) => Game.Query.added(descriptor)),
|
|
69
68
|
...triggers.map((trigger) => Game.Query.changed(trigger))
|
|
70
69
|
];
|
|
71
|
-
//
|
|
72
|
-
|
|
70
|
+
// A node follows its renderable, so the sync also meets every entity whose
|
|
71
|
+
// renderable changed, to compare it with the value its node was made from.
|
|
72
|
+
const renderableTriggers = triggers.includes(options.renderable);
|
|
73
|
+
const syncFilters = renderableTriggers ? applyFilters : [...applyFilters, Game.Query.changed(options.renderable)];
|
|
74
|
+
// One query: an entity whose required component was added, or whose
|
|
75
|
+
// trigger or renderable changed, is synced once.
|
|
76
|
+
queries["sync"] = Query({ selection, filters: [syncFilters.length === 1 ? syncFilters[0] : anyOf(...syncFilters)] });
|
|
77
|
+
// Whether `apply` runs for an entity the sync met only for its renderable:
|
|
78
|
+
// looked up (`get` checks one entity against the filters for this reader)
|
|
79
|
+
// when the renderable was written with an equal value, never iterated.
|
|
80
|
+
queries["applies"] = Query({
|
|
81
|
+
selection: { __renderable: Game.Query.read(options.renderable) },
|
|
82
|
+
filters: [applyFilters.length === 1 ? applyFilters[0] : anyOf(...applyFilters)]
|
|
83
|
+
});
|
|
73
84
|
// Every entity that should have a node: read only after removals were lost.
|
|
74
85
|
queries["members"] = Query({
|
|
75
86
|
selection: { __renderable: Game.Query.read(options.renderable) },
|
|
76
87
|
with: required.filter((descriptor) => descriptor !== options.renderable)
|
|
77
88
|
});
|
|
89
|
+
// Every entity added since the last run: read only after removals were lost.
|
|
90
|
+
queries["added"] = Query({ selection: { __renderable: Game.Query.read(options.renderable) }, filters: [Game.Query.added(options.renderable)] });
|
|
78
91
|
// Every renderable entity with a parent: checked each run against where
|
|
79
92
|
// its node is attached. There is no per-reader filter for relation edges.
|
|
80
93
|
if (hierarchy !== undefined) {
|
|
81
94
|
queries["parented"] = Query({ selection: { __parent: Game.Query.readRelation(hierarchy) }, with: [options.renderable] });
|
|
82
95
|
}
|
|
96
|
+
// The renderable value each node was made from, by entity, for each
|
|
97
|
+
// registry (one system may run in several runtimes). World values are
|
|
98
|
+
// never mutated, so a value still held here by reference is unchanged.
|
|
99
|
+
const madeFrom = new WeakMap();
|
|
100
|
+
const sourcesOf = (registry) => {
|
|
101
|
+
let sources = madeFrom.get(registry);
|
|
102
|
+
if (sources === undefined)
|
|
103
|
+
madeFrom.set(registry, sources = new Map());
|
|
104
|
+
return sources;
|
|
105
|
+
};
|
|
106
|
+
const destroy = (registry, sources, entity) => {
|
|
107
|
+
registry.remove(entity);
|
|
108
|
+
sources.delete(entity);
|
|
109
|
+
};
|
|
110
|
+
// The context of the node being created, read by one shared thunk, so a
|
|
111
|
+
// creation allocates no closure.
|
|
112
|
+
let creating;
|
|
113
|
+
const createNode = () => options.create(creating);
|
|
114
|
+
const create = (registry, sources, entity, data, context) => {
|
|
115
|
+
// A child met before its parent's node exists starts at the root; the
|
|
116
|
+
// reattach pass moves it under the parent in this same run.
|
|
117
|
+
const parent = hierarchy === undefined ? undefined : data["__parent"]?.get(entity);
|
|
118
|
+
creating = context;
|
|
119
|
+
const node = registry.ensure(entity.id, createNode, parent);
|
|
120
|
+
creating = undefined;
|
|
121
|
+
sources.set(entity.id, context.renderable);
|
|
122
|
+
return node;
|
|
123
|
+
};
|
|
124
|
+
// An entity whose renderable is not the value its node was made from (by
|
|
125
|
+
// reference): another value makes the node again, an equal one keeps it
|
|
126
|
+
// and is applied only when the entity was met for more than its renderable.
|
|
127
|
+
// A node the system did not make is applied as it is.
|
|
128
|
+
const follow = (registry, sources, applies, entity, data, node, context) => {
|
|
129
|
+
if (!sources.has(entity.id))
|
|
130
|
+
return options.apply(node, context);
|
|
131
|
+
if (!sameValue(sources.get(entity.id), context.renderable)) {
|
|
132
|
+
registry.remove(entity.id);
|
|
133
|
+
return options.apply(create(registry, sources, entity, data, context), context);
|
|
134
|
+
}
|
|
135
|
+
sources.set(entity.id, context.renderable);
|
|
136
|
+
if (renderableTriggers || applies.get(entity.id).ok)
|
|
137
|
+
options.apply(node, context);
|
|
138
|
+
};
|
|
139
|
+
// Creates, makes again, or applies the node of one entity the sync met.
|
|
140
|
+
const sync = (registry, sources, applies, entity, data, provided, cells) => {
|
|
141
|
+
const context = contextOf(entity, data, provided, cells);
|
|
142
|
+
const node = registry.get(entity.id);
|
|
143
|
+
if (node === undefined)
|
|
144
|
+
options.apply(create(registry, sources, entity, data, context), context);
|
|
145
|
+
else if (sources.get(entity.id) !== context.renderable)
|
|
146
|
+
follow(registry, sources, applies, entity, data, node, context);
|
|
147
|
+
else
|
|
148
|
+
options.apply(node, context);
|
|
149
|
+
};
|
|
83
150
|
return System(options.name, {
|
|
84
151
|
queries,
|
|
85
152
|
removed: removedReads,
|
|
@@ -88,36 +155,37 @@ export const system = (Game, options) => {
|
|
|
88
155
|
when: options.when ?? []
|
|
89
156
|
}, ({ queries, removed, resources, services, lookup }) => {
|
|
90
157
|
const registry = services.__registry;
|
|
158
|
+
const sources = sourcesOf(registry);
|
|
91
159
|
// Destroy first: an entity that lost a required component has no node,
|
|
92
160
|
// and one that lost it and got it back since the last run gets a fresh one.
|
|
93
161
|
let lagged = false;
|
|
94
162
|
for (let index = 0; index < required.length; index++) {
|
|
95
163
|
const stream = removed[`removed${index}`];
|
|
96
164
|
for (const entity of stream.all())
|
|
97
|
-
registry
|
|
165
|
+
destroy(registry, sources, entity);
|
|
98
166
|
if (stream.lagged())
|
|
99
167
|
lagged = true;
|
|
100
168
|
}
|
|
101
169
|
// Removals were dropped before this system read them (it did not run
|
|
102
|
-
// for longer than the stream keeps them
|
|
103
|
-
// entity no longer has one, so none
|
|
170
|
+
// for longer than the stream keeps them, or a restore replaced the
|
|
171
|
+
// world): destroy every node whose entity no longer has one, so none
|
|
172
|
+
// stays on screen, and every node of an entity added since, which may
|
|
173
|
+
// be another entity under the same id. The sync then makes those once.
|
|
104
174
|
if (lagged) {
|
|
105
175
|
const members = new Set();
|
|
106
176
|
for (const entity of queries["members"].each())
|
|
107
177
|
members.add(entity.id);
|
|
108
178
|
for (const [entity] of [...registry.entries()]) {
|
|
109
179
|
if (!members.has(entity))
|
|
110
|
-
registry
|
|
180
|
+
destroy(registry, sources, entity);
|
|
111
181
|
}
|
|
182
|
+
for (const entity of queries["added"].each())
|
|
183
|
+
destroy(registry, sources, entity.id);
|
|
112
184
|
}
|
|
113
185
|
const data = queries["sync"].data;
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
// pass below moves it under the parent in this same run.
|
|
118
|
-
const parent = hierarchy === undefined ? undefined : data["__parent"]?.get(entity);
|
|
119
|
-
options.apply(registry.ensure(entity.id, () => options.create(context), parent), context);
|
|
120
|
-
}
|
|
186
|
+
const applies = queries["applies"];
|
|
187
|
+
for (const entity of queries["sync"].each())
|
|
188
|
+
sync(registry, sources, applies, entity, data, services, resources);
|
|
121
189
|
if (hierarchy !== undefined)
|
|
122
190
|
reattach(registry, queries["parented"], lookup, hierarchy);
|
|
123
191
|
});
|
|
@@ -148,7 +216,7 @@ const reattach = (registry, parented, lookup, hierarchy) => {
|
|
|
148
216
|
if (stillParented < registry.parents.size) {
|
|
149
217
|
const toRoot = [];
|
|
150
218
|
for (const [entity] of registry.parents) {
|
|
151
|
-
if (!lookup.
|
|
219
|
+
if (!lookup.related(entity, hierarchy).ok)
|
|
152
220
|
toRoot.push(entity);
|
|
153
221
|
}
|
|
154
222
|
for (const entity of toRoot)
|
|
@@ -166,6 +234,40 @@ const reattach = (registry, parented, lookup, hierarchy) => {
|
|
|
166
234
|
for (const move of moves)
|
|
167
235
|
registry.reparent(move.entity, move.parent);
|
|
168
236
|
};
|
|
237
|
+
// Structural equality for plain data, as the world compares resource writes:
|
|
238
|
+
// primitives by `Object.is`, arrays and plain objects by their entries, other
|
|
239
|
+
// objects (class instances, maps, sets) by reference.
|
|
240
|
+
const sameValue = (left, right) => {
|
|
241
|
+
if (Object.is(left, right))
|
|
242
|
+
return true;
|
|
243
|
+
if (typeof left !== "object" || typeof right !== "object" || left === null || right === null)
|
|
244
|
+
return false;
|
|
245
|
+
if (Array.isArray(left)) {
|
|
246
|
+
if (!Array.isArray(right) || left.length !== right.length)
|
|
247
|
+
return false;
|
|
248
|
+
for (let index = 0; index < left.length; index++) {
|
|
249
|
+
if (!sameValue(left[index], right[index]))
|
|
250
|
+
return false;
|
|
251
|
+
}
|
|
252
|
+
return true;
|
|
253
|
+
}
|
|
254
|
+
if (Array.isArray(right) || !isPlain(left) || !isPlain(right))
|
|
255
|
+
return false;
|
|
256
|
+
const leftKeys = Object.keys(left);
|
|
257
|
+
if (leftKeys.length !== Object.keys(right).length)
|
|
258
|
+
return false;
|
|
259
|
+
const leftRecord = left;
|
|
260
|
+
const rightRecord = right;
|
|
261
|
+
for (const key of leftKeys) {
|
|
262
|
+
if (!(key in rightRecord) || !sameValue(leftRecord[key], rightRecord[key]))
|
|
263
|
+
return false;
|
|
264
|
+
}
|
|
265
|
+
return true;
|
|
266
|
+
};
|
|
267
|
+
const isPlain = (value) => {
|
|
268
|
+
const prototype = Object.getPrototypeOf(value);
|
|
269
|
+
return prototype === null || prototype === Object.prototype;
|
|
270
|
+
};
|
|
169
271
|
/**
|
|
170
272
|
* Builds the system that draws moving entities between fixed steps.
|
|
171
273
|
*
|
|
@@ -188,7 +290,8 @@ const reattach = (registry, parented, lookup, hierarchy) => {
|
|
|
188
290
|
* const PrevPosition = Descriptor.Component<{ x: number; y: number }>()("Game/PrevPosition")
|
|
189
291
|
* const Position3 = Descriptor.Component<{ x: number; y: number; z: number }>()("Game/Position3")
|
|
190
292
|
* const PrevPosition3 = Descriptor.Component<{ x: number; y: number; z: number }>()("Game/PrevPosition3")
|
|
191
|
-
* const
|
|
293
|
+
* const Root = Schema.defineRoot("Game")
|
|
294
|
+
* const Game = Schema.bind(Schema.fragment({ components: { Position, PrevPosition, Position3, PrevPosition3 } }), Root)
|
|
192
295
|
* const Sprites = Descriptor.Service<NodeRegistry.NodeRegistry<Sprite>>()("Game/Sprites")
|
|
193
296
|
* const Meshes = Descriptor.Service<NodeRegistry.NodeRegistry<Mesh>>()("Game/Meshes")
|
|
194
297
|
* // The loop's render alpha, provided by the host each frame:
|
package/dist/RenderSync.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RenderSync.js","sourceRoot":"","sources":["../src/RenderSync.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"RenderSync.js","sourceRoot":"","sources":["../src/RenderSync.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@typeonce/ritmo-render",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.23.0",
|
|
4
4
|
"description": "Renderer-agnostic entity-to-node mirroring for Ritmo",
|
|
5
5
|
"author": "Sandro Maglione",
|
|
6
6
|
"license": "MIT",
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
"provenance": true
|
|
47
47
|
},
|
|
48
48
|
"dependencies": {
|
|
49
|
-
"@typeonce/ritmo": "^0.
|
|
49
|
+
"@typeonce/ritmo": "^0.23.0"
|
|
50
50
|
},
|
|
51
51
|
"engines": {
|
|
52
52
|
"node": ">=22"
|
package/src/RenderSync.ts
CHANGED
|
@@ -9,8 +9,11 @@
|
|
|
9
9
|
* in a safe order (destroy, create, update), for one bound `Game`. What a
|
|
10
10
|
* node looks like and how state is applied stay caller-defined. The registry
|
|
11
11
|
* belongs to the system: when removals were dropped before it read them
|
|
12
|
-
* (`lagged()`, after it did not run for long
|
|
13
|
-
* entity no longer matches,
|
|
12
|
+
* (`lagged()`, after it did not run for long or after a `runtime.restore`),
|
|
13
|
+
* it destroys every node whose entity no longer matches, and the node of
|
|
14
|
+
* every entity added since, which a load may have given to another entity
|
|
15
|
+
* under the same id: that entity gets a new node. So give each
|
|
16
|
+
* `RenderSync.system` its own registry.
|
|
14
17
|
*
|
|
15
18
|
* Change detection is per system, so the system sees every addition, change,
|
|
16
19
|
* and removal exactly once, wherever it sits in the schedule, and applies each
|
|
@@ -20,6 +23,16 @@
|
|
|
20
23
|
* interpolation). Place the system after the `applyDeferred()` that commits
|
|
21
24
|
* spawns to render new entities in the same tick.
|
|
22
25
|
*
|
|
26
|
+
* A node follows its renderable: when the entity's renderable value is no
|
|
27
|
+
* longer the one its node was made from (a system wrote another one, or
|
|
28
|
+
* after a rewind another entity holds an id the system drew), the node is
|
|
29
|
+
* destroyed and made again from the new value, then applied. An equal value,
|
|
30
|
+
* compared as plain data, keeps the node. Making a node costs more than
|
|
31
|
+
* applying one, so the renderable holds what decides which node to make (a
|
|
32
|
+
* kind, a texture, a mesh), and what changes while the node lives (a frame,
|
|
33
|
+
* a tint, a facing) goes in other components, listed in `redrawOn` and set by
|
|
34
|
+
* `apply`.
|
|
35
|
+
*
|
|
23
36
|
* `create` and `apply` receive one context: the renderable and transform
|
|
24
37
|
* values, the entity id, extra read-only slots declared in `select` (as read
|
|
25
38
|
* cells in `data`), resources declared in `resources` (as read cells), and extra
|
|
@@ -151,7 +164,16 @@ export interface Options<
|
|
|
151
164
|
> {
|
|
152
165
|
/** The system name. */
|
|
153
166
|
readonly name: string
|
|
154
|
-
/**
|
|
167
|
+
/**
|
|
168
|
+
* The component whose presence means "this entity has a node", and whose
|
|
169
|
+
* value decides which node `create` makes. When the entity's value is no
|
|
170
|
+
* longer the one its node was made from, the node is destroyed and made
|
|
171
|
+
* again from the new value; an equal value (compared as plain data) keeps
|
|
172
|
+
* it. Keep here only what decides which node to make (a kind, a texture, a
|
|
173
|
+
* mesh): a field written while the node lives (a frame, a tint) would make
|
|
174
|
+
* the node again each time. Put that in its own component, listed in
|
|
175
|
+
* `redrawOn` and set by `apply`.
|
|
176
|
+
*/
|
|
155
177
|
readonly renderable: Renderable
|
|
156
178
|
/**
|
|
157
179
|
* The component applied to the node on creation and whenever it changes.
|
|
@@ -170,9 +192,12 @@ export interface Options<
|
|
|
170
192
|
readonly resources?: Resources
|
|
171
193
|
/**
|
|
172
194
|
* More components whose changes re-run `apply`, for node state other than
|
|
173
|
-
* the transform: animation frames, tints, interpolation.
|
|
174
|
-
*
|
|
175
|
-
*
|
|
195
|
+
* the transform: animation frames, tints, interpolation. This is where data
|
|
196
|
+
* that changes while the node lives belongs, not in the renderable, whose
|
|
197
|
+
* new values make the node again (listing the renderable here only re-runs
|
|
198
|
+
* `apply` when it is written with an equal value). `apply` then runs once
|
|
199
|
+
* per changed entity per sync, however many of these changed, so it should
|
|
200
|
+
* set the node's state rather than increment it.
|
|
176
201
|
*/
|
|
177
202
|
readonly redrawOn?: ReadonlyArray<Schema.ComponentDescriptor<S>>
|
|
178
203
|
/**
|
|
@@ -196,11 +221,18 @@ export interface Options<
|
|
|
196
221
|
* parent, so the cost grows with the number of children, not of changes.
|
|
197
222
|
*/
|
|
198
223
|
readonly hierarchy?: HierarchyOption<S, Hierarchy>
|
|
199
|
-
/**
|
|
224
|
+
/**
|
|
225
|
+
* Builds the node for a new renderable entity, and again whenever the
|
|
226
|
+
* entity's renderable takes a value other than the one its node was made
|
|
227
|
+
* from (the old node is destroyed first). Build from the renderable what
|
|
228
|
+
* stays for the node's life; `apply` runs right after and sets the rest.
|
|
229
|
+
*/
|
|
200
230
|
readonly create: (context: NodeContext<S, Root, Renderable, Transform, Select, Services, Resources>) => NodeOf<Registry>
|
|
201
231
|
/**
|
|
202
|
-
* Applies the current state to the node: on creation
|
|
203
|
-
*
|
|
232
|
+
* Applies the current state to the node: on creation (also of a node made
|
|
233
|
+
* again for a new renderable value), and whenever the transform or a
|
|
234
|
+
* `redrawOn` component changes. Set here everything that changes while the
|
|
235
|
+
* node lives, from the transform and the `redrawOn` components.
|
|
204
236
|
*/
|
|
205
237
|
readonly apply: (node: NodeOf<Registry>, context: NodeContext<S, Root, Renderable, Transform, Select, Services, Resources>) => void
|
|
206
238
|
}
|
|
@@ -300,25 +332,112 @@ export const system = <
|
|
|
300
332
|
// Despawns are recorded as removals of every component, so these cover them too.
|
|
301
333
|
removedReads[`removed${index}`] = Game.System.readRemoved(descriptor)
|
|
302
334
|
})
|
|
303
|
-
//
|
|
304
|
-
|
|
305
|
-
const filters = [
|
|
335
|
+
// When `apply` runs: a required component was added, or a trigger changed.
|
|
336
|
+
const applyFilters = [
|
|
306
337
|
...additions.map((descriptor) => Game.Query.added(descriptor)),
|
|
307
338
|
...triggers.map((trigger) => Game.Query.changed(trigger))
|
|
308
339
|
]
|
|
309
|
-
//
|
|
310
|
-
|
|
340
|
+
// A node follows its renderable, so the sync also meets every entity whose
|
|
341
|
+
// renderable changed, to compare it with the value its node was made from.
|
|
342
|
+
const renderableTriggers = triggers.includes(options.renderable)
|
|
343
|
+
const syncFilters = renderableTriggers ? applyFilters : [...applyFilters, Game.Query.changed(options.renderable)]
|
|
344
|
+
// One query: an entity whose required component was added, or whose
|
|
345
|
+
// trigger or renderable changed, is synced once.
|
|
346
|
+
queries["sync"] = Query({ selection, filters: [syncFilters.length === 1 ? syncFilters[0] : anyOf(...syncFilters)] })
|
|
347
|
+
// Whether `apply` runs for an entity the sync met only for its renderable:
|
|
348
|
+
// looked up (`get` checks one entity against the filters for this reader)
|
|
349
|
+
// when the renderable was written with an equal value, never iterated.
|
|
350
|
+
queries["applies"] = Query({
|
|
351
|
+
selection: { __renderable: Game.Query.read(options.renderable) },
|
|
352
|
+
filters: [applyFilters.length === 1 ? applyFilters[0] : anyOf(...applyFilters)]
|
|
353
|
+
})
|
|
311
354
|
// Every entity that should have a node: read only after removals were lost.
|
|
312
355
|
queries["members"] = Query({
|
|
313
356
|
selection: { __renderable: Game.Query.read(options.renderable) },
|
|
314
357
|
with: required.filter((descriptor) => descriptor !== options.renderable)
|
|
315
358
|
})
|
|
359
|
+
// Every entity added since the last run: read only after removals were lost.
|
|
360
|
+
queries["added"] = Query({ selection: { __renderable: Game.Query.read(options.renderable) }, filters: [Game.Query.added(options.renderable)] })
|
|
316
361
|
// Every renderable entity with a parent: checked each run against where
|
|
317
362
|
// its node is attached. There is no per-reader filter for relation edges.
|
|
318
363
|
if (hierarchy !== undefined) {
|
|
319
364
|
queries["parented"] = Query({ selection: { __parent: Game.Query.readRelation(hierarchy) }, with: [options.renderable] })
|
|
320
365
|
}
|
|
321
366
|
|
|
367
|
+
// The renderable value each node was made from, by entity, for each
|
|
368
|
+
// registry (one system may run in several runtimes). World values are
|
|
369
|
+
// never mutated, so a value still held here by reference is unchanged.
|
|
370
|
+
const madeFrom = new WeakMap<NodeRegistry<Node>, Map<number, unknown>>()
|
|
371
|
+
const sourcesOf = (registry: NodeRegistry<Node>): Map<number, unknown> => {
|
|
372
|
+
let sources = madeFrom.get(registry)
|
|
373
|
+
if (sources === undefined) madeFrom.set(registry, sources = new Map())
|
|
374
|
+
return sources
|
|
375
|
+
}
|
|
376
|
+
const destroy = (registry: NodeRegistry<Node>, sources: Map<number, unknown>, entity: number): void => {
|
|
377
|
+
registry.remove(entity)
|
|
378
|
+
sources.delete(entity)
|
|
379
|
+
}
|
|
380
|
+
|
|
381
|
+
// The context of the node being created, read by one shared thunk, so a
|
|
382
|
+
// creation allocates no closure.
|
|
383
|
+
let creating: Context | undefined
|
|
384
|
+
const createNode = (): Node => options.create(creating!)
|
|
385
|
+
const create = (
|
|
386
|
+
registry: NodeRegistry<Node>,
|
|
387
|
+
sources: Map<number, unknown>,
|
|
388
|
+
entity: { readonly id: number },
|
|
389
|
+
data: Record<string, any>,
|
|
390
|
+
context: Context
|
|
391
|
+
): Node => {
|
|
392
|
+
// A child met before its parent's node exists starts at the root; the
|
|
393
|
+
// reattach pass moves it under the parent in this same run.
|
|
394
|
+
const parent: number | undefined = hierarchy === undefined ? undefined : data["__parent"]?.get(entity)
|
|
395
|
+
creating = context
|
|
396
|
+
const node = registry.ensure(entity.id, createNode, parent)
|
|
397
|
+
creating = undefined
|
|
398
|
+
sources.set(entity.id, context.renderable)
|
|
399
|
+
return node
|
|
400
|
+
}
|
|
401
|
+
|
|
402
|
+
// An entity whose renderable is not the value its node was made from (by
|
|
403
|
+
// reference): another value makes the node again, an equal one keeps it
|
|
404
|
+
// and is applied only when the entity was met for more than its renderable.
|
|
405
|
+
// A node the system did not make is applied as it is.
|
|
406
|
+
const follow = (
|
|
407
|
+
registry: NodeRegistry<Node>,
|
|
408
|
+
sources: Map<number, unknown>,
|
|
409
|
+
applies: { get(entity: number): { readonly ok: boolean } },
|
|
410
|
+
entity: { readonly id: number },
|
|
411
|
+
data: Record<string, any>,
|
|
412
|
+
node: Node,
|
|
413
|
+
context: Context
|
|
414
|
+
): void => {
|
|
415
|
+
if (!sources.has(entity.id)) return options.apply(node, context)
|
|
416
|
+
if (!sameValue(sources.get(entity.id), context.renderable)) {
|
|
417
|
+
registry.remove(entity.id)
|
|
418
|
+
return options.apply(create(registry, sources, entity, data, context), context)
|
|
419
|
+
}
|
|
420
|
+
sources.set(entity.id, context.renderable)
|
|
421
|
+
if (renderableTriggers || applies.get(entity.id).ok) options.apply(node, context)
|
|
422
|
+
}
|
|
423
|
+
|
|
424
|
+
// Creates, makes again, or applies the node of one entity the sync met.
|
|
425
|
+
const sync = (
|
|
426
|
+
registry: NodeRegistry<Node>,
|
|
427
|
+
sources: Map<number, unknown>,
|
|
428
|
+
applies: { get(entity: number): { readonly ok: boolean } },
|
|
429
|
+
entity: { readonly id: number },
|
|
430
|
+
data: Record<string, any>,
|
|
431
|
+
provided: Record<string, unknown>,
|
|
432
|
+
cells: Record<string, unknown>
|
|
433
|
+
): void => {
|
|
434
|
+
const context = contextOf(entity, data, provided, cells)
|
|
435
|
+
const node = registry.get(entity.id)
|
|
436
|
+
if (node === undefined) options.apply(create(registry, sources, entity, data, context), context)
|
|
437
|
+
else if (sources.get(entity.id) !== context.renderable) follow(registry, sources, applies, entity, data, node, context)
|
|
438
|
+
else options.apply(node, context)
|
|
439
|
+
}
|
|
440
|
+
|
|
322
441
|
return System(options.name, {
|
|
323
442
|
queries,
|
|
324
443
|
removed: removedReads,
|
|
@@ -327,33 +446,32 @@ export const system = <
|
|
|
327
446
|
when: options.when ?? []
|
|
328
447
|
}, ({ queries, removed, resources, services, lookup }) => {
|
|
329
448
|
const registry = services.__registry as NodeRegistry<Node>
|
|
449
|
+
const sources = sourcesOf(registry)
|
|
330
450
|
// Destroy first: an entity that lost a required component has no node,
|
|
331
451
|
// and one that lost it and got it back since the last run gets a fresh one.
|
|
332
452
|
let lagged = false
|
|
333
453
|
for (let index = 0; index < required.length; index++) {
|
|
334
454
|
const stream = removed[`removed${index}`]
|
|
335
|
-
for (const entity of stream.all()) registry
|
|
455
|
+
for (const entity of stream.all()) destroy(registry, sources, entity)
|
|
336
456
|
if (stream.lagged()) lagged = true
|
|
337
457
|
}
|
|
338
458
|
// Removals were dropped before this system read them (it did not run
|
|
339
|
-
// for longer than the stream keeps them
|
|
340
|
-
// entity no longer has one, so none
|
|
459
|
+
// for longer than the stream keeps them, or a restore replaced the
|
|
460
|
+
// world): destroy every node whose entity no longer has one, so none
|
|
461
|
+
// stays on screen, and every node of an entity added since, which may
|
|
462
|
+
// be another entity under the same id. The sync then makes those once.
|
|
341
463
|
if (lagged) {
|
|
342
464
|
const members = new Set<number>()
|
|
343
465
|
for (const entity of queries["members"].each()) members.add(entity.id)
|
|
344
466
|
for (const [entity] of [...registry.entries()]) {
|
|
345
|
-
if (!members.has(entity)) registry
|
|
467
|
+
if (!members.has(entity)) destroy(registry, sources, entity)
|
|
346
468
|
}
|
|
469
|
+
for (const entity of queries["added"].each()) destroy(registry, sources, entity.id)
|
|
347
470
|
}
|
|
348
471
|
|
|
349
472
|
const data = queries["sync"].data
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
// A child met before its parent's node exists starts at the root; the
|
|
353
|
-
// pass below moves it under the parent in this same run.
|
|
354
|
-
const parent: number | undefined = hierarchy === undefined ? undefined : data["__parent"]?.get(entity)
|
|
355
|
-
options.apply(registry.ensure(entity.id, () => options.create(context), parent), context)
|
|
356
|
-
}
|
|
473
|
+
const applies = queries["applies"]
|
|
474
|
+
for (const entity of queries["sync"].each()) sync(registry, sources, applies, entity, data, services, resources)
|
|
357
475
|
|
|
358
476
|
if (hierarchy !== undefined) reattach(registry, queries["parented"], lookup, hierarchy)
|
|
359
477
|
}) as RenderSystem<S, Root, Registry | Services[keyof Services] | Resources[keyof Resources] | ConditionNeedsFromConditions<When>>
|
|
@@ -361,7 +479,7 @@ export const system = <
|
|
|
361
479
|
|
|
362
480
|
// The lookups `reattach` uses, with the generic ids erased.
|
|
363
481
|
interface HierarchyLookup {
|
|
364
|
-
|
|
482
|
+
related(entity: number, relation: unknown): { readonly ok: boolean }
|
|
365
483
|
ancestors(entity: number, relation: unknown): { readonly ok: true; readonly value: ReadonlyArray<number> } | { readonly ok: false }
|
|
366
484
|
}
|
|
367
485
|
|
|
@@ -398,7 +516,7 @@ const reattach = (
|
|
|
398
516
|
if (stillParented < registry.parents.size) {
|
|
399
517
|
const toRoot: Array<number> = []
|
|
400
518
|
for (const [entity] of registry.parents) {
|
|
401
|
-
if (!lookup.
|
|
519
|
+
if (!lookup.related(entity, hierarchy).ok) toRoot.push(entity)
|
|
402
520
|
}
|
|
403
521
|
for (const entity of toRoot) registry.reparent(entity, undefined)
|
|
404
522
|
}
|
|
@@ -413,6 +531,35 @@ const reattach = (
|
|
|
413
531
|
for (const move of moves) registry.reparent(move.entity, move.parent)
|
|
414
532
|
}
|
|
415
533
|
|
|
534
|
+
// Structural equality for plain data, as the world compares resource writes:
|
|
535
|
+
// primitives by `Object.is`, arrays and plain objects by their entries, other
|
|
536
|
+
// objects (class instances, maps, sets) by reference.
|
|
537
|
+
const sameValue = (left: unknown, right: unknown): boolean => {
|
|
538
|
+
if (Object.is(left, right)) return true
|
|
539
|
+
if (typeof left !== "object" || typeof right !== "object" || left === null || right === null) return false
|
|
540
|
+
if (Array.isArray(left)) {
|
|
541
|
+
if (!Array.isArray(right) || left.length !== right.length) return false
|
|
542
|
+
for (let index = 0; index < left.length; index++) {
|
|
543
|
+
if (!sameValue(left[index], right[index])) return false
|
|
544
|
+
}
|
|
545
|
+
return true
|
|
546
|
+
}
|
|
547
|
+
if (Array.isArray(right) || !isPlain(left) || !isPlain(right)) return false
|
|
548
|
+
const leftKeys = Object.keys(left)
|
|
549
|
+
if (leftKeys.length !== Object.keys(right).length) return false
|
|
550
|
+
const leftRecord = left as Record<string, unknown>
|
|
551
|
+
const rightRecord = right as Record<string, unknown>
|
|
552
|
+
for (const key of leftKeys) {
|
|
553
|
+
if (!(key in rightRecord) || !sameValue(leftRecord[key], rightRecord[key])) return false
|
|
554
|
+
}
|
|
555
|
+
return true
|
|
556
|
+
}
|
|
557
|
+
|
|
558
|
+
const isPlain = (value: object): boolean => {
|
|
559
|
+
const prototype = Object.getPrototypeOf(value) as object | null
|
|
560
|
+
return prototype === null || prototype === Object.prototype
|
|
561
|
+
}
|
|
562
|
+
|
|
416
563
|
/** A 2D position, the value `interpolate` blends when no `blend` is given. */
|
|
417
564
|
export interface Planar {
|
|
418
565
|
readonly x: number
|
|
@@ -524,7 +671,8 @@ interface InterpolateBase<
|
|
|
524
671
|
* const PrevPosition = Descriptor.Component<{ x: number; y: number }>()("Game/PrevPosition")
|
|
525
672
|
* const Position3 = Descriptor.Component<{ x: number; y: number; z: number }>()("Game/Position3")
|
|
526
673
|
* const PrevPosition3 = Descriptor.Component<{ x: number; y: number; z: number }>()("Game/PrevPosition3")
|
|
527
|
-
* const
|
|
674
|
+
* const Root = Schema.defineRoot("Game")
|
|
675
|
+
* const Game = Schema.bind(Schema.fragment({ components: { Position, PrevPosition, Position3, PrevPosition3 } }), Root)
|
|
528
676
|
* const Sprites = Descriptor.Service<NodeRegistry.NodeRegistry<Sprite>>()("Game/Sprites")
|
|
529
677
|
* const Meshes = Descriptor.Service<NodeRegistry.NodeRegistry<Mesh>>()("Game/Meshes")
|
|
530
678
|
* // The loop's render alpha, provided by the host each frame:
|