Merge 0c5f6db70c into 958d400ff5

src/js/game/core.js

@@ -440,7 +440,7 @@ export class GameCore {
         this.overlayAlpha = lerp(this.overlayAlpha, desiredOverlayAlpha, 0.25);
 
         // On low performance, skip the fade
-        if (this.root.entityMgr.entities.length > 5000 || this.root.dynamicTickrate.averageFps < 50) {
+        if (this.root.entityMgr.entities.size > 5000 || this.root.dynamicTickrate.averageFps < 50) {
             this.overlayAlpha = desiredOverlayAlpha;
         }
 

src/js/game/entity_manager.js

@@ -20,8 +20,8 @@ export class EntityManager extends BasicSerializableObject {
         /** @type {GameRoot} */
         this.root = root;
 
-        /** @type {Array<Entity>} */
-        this.entities = [];
+        /** @type {Map<number, Entity>} */
+        this.entities = new Map();
 
         // We store a separate list with entities to destroy, since we don't destroy
         // them instantly
@@ -48,7 +48,7 @@ export class EntityManager extends BasicSerializableObject {
     }
 
     getStatsText() {
-        return this.entities.length + " entities [" + this.destroyList.length + " to kill]";
+        return this.entities.size + " entities [" + this.destroyList.length + " to kill]";
     }
 
     // Main update
@@ -63,7 +63,7 @@ export class EntityManager extends BasicSerializableObject {
      */
     registerEntity(entity, uid = null) {
         if (G_IS_DEV && !globalConfig.debug.disableSlowAsserts) {
-            assert(this.entities.indexOf(entity) < 0, `RegisterEntity() called twice for entity ${entity}`);
+            assert(this.entities.get(entity.uid) !== entity, `RegisterEntity() called twice for entity ${entity}`);
         }
         assert(!entity.destroyed, `Attempting to register destroyed entity ${entity}`);
 
@@ -72,7 +72,11 @@ export class EntityManager extends BasicSerializableObject {
             assert(uid >= 0 && uid < Number.MAX_SAFE_INTEGER, "Invalid uid passed: " + uid);
         }
 
-        this.entities.push(entity);
+        // Give each entity a unique id
+        entity.uid = uid ? uid : this.generateUid();
+        entity.registered = true;
+
+        this.entities.set(entity.uid, entity);
 
         // Register into the componentToEntity map
         for (const componentId in entity.components) {
@@ -85,10 +89,6 @@ export class EntityManager extends BasicSerializableObject {
             }
         }
 
-        // Give each entity a unique id
-        entity.uid = uid ? uid : this.generateUid();
-        entity.registered = true;
-
         this.root.signals.entityAdded.dispatch(entity);
     }
 
@@ -136,23 +136,17 @@ export class EntityManager extends BasicSerializableObject {
      * @returns {Entity}
      */
     findByUid(uid, errorWhenNotFound = true) {
-        const arr = this.entities;
-        for (let i = 0, len = arr.length; i < len; ++i) {
-            const entity = arr[i];
-            if (entity.uid === uid) {
-                if (entity.queuedForDestroy || entity.destroyed) {
-                    if (errorWhenNotFound) {
-                        logger.warn("Entity with UID", uid, "not found (destroyed)");
-                    }
-                    return null;
-                }
-                return entity;
+        const entity = this.entities.get(uid);
+
+        if (entity === undefined || entity.queuedForDestroy || entity.destroyed) {
+            if (errorWhenNotFound) {
+                logger.warn("Entity with UID", uid, "not found (destroyed)");
             }
+
+            return null
         }
-        if (errorWhenNotFound) {
-            logger.warn("Entity with UID", uid, "not found");
-        }
-        return null;
+
+        return entity
     }
 
     /**
@@ -163,14 +157,12 @@ export class EntityManager extends BasicSerializableObject {
      */
     getFrozenUidSearchMap() {
         const result = new Map();
-        const array = this.entities;
-        for (let i = 0, len = array.length; i < len; ++i) {
-            const entity = array[i];
+        for (const [uid, entity] of this.entities.entries()){
             if (!entity.queuedForDestroy && !entity.destroyed) {
-                result.set(entity.uid, entity);
+                result.set(uid, entity);
             }
         }
-        return result;
+        return result
     }
 
     /**
@@ -200,8 +192,8 @@ export class EntityManager extends BasicSerializableObject {
         for (let i = 0; i < this.destroyList.length; ++i) {
             const entity = this.destroyList[i];
 
-            // Remove from entities list
-            arrayDeleteValue(this.entities, entity);
+            // Remove from entities map
+            this.entities.delete(entity.uid)
 
             // Remove from componentToEntity list
             this.unregisterEntityComponents(entity);

src/js/game/hud/parts/puzzle_editor_settings.js

@@ -93,7 +93,7 @@ export class HUDPuzzleEditorSettings extends BaseHUDPart {
 
     trim() {
         // Now, find the center
-        const buildings = this.root.entityMgr.entities.slice();
+        const buildings = Array.from(this.root.entityMgr.entities.values());
 
         if (buildings.length === 0) {
             // nothing to do

src/js/game/hud/parts/wires_overlay.js

@@ -64,7 +64,7 @@ export class HUDWiresOverlay extends BaseHUDPart {
         const desiredAlpha = this.root.currentLayer === "wires" ? 1.0 : 0.0;
 
         // On low performance, skip the fade
-        if (this.root.entityMgr.entities.length > 5000 || this.root.dynamicTickrate.averageFps < 50) {
+        if (this.root.entityMgr.entities.size > 5000 || this.root.dynamicTickrate.averageFps < 50) {
             this.currentAlpha = desiredAlpha;
         } else {
             this.currentAlpha = lerp(this.currentAlpha, desiredAlpha, 0.12);

src/js/game/logic.js

@@ -473,7 +473,7 @@ export class GameLogic {
      * Clears all belts and items
      */
     clearAllBeltsAndItems() {
-        for (const entity of this.root.entityMgr.entities) {
+        for (const entity of this.root.entityMgr.entities.values()) {
             for (const component of Object.values(entity.components)) {
                 /** @type {Component} */ (component).clear();
             }

src/js/savegame/savegame_serializer.js

@@ -37,7 +37,7 @@ export class SavegameSerializer {
             gameMode: root.gameMode.serialize(),
             entityMgr: root.entityMgr.serialize(),
             hubGoals: root.hubGoals.serialize(),
-            entities: this.internal.serializeEntityArray(root.entityMgr.entities),
+            entities: this.internal.serializeEntityMap(root.entityMgr.entities),
             beltPaths: root.systemMgr.systems.belt.serializePaths(),
             pinnedShapes: root.hud.parts.pinnedShapes ? root.hud.parts.pinnedShapes.serialize() : null,
             waypoints: root.hud.parts.waypoints ? root.hud.parts.waypoints.serialize() : null,
@@ -86,7 +86,7 @@ export class SavegameSerializer {
             }
             seenUids.add(uid);
 
-            // Verify components
+            // Verify components/
             if (!entity.components) {
                 return ExplainedResult.bad("Entity is missing key 'components': " + JSON.stringify(entity));
             }

src/js/savegame/serializer_internal.js

@@ -11,12 +11,11 @@ const logger = createLogger("serializer_internal");
 export class SerializerInternal {
     /**
      * Serializes an array of entities
-     * @param {Array<Entity>} array
+     * @param {Map<number, Entity>} map
      */
-    serializeEntityArray(array) {
+    serializeEntityMap(map) {
         const serialized = [];
-        for (let i = 0; i < array.length; ++i) {
-            const entity = array[i];
+        for (const entity of map.values()) {
             if (!entity.queuedForDestroy && !entity.destroyed) {
                 serialized.push(entity.serialize());
             }