Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2025-06-13 13:04:03 +00:00
Code Issues Projects Releases Wiki Activity

moved all gamesystemwithfilter arrays to sets, significant fps boost?

Browse Source
This commit is contained in:
dgs4349 2020-09-27 10:10:06 -04:00
parent 0377c6d58f
commit b7cb6b606d
12 changed files with 106 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/js/game/game_system_with_filter.js
View File

@ -21,9 +21,11 @@ export class GameSystemWithFilter extends GameSystem {
/**
* All entities which match the current components
* @type {Array<Entity>}
* @type {Set<Entity>}
*/
this.allEntities = [];
this.allEntitiesSet = new Set();
this.allEntitiesArray = [];
this.allEntitiesArrayIsOutdated = true;
this.root.signals.entityAdded.add(this.internalPushEntityIfMatching, this);
this.root.signals.entityGotNewComponent.add(this.internalReconsiderEntityToAdd, this);
@ -34,6 +36,17 @@ export class GameSystemWithFilter extends GameSystem {
this.root.signals.bulkOperationFinished.add(this.refreshCaches, this);
}
getUpdateEntitiesArray() {
if (!this.allEntitiesArrayIsOutdated) {
return this.allEntitiesArray;
}
this.allEntitiesArray = [...this.allEntitiesSet.values()];
this.allEntitiesArrayIsOutdated = true;
return this.allEntitiesArray;
}
/**
* @param {Entity} entity
*/
@ -44,7 +57,7 @@ export class GameSystemWithFilter extends GameSystem {
}
}
assert(this.allEntities.indexOf(entity) < 0, "entity already in list: " + entity);
assert(!this.allEntitiesSet.has(entity), "entity already in list: " + entity);
this.internalRegisterEntity(entity);
}
@ -53,7 +66,7 @@ export class GameSystemWithFilter extends GameSystem {
* @param {Entity} entity
*/
internalCheckEntityAfterComponentRemoval(entity) {
if (this.allEntities.indexOf(entity) < 0) {
if (!this.allEntitiesSet.has(entity)) {
// Entity wasn't interesting anyways
return;
}
@ -61,7 +74,8 @@ export class GameSystemWithFilter extends GameSystem {
for (let i = 0; i < this.requiredComponentIds.length; ++i) {
if (!entity.components[this.requiredComponentIds[i]]) {
// Entity is not interesting anymore
arrayDeleteValue(this.allEntities, entity);
//arrayDeleteValue(this.allEntities, entity);
this.allEntitiesArrayIsOutdated = this.allEntitiesSet.delete(entity);
}
}
}
@ -76,20 +90,30 @@ export class GameSystemWithFilter extends GameSystem {
return;
}
}
if (this.allEntities.indexOf(entity) >= 0) {
if (this.allEntitiesSet.has(entity)) {
return;
}
this.internalRegisterEntity(entity);
}
refreshCaches() {
this.allEntities.sort((a, b) => a.uid - b.uid);
//this.allEntities.sort((a, b) => a.uid - b.uid);
// Remove all entities which are queued for destroy
for (let i = 0; i < this.allEntities.length; ++i) {
const entity = this.allEntities[i];
// for (let i = 0; i < this.allEntities.length; ++i) {
// const entity = this.allEntities[i];
// if (entity.queuedForDestroy || entity.destroyed) {
// this.allEntities.splice(i, 1);
// }
// }
for (
let arr = [...this.allEntitiesSet.values()], i = arr.length - 1, entity;
(entity = arr[i]) && i >= 0;
--i
) {
if (entity.queuedForDestroy || entity.destroyed) {
this.allEntities.splice(i, 1);
this.allEntitiesArrayIsOutdated = this.allEntitiesSet.delete(entity);
}
}
}
@ -106,12 +130,12 @@ export class GameSystemWithFilter extends GameSystem {
* @param {Entity} entity
*/
internalRegisterEntity(entity) {
this.allEntities.push(entity);
this.allEntitiesSet.add(entity);
if (this.root.gameInitialized && !this.root.bulkOperationRunning) {
// Sort entities by uid so behaviour is predictable
this.allEntities.sort((a, b) => a.uid - b.uid);
}
// if (this.root.gameInitialized && !this.root.bulkOperationRunning) {
// // Sort entities by uid so behaviour is predictable
// this.allEntities.sort((a, b) => a.uid - b.uid);
// }
}
/**
@ -123,9 +147,6 @@ export class GameSystemWithFilter extends GameSystem {
// We do this in refreshCaches afterwards
return;
}
const index = this.allEntities.indexOf(entity);
if (index >= 0) {
arrayDelete(this.allEntities, index);
}
this.allEntitiesSet.delete(entity);
}
}

7
src/js/game/systems/belt_reader.js
View File

@ -12,9 +12,12 @@ export class BeltReaderSystem extends GameSystemWithFilter {
const now = this.root.time.now();
const minimumTime = now - globalConfig.readerAnalyzeIntervalSeconds;
const minimumTimeForThroughput = now - 1;
for (let i = 0; i < this.allEntities.length; ++i) {
const entity = this.allEntities[i];
for (
let arr = this.getUpdateEntitiesArray(), i = arr.length - 1, entity;
(entity = arr[i]) && i >= 0;
--i
) {
const readerComp = entity.components.BeltReader;
const pinsComp = entity.components.WiredPins;

7
src/js/game/systems/constant_signal.js
View File

@ -19,8 +19,11 @@ export class ConstantSignalSystem extends GameSystemWithFilter {
update() {
// Set signals
for (let i = 0; i < this.allEntities.length; ++i) {
const entity = this.allEntities[i];
for (
let arr = this.getUpdateEntitiesArray(), i = arr.length - 1, entity;
(entity = arr[i]) && i >= 0;
--i
) {
const pinsComp = entity.components.WiredPins;
const signalComp = entity.components.ConstantSignal;
pinsComp.slots[0].value = signalComp.signal;

16
src/js/game/systems/hub.js
View File

@ -25,15 +25,21 @@ export class HubSystem extends GameSystemWithFilter {
* @param {DrawParameters} parameters
*/
draw(parameters) {
for (let i = 0; i < this.allEntities.length; ++i) {
this.drawEntity(parameters, this.allEntities[i]);
for (
let arr = this.getUpdateEntitiesArray(), i = arr.length - 1, entity;
(entity = arr[i]) && i >= 0;
--i
) {
this.drawEntity(parameters, entity);
}
}
update() {
for (let i = 0; i < this.allEntities.length; ++i) {
// Set hub goal
const entity = this.allEntities[i];
for (
let arr = this.getUpdateEntitiesArray(), i = arr.length - 1, entity;
(entity = arr[i]) && i >= 0;
--i
) {
const pinsComp = entity.components.WiredPins;
pinsComp.slots[0].value = this.root.shapeDefinitionMgr.getShapeItemFromDefinition(
this.root.hubGoals.currentGoal.definition

7
src/js/game/systems/item_acceptor.js
View File

@ -18,8 +18,11 @@ export class ItemAcceptorSystem extends GameSystemWithFilter {
this.root.hubGoals.getBeltBaseSpeed() *
globalConfig.itemSpacingOnBelts; // * 2 because its only a half tile
for (let i = 0; i < this.allEntities.length; ++i) {
const entity = this.allEntities[i];
for (
let arr = this.getUpdateEntitiesArray(), i = arr.length - 1, entity;
(entity = arr[i]) && i >= 0;
--i
) {
const aceptorComp = entity.components.ItemAcceptor;
const animations = aceptorComp.itemConsumptionAnimations;

14
src/js/game/systems/item_ejector.js
View File

@ -76,8 +76,11 @@ export class ItemEjectorSystem extends GameSystemWithFilter {
}
// Try to find acceptors for every ejector
for (let i = 0; i < this.allEntities.length; ++i) {
const entity = this.allEntities[i];
for (
let arr = this.getUpdateEntitiesArray(), i = arr.length - 1, entity;
(entity = arr[i]) && i >= 0;
--i
) {
this.recomputeSingleEntityCache(entity);
}
}
@ -195,8 +198,11 @@ export class ItemEjectorSystem extends GameSystemWithFilter {
}
// Go over all cache entries
for (let i = 0; i < this.allEntities.length; ++i) {
const sourceEntity = this.allEntities[i];
for (
let arr = this.getUpdateEntitiesArray(), i = arr.length - 1, sourceEntity;
(sourceEntity = arr[i]) && i >= 0;
--i
) {
const sourceEjectorComp = sourceEntity.components.ItemEjector;
if (!sourceEjectorComp.enabled) {
continue;

8
src/js/game/systems/item_processor.js
View File

@ -22,9 +22,11 @@ export class ItemProcessorSystem extends GameSystemWithFilter {
}
update() {
for (let i = 0; i < this.allEntities.length; ++i) {
const entity = this.allEntities[i];
for (
let arr = this.getUpdateEntitiesArray(), i = arr.length - 1, entity;
(entity = arr[i]) && i >= 0;
--i
) {
const processorComp = entity.components.ItemProcessor;
const ejectorComp = entity.components.ItemEjector;

8
src/js/game/systems/lever.js
View File

@ -14,9 +14,11 @@ export class LeverSystem extends GameSystemWithFilter {
}
update() {
for (let i = 0; i < this.allEntities.length; ++i) {
const entity = this.allEntities[i];
for (
let arr = this.getUpdateEntitiesArray(), i = arr.length - 1, entity;
(entity = arr[i]) && i >= 0;
--i
) {
const leverComp = entity.components.Lever;
const pinsComp = entity.components.WiredPins;

7
src/js/game/systems/logic_gate.js
View File

@ -28,8 +28,11 @@ export class LogicGateSystem extends GameSystemWithFilter {
}
update() {
for (let i = 0; i < this.allEntities.length; ++i) {
const entity = this.allEntities[i];
for (
let arr = this.getUpdateEntitiesArray(), i = arr.length - 1, entity;
(entity = arr[i]) && i >= 0;
--i
) {
const logicComp = entity.components.LogicGate;
const slotComp = entity.components.WiredPins;

7
src/js/game/systems/miner.js
View File

@ -36,8 +36,11 @@ export class MinerSystem extends GameSystemWithFilter {
miningSpeed *= 100;
}
for (let i = 0; i < this.allEntities.length; ++i) {
const entity = this.allEntities[i];
for (
let arr = this.getUpdateEntitiesArray(), i = arr.length - 1, entity;
(entity = arr[i]) && i >= 0;
--i
) {
const minerComp = entity.components.Miner;
// Reset everything on recompute

7
src/js/game/systems/storage.js
View File

@ -26,8 +26,11 @@ export class StorageSystem extends GameSystemWithFilter {
}
update() {
for (let i = 0; i < this.allEntities.length; ++i) {
const entity = this.allEntities[i];
for (
let arr = this.getUpdateEntitiesArray(), i = arr.length - 1, entity;
(entity = arr[i]) && i >= 0;
--i
) {
const storageComp = entity.components.Storage;
const pinsComp = entity.components.WiredPins;

7
src/js/game/systems/underground_belt.js
View File

@ -255,8 +255,11 @@ export class UndergroundBeltSystem extends GameSystemWithFilter {
const delta = this.root.dynamicTickrate.deltaSeconds;
for (let i = 0; i < this.allEntities.length; ++i) {
const entity = this.allEntities[i];
for (
let arr = this.getUpdateEntitiesArray(), i = arr.length - 1, entity;
(entity = arr[i]) && i >= 0;
--i
) {
const undergroundComp = entity.components.UndergroundBelt;
const pendingItems = undergroundComp.pendingItems;