@dcl/ecs 7.0.6-3808797047.commit-ee7ea04 → 7.0.6-3808892339.commit-e47ed81

package/dist/engine/entity.d.ts

@@ -1,17 +1,39 @@
-import { EntityUtils } from './entity-utils';
+/**
+ * @public It only defines the type explicitly, no effects.
+ */
+export declare type uint32 = number;
+export declare const MAX_U16 = 65535;
+export declare const MASK_UPPER_16_ON_32 = 4294901760;
+export declare const AMOUNT_VERSION_AVAILABLE: number;
+/**
+ * @public The Entity is a number type, the cast is only for typescript, the final javascript code treat as a number
+ *  version  number
+ * [31...16][15...0]
+ *
+ * Convertion from entity to its compound numbers:
+ * To get the version => ((entity & MASK_UPPER_16_ON_32) >> 16) & MAX_U16
+ * To get the number  => entity & MAX_U16
+ *
+ * Convertion from its compound numbers to entity:
+ * entity = (entityNumber & MAX_U16) | ((entityVersion & MAX_U16) << 16)
+ */
+export declare type Entity = uint32 & {
+    __entity_type: '';
+};
+/**
+ * @public This first 512 entities are reserved by the renderer
+ */
+export declare const RESERVED_STATIC_ENTITIES = 512;
 /**
  * @public
  */
-export declare type Entity = unknown;
+export declare const MAX_ENTITY_NUMBER = 65535;
 export declare function EntityContainer(): {
-    generateEntity(dynamic?: boolean): Entity;
+    generateEntity(): Entity;
     removeEntity(entity: Entity): boolean;
     entityExists(entity: Entity): boolean;
     getExistingEntities(): Set<Entity>;
+    entityVersion: (entity: Entity) => number;
+    entityNumber: (entity: Entity) => number;
+    entityId: (entityNumber: number, entityVersion: number) => Entity;
 };
-declare function Entity(range: EntityUtils.EntityRange): {
-    getExistingEntities(): Set<unknown>;
-    generateEntity: () => Entity;
-    removeEntity: (entity: Entity) => boolean;
-};
-export {};

package/dist/engine/entity.js

