@dcl/ecs 7.27.1-33533530571.commit-451d001 → 7.27.1-33669021544.commit-a6216ed

package/dist/systems/crdt/index.js

@@ -1,17 +1,24 @@
 import { EntityState } from '../../engine/entity';
 import { ReadWriteByteBuffer } from '../../serialization/ByteBuffer';
-import { AppendValueOperation, CrdtMessageProtocol } from '../../serialization/crdt';
+import { AppendValueOperation, CrdtMessageProtocol, DeleteComponentNetwork, DeleteEntityNetwork } from '../../serialization/crdt';
 import { DeleteComponent } from '../../serialization/crdt/deleteComponent';
 import { DeleteEntity } from '../../serialization/crdt/deleteEntity';
 import { PutComponentOperation } from '../../serialization/crdt/putComponent';
-import { AuthoritativePutComponentOperation } from '../../serialization/crdt/authoritativePutComponent';
 import { CrdtMessageType } from '../../serialization/crdt/types';
+import { PutNetworkComponentOperation } from '../../serialization/crdt/network/putComponentNetwork';
+import { NetworkEntity as defineNetworkEntity, NetworkParent as defineNetworkParent, Transform as defineTransform } from '../../components';
+import * as networkUtils from '../../serialization/crdt/network/utils';
+// NetworkMessages can only have a MAX_SIZE of 12kb. So we need to send it in chunks.
+export const LIVEKIT_MAX_SIZE = 12;
 /**
  * @internal
  */
 export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
     const transports = [];
-    // No network components needed - pure CRDT processing only
+    // Components that we used on this system
+    const NetworkEntity = defineNetworkEntity(engine);
+    const NetworkParent = defineNetworkParent(engine);
+    const Transform = defineTransform(engine);
     // Messages that we received at transport.onMessage waiting to be processed
     const receivedMessages = [];
     // Messages already processed by the engine but that we need to broadcast to other transports.
@@ -36,20 +43,27 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
                 if (header.type === CrdtMessageType.DELETE_COMPONENT) {
                     message = DeleteComponent.read(buffer);
                 }
+                else if (header.type === CrdtMessageType.DELETE_COMPONENT_NETWORK) {
+                    message = DeleteComponentNetwork.read(buffer);
+                }
                 else if (header.type === CrdtMessageType.PUT_COMPONENT) {
                     message = PutComponentOperation.read(buffer);
                 }
