@dcl/ecs 7.22.6-25007982108.commit-83012ab → 7.22.6-25321038582.commit-63ddb3f

package/dist-cjs/serialization/crdt/authoritativePutComponent.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AuthoritativePutComponentOperation = void 0;
+const crdtMessageProtocol_1 = require("./crdtMessageProtocol");
+const types_1 = require("./types");
+/**
+ * @public
+ */
+var AuthoritativePutComponentOperation;
+(function (AuthoritativePutComponentOperation) {
+    AuthoritativePutComponentOperation.MESSAGE_HEADER_LENGTH = 16;
+    /**
+     * Call this function for an optimal writing data passing the ByteBuffer
+     *  already allocated
+     */
+    function write(entity, timestamp, componentId, data, buf) {
+        // reserve the beginning
+        const startMessageOffset = buf.incrementWriteOffset(types_1.CRDT_MESSAGE_HEADER_LENGTH + AuthoritativePutComponentOperation.MESSAGE_HEADER_LENGTH);
+        // write body
+        buf.writeBuffer(data, false);
+        const messageLength = buf.currentWriteOffset() - startMessageOffset;
+        // Write CrdtMessage header
+        buf.setUint32(startMessageOffset, messageLength);
+        buf.setUint32(startMessageOffset + 4, types_1.CrdtMessageType.AUTHORITATIVE_PUT_COMPONENT);
+        // Write ComponentOperation header
+        buf.setUint32(startMessageOffset + 8, entity);
+        buf.setUint32(startMessageOffset + 12, componentId);
+        buf.setUint32(startMessageOffset + 16, timestamp);
+        const newLocal = messageLength - AuthoritativePutComponentOperation.MESSAGE_HEADER_LENGTH - types_1.CRDT_MESSAGE_HEADER_LENGTH;
+        buf.setUint32(startMessageOffset + 20, newLocal);
+    }
+    AuthoritativePutComponentOperation.write = write;
+    function read(buf) {
+        const header = crdtMessageProtocol_1.CrdtMessageProtocol.readHeader(buf);
+        if (!header) {
+            return null;
+        }
+        if (header.type !== types_1.CrdtMessageType.AUTHORITATIVE_PUT_COMPONENT) {
+            throw new Error('AuthoritativePutComponentOperation tried to read another message type.');
+        }
+        return {
+            ...header,
+            entityId: buf.readUint32(),
+            componentId: buf.readUint32(),
+            timestamp: buf.readUint32(),
+            data: buf.readBuffer()
+        };
+    }
+    AuthoritativePutComponentOperation.read = read;
+})(AuthoritativePutComponentOperation = exports.AuthoritativePutComponentOperation || (exports.AuthoritativePutComponentOperation = {}));

package/dist-cjs/serialization/crdt/index.d.ts

@@ -7,3 +7,4 @@ export * from './network/deleteComponentNetwork';
 export * from './network/deleteEntityNetwork';
 export * from './types';
 export * from './crdtMessageProtocol';
+export * from './authoritativePutComponent';

package/dist-cjs/serialization/crdt/index.js

