Merge pull request #149 from r04423/fix/changed-mask

fix: update setChanged logic to correctly populate changedMask

Author: krispya

packages/core/src/query/modifiers/changed.ts

@@ -35,9 +35,21 @@ export function setChanged(world: World, entity: Entity, trait: Trait) {
 	// This is used for filling initial values for Changed modifiers.
 	for (const changedMask of ctx.changedMasks.values()) {
 		const eid = getEntityId(entity);
-		if (!changedMask[eid]) changedMask[eid] = [];
-		const traitId = trait[$internal].id;
-		changedMask[eid][traitId] = 1;
+		const data = ctx.traitData.get(trait)!;
+		const { generationId, bitflag } = data;
+
+		// Ensure the generation array exists
+		if (!changedMask[generationId]) {
+			changedMask[generationId] = [];
+		}
+
+		// Ensure the entity mask exists
+		if (!changedMask[generationId][eid]) {
+			changedMask[generationId][eid] = 0;
+		}
+
+		// Set the bit for this trait
+		changedMask[generationId][eid] |= bitflag;
 	}
 
 	// Update queries.

packages/core/tests/query-modifiers.test.ts

@@ -498,4 +498,17 @@ describe('Query modifiers', () => {
 		entity.remove(Foo);
 		expect(world.queryFirst(Changed(Position), Not(Foo))).toBeUndefined();
 	});
+
+	it('should correctly populate Changed query when trait changes happen before query initialization', () => {
+		// Create change modifier and spawn an entity
+		const Changed = createChanged();
+		const entity = world.spawn(Foo, Bar);
+
+		// Mark Bar as changed
+		entity.changed(Bar);
+
+		// Even if the query wasn't executed before,
+		// it should pick up the trait change
+		expect(world.queryFirst(Changed(Bar))).toBe(entity);
+	});
 });

packages/publish/tests/core/query-modifiers.test.ts

@@ -498,4 +498,17 @@ describe('Query modifiers', () => {
 		entity.remove(Foo);
 		expect(world.queryFirst(Changed(Position), Not(Foo))).toBeUndefined();
 	});
+
+	it('should correctly populate Changed query when trait changes happen before query initialization', () => {
+		// Create change modifier and spawn an entity
+		const Changed = createChanged();
+		const entity = world.spawn(Foo, Bar);
+
+		// Mark Bar as changed
+		entity.changed(Bar);
+
+		// Even if the query wasn't executed before,
+		// it should pick up the trait change
+		expect(world.queryFirst(Changed(Bar))).toBe(entity);
+	});
 });