-                else if (header.type === CrdtMessageType.AUTHORITATIVE_PUT_COMPONENT) {
-                    message = AuthoritativePutComponentOperation.read(buffer);
+                else if (header.type === CrdtMessageType.PUT_COMPONENT_NETWORK) {
+                    message = PutNetworkComponentOperation.read(buffer);
                 }
                 else if (header.type === CrdtMessageType.DELETE_ENTITY) {
                     message = DeleteEntity.read(buffer);
                 }
+                else if (header.type === CrdtMessageType.DELETE_ENTITY_NETWORK) {
+                    message = DeleteEntityNetwork.read(buffer);
+                }
                 else if (header.type === CrdtMessageType.APPEND_VALUE) {
                     message = AppendValueOperation.read(buffer);
+                    // Unknown message, we skip it
                 }
                 else {
-                    // Unknown message, we skip it (including NETWORK messages)
+                    // consume the message
                     buffer.incrementReadOffset(header.length);
                 }
                 if (message) {
@@ -71,12 +85,20 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
         return messagesToProcess;
     }
     /**
-     * Reserved-range entities (root/player/camera + avatars, entity number <
-     * RESERVED_STATIC_ENTITIES) are host-owned: only a transport flagged with
-     * `allowReservedEntities` (the host/renderer) may mutate or delete them.
+     * Find the local entityId associated to the network component message.
+     * It's a mapping Network -> to Local
+     * If it's not a network message, return the entityId received by the message
      */
-    function isTrustedForReservedEntities(transportId) {
-        return transportId !== undefined && !!transports[transportId]?.allowReservedEntities;
+    function findNetworkId(msg) {
+        const hasNetworkId = 'networkId' in msg;
+        if (hasNetworkId) {
+            for (const [entityId, network] of engine.getEntitiesWith(NetworkEntity)) {
+                if (network.networkId === msg.networkId && network.entityId === msg.entityId) {
+                    return { entityId, network };
+                }
+            }
+        }
+        return { entityId: msg.entityId };
     }
     /**
      * This fn will be called on every tick.
@@ -86,68 +108,46 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
         const messagesToProcess = getMessages(receivedMessages);
         const entitiesShouldBeCleaned = [];
         for (const msg of messagesToProcess) {
-            // Simple CRDT processing - no network logic
-            if (msg.type === CrdtMessageType.DELETE_ENTITY) {
-                // Reject an inbound DELETE_ENTITY on a reserved entity from an untrusted
-                // transport (a comms peer, or a scene-added transport). The allocator half
-                // is already guarded (engine.removeEntity is a no-op on this range); this
-                // closes the receive-side half.
-                const isReserved = engine.entityContainer.getEntityState(msg.entityId) === EntityState.Reserved;
-                if (isReserved && !isTrustedForReservedEntities(msg.transportId)) {
-                    continue;
-                }
-                entitiesShouldBeCleaned.push(msg.entityId);
+            let { entityId, network } = findNetworkId(msg);
+            // We receive a new Entity. Create the localEntity and map it to the NetworkEntity component
+            if (networkUtils.isNetworkMessage(msg) && !network) {
+                entityId = engine.addEntity();
+                network = { entityId: msg.entityId, networkId: msg.networkId };
+                NetworkEntity.createOrReplace(entityId, network);
+            }
+            if (msg.type === CrdtMessageType.DELETE_ENTITY || msg.type === CrdtMessageType.DELETE_ENTITY_NETWORK) {
+                entitiesShouldBeCleaned.push(entityId);
                 broadcastMessages.push(msg);
             }
             else {
-                const entityState = engine.entityContainer.getEntityState(msg.entityId);
-                // Skip updates from removed entities
+                const entityState = engine.entityContainer.getEntityState(entityId);
+                // Skip updates from removed entityes
                 if (entityState === EntityState.Removed)
                     continue;
-                // Reject component operations (PUT/DELETE/APPEND, including AUTHORITATIVE_PUT
-                // which bypasses timestamps entirely) on reserved entities from untrusted
-                // transports. Dropping before updateFromCrdt keeps local LWW timestamps
-                // unpoisoned by forged high timestamps, and also prevents the
-                // unknown-component rebroadcast below from relaying forged reserved-entity
-                // data to other transports (including the renderer).
-                if (entityState === EntityState.Reserved && !isTrustedForReservedEntities(msg.transportId))
-                    continue;
-                // Entities with unknown state should update its entity state
+                // Entities with unknown entities should update its entity state
                 if (entityState === EntityState.Unknown) {
-                    engine.entityContainer.updateUsedEntity(msg.entityId);
-                }
-                // Only process component-related messages (not DELETE_ENTITY)
-                if ('componentId' in msg) {
-                    const component = engine.getComponentOrNull(msg.componentId);
-                    if (component) {
-                        // Handle authoritative messages differently - they force the state regardless of timestamp
-                        const tryUpdate = () => {
-                            try {
-                                return msg.type === CrdtMessageType.AUTHORITATIVE_PUT_COMPONENT
-                                    ? component.__forceUpdateFromCrdt(msg)
-                                    : component.updateFromCrdt(msg);
-                            }
-                            catch (e) {
-                                console.error('[receiveMessages] ERROR processing message', msg, e);
-                                return null;
-                            }
-                        };
-                        const result = tryUpdate();
-                        if (!result)
-                            continue;
-                        const [conflictMessage, value] = result;
-                        if (!conflictMessage) {
-                            // Add message to broadcast queue when no conflict
-                            broadcastMessages.push(msg);
-                            onProcessEntityComponentChange && onProcessEntityComponentChange(msg.entityId, msg.type, component, value);
-                        }
+                    engine.entityContainer.updateUsedEntity(entityId);
+                }
+                const component = engine.getComponentOrNull(msg.componentId);
+                /* istanbul ignore else */
+                if (component) {
+                    if (msg.type === CrdtMessageType.PUT_COMPONENT &&
+                        component.componentId === Transform.componentId &&
+                        NetworkEntity.has(entityId) &&
+                        NetworkParent.has(entityId)) {
+                        msg.data = networkUtils.fixTransformParent(msg);
                     }
-                    else {
-                        // Component not found - still broadcast for editor compatibility
-                        /* istanbul ignore next */
+                    const [conflictMessage, value] = component.updateFromCrdt({ ...msg, entityId });
+                    if (!conflictMessage) {
+                        // Add message to transport queue to be processed by others transports
                         broadcastMessages.push(msg);
+                        onProcessEntityComponentChange && onProcessEntityComponentChange(entityId, msg.type, component, value);
                     }
                 }
+                else {
+                    // TODO: test this line, it is fundammental to make the editor work
+                    broadcastMessages.push(msg);
+                }
             }
         }
         // the last stage of the syncrhonization is to delete the entities
@@ -161,17 +161,16 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
         }
     }
     /**
-     * Simple CRDT message broadcasting - no network-specific logic
+     * Iterates the dirty map and generates crdt messages to be send
      */
     async function sendMessages(entitiesDeletedThisTick) {
-        // Get messages from broadcast queue and component updates
+        // CRDT Messages will be the merge between the recieved transport messages and the new crdt messages
         const crdtMessages = getMessages(broadcastMessages);
         const buffer = new ReadWriteByteBuffer();
-        // Generate CRDT messages from component updates
         for (const component of engine.componentsIter()) {
             for (const message of component.getCrdtUpdates()) {
                 const offset = buffer.currentWriteOffset();
-                // Only create messages if there's a transport that will handle it
+                // Avoid creating messages if there is no transport that will handle it
                 if (transports.some((t) => t.filter(message))) {
                     if (message.type === CrdtMessageType.PUT_COMPONENT) {
                         PutComponentOperation.write(message.entityId, message.timestamp, message.componentId, message.data, buffer);
@@ -195,7 +194,7 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
                 }
             }
         }
-        // Handle deleted entities
+        // After all updates, I execute the DeletedEntity messages
         for (const entityId of entitiesDeletedThisTick) {
             const offset = buffer.currentWriteOffset();
             DeleteEntity.write(entityId, buffer);
@@ -206,19 +205,87 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
             });
             onProcessEntityComponentChange && onProcessEntityComponentChange(entityId, CrdtMessageType.DELETE_ENTITY);
         }
