Skip to content

Commit b69aa21

Browse files
nidorxnidorx
committed
Alteração da subscrição para resposta imediata
1 parent 879ddbe commit b69aa21

9 files changed

+68
-93
lines changed

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ Invoked when:
430430
super([-1], 0.5); // Logs all entities every 2 seconds (0.5 FPS)
431431
}
432432

433-
change(entity: Entity, added: Component<any>[], removed: Component<any>[]): void {
433+
change(entity: Entity, added?: Component<any>, removed?: Component<any>): void {
434434
console.log(entity, added, removed);
435435
}
436436
}
@@ -508,7 +508,7 @@ export default class SceneObjectSystem extends System {
508508
| `beforeUpdateAll(time: number)` | | Invoked before updating entities available for this system. It is only invoked when there are entities with the characteristics expected by this system. |
509509
| `update(time: number, delta: number, entity: Entity)` | | Invoked in updates, limited to the value set in the "frequency" attribute |
510510
| `afterUpdateAll(time: number, entities: Entity[])` | | Invoked after performing update of entities available for this system. It is only invoked when there are entities with the characteristics expected by this system. |
511-
| `change(entity: Entity, added: Component<any>[], removed: Component<any>[])` | | Invoked when an expected feature of this system is added or removed from the entity |
511+
| `change(entity: Entity, added?: Component<any>, removed?: Component<any>)` | | Invoked when an expected feature of this system is added or removed from the entity |
512512
| `enter(entity: Entity)` | | Invoked when: <br>**A)** An entity with the characteristics (components) expected by this system is added in the world; <br>**B)** This system is added in the world and this world has one or more entities with the characteristics expected by this system; <br>**C)** An existing entity in the same world receives a new component at runtime and all of its new components match the standard expected by this system. |
513513
| `exit(entity: Entity)` | | Invoked when: <br>**A)** An entity with the characteristics (components) expected by this system is removed from the world; <br>**B)** This system is removed from the world and this world has one or more entities with the characteristics expected by this system; <br>**C)** An existing entity in the same world loses a component at runtime and its new component set no longer matches the standard expected by this system |
514514

‎example/package-lock.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎example/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"license": "MIT",
1414
"dependencies": {
1515
"dat.gui": "0.7.6",
16-
"ecs-lib": "0.7.0",
16+
"ecs-lib": "0.8.0-pre.0",
1717
"three": "0.110.0",
1818
"react": "^16.12.0",
1919
"react-dom": "^16.12.0"

‎example/src/system/CubeFactorySystem.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default class CubeFactorySystem extends System {
3131
}
3232
}
3333

34-
change(entity: Entity, added: Component<any>[], removed: Component<any>[]): void {
34+
change(entity: Entity, added?: Component<any>, removed?: Component<any>): void {
3535
console.log('CubeFactorySystem::change', entity, added, removed);
3636
}
3737
}

‎example/src/system/LogSystem.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export default class LogSystem extends System {
1818
console.log('LogSystem: After update', time, entities);
1919
}
2020

21-
change(entity: Entity, added: Component<any>[], removed: Component<any>[]): void {
21+
change(entity: Entity, added?: Component<any>, removed?: Component<any>): void {
2222
console.log('LogSystem::change', entity, added, removed);
2323
}
2424
}

‎package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,4 @@
7777
],
7878
"all": true
7979
}
80-
}
80+
}

‎src/index.ts

+56-74
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,33 @@
11
let NOW: () => number;
22

