Skip to content

A fast 2D and 3D game engine — TypeScript SDK, C++/WebAssembly core, visual editor. Ship one project to web, desktop, WeChat MiniGames, playable ads, and native Android / iOS.

perf: add ptr-based setters and integrate into Mut query write-back

esengine1cf0ab42da7b
diff --git a/sdk/src/query.ts b/sdk/src/query.ts
index e9e2ae195..1972039b0 100644
--- a/sdk/src/query.ts
+++ b/sdk/src/query.ts
@@ -170,6 +170,7 @@ export class QueryInstance<C extends readonly QueryArg[]> implements Iterable<Qu
private readonly lastRunTick_: number;
private readonly getters_: Array<((entity: Entity) => unknown) | null>;
private readonly mutSetters_: Array<((entity: Entity, data: unknown) => void) | null>;
+ private readonly mutIsBuiltin_: boolean[];
constructor(world: World, descriptor: QueryDescriptor<C>, lastRunTick = -1) {
this.world_ = world;
@@ -191,6 +192,9 @@ export class QueryInstance<C extends readonly QueryArg[]> implements Iterable<Qu
this.mutSetters_ = descriptor._mutIndices.map(idx =>
world.resolveSetter(this.actualComponents_[idx])
);
+ this.mutIsBuiltin_ = descriptor._mutIndices.map(idx =>
+ isBuiltinComponent(this.actualComponents_[idx])
+ );
for (const f of descriptor._addedFilters) {
world.enableChangeTracking(f.component);
}
@@ -237,14 +241,16 @@ export class QueryInstance<C extends readonly QueryArg[]> implements Iterable<Qu
let started = false;
let done = false;
+ const mutIsBuiltin = this.mutIsBuiltin_;
const writeMut = () => {
for (let i = 0; i < mutCount; i++) {
const mut = mutData[i];
- const setter = mutSetters[i];
- if (setter) {
- setter(prevEntity!, mut.data);
+ if (mutIsBuiltin[i]) {
+ const setter = mutSetters[i];
+ if (setter) setter(prevEntity!, mut.data);
+ else world.set(prevEntity!, mut.component, mut.data);
} else {
- world.set(prevEntity!, mut.component, mut.data);
+ world.markChanged(prevEntity!, mut.component);
}
}
};
@@ -333,9 +339,13 @@ export class QueryInstance<C extends readonly QueryArg[]> implements Iterable<Qu
if (prevEntity !== null && hasMut) {
for (let i = 0; i < mutCount; i++) {
const mut = mutData[i];
- const setter = mutSetters[i];
- if (setter) setter(prevEntity, mut.data);
- else world.set(prevEntity, mut.component, mut.data);
+ if (this.mutIsBuiltin_[i]) {
+ const setter = mutSetters[i];
+ if (setter) setter(prevEntity, mut.data);
+ else world.set(prevEntity, mut.component, mut.data);
+ } else {
+ world.markChanged(prevEntity, mut.component);
+ }
}
}
@@ -363,9 +373,13 @@ export class QueryInstance<C extends readonly QueryArg[]> implements Iterable<Qu
if (prevEntity !== null && hasMut) {
for (let i = 0; i < mutCount; i++) {
const mut = mutData[i];
- const setter = mutSetters[i];
- if (setter) setter(prevEntity, mut.data);
- else world.set(prevEntity, mut.component, mut.data);
+ if (this.mutIsBuiltin_[i]) {
+ const setter = mutSetters[i];
+ if (setter) setter(prevEntity, mut.data);
+ else world.set(prevEntity, mut.component, mut.data);
+ } else {
+ world.markChanged(prevEntity, mut.component);
+ }
}
}
world.endIteration();
diff --git a/sdk/src/world.ts b/sdk/src/world.ts
index 3b6b32ad4..2e229072f 100644
--- a/sdk/src/world.ts
+++ b/sdk/src/world.ts
@@ -1065,6 +1065,11 @@ export class World {
map.set(entity, this.worldTick_);
}
+ /** @internal Mark component as changed without writing data (for in-place Mut query) */
+ markChanged(entity: Entity, component: AnyComponentDef): void {
+ this.recordChangedTick_(component, entity);
+ }
+
private recordChangedTick_(component: AnyComponentDef, entity: Entity): void {
if (!this.trackedComponents_.has(component._id)) return;
let map = this.componentChangedTicks_.get(component._id);