moved map and foreach enteties input to be the second arg

yoieh · Nov 28, 2021 · 6c8c7da · 6c8c7da
1 parent e4d7b60
commit 6c8c7da
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 25 deletions.
diff --git a/src/ecs/Query.ts b/src/ecs/Query.ts
@@ -28,13 +28,13 @@ export class Query {
     return entities.filter(this._filter);
   }
 
-  public map(entities: IEntity[], callback: (entity: IEntity) => IEntity): IEntity[] {
+  public map(callback: (entity: IEntity) => IEntity, entities: IEntity[]): IEntity[] {
     return entities.map((entity) => {
       return callback(entity);
     });
   }
 
-  public foreach(entities: IEntity[], callback: (entity: IEntity) => void): void {
+  public foreach(callback: (entity: IEntity) => void, entities: IEntity[]): void {
     entities.forEach((entity) => {
       if (this._filter(entity)) {
         callback(entity);

diff --git a/tests/_test_classes/SimpelSystem.ts b/tests/_test_classes/SimpelSystem.ts
@@ -16,9 +16,9 @@ export class SimpelSystem extends BaseSystem {
   public onUpdate(delta: number): void {
     const entities = this.q.filter(this.entityManager.entities);
 
-    this.q.foreach(entities, (entity: IEntity) => {
+    this.q.foreach((entity: IEntity) => {
       const cValue = entity.get(CValue);
       cValue.value = delta + 1;
-    });
+    }, entities);
   }
 }
diff --git a/tests/ecs/Query.test.ts b/tests/ecs/Query.test.ts
@@ -115,7 +115,7 @@ describe('>>> Query', () => {
     describe('>>> Query map', () => {
       it('should map all entities with a componet C1', () => {
         const query = new Query((entity: IEntity) => entity.has(C1));
-        const entities = query.map(entityManager.entities, (entity: IEntity) => entity);
+        const entities = query.map((entity: IEntity) => entity, entityManager.entities);
 
         expect(entities).toBeDefined();
         expect(entities.length).toBe(3);
@@ -132,7 +132,7 @@ describe('>>> Query', () => {
         expect(beforeFilter).toBeDefined();
         expect(beforeFilter.length).toBe(1);
 
-        const beforeEntities = beforeQuery.map(beforeFilter, (entity: IEntity) => entity);
+        const beforeEntities = beforeQuery.map((entity: IEntity) => entity, beforeFilter);
 
         expect(beforeEntities).toBeDefined();
         expect(beforeEntities.length).toBe(1);
@@ -143,7 +143,7 @@ describe('>>> Query', () => {
         expect(updateFilter).toBeDefined();
         expect(updateFilter.length).toBe(2);
 
-        const updateEntities = updateQuery.map(updateFilter, (entity: IEntity) => entity.add(new C3()));
+        const updateEntities = updateQuery.map((entity: IEntity) => entity.add(new C3()), updateFilter);
 
         expect(updateEntities).toBeDefined();
         expect(updateEntities.length).toBe(2);
@@ -154,7 +154,7 @@ describe('>>> Query', () => {
         expect(afterFilter).toBeDefined();
         expect(afterFilter.length).toBe(beforeEntities.length + updateEntities.length);
 
-        const afterEntities = afterQuery.map(afterFilter, (entity: IEntity) => entity);
+        const afterEntities = afterQuery.map((entity: IEntity) => entity, afterFilter);
 
         expect(afterEntities).toBeDefined();
         expect(afterEntities.length).toBe(beforeEntities.length + updateEntities.length);
@@ -167,7 +167,7 @@ describe('>>> Query', () => {
         expect(beforeFilter).toBeDefined();
         expect(beforeFilter.length).toBe(1);
 
-        const beforeEntities = beforeQuery.map(beforeFilter, (entity: IEntity) => entity);
+        const beforeEntities = beforeQuery.map((entity: IEntity) => entity, beforeFilter);
 
         expect(beforeEntities).toBeDefined();
         expect(beforeEntities.length).toBe(1);
@@ -178,7 +178,7 @@ describe('>>> Query', () => {
         expect(updateFilter).toBeDefined();
         expect(updateFilter.length).toBe(1);
 
-        const updateEntities = updateQuery.map(updateFilter, (entity: IEntity) => entity.remove(C3));
+        const updateEntities = updateQuery.map((entity: IEntity) => entity.remove(C3), updateFilter);
 
         expect(updateEntities).toBeDefined();
         expect(updateEntities.length).toBe(1);
@@ -189,7 +189,7 @@ describe('>>> Query', () => {
         expect(afterFilter).toBeDefined();
         expect(afterFilter.length).toBe(beforeEntities.length - updateEntities.length);
 
-        const afterEntities = afterQuery.map(afterFilter, (entity: IEntity) => entity);
+        const afterEntities = afterQuery.map((entity: IEntity) => entity, afterFilter);
 
         expect(afterEntities).toBeDefined();
         expect(afterEntities.length).toBe(beforeEntities.length - updateEntities.length);
@@ -202,9 +202,9 @@ describe('>>> Query', () => {
         const entities = query.filter(entityManager.entities);
 
         let count = 0;
-        query.foreach(entities, (entity: IEntity) => {
+        query.foreach((entity: IEntity) => {
           count++;
-        });
+        }, entities);
 
         expect(count).toBe(3);
       });
@@ -214,9 +214,9 @@ describe('>>> Query', () => {
         const entities = query.filter(entityManager.entities);
 
         let count = 0;
-        query.foreach(entities, (entity: IEntity) => {
+        query.foreach((entity: IEntity) => {
           count++;
-        });
+        }, entities);
 
         expect(count).toBe(3);
       });
@@ -226,9 +226,9 @@ describe('>>> Query', () => {
         const entities = query.filter(entityManager.entities);
 
         let count = 0;
-        query.foreach(entities, (entity: IEntity) => {
+        query.foreach((entity: IEntity) => {
           count++;
-        });
+        }, entities);
 
         expect(count).toBe(2);
       });
@@ -238,9 +238,9 @@ describe('>>> Query', () => {
         const entities = query.filter(entityManager.entities);
 
         let count = 0;
-        query.foreach(entities, (entity: IEntity) => {
+        query.foreach((entity: IEntity) => {
           count++;
-        });
+        }, entities);
 
         expect(count).toBe(1);
       });
@@ -250,9 +250,9 @@ describe('>>> Query', () => {
         const entities = query.filter(entityManager.entities);
 
         let count = 0;
-        query.foreach(entities, (entity: IEntity) => {
+        query.foreach((entity: IEntity) => {
           count++;
-        });
+        }, entities);
 
         expect(count).toBe(3);
       });
@@ -262,9 +262,9 @@ describe('>>> Query', () => {
         const entities = query.filter(entityManager.entities);
 
         let count = 0;
-        query.foreach(entities, (entity: IEntity) => {
+        query.foreach((entity: IEntity) => {
           count++;
-        });
+        }, entities);
 
         expect(count).toBe(3);
       });
@@ -274,9 +274,9 @@ describe('>>> Query', () => {
         const entities = query.filter(entityManager.entities);
 
         let count = 0;
-        query.foreach(entities, (entity: IEntity) => {
+        query.foreach((entity: IEntity) => {
           count++;
-        });
+        }, entities);
 
         expect(count).toBe(2);
       });