-        // Simple transport broadcasting - no network-specific transforms
-        for (const transport of transports) {
-            const transportBuffer = new ReadWriteByteBuffer();
+        // Send CRDT messages to transports
+        const transportBuffer = new ReadWriteByteBuffer();
+        for (const index in transports) {
+            const __NetworkMessagesBuffer = [];
+            const transportIndex = Number(index);
+            const transport = transports[transportIndex];
+            const isRendererTransport = transport.type === 'renderer';
+            const isNetworkTransport = transport.type === 'network';
+            // Reset Buffer for each Transport
+            transportBuffer.resetBuffer();
+            const buffer = new ReadWriteByteBuffer();
+            // Then we send all the new crdtMessages that the transport needs to process
             for (const message of crdtMessages) {
                 // Avoid echo messages
-                if (message.transportId === transports.indexOf(transport))
+                if (message.transportId === transportIndex)
                     continue;
-                // Check if transport wants this message
-                if (transport.filter(message)) {
-                    transportBuffer.writeBuffer(message.messageBuffer, false);
+                // Redundant message for the transport
+                if (!transport.filter(message))
+                    continue;
+                // Check if adding this message would exceed the size limit
+                const currentBufferSize = transportBuffer.toBinary().byteLength;
+                const messageSize = message.messageBuffer.byteLength;
+                if (isNetworkTransport && (currentBufferSize + messageSize) / 1024 > LIVEKIT_MAX_SIZE) {
+                    // If the current buffer has content, save it as a chunk
+                    if (currentBufferSize > 0) {
+                        __NetworkMessagesBuffer.push(transportBuffer.toCopiedBinary());
+                        transportBuffer.resetBuffer();
+                    }
+                    // If the message itself is larger than the limit, we need to handle it specially
+                    // For now, we'll skip it to prevent infinite loops
+                    if (messageSize / 1024 > LIVEKIT_MAX_SIZE) {
+                        console.error(`Message too large (${messageSize} bytes), skipping message for entity ${message.entityId}`);
+                        continue;
+                    }
                 }
+                const { entityId } = findNetworkId(message);
+                const transformNeedsFix = 'componentId' in message &&
+                    message.componentId === Transform.componentId &&
+                    Transform.has(entityId) &&
+                    NetworkParent.has(entityId) &&
+                    NetworkEntity.has(entityId);
+                // If there was a LOCAL change in the transform. Add the parent to that transform
+                if (isRendererTransport && message.type === CrdtMessageType.PUT_COMPONENT && transformNeedsFix) {
+                    const parent = findNetworkId(NetworkParent.get(entityId));
+                    const transformData = networkUtils.fixTransformParent(message, Transform.get(entityId), parent.entityId);
+                    const offset = buffer.currentWriteOffset();
+                    PutComponentOperation.write(entityId, message.timestamp, message.componentId, transformData, buffer);
+                    transportBuffer.writeBuffer(buffer.buffer().subarray(offset, buffer.currentWriteOffset()), false);
+                    continue;
+                }
+                if (isRendererTransport && networkUtils.isNetworkMessage(message)) {
+                    // If it's the renderer transport and its a NetworkMessage, we need to fix the entityId field and convert it to a known Message.
+                    // PUT_NETWORK_COMPONENT -> PUT_COMPONENT
+                    let transformData = 'data' in message ? message.data : new Uint8Array();
+                    if (transformNeedsFix) {
+                        const parent = findNetworkId(NetworkParent.get(entityId));
+                        transformData = networkUtils.fixTransformParent(message, Transform.get(entityId), parent.entityId);
+                    }
+                    networkUtils.networkMessageToLocal({ ...message, data: transformData }, entityId, buffer, transportBuffer);
+                    // Iterate the next message
+                    continue;
+                }
+                // If its a network transport and its a PUT_COMPONENT that has a NetworkEntity component, we need to send this message
+                // through comms with the EntityID and NetworkID from ther NetworkEntity so everyone can recieve this message and map to their custom entityID.
+                if (isNetworkTransport && !networkUtils.isNetworkMessage(message)) {
+                    const networkData = NetworkEntity.getOrNull(message.entityId);
+                    // If it has networkData convert the message to PUT_NETWORK_COMPONENT.
+                    if (networkData) {
+                        networkUtils.localMessageToNetwork(message, networkData, buffer, transportBuffer);
+                        // Iterate the next message
+                        continue;
+                    }
+                }
+                // Common message
+                transportBuffer.writeBuffer(message.messageBuffer, false);
+            }
+            if (isNetworkTransport && transportBuffer.currentWriteOffset()) {
+                __NetworkMessagesBuffer.push(transportBuffer.toBinary());
             }
-            await transport.send(transportBuffer.toBinary());
+            const message = isNetworkTransport ? __NetworkMessagesBuffer : transportBuffer.toBinary();
+            await transport.send(message);
         }
     }
     /**

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

@@ -29,14 +29,4 @@ export type Transport = {
     onmessage?(message: Uint8Array): void;
     filter(message: Omit<TransportMessage, 'messageBuffer'>): boolean;
     type?: string;
-    /**
-     * Whether this transport is allowed to mutate reserved-range entities
-     * (root/player/camera + avatars, entity number below `RESERVED_STATIC_ENTITIES`).
-     * Only the trusted host/renderer transport sets this. An inbound DELETE_ENTITY
-     * or component operation (PUT_COMPONENT, DELETE_COMPONENT, APPEND_VALUE,
-     * AUTHORITATIVE_PUT_COMPONENT) on a reserved entity from a transport without
-     * this flag (a comms peer, or any scene-added transport) is rejected — see
-     * `receiveMessages`.
-     */
-    allowReservedEntities?: boolean;
 };