3-
let requestAnimationFrame: (cb: () => void) => void = () => 0;
4-
5-
if (typeof window !== 'undefined') {
6-
requestAnimationFrame = window.requestAnimationFrame;
7-
if (window.performance) {
8-
NOW = window.performance.now.bind(window.performance);
9-
}
10-
} else {
11-
const start = Date.now();
12-
NOW = () => {
13-
return Date.now() - start;
3+
// Include a performance.now polyfill.
4+
// In node.js, use process.hrtime.
5+
// @ts-ignore
6+
if (typeof (self) === 'undefined' && typeof (process) !== 'undefined' && process.hrtime) {
7+
NOW = function () {
8+
// @ts-ignore
9+
var time = process.hrtime();
10+
11+
// Convert [seconds, nanoseconds] to milliseconds.
12+
return time[0] * 1000 + time[1] / 1000000;
13+
};
14+
}
15+
// In a browser, use self.performance.now if it is available.
16+
else if (typeof (self) !== 'undefined' && self.performance !== undefined && self.performance.now !== undefined) {
17+
// This must be bound, because directly assigning this function
18+
// leads to an invocation exception in Chrome.
19+
NOW = self.performance.now.bind(self.performance);
20+
}
21+
// Use Date.now if it is available.
22+
else if (Date.now !== undefined) {
23+
NOW = Date.now;
24+
}
25+
// Otherwise, use 'new Date().getTime()'.
26+
else {
27+
NOW = function () {
28+
return new Date().getTime();
1429
};
15-
16-
requestAnimationFrame = setImmediate;
1730
}
18-
19-
console.log(requestAnimationFrame);
2031

2132
let SEQ_SYSTEM = 1;
2233

@@ -115,7 +126,7 @@ export class Iterator<T> {
115126
}
116127
}
117128

118-
export type Susbcription = (entity: Entity, added: Component<any>[], removed: Component<any>[]) => void;
129+
export type Susbcription = (entity: Entity, added?: Component<any>, removed?: Component<any>) => void;
119130

120131
/**
121132
* Representation of an entity in ECS
@@ -127,21 +138,6 @@ export abstract class Entity {
127138
*/
128139
private subscriptions: Array<Susbcription> = [];
129140

130-
/**
131-
* Informs that subscriptions have been triggered.
132-
*/
133-
private queued = false;
134-
135-
/**
136-
* Quais componentes foram adicionados nessa entidade antes de informar aos interessados
137-
*/
138-
private added: Component<any>[] = [];
139-
140-
/**
141-
* Quais componentes foram removidos dessa entidade antes de informar aos interessados
142-
*/
143-
private removed: Component<any>[] = [];
144-
145141
/**
146142
* Components by type
147143
*/
@@ -160,31 +156,6 @@ export abstract class Entity {
160156
this.id = SEQ_ENTITY++;
161157
}
162158

163-
private dispatch() {
164-
if (!this.queued) {
165-
this.queued = true;
166-
// Informa aos interessados sobre a atualização
167-
requestAnimationFrame(() => {
168-
this.queued = false;
169-
170-
const removed = this.removed.filter((component, index, self) => {
171-
return (this.components[component.type] || []).indexOf(component) < 0
172-
&& self.indexOf(component) === index;
173-
});
174-
175-
const added = this.added.filter((component, index, self) => {
176-
return (this.components[component.type] || []).indexOf(component) >= 0
177-
&& self.indexOf(component) === index;
178-
});
179-
180-
this.added = [];
181-
this.removed = [];
182-
183-
this.subscriptions.forEach(cb => cb(this, added, removed));
184-
});
185-
}
186-
}
187-
188159
/**
189160
* Allows interested parties to receive information when this entity's component list is updated
190161
*
@@ -213,11 +184,14 @@ export abstract class Entity {
213184
this.components[type] = [];
214185
}
215186

216-
this.components[type].push(component);
187+
if (this.components[type].indexOf(component) >= 0) {
188+
return
189+
}
217190

218-
this.added.push(component);
191+
this.components[type].push(component);
219192

220-
this.dispatch();
193+
// Informa aos interessados sobre a atualização
194+
this.subscriptions.forEach(cb => cb(this, component, undefined));
221195
}
222196

223197
/**
@@ -234,10 +208,10 @@ export abstract class Entity {
234208
const idx = this.components[type].indexOf(component);
235209
if (idx >= 0) {
236210
this.components[type].splice(idx, 1);
237-
this.removed.push(component);
238-
}
239211

240-
this.dispatch();
212+
// Informa aos interessados sobre a atualização
213+
this.subscriptions.forEach(cb => cb(this, undefined, component));
214+
}
241215
}
242216
}
243217

@@ -400,7 +374,7 @@ export abstract class System {
400374
* @param added
401375
* @param removed
402376
*/
403-
public change?(entity: Entity, added: Component<any>[], removed: Component<any>[]): void;
377+
public change?(entity: Entity, added?: Component<any>, removed?: Component<any>): void;
404378

405379
/**
406380
* Invoked when:
@@ -894,7 +868,7 @@ export default class ECS {
894868
*
895869
* @param entity
896870
*/
897-
private onEntityUpdate(entity: Entity, added: Component<any>[], removed: Component<any>[]) {
871+
private onEntityUpdate(entity: Entity, added?: Component<any>, removed?: Component<any>) {
898872
if (!this.entitySystems[entity.id]) {
899873
return;
900874
}
@@ -915,16 +889,12 @@ export default class ECS {
915889
continue;
916890
}
917891

918-
for (var a = 0, l = added.length; a < l; a++) {
919-
if (systemComponentTypes.indexOf(added[a].type) >= 0) {
920-
continue outside;
921-
}
892+
if (added && systemComponentTypes.indexOf(added.type) >= 0) {
893+
continue outside;
922894
}
923895

924-
for (var a = 0, l = removed.length; a < l; a++) {
925-
if (systemComponentTypes.indexOf(removed[a].type) >= 0) {
926-
continue outside;
927-
}
896+
if (removed && systemComponentTypes.indexOf(removed.type) >= 0) {
897+
continue outside;
928898
}
929899
}
930900

@@ -940,8 +910,20 @@ export default class ECS {
940910
(system.change as any)(
941911
entity,
942912
// Send only the list of components this system expects
943-
all ? added : added.filter(c => systemComponentTypes.indexOf(c.type) >= 0),
944-
all ? removed : removed.filter(c => systemComponentTypes.indexOf(c.type) >= 0)
913+
all
914+
? added
915+
: (
916+
added && systemComponentTypes.indexOf(added.type)
917+
? added
918+
: undefined
919+
),
920+
all
921+
? removed
922+
: (
923+
removed && systemComponentTypes.indexOf(removed.type) >= 0
924+
? removed
925+
: undefined
926+
)
945927
);
946928
});
947929
}

‎test/ECS.test.ts

+2-9
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ describe("ECS", () => {
152152
exitCalled = callOrder++;
153153
}
154154

155-
change(entity: Entity, added: Component<any>[], removed: Component<any>[]): void {
155+
change(entity: Entity, added?: Component<any>, removed?: Component<any>): void {
156156
changedCalled = callOrder++;
157157
}
158158
}
@@ -196,17 +196,10 @@ describe("ECS", () => {
196196
expect(afterUpdateAllCalled).to.eql(0);
197197
expect(exitCalled).to.eql(0);
198198

199-
// does nothing, system execution only occurs in the future
199+
// expect enter
200200
let componentA = new ComponentA(100);
201201
entity.add(componentA);
202202

203-
expect(enterCalled).to.eql(0);
204-
expect(changedCalled).to.eql(0);
205-
expect(beforeUpdateAllCalled).to.eql(0);
206-
expect(updateCalled).to.eql(0);
207-
expect(afterUpdateAllCalled).to.eql(0);
208-
expect(exitCalled).to.eql(0);
209-
210203
// expect enter
211204
(global as any).setImmediateExec();
212205

0 commit comments

Comments
 (0)