@dcl/playground-assets 7.1.3-4479271193.commit-2d89420 → 7.1.3-4479913205.commit-bfd9912

package/dist/alpha.d.ts

@@ -1458,6 +1458,12 @@ export declare type EntityContainer = {
     updateUsedEntity(entity: Entity): boolean;
 };
 
+export declare enum EntityMappingMode {
+    EMM_NONE = 0,
+    EMM_NEXT_AVAILABLE = 1,
+    EMM_DIRECT_MAPPING = 2
+}
+
 /**
  * @public
  * Common props to all components
@@ -2028,7 +2034,19 @@ export declare const inputSystem: IInputSystem;
  * @deprecated composite is not being supported so far, please do not use this feature
  *
  */
-export declare function instanceComposite(engine: IEngine, compositeData: Composite, getNextAvailableEntity: () => Entity | null, compositeProvider: CompositeProvider, rootEntity?: Entity, alreadyRequestedId?: Set<string>): Entity;
+export declare function instanceComposite(engine: IEngine, compositeData: Composite, compositeProvider: CompositeProvider, options?: InstanceCompositeOptions): Entity;
+
+export declare type InstanceCompositeOptions = {
+    entityMapping?: {
+        type: EntityMappingMode.EMM_NEXT_AVAILABLE;
+        getNextAvailableEntity: () => Entity | null;
+    } | {
+        type: EntityMappingMode.EMM_DIRECT_MAPPING;
+        getCompositeEntity: (compositeEntity: Entity | number) => Entity;
+    };
+    rootEntity?: Entity;
+    alreadyRequestedId?: Set<string>;
+};
 
 /**
  * @public

package/dist/beta.d.ts

@@ -1458,6 +1458,12 @@ export declare type EntityContainer = {
     updateUsedEntity(entity: Entity): boolean;
 };
 
+export declare enum EntityMappingMode {
+    EMM_NONE = 0,
+    EMM_NEXT_AVAILABLE = 1,
+    EMM_DIRECT_MAPPING = 2
+}
+
 /**
  * @public
  * Common props to all components
@@ -2024,7 +2030,19 @@ export declare const inputSystem: IInputSystem;
  * @deprecated composite is not being supported so far, please do not use this feature
  *
  */
-export declare function instanceComposite(engine: IEngine, compositeData: Composite, getNextAvailableEntity: () => Entity | null, compositeProvider: CompositeProvider, rootEntity?: Entity, alreadyRequestedId?: Set<string>): Entity;
+export declare function instanceComposite(engine: IEngine, compositeData: Composite, compositeProvider: CompositeProvider, options?: InstanceCompositeOptions): Entity;
+
+export declare type InstanceCompositeOptions = {
+    entityMapping?: {
+        type: EntityMappingMode.EMM_NEXT_AVAILABLE;
+        getNextAvailableEntity: () => Entity | null;
+    } | {
+        type: EntityMappingMode.EMM_DIRECT_MAPPING;
+        getCompositeEntity: (compositeEntity: Entity | number) => Entity;
+    };
+    rootEntity?: Entity;
+    alreadyRequestedId?: Set<string>;
+};
 
 /**
  * @public

package/dist/index.bundled.d.ts

@@ -1458,6 +1458,12 @@ export declare type EntityContainer = {
     updateUsedEntity(entity: Entity): boolean;
 };
 
+export declare enum EntityMappingMode {
+    EMM_NONE = 0,
+    EMM_NEXT_AVAILABLE = 1,
+    EMM_DIRECT_MAPPING = 2
+}
+
 /**
  * @public
  * Common props to all components
@@ -2024,7 +2030,19 @@ export declare const inputSystem: IInputSystem;
  * @deprecated composite is not being supported so far, please do not use this feature
  *
  */