package/dist/systems/events.d.ts

@@ -48,6 +48,24 @@ export interface PointerEventsSystem {
      * @param entity - Entity where the callback was attached
      */
     removeOnPointerHoverLeave(entity: Entity): void;
+    /**
+     * @public
+     * Remove the callback for onPointerDrag event
+     * @param entity - Entity where the callback was attached
+     */
+    removeOnPointerDrag(entity: Entity): void;
+    /**
+     * @public
+     * Remove the callback for onPointerDragLocked event
+     * @param entity - Entity where the callback was attached
+     */
+    removeOnPointerDragLocked(entity: Entity): void;
+    /**
+     * @public
+     * Remove the callback for onPointerDragEnd event
+     * @param entity - Entity where the callback was attached
+     */
+    removeOnPointerDragEnd(entity: Entity): void;
     /**
      * @public
      * Remove the callback for onProximityDown event
@@ -126,6 +144,36 @@ export interface PointerEventsSystem {
         entity: Entity;
         opts?: Partial<EventSystemOptions>;
     }, cb: EventSystemCallback): void;
+    /**
+     * @public
+     * Execute callback while the user holds the button pressed and moves the pointer, having pressed it on the entity
+     * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
+     * @param cb - Function to execute on every drag update
+     */
+    onPointerDrag(pointerData: {
+        entity: Entity;
+        opts?: Partial<EventSystemOptions>;
+    }, cb: EventSystemCallback): void;
+    /**
+     * @public
+     * Same as onPointerDrag, but the cursor is locked in place for the duration of the drag
+     * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
+     * @param cb - Function to execute on every drag update
+     */
+    onPointerDragLocked(pointerData: {
+        entity: Entity;
+        opts?: Partial<EventSystemOptions>;
+    }, cb: EventSystemCallback): void;
+    /**
+     * @public
+     * Execute callback when the user releases the button after a drag that started on the entity
+     * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
+     * @param cb - Function to execute when the drag ends
+     */
+    onPointerDragEnd(pointerData: {
+        entity: Entity;
+        opts?: Partial<EventSystemOptions>;
+    }, cb: EventSystemCallback): void;
     /**
      * @public
      * Execute callback when the user presses the proximity button on the entity

package/dist/systems/events.js

@@ -20,6 +20,9 @@ export function createPointerEventsSystem(engine, inputSystem) {
         EventType[EventType["HoverLeave"] = 4] = "HoverLeave";
         EventType[EventType["ProximityEnter"] = 5] = "ProximityEnter";
         EventType[EventType["ProximityLeave"] = 6] = "ProximityLeave";
+        EventType[EventType["Drag"] = 7] = "Drag";
+        EventType[EventType["DragLocked"] = 8] = "DragLocked";
+        EventType[EventType["DragEnd"] = 9] = "DragEnd";
     })(EventType || (EventType = {}));
     const eventsMap = new Map();
     function getEvent(entity) {
@@ -65,6 +68,15 @@ export function createPointerEventsSystem(engine, inputSystem) {
         else if (eventType === EventType.ProximityLeave) {
             return 5 /* PointerEventType.PET_PROXIMITY_LEAVE */;
         }