@@ -1,59 +1,72 @@
-import { EntityUtils } from './entity-utils';
+export const MAX_U16 = 0xffff;
+export const MASK_UPPER_16_ON_32 = 0xffff0000;
+export const AMOUNT_VERSION_AVAILABLE = MAX_U16 + 1;
+/**
+ * @public This first 512 entities are reserved by the renderer
+ */
+export const RESERVED_STATIC_ENTITIES = 512;
+/**
+ * @public
+ */
+export const MAX_ENTITY_NUMBER = MAX_U16;
 export function EntityContainer() {
-    const staticEntity = Entity(EntityUtils.STATIC_ENTITIES_RANGE);
-    const dynamicEntity = Entity(EntityUtils.DYNAMIC_ENTITIES_RANGE);
-    return {
-        generateEntity(dynamic = false) {
-            /* istanbul ignore next */
-            if (dynamic) {
-                // Dynamic entities are not being used, but since we dont know the future of the dynamic entities
-                // I prefer to comment the code instead of removing all the logic
-                /* istanbul ignore next */
-                return dynamicEntity.generateEntity();
-            }
-            else {
-                return staticEntity.generateEntity();
-            }
-        },
-        removeEntity(entity) {
-            return (staticEntity.removeEntity(entity) || dynamicEntity.removeEntity(entity));
-        },
-        entityExists(entity) {
-            return (EntityUtils.isReservedEntity(entity) ||
-                staticEntity.getExistingEntities().has(entity) ||
-                dynamicEntity.getExistingEntities().has(entity));
-        },
-        getExistingEntities() {
-            return new Set([
-                ...staticEntity.getExistingEntities(),
-                ...dynamicEntity.getExistingEntities()
-            ]);
+    let entityCounter = RESERVED_STATIC_ENTITIES;
+    const usedEntities = new Set();
+    const removedEntities = new Map();
+    function entityVersion(entity) {
+        return (((entity & MASK_UPPER_16_ON_32) >> 16) & MAX_U16) >>> 0;
+    }
+    function entityNumber(entity) {
+        return (entity & MAX_U16) >>> 0;
+    }
+    function entityId(entityNumber, entityVersion) {
+        return (((entityNumber & MAX_U16) | ((entityVersion & MAX_U16) << 16)) >>>
+            0);
+    }
+    function generateNewEntity() {
+        if (entityCounter > MAX_ENTITY_NUMBER - 1) {
+            throw new Error(`It fails trying to generate an entity out of range ${MAX_ENTITY_NUMBER}.`);
         }
-    };
-}
-function Entity(range) {
-    function createEntity(entity) {
+        const entity = entityCounter++;
+        usedEntities.add(entity);
         return entity;
     }
-    let entityCounter = range[0];
-    const usedEntities = new Set();
     function generateEntity() {
-        if (entityCounter >= range[1]) {
-            throw new Error(`It fails trying to generate an entity out of range [${range[0]}, ${range[1]}].`);
+        if (usedEntities.size + RESERVED_STATIC_ENTITIES >= entityCounter) {
+            return generateNewEntity();
         }
-        const entity = createEntity(entityCounter);
-        entityCounter++;
-        usedEntities.add(entity);
-        return entity;
+        for (const [number, version] of removedEntities) {
+            if (version < MAX_U16) {
+                const entity = entityId(number, version + 1);
+                usedEntities.add(entity);
+                removedEntities.delete(number);
+                return entity;
+            }
+        }
+        return generateNewEntity();
     }
     function removeEntity(entity) {
-        return usedEntities.delete(entity);
+        const deleted = usedEntities.delete(entity);
+        if (deleted) {
+            removedEntities.set(entityNumber(entity), entityVersion(entity));
+        }
+        return deleted;
     }
     return {
+        generateEntity() {
+            return generateEntity();
+        },
+        removeEntity(entity) {
+            return removeEntity(entity);
+        },
+        entityExists(entity) {
+            return entity < RESERVED_STATIC_ENTITIES || usedEntities.has(entity);
+        },
         getExistingEntities() {
             return new Set(usedEntities);
         },
-        generateEntity,
-        removeEntity
+        entityVersion,
+        entityNumber,
+        entityId
     };
 }

package/dist/runtime/initialization/index.d.ts

@@ -7,12 +7,12 @@ import { Task } from '../../systems/async-task';
 export declare const engine: IEngine;
 export declare const inputSystem: import("../../engine").IInputSystem;
 export declare const pointerEventsSystem: {
-    removeOnClick(entity: unknown): void;
-    removeOnPointerDown(entity: unknown): void;
-    removeOnPointerUp(entity: unknown): void;
-    onClick(entity: unknown, cb: import("../../systems/events").EventSystemCallback, opts?: Partial<import("../../systems/events").EventSystemOptions> | undefined): void;
-    onPointerDown(entity: unknown, cb: import("../../systems/events").EventSystemCallback, opts?: Partial<import("../../systems/events").EventSystemOptions> | undefined): void;
-    onPointerUp(entity: unknown, cb: import("../../systems/events").EventSystemCallback, opts?: Partial<import("../../systems/events").EventSystemOptions> | undefined): void;
+    removeOnClick(entity: import("../../engine").Entity): void;
+    removeOnPointerDown(entity: import("../../engine").Entity): void;
+    removeOnPointerUp(entity: import("../../engine").Entity): void;
+    onClick(entity: import("../../engine").Entity, cb: import("../../systems/events").EventSystemCallback, opts?: Partial<import("../../systems/events").EventSystemOptions> | undefined): void;
+    onPointerDown(entity: import("../../engine").Entity, cb: import("../../systems/events").EventSystemCallback, opts?: Partial<import("../../systems/events").EventSystemOptions> | undefined): void;
+    onPointerUp(entity: import("../../engine").Entity, cb: import("../../systems/events").EventSystemCallback, opts?: Partial<import("../../systems/events").EventSystemOptions> | undefined): void;
 };
 /**
  * @public

package/dist/systems/crdt/index.d.ts

@@ -6,5 +6,5 @@ export declare function crdtSceneSystem(engine: Pick<IEngine, 'getComponentOrNul
     sendMessages: (dirtyEntities: Map<Entity, Set<number>>) => Promise<void>;
     receiveMessages: () => Promise<void>;
     addTransport: (transport: Transport) => void;
-    updateState: () => Map<unknown, Set<number>>;
+    updateState: () => Map<Entity, Set<number>>;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcl/ecs",
-  "version": "7.0.6-3808797047.commit-ee7ea04",
+  "version": "7.0.6-3808892339.commit-e47ed81",
   "description": "Decentraland ECS",
   "main": "./dist/index.js",
   "typings": "./dist/index.d.ts",
@@ -27,7 +27,7 @@
     "ts-proto": "^1.112.0"
   },
   "dependencies": {
-    "@dcl/crdt": "7.0.6-3808797047.commit-ee7ea04",
+    "@dcl/crdt": "7.0.6-3808892339.commit-e47ed81",
     "@dcl/js-runtime": "file:../js-runtime",
     "@dcl/protocol": "^1.0.0-3808528053.commit-d66d462"
   },
@@ -41,5 +41,5 @@
     "displayName": "ECS",
     "tsconfig": "./tsconfig.json"
   },
-  "commit": "ee7ea0434ecbd9e92db737237a67cd02af989b73"
+  "commit": "e47ed813e0b5bd0e5fd6a0fd9e2eeb80783dab27"
 }

package/dist/engine/entity-utils.d.ts

@@ -1,17 +0,0 @@
-import { Entity } from './entity';
-export declare namespace EntityUtils {
-    /**
-     * Range is the first element and the last possible element, they both are included in the interval.
-     * [start, end]
-     */
-    type EntityRange = readonly [number, number];
-    const MAX_ENTITIES = 4294967295;
-    const DYNAMIC_ENTITIES_START_AT = 100000;
-    const RESERVED_STATIC_ENTITIES = 512;
-    const RESERVED_ENTITIES_RANGE: EntityRange;
-    const STATIC_ENTITIES_RANGE: EntityRange;
-    const DYNAMIC_ENTITIES_RANGE: EntityRange;
-    function isStaticEntity(entity: Entity): boolean;
-    function isReservedEntity(entity: Entity): boolean;
-}
-export default EntityUtils;

package/dist/engine/entity-utils.js

@@ -1,36 +0,0 @@
-export var EntityUtils;
-(function (EntityUtils) {
-    EntityUtils.MAX_ENTITIES = 0xffffffff;
-    EntityUtils.DYNAMIC_ENTITIES_START_AT = 100e3;
-    EntityUtils.RESERVED_STATIC_ENTITIES = 512;
-    EntityUtils.RESERVED_ENTITIES_RANGE = [
-        0,
-        EntityUtils.RESERVED_STATIC_ENTITIES - 1
-    ];
-    EntityUtils.STATIC_ENTITIES_RANGE = [
-        EntityUtils.RESERVED_STATIC_ENTITIES,
-        EntityUtils.MAX_ENTITIES
-        // DYNAMIC_ENTITIES_START_AT - 1
-    ];
-    EntityUtils.DYNAMIC_ENTITIES_RANGE = [
-        EntityUtils.DYNAMIC_ENTITIES_START_AT,
-        EntityUtils.MAX_ENTITIES
-    ];
-    function isInRange(entity, range) {
-        return entity >= range[0] && entity <= range[1];
-    }
-    // @internal
-    function isDynamicEntity(entity) {
-        return isInRange(entity, EntityUtils.DYNAMIC_ENTITIES_RANGE);
-    }
-    EntityUtils.isDynamicEntity = isDynamicEntity;
-    function isStaticEntity(entity) {
-        return isInRange(entity, EntityUtils.STATIC_ENTITIES_RANGE);
-    }
-    EntityUtils.isStaticEntity = isStaticEntity;
-    function isReservedEntity(entity) {
-        return isInRange(entity, EntityUtils.RESERVED_ENTITIES_RANGE);
-    }
-    EntityUtils.isReservedEntity = isReservedEntity;
-})(EntityUtils || (EntityUtils = {}));
-export default EntityUtils;