@@ -23,3 +23,4 @@ __exportStar(require("./network/deleteComponentNetwork"), exports);
 __exportStar(require("./network/deleteEntityNetwork"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./crdtMessageProtocol"), exports);
+__exportStar(require("./authoritativePutComponent"), exports);

package/dist-cjs/serialization/crdt/types.d.ts

@@ -11,7 +11,8 @@ export declare enum CrdtMessageType {
     PUT_COMPONENT_NETWORK = 5,
     DELETE_COMPONENT_NETWORK = 6,
     DELETE_ENTITY_NETWORK = 7,
-    MAX_MESSAGE_TYPE = 8
+    AUTHORITATIVE_PUT_COMPONENT = 8,
+    MAX_MESSAGE_TYPE = 9
 }
 /**
  * Min length = 8 bytes
@@ -48,6 +49,23 @@ export type PutNetworkComponentMessageBody = Omit<PutComponentMessageBody, 'type
     type: CrdtMessageType.PUT_COMPONENT_NETWORK;
     networkId: number;
 };
+/**
+ * Server authoritative message - identical to PutComponentMessageBody but with forced processing
+ * Min. length = header (8 bytes) + 16 bytes = 24 bytes
+ *
+ * @param entity - Uint32 number of the entity
+ * @param componentId - Uint32 number of id
+ * @param timestamp - Uint32 Lamport timestamp (server's authoritative timestamp)
+ * @param data - Uint8[] data of component => length(4 bytes) + block of bytes[0..length-1]
+ * @public
+ */
+export type AuthoritativePutComponentMessageBody = {
+    type: CrdtMessageType.AUTHORITATIVE_PUT_COMPONENT;
+    entityId: Entity;
+    componentId: number;
+    timestamp: number;
+    data: Uint8Array;
+};
 /**
  * Min. length = header (8 bytes) + 16 bytes = 24 bytes
  *
@@ -114,6 +132,10 @@ export type AppendValueMessage = CrdtMessageHeader & AppendValueMessageBody;
  * @public
  */
 export type PutComponentMessage = CrdtMessageHeader & PutComponentMessageBody;
+/**
+ * @public
+ */
+export type AuthoritativePutComponentMessage = CrdtMessageHeader & AuthoritativePutComponentMessageBody;
 /**
  * @public
  */
@@ -137,7 +159,7 @@ export type DeleteEntityNetworkMessage = CrdtMessageHeader & DeleteEntityNetwork
 /**
  * @public
  */
-export type CrdtMessage = PutComponentMessage | DeleteComponentMessage | AppendValueMessage | DeleteEntityMessage | PutNetworkComponentMessage | DeleteComponentNetworkMessage | DeleteEntityNetworkMessage;
+export type CrdtMessage = PutComponentMessage | AuthoritativePutComponentMessage | DeleteComponentMessage | AppendValueMessage | DeleteEntityMessage | PutNetworkComponentMessage | DeleteComponentNetworkMessage | DeleteEntityNetworkMessage;
 /**
  * @public
  */
@@ -145,7 +167,7 @@ export type CrdtNetworkMessageBody = PutNetworkComponentMessageBody | DeleteComp
 /**
  * @public
  */
-export type CrdtMessageBody = PutComponentMessageBody | DeleteComponentMessageBody | DeleteEntityMessageBody | AppendValueMessageBody | CrdtNetworkMessageBody;
+export type CrdtMessageBody = PutComponentMessageBody | AuthoritativePutComponentMessageBody | DeleteComponentMessageBody | DeleteEntityMessageBody | AppendValueMessageBody | CrdtNetworkMessageBody;
 export declare enum ProcessMessageResultType {
     /**
      * Typical message and new state set.

package/dist-cjs/serialization/crdt/types.js

@@ -16,7 +16,9 @@ var CrdtMessageType;
     CrdtMessageType[CrdtMessageType["PUT_COMPONENT_NETWORK"] = 5] = "PUT_COMPONENT_NETWORK";
     CrdtMessageType[CrdtMessageType["DELETE_COMPONENT_NETWORK"] = 6] = "DELETE_COMPONENT_NETWORK";
     CrdtMessageType[CrdtMessageType["DELETE_ENTITY_NETWORK"] = 7] = "DELETE_ENTITY_NETWORK";
-    CrdtMessageType[CrdtMessageType["MAX_MESSAGE_TYPE"] = 8] = "MAX_MESSAGE_TYPE";
+    // Server authoritative operation - forces component state regardless of timestamp
+    CrdtMessageType[CrdtMessageType["AUTHORITATIVE_PUT_COMPONENT"] = 8] = "AUTHORITATIVE_PUT_COMPONENT";
+    CrdtMessageType[CrdtMessageType["MAX_MESSAGE_TYPE"] = 9] = "MAX_MESSAGE_TYPE";
 })(CrdtMessageType = exports.CrdtMessageType || (exports.CrdtMessageType = {}));
 /**
  * @public

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

@@ -1,7 +1,6 @@
 import { Entity } from '../../engine/entity';
 import type { ComponentDefinition } from '../../engine';
 import { CrdtMessageType } from '../../serialization/crdt/types';
-export declare const LIVEKIT_MAX_SIZE = 12;
 /**
  * @public
  */

package/dist-cjs/systems/crdt/index.js

@@ -1,50 +1,20 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.crdtSceneSystem = exports.LIVEKIT_MAX_SIZE = void 0;
+exports.crdtSceneSystem = void 0;
 const entity_1 = require("../../engine/entity");
 const ByteBuffer_1 = require("../../serialization/ByteBuffer");
 const crdt_1 = require("../../serialization/crdt");
 const deleteComponent_1 = require("../../serialization/crdt/deleteComponent");
 const deleteEntity_1 = require("../../serialization/crdt/deleteEntity");
 const putComponent_1 = require("../../serialization/crdt/putComponent");
+const authoritativePutComponent_1 = require("../../serialization/crdt/authoritativePutComponent");
 const types_1 = require("../../serialization/crdt/types");
-const putComponentNetwork_1 = require("../../serialization/crdt/network/putComponentNetwork");
-const components_1 = require("../../components");
-const networkUtils = __importStar(require("../../serialization/crdt/network/utils"));
-// NetworkMessages can only have a MAX_SIZE of 12kb. So we need to send it in chunks.
-exports.LIVEKIT_MAX_SIZE = 12;
 /**
  * @internal
  */
 function crdtSceneSystem(engine, onProcessEntityComponentChange) {
     const transports = [];
-    // Components that we used on this system
-    const NetworkEntity = (0, components_1.NetworkEntity)(engine);
-    const NetworkParent = (0, components_1.NetworkParent)(engine);
-    const Transform = (0, components_1.Transform)(engine);
+    // No network components needed - pure CRDT processing only
     // 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.
@@ -69,27 +39,20 @@ function crdtSceneSystem(engine, onProcessEntityComponentChange) {
                 if (header.type === types_1.CrdtMessageType.DELETE_COMPONENT) {
                     message = deleteComponent_1.DeleteComponent.read(buffer);
                 }
-                else if (header.type === types_1.CrdtMessageType.DELETE_COMPONENT_NETWORK) {
-                    message = crdt_1.DeleteComponentNetwork.read(buffer);
-                }
                 else if (header.type === types_1.CrdtMessageType.PUT_COMPONENT) {
                     message = putComponent_1.PutComponentOperation.read(buffer);
                 }
-                else if (header.type === types_1.CrdtMessageType.PUT_COMPONENT_NETWORK) {
-                    message = putComponentNetwork_1.PutNetworkComponentOperation.read(buffer);
+                else if (header.type === types_1.CrdtMessageType.AUTHORITATIVE_PUT_COMPONENT) {
+                    message = authoritativePutComponent_1.AuthoritativePutComponentOperation.read(buffer);
                 }
                 else if (header.type === types_1.CrdtMessageType.DELETE_ENTITY) {
                     message = deleteEntity_1.DeleteEntity.read(buffer);
                 }
-                else if (header.type === types_1.CrdtMessageType.DELETE_ENTITY_NETWORK) {
-                    message = crdt_1.DeleteEntityNetwork.read(buffer);
-                }
                 else if (header.type === types_1.CrdtMessageType.APPEND_VALUE) {
                     message = crdt_1.AppendValueOperation.read(buffer);
-                    // Unknown message, we skip it
                 }
                 else {
-                    // consume the message
+                    // Unknown message, we skip it (including NETWORK messages)
                     buffer.incrementReadOffset(header.length);
                 }
                 if (message) {
@@ -110,22 +73,6 @@ function crdtSceneSystem(engine, onProcessEntityComponentChange) {
         const messagesToProcess = value.splice(0, value.length);
         return messagesToProcess;
     }
-    /**
-     * 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 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.
      * Process all the messages queue received by the transport
@@ -134,46 +81,52 @@ function crdtSceneSystem(engine, onProcessEntityComponentChange) {
         const messagesToProcess = getMessages(receivedMessages);
         const entitiesShouldBeCleaned = [];
         for (const msg of messagesToProcess) {
-            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 === types_1.CrdtMessageType.DELETE_ENTITY || msg.type === types_1.CrdtMessageType.DELETE_ENTITY_NETWORK) {
-                entitiesShouldBeCleaned.push(entityId);
+            // Simple CRDT processing - no network logic
+            if (msg.type === types_1.CrdtMessageType.DELETE_ENTITY) {
+                entitiesShouldBeCleaned.push(msg.entityId);
                 broadcastMessages.push(msg);
             }
             else {
-                const entityState = engine.entityContainer.getEntityState(entityId);
-                // Skip updates from removed entityes
+                const entityState = engine.entityContainer.getEntityState(msg.entityId);
+                // Skip updates from removed entities
                 if (entityState === entity_1.EntityState.Removed)
                     continue;
-                // Entities with unknown entities should update its entity state
+                // Entities with unknown state should update its entity state
                 if (entityState === entity_1.EntityState.Unknown) {
-                    engine.entityContainer.updateUsedEntity(entityId);
-                }
-                const component = engine.getComponentOrNull(msg.componentId);
-                /* istanbul ignore else */
-                if (component) {
-                    if (msg.type === types_1.CrdtMessageType.PUT_COMPONENT &&
-                        component.componentId === Transform.componentId &&
-                        NetworkEntity.has(entityId) &&
-                        NetworkParent.has(entityId)) {
-                        msg.data = networkUtils.fixTransformParent(msg);
+                    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 === types_1.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);
+                        }
                     }
-                    const [conflictMessage, value] = component.updateFromCrdt({ ...msg, entityId });
-                    if (!conflictMessage) {
-                        // Add message to transport queue to be processed by others transports
+                    else {
+                        // Component not found - still broadcast for editor compatibility
+                        /* istanbul ignore next */
                         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
@@ -187,16 +140,17 @@ function crdtSceneSystem(engine, onProcessEntityComponentChange) {
         }
     }
     /**
-     * Iterates the dirty map and generates crdt messages to be send
+     * Simple CRDT message broadcasting - no network-specific logic
      */
     async function sendMessages(entitiesDeletedThisTick) {
-        // CRDT Messages will be the merge between the recieved transport messages and the new crdt messages
+        // Get messages from broadcast queue and component updates
         const crdtMessages = getMessages(broadcastMessages);
         const buffer = new ByteBuffer_1.ReadWriteByteBuffer();
+        // Generate CRDT messages from component updates
         for (const component of engine.componentsIter()) {
             for (const message of component.getCrdtUpdates()) {
                 const offset = buffer.currentWriteOffset();
-                // Avoid creating messages if there is no transport that will handle it
+                // Only create messages if there's a transport that will handle it
                 if (transports.some((t) => t.filter(message))) {
                     if (message.type === types_1.CrdtMessageType.PUT_COMPONENT) {
                         putComponent_1.PutComponentOperation.write(message.entityId, message.timestamp, message.componentId, message.data, buffer);
@@ -220,7 +174,7 @@ function crdtSceneSystem(engine, onProcessEntityComponentChange) {
                 }
             }
         }
-        // After all updates, I execute the DeletedEntity messages
+        // Handle deleted entities
         for (const entityId of entitiesDeletedThisTick) {
             const offset = buffer.currentWriteOffset();
             deleteEntity_1.DeleteEntity.write(entityId, buffer);
@@ -231,87 +185,19 @@ function crdtSceneSystem(engine, onProcessEntityComponentChange) {
             });
             onProcessEntityComponentChange && onProcessEntityComponentChange(entityId, types_1.CrdtMessageType.DELETE_ENTITY);
         }
-        // Send CRDT messages to transports
-        const transportBuffer = new ByteBuffer_1.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 ByteBuffer_1.ReadWriteByteBuffer();
-            // Then we send all the new crdtMessages that the transport needs to process
+        // Simple transport broadcasting - no network-specific transforms
+        for (const transport of transports) {
+            const transportBuffer = new ByteBuffer_1.ReadWriteByteBuffer();
             for (const message of crdtMessages) {
-                // 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 > exports.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 > exports.LIVEKIT_MAX_SIZE) {
-                        console.error(`Message too large (${messageSize} bytes), skipping message for entity ${message.entityId}`);
-                        continue;
-                    }
-                }
                 // Avoid echo messages
-                if (message.transportId === transportIndex)
-                    continue;
-                // Redundant message for the transport
-                if (!transport.filter(message))
-                    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 === types_1.CrdtMessageType.PUT_COMPONENT && transformNeedsFix) {
-                    const parent = findNetworkId(NetworkParent.get(entityId));
-                    const transformData = networkUtils.fixTransformParent(message, Transform.get(entityId), parent.entityId);
-                    const offset = buffer.currentWriteOffset();
-                    putComponent_1.PutComponentOperation.write(entityId, message.timestamp, message.componentId, transformData, buffer);
-                    transportBuffer.writeBuffer(buffer.buffer().subarray(offset, buffer.currentWriteOffset()), false);
+                if (message.transportId === transports.indexOf(transport))
                     continue;
+                // Check if transport wants this message
+                if (transport.filter(message)) {
+                    transportBuffer.writeBuffer(message.messageBuffer, false);
                 }
-                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());
             }
-            const message = isNetworkTransport ? __NetworkMessagesBuffer : transportBuffer.toBinary();
-            await transport.send(message);
+            await transport.send(transportBuffer.toBinary());
         }
     }
     /**

package/dist-cjs/systems/events.d.ts

@@ -17,12 +17,7 @@ export type EventSystemOptions = {
     showFeedback?: boolean;
     showHighlight?: boolean;
     maxPlayerDistance?: number;
-};
-/**
- * @public
- */
-export type EventSystemOptionsCallback = EventSystemOptions & {
-    cb: EventSystemCallback;
+    priority?: number;
 };
 export declare const getDefaultOpts: (opts?: Partial<EventSystemOptions>) => EventSystemOptions;
 /**
@@ -55,35 +50,33 @@ export interface PointerEventsSystem {
     removeOnPointerHoverLeave(entity: Entity): void;
     /**
      * @public
-     * Remove the callback for onPointerDrag event
+     * Remove the callback for onProximityDown event
      * @param entity - Entity where the callback was attached
      */
-    removeOnPointerDrag(entity: Entity): void;
+    removeOnProximityDown(entity: Entity): void;
     /**
      * @public
-     * Remove the callback for onPointerDragLocked event
+     * Remove the callback for onProximityUp event
      * @param entity - Entity where the callback was attached
      */
-    removeOnPointerDragLocked(entity: Entity): void;
+    removeOnProximityUp(entity: Entity): void;
     /**
      * @public
-     * Remove the callback for onPointerDragEnd event
+     * Remove the callback for onProximityEnter event
      * @param entity - Entity where the callback was attached
      */
-    removeOnPointerDragEnd(entity: Entity): void;
+    removeOnProximityEnter(entity: Entity): void;
     /**
      * @public
-     * Execute callbacks when the user presses one of the InputButtons pointing at the entity
-     * @param pointerData - Entity to attach the callbacks, list of options to trigger Feedback, Button, and Callback
+     * Remove the callback for onProximityLeave event
+     * @param entity - Entity where the callback was attached
      */
-    onPointerDown(pointerData: {
-        entity: Entity;
-        optsList: EventSystemOptionsCallback[];
-    }): void;
+    removeOnProximityLeave(entity: Entity): void;
     /**
      * @public
      * Execute callback when the user press the InputButton pointing at the entity
      * @param pointerData - Entity to attach the callback, Opts to trigger Feedback and Button
+     * @param cb - Function to execute when click fires
      */
     onPointerDown(pointerData: {
         entity: Entity;
@@ -96,15 +89,6 @@ export interface PointerEventsSystem {
      * @param opts - Opts to trigger Feedback and Button
      */
     onPointerDown(entity: Entity, cb: EventSystemCallback, opts?: Partial<EventSystemOptions>): void;
-    /**
-     * @public
-     * Execute callbacks when the user releases one of the InputButtons pointing at the entity
-     * @param pointerData - Entity to attach the callbacks, list of options to trigger Feedback, Button, and Callback
-     */
-    onPointerUp(pointerData: {
-        entity: Entity;
-        optsList: EventSystemOptionsCallback[];
-    }): void;
     /**
      * @public
      * Execute callback when the user releases the InputButton pointing at the entity
@@ -144,59 +128,41 @@ export interface PointerEventsSystem {
     }, cb: EventSystemCallback): void;
     /**
      * @public
-     * Execute callbacks when the user drags the pointer from inside the entity
-     * @param pointerData - Entity to attach the callbacks, list of options to trigger Feedback, Button, and Callback
-     */
-    onPointerDrag(pointerData: {
-        entity: Entity;
-        optsList: EventSystemOptionsCallback[];
-    }): void;
-    /**
-     * @public
-     * Execute callback when the user clicks and drags the pointer from inside the entity
+     * Execute callback when the user presses the proximity button on the entity
      * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
      * @param cb - Function to execute when click fires
      */
-    onPointerDrag(pointerData: {
+    onProximityDown(pointerData: {
         entity: Entity;
         opts?: Partial<EventSystemOptions>;
     }, cb: EventSystemCallback): void;
     /**
      * @public
-     * Execute callbacks when the user drags the pointer from inside the entity, locking the cursor in place.
-     * @param pointerData - Entity to attach the callbacks, list of options to trigger Feedback, Button, and Callback
-     */
-    onPointerDragLocked(pointerData: {
-        entity: Entity;
-        optsList: EventSystemOptionsCallback[];
-    }): void;
-    /**
-     * @public
-     * Execute callback when the user clicks and drags the pointer from inside the entity,
-     * locking the cursor in place
+     * Execute callback when the user releases the proximity button on the entity
      * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
-     * @param cb - Function to execute when click fires
+     * @param cb - Function to execute when event fires
      */
-    onPointerDragLocked(pointerData: {
+    onProximityUp(pointerData: {
         entity: Entity;
         opts?: Partial<EventSystemOptions>;
     }, cb: EventSystemCallback): void;
     /**
      * @public
-     * Execute callbacks when the user releases a button after a drag
-     * @param pointerData - Entity to attach the callbacks, list of options to trigger Feedback, Button, and Callback
+     * Execute callback when the entity enters the proximity zone of the user
+     * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
+     * @param cb - Function to execute when event fires
      */
-    onPointerDragEnd(pointerData: {
+    onProximityEnter(pointerData: {
         entity: Entity;
-        optsList: EventSystemOptionsCallback[];
-    }): void;
+        opts?: Partial<EventSystemOptions>;
+    }, cb: EventSystemCallback): void;
     /**
      * @public
-     * Execute callback when the user releases the button after a drag
+     * Execute callback when the entity leaves the proximity zone of the user
      * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
-     * @param cb - Function to execute when click fires
+     * @param cb - Function to execute when event fires
      */
-    onPointerDragEnd(pointerData: {
+    onProximityLeave(pointerData: {
         entity: Entity;
         opts?: Partial<EventSystemOptions>;
     }, cb: EventSystemCallback): void;