+        else if (eventType === EventType.Drag) {
+            return 7 /* PointerEventType.PET_DRAG */;
+        }
+        else if (eventType === EventType.DragLocked) {
+            return 6 /* PointerEventType.PET_DRAG_LOCKED */;
+        }
+        else if (eventType === EventType.DragEnd) {
+            return 8 /* PointerEventType.PET_DRAG_END */;
+        }
         return 1 /* PointerEventType.PET_DOWN */;
     }
     function removeEvent(entity, type, interactionType = 0 /* InteractionType.CURSOR */) {
@@ -92,7 +104,10 @@ export function createPointerEventsSystem(engine, inputSystem) {
                     eventType === EventType.HoverEnter ||
                     eventType === EventType.HoverLeave ||
                     eventType === EventType.ProximityEnter ||
-                    eventType === EventType.ProximityLeave) {
+                    eventType === EventType.ProximityLeave ||
+                    eventType === EventType.Drag ||
+                    eventType === EventType.DragLocked ||
+                    eventType === EventType.DragEnd) {
                     const command = inputSystem.getInputCommand(opts.button, getPointerEvent(eventType), entity);
                     if (command) {
                         checkNotThenable(cb(command), 'Event handler returned a thenable. Only synchronous functions are allowed');
@@ -139,6 +154,30 @@ export function createPointerEventsSystem(engine, inputSystem) {
         getEvent(entity).set(EventType.HoverLeave, { cb, opts: options });
         setPointerEvent(entity, 3 /* PointerEventType.PET_HOVER_LEAVE */, options);
     };
+    const onPointerDrag = (...args) => {
+        const [data, cb] = args;
+        const { entity, opts } = data;
+        const options = getDefaultOpts(opts);
+        removeEvent(entity, EventType.Drag);
+        getEvent(entity).set(EventType.Drag, { cb, opts: options });
+        setPointerEvent(entity, 7 /* PointerEventType.PET_DRAG */, options);
+    };
+    const onPointerDragLocked = (...args) => {
+        const [data, cb] = args;
+        const { entity, opts } = data;
+        const options = getDefaultOpts(opts);
+        removeEvent(entity, EventType.DragLocked);
+        getEvent(entity).set(EventType.DragLocked, { cb, opts: options });
+        setPointerEvent(entity, 6 /* PointerEventType.PET_DRAG_LOCKED */, options);
+    };
+    const onPointerDragEnd = (...args) => {
+        const [data, cb] = args;
+        const { entity, opts } = data;
+        const options = getDefaultOpts(opts);
+        removeEvent(entity, EventType.DragEnd);
+        getEvent(entity).set(EventType.DragEnd, { cb, opts: options });
+        setPointerEvent(entity, 8 /* PointerEventType.PET_DRAG_END */, options);
+    };
     const onProximityDown = (...args) => {
         const [data, cb] = args;
         const { entity, opts } = data;
@@ -187,6 +226,15 @@ export function createPointerEventsSystem(engine, inputSystem) {
         removeOnPointerHoverLeave(entity) {
             removeEvent(entity, EventType.HoverLeave);
         },
+        removeOnPointerDrag(entity) {
+            removeEvent(entity, EventType.Drag);
+        },
+        removeOnPointerDragLocked(entity) {
+            removeEvent(entity, EventType.DragLocked);
+        },
+        removeOnPointerDragEnd(entity) {
+            removeEvent(entity, EventType.DragEnd);
+        },
         removeOnProximityDown(entity) {
             removeEvent(entity, EventType.Down, 1 /* InteractionType.PROXIMITY */);
         },
@@ -212,6 +260,9 @@ export function createPointerEventsSystem(engine, inputSystem) {
         onPointerUp,
         onPointerHoverEnter,
         onPointerHoverLeave,
+        onPointerDrag,
+        onPointerDragLocked,
+        onPointerDragEnd,
         onProximityDown,
         onProximityUp,
         onProximityEnter,

package/dist/systems/raycast.d.ts

@@ -1,4 +1,4 @@
-import { RaycastQueryType, PBRaycastResult } from '../components';
+import { RaycastQueryType, RaycastShape, PBRaycastResult } from '../components';
 import { DeepReadonlyObject, Entity } from '../engine';
 import { Vector3 } from '../components/generated/pb/decentraland/common/vectors.gen';
 /**
@@ -14,6 +14,10 @@ export type RaycastSystemOptions = {
     queryType: RaycastQueryType;
     continuous?: boolean | undefined;
     collisionMask?: number | undefined;
+    /** shape to sweep along the ray, default RS_RAY (a point) */
+    shape?: RaycastShape | undefined;
+    /** include colliders from other scenes, default false */
+    includeWorld?: boolean | undefined;
 };
 export type LocalDirectionRaycastSystemOptions = {
     direction?: Vector3;

package/dist/systems/raycast.js

@@ -12,7 +12,9 @@ export function createRaycastSystem(engine) {
         queryType: 0 /* RaycastQueryType.RQT_HIT_FIRST */,
         continuous: false,
         originOffset: { x: 0, y: 0, z: 0 },
-        collisionMask: 2 /* ColliderLayer.CL_PHYSICS */
+        collisionMask: 2 /* ColliderLayer.CL_PHYSICS */,
+        shape: 0 /* RaycastShape.RS_RAY */,
+        includeWorld: false
     };
     const getLocalDirectionRaycastDefaultOptions = (options = {}) => ({
         ...defaultOptions,
@@ -58,6 +60,8 @@ export function createRaycastSystem(engine) {
             raycast.direction = raycastValue.directionRawValue;
             raycast.continuous = raycastValue.continuous;
             raycast.queryType = raycastValue.queryType;
+            raycast.shape = raycastValue.shape;
+            raycast.includeWorld = raycastValue.includeWorld;
             entitiesCallbackResultMap.set(entity, { callback: callback });
         };
         nextTickRaycasts.push(onNextTick);

package/dist-cjs/components/extended/AvatarEquippedData.d.ts

@@ -0,0 +1,15 @@
+import { IEngine, LastWriteWinElementSetComponentDefinition } from '../../engine';
+import { PBAvatarEquippedData } from '../generated/pb/decentraland/sdk/components/avatar_equipped_data.gen';
+/**
+ * @public
+ * AvatarEquippedData with `forceRender` optional: the wire type is a repeated field (always present, so the
+ * generated type requires it), but a scene rarely needs it and shouldn't have to pass `[]`.
+ */
+export type AvatarEquippedDataType = Omit<PBAvatarEquippedData, 'forceRender'> & {
+    forceRender?: string[] | undefined;
+};
+/**
+ * @public
+ */
+export type AvatarEquippedDataComponentDefinitionExtended = LastWriteWinElementSetComponentDefinition<AvatarEquippedDataType>;
+export declare function defineAvatarEquippedDataComponent(engine: Pick<IEngine, 'defineComponentFromSchema'>): AvatarEquippedDataComponentDefinitionExtended;

package/dist-cjs/components/extended/AvatarEquippedData.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.defineAvatarEquippedDataComponent = void 0;
+const AvatarEquippedData_gen_1 = require("../generated/AvatarEquippedData.gen");
+function defineAvatarEquippedDataComponent(engine) {
+    const patchedSchema = { ...AvatarEquippedData_gen_1.AvatarEquippedDataSchema };
+    const origSerialize = patchedSchema.serialize;
+    patchedSchema.serialize = (value, builder) => {
+        origSerialize(value.forceRender === undefined ? { ...value, forceRender: [] } : value, builder);
+    };
+    const theComponent = engine.defineComponentFromSchema('core::AvatarEquippedData', patchedSchema);
+    return theComponent;
+}
+exports.defineAvatarEquippedDataComponent = defineAvatarEquippedDataComponent;

package/dist-cjs/components/extended/AvatarShape.d.ts

@@ -0,0 +1,15 @@
+import { IEngine, LastWriteWinElementSetComponentDefinition } from '../../engine';
+import { PBAvatarShape } from '../generated/pb/decentraland/sdk/components/avatar_shape.gen';
+/**
+ * @public
+ * AvatarShape with `forceRender` optional: the wire type is a repeated field (always present, so the
+ * generated type requires it), but a scene rarely needs it and shouldn't have to pass `[]`.
+ */
+export type AvatarShapeType = Omit<PBAvatarShape, 'forceRender'> & {
+    forceRender?: string[] | undefined;
+};
+/**
+ * @public
+ */
+export type AvatarShapeComponentDefinitionExtended = LastWriteWinElementSetComponentDefinition<AvatarShapeType>;
+export declare function defineAvatarShapeComponent(engine: Pick<IEngine, 'defineComponentFromSchema'>): AvatarShapeComponentDefinitionExtended;

package/dist-cjs/components/extended/AvatarShape.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.defineAvatarShapeComponent = void 0;
+const AvatarShape_gen_1 = require("../generated/AvatarShape.gen");
+function defineAvatarShapeComponent(engine) {
+    const patchedSchema = { ...AvatarShape_gen_1.AvatarShapeSchema };
+    const origSerialize = patchedSchema.serialize;
+    patchedSchema.serialize = (value, builder) => {
+        origSerialize(value.forceRender === undefined ? { ...value, forceRender: [] } : value, builder);
+    };
+    const theComponent = engine.defineComponentFromSchema('core::AvatarShape', patchedSchema);
+    return theComponent;
+}
+exports.defineAvatarShapeComponent = defineAvatarShapeComponent;

package/dist-cjs/components/extended/MeshCollider.d.ts

@@ -34,5 +34,14 @@ export interface MeshColliderComponentDefinitionExtended extends LastWriteWinEle
      * @param colliderMask - the set of layer where the collider reacts, default: Physics and Pointer
      */
     setSphere(entity: Entity, colliderLayers?: ColliderLayer | ColliderLayer[]): void;
+    /**
+     * @public
+     * Set a mesh from inside a gltf in the MeshCollider component
+     * @param entity - entity to create or replace the MeshCollider component
+     * @param source - the path to the gltf
+     * @param meshName - the name of the mesh in the gltf (see GltfContainerLoadingState.meshNames)
+     * @param colliderMask - the set of layer where the collider reacts, default: Physics and Pointer
+     */
+    setGltfMesh(entity: Entity, source: string, meshName: string, colliderLayers?: ColliderLayer | ColliderLayer[]): void;
 }
 export declare function defineMeshColliderComponent(engine: Pick<IEngine, 'defineComponentFromSchema'>): MeshColliderComponentDefinitionExtended;

package/dist-cjs/components/extended/MeshCollider.js

@@ -37,6 +37,12 @@ function defineMeshColliderComponent(engine) {
                 mesh: { $case: 'sphere', sphere: {} },
                 collisionMask: getCollisionMask(colliderLayers)
             });
+        },
+        setGltfMesh(entity, source, meshName, colliderLayers) {
+            theComponent.createOrReplace(entity, {
+                mesh: { $case: 'gltf', gltf: { gltfSrc: source, name: meshName } },
+                collisionMask: getCollisionMask(colliderLayers)
+            });
         }
     };
 }

package/dist-cjs/components/extended/MeshRenderer.d.ts

@@ -32,5 +32,13 @@ export interface MeshRendererComponentDefinitionExtended extends LastWriteWinEle
      * @param entity - entity to create or replace the MeshRenderer component
      */
     setSphere(entity: Entity): void;
+    /**
+     * @public
+     * Set a mesh from inside a gltf in the MeshRenderer component
+     * @param entity - entity to create or replace the MeshRenderer component
+     * @param source - the path to the gltf
+     * @param meshName - the name of the mesh in the gltf (see GltfContainerLoadingState.meshNames)
+     */
+    setGltfMesh(entity: Entity, source: string, meshName: string): void;
 }
 export declare function defineMeshRendererComponent(engine: Pick<IEngine, 'defineComponentFromSchema'>): MeshRendererComponentDefinitionExtended;

package/dist-cjs/components/extended/MeshRenderer.js

@@ -25,6 +25,11 @@ function defineMeshRendererComponent(engine) {
             theComponent.createOrReplace(entity, {
                 mesh: { $case: 'sphere', sphere: {} }
             });
+        },
+        setGltfMesh(entity, source, meshName) {
+            theComponent.createOrReplace(entity, {
+                mesh: { $case: 'gltf', gltf: { gltfSrc: source, name: meshName } }
+            });
         }
     };
 }

package/dist-cjs/components/generated/AvatarMovement.gen.d.ts

@@ -0,0 +1 @@
+export {};