-export declare function instanceComposite(engine: IEngine, compositeData: Composite, getNextAvailableEntity: () => Entity | null, compositeProvider: CompositeProvider, rootEntity?: Entity, alreadyRequestedId?: Set<string>): Entity;
+export declare function instanceComposite(engine: IEngine, compositeData: Composite, compositeProvider: CompositeProvider, options?: InstanceCompositeOptions): Entity;
+
+export declare type InstanceCompositeOptions = {
+    entityMapping?: {
+        type: EntityMappingMode.EMM_NEXT_AVAILABLE;
+        getNextAvailableEntity: () => Entity | null;
+    } | {
+        type: EntityMappingMode.EMM_DIRECT_MAPPING;
+        getCompositeEntity: (compositeEntity: Entity | number) => Entity;
+    };
+    rootEntity?: Entity;
+    alreadyRequestedId?: Set<string>;
+};
 
 /**
  * @public

package/dist/index.js

@@ -16971,6 +16971,13 @@
         });
     }
 
+    // @public
+    exports.EntityMappingMode = void 0;
+    (function (EntityMappingMode) {
+        EntityMappingMode[EntityMappingMode["EMM_NONE"] = 0] = "EMM_NONE";
+        EntityMappingMode[EntityMappingMode["EMM_NEXT_AVAILABLE"] = 1] = "EMM_NEXT_AVAILABLE";
+        EntityMappingMode[EntityMappingMode["EMM_DIRECT_MAPPING"] = 2] = "EMM_DIRECT_MAPPING";
+    })(exports.EntityMappingMode || (exports.EntityMappingMode = {}));
     /**
      * Return the component value from composite data
      * @internal
@@ -17013,13 +17020,20 @@
      * Return the entity mapping or fail if there is no more
      * @internal
      */
-    function getEntityMapping(compositeEntity, mappedEntities, getNextAvailableEntity) {
+    function getEntityMapping(engine, compositeEntity, mappedEntities, { entityMapping }) {
         const existingEntity = mappedEntities.get(compositeEntity);
         if (existingEntity) {
             return existingEntity;
         }
+        if (entityMapping?.type === exports.EntityMappingMode.EMM_DIRECT_MAPPING) {
+            const entity = entityMapping.getCompositeEntity(compositeEntity);
+            mappedEntities.set(compositeEntity, entity);
+            return entity;
+        }
         // This function in runtime can be just `engine.addEntity()`
-        const newEntity = getNextAvailableEntity();
+        const newEntity = entityMapping?.type === exports.EntityMappingMode.EMM_NEXT_AVAILABLE
+            ? entityMapping.getNextAvailableEntity()
+            : engine.addEntity();
         if (newEntity === null) {
             throw new Error('There is no more entities to allocate');
         }
@@ -17037,13 +17051,15 @@
      *
      */
 
-    function instanceComposite(engine, compositeData, getNextAvailableEntity, compositeProvider, rootEntity, alreadyRequestedId = new Set()) {
+    function instanceComposite(engine, compositeData, compositeProvider, options = {}) {
+        const { rootEntity, alreadyRequestedId: optionalAlreadyRequestedId, entityMapping } = options;
+        const alreadyRequestedId = optionalAlreadyRequestedId || new Set();
         const TransformComponentNumber = componentNumberFromName('core::Transform');
         const CompositeRootComponent = getCompositeRootComponent(engine);
         // Key => EntityNumber from the composite
         // Value => EntityNumber in current engine
         const mappedEntities = new Map();
-        const getCompositeEntity = (compositeEntity) => getEntityMapping(compositeEntity, mappedEntities, getNextAvailableEntity);
+        const getCompositeEntity = (compositeEntity) => getEntityMapping(engine, compositeEntity, mappedEntities, options);
         // ## 1 ##
         // First entity that I want to map, the root entity from the composite to the target entity in the engine
         // If there is no `rootEntity` passed, we assign one from `getNextAvailableEntity`
@@ -17057,14 +17073,19 @@
         // => TODO: in the future, the instanciation is first, then the overides (to parameterize Composite, e.g. house with different wall colors)
         const childrenComposite = compositeData.components.find((item) => item.name === CompositeRootComponent.componentName);
         if (childrenComposite) {
-            for (const [entity, childComposite] of childrenComposite.data) {
+            for (const [compositeEntity, childComposite] of childrenComposite.data) {
                 const compositeRoot = getComponentValue(CompositeRootComponent, childComposite);
                 const composite = compositeProvider.getCompositeOrNull(compositeRoot.id);
+                const targetEntity = getCompositeEntity(compositeEntity);
                 if (composite) {
                     if (alreadyRequestedId.has(compositeRoot.id) || compositeRoot.id === compositeData.id) {
                         throw new Error(`Composite ${compositeRoot.id} has a recursive instanciation while try to instance ${compositeData.id}. Previous instances: ${alreadyRequestedId.toString()}`);
                     }
-                    instanceComposite(engine, composite, getNextAvailableEntity, compositeProvider, entity, new Set(alreadyRequestedId).add(compositeData.id));
+                    instanceComposite(engine, composite, compositeProvider, {
+                        rootEntity: targetEntity,
+                        alreadyRequestedId: new Set(alreadyRequestedId).add(compositeData.id),
+                        entityMapping: entityMapping?.type === exports.EntityMappingMode.EMM_NEXT_AVAILABLE ? entityMapping : undefined
+                    });
                 }
             }
         }