@dcl/ecs 7.22.4 → 7.22.5-24776890516.commit-b10e9ab

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (121) hide show
  1. package/dist/components/generated/component-names.gen.js +0 -1
  2. package/dist/components/generated/global.gen.d.ts +0 -2
  3. package/dist/components/generated/global.gen.js +0 -1
  4. package/dist/components/generated/index.gen.d.ts +0 -4
  5. package/dist/components/generated/index.gen.js +0 -5
  6. package/dist/components/generated/pb/decentraland/common/colors.gen.d.ts +0 -15
  7. package/dist/components/generated/pb/decentraland/common/colors.gen.js +0 -47
  8. package/dist/components/generated/pb/decentraland/sdk/components/common/input_action.gen.d.ts +1 -10
  9. package/dist/components/generated/pb/decentraland/sdk/components/common/input_action.gen.js +0 -10
  10. package/dist/components/generated/pb/decentraland/sdk/components/pointer_events.gen.d.ts +1 -5
  11. package/dist/components/generated/pb/decentraland/sdk/components/pointer_events.gen.js +1 -20
  12. package/dist/components/generated/types.gen.d.ts +0 -2
  13. package/dist/components/generated/types.gen.js +0 -3
  14. package/dist/components/index.d.ts +5 -2
  15. package/dist/components/index.js +5 -5
  16. package/dist/components/manual/CreatedBy.d.ts +9 -0
  17. package/dist/components/manual/CreatedBy.js +8 -0
  18. package/dist/components/manual/Transform.d.ts +9 -13
  19. package/dist/components/manual/Transform.js +3 -11
  20. package/dist/components/types.d.ts +1 -1
  21. package/dist/engine/component.d.ts +52 -1
  22. package/dist/engine/grow-only-value-set-component-definition.js +45 -2
  23. package/dist/engine/lww-element-set-component-definition.d.ts +5 -3
  24. package/dist/engine/lww-element-set-component-definition.js +70 -35
  25. package/dist/index.d.ts +2 -3
  26. package/dist/index.js +1 -3
  27. package/dist/runtime/helpers/index.d.ts +0 -1
  28. package/dist/runtime/helpers/index.js +0 -1
  29. package/dist/runtime/helpers/tree.d.ts +0 -6
  30. package/dist/runtime/helpers/tree.js +2 -2
  31. package/dist/runtime/initialization/index.d.ts +0 -7
  32. package/dist/runtime/initialization/index.js +0 -6
  33. package/dist/serialization/crdt/authoritativePutComponent.d.ts +15 -0
  34. package/dist/serialization/crdt/authoritativePutComponent.js +47 -0
  35. package/dist/serialization/crdt/index.d.ts +1 -0
  36. package/dist/serialization/crdt/index.js +1 -0
  37. package/dist/serialization/crdt/types.d.ts +25 -3
  38. package/dist/serialization/crdt/types.js +3 -1
  39. package/dist/systems/crdt/index.d.ts +0 -1
  40. package/dist/systems/crdt/index.js +55 -146
  41. package/dist/systems/events.d.ts +0 -65
  42. package/dist/systems/events.js +8 -70
  43. package/dist-cjs/components/generated/component-names.gen.js +0 -1
  44. package/dist-cjs/components/generated/global.gen.d.ts +0 -2
  45. package/dist-cjs/components/generated/global.gen.js +1 -3
  46. package/dist-cjs/components/generated/index.gen.d.ts +0 -4
  47. package/dist-cjs/components/generated/index.gen.js +2 -8
  48. package/dist-cjs/components/generated/pb/decentraland/common/colors.gen.d.ts +0 -15
  49. package/dist-cjs/components/generated/pb/decentraland/common/colors.gen.js +1 -48
  50. package/dist-cjs/components/generated/pb/decentraland/sdk/components/common/input_action.gen.d.ts +1 -10
  51. package/dist-cjs/components/generated/pb/decentraland/sdk/components/common/input_action.gen.js +1 -11
  52. package/dist-cjs/components/generated/pb/decentraland/sdk/components/pointer_events.gen.d.ts +1 -5
  53. package/dist-cjs/components/generated/pb/decentraland/sdk/components/pointer_events.gen.js +1 -20
  54. package/dist-cjs/components/generated/types.gen.d.ts +0 -2
  55. package/dist-cjs/components/generated/types.gen.js +0 -5
  56. package/dist-cjs/components/index.d.ts +5 -2
  57. package/dist-cjs/components/index.js +7 -7
  58. package/dist-cjs/components/manual/CreatedBy.d.ts +9 -0
  59. package/dist-cjs/components/manual/CreatedBy.js +10 -0
  60. package/dist-cjs/components/manual/Transform.d.ts +9 -13
  61. package/dist-cjs/components/manual/Transform.js +3 -34
  62. package/dist-cjs/components/types.d.ts +1 -1
  63. package/dist-cjs/engine/component.d.ts +52 -1
  64. package/dist-cjs/engine/grow-only-value-set-component-definition.js +44 -1
  65. package/dist-cjs/engine/lww-element-set-component-definition.d.ts +5 -3
  66. package/dist-cjs/engine/lww-element-set-component-definition.js +73 -36
  67. package/dist-cjs/index.d.ts +2 -3
  68. package/dist-cjs/index.js +2 -4
  69. package/dist-cjs/runtime/helpers/index.d.ts +0 -1
  70. package/dist-cjs/runtime/helpers/index.js +0 -1
  71. package/dist-cjs/runtime/helpers/tree.d.ts +0 -6
  72. package/dist-cjs/runtime/helpers/tree.js +2 -3
  73. package/dist-cjs/runtime/initialization/index.d.ts +0 -7
  74. package/dist-cjs/runtime/initialization/index.js +1 -7
  75. package/dist-cjs/serialization/crdt/authoritativePutComponent.d.ts +15 -0
  76. package/dist-cjs/serialization/crdt/authoritativePutComponent.js +50 -0
  77. package/dist-cjs/serialization/crdt/index.d.ts +1 -0
  78. package/dist-cjs/serialization/crdt/index.js +1 -0
  79. package/dist-cjs/serialization/crdt/types.d.ts +25 -3
  80. package/dist-cjs/serialization/crdt/types.js +3 -1
  81. package/dist-cjs/systems/crdt/index.d.ts +0 -1
  82. package/dist-cjs/systems/crdt/index.js +55 -169
  83. package/dist-cjs/systems/events.d.ts +0 -65
  84. package/dist-cjs/systems/events.js +8 -70
  85. package/package.json +2 -3
  86. package/dist/components/extended/ParticleSystem.d.ts +0 -24
  87. package/dist/components/extended/ParticleSystem.js +0 -23
  88. package/dist/components/generated/ParticleSystem.gen.d.ts +0 -1
  89. package/dist/components/generated/ParticleSystem.gen.js +0 -25
  90. package/dist/components/generated/pb/decentraland/common/floats.gen.d.ts +0 -16
  91. package/dist/components/generated/pb/decentraland/common/floats.gen.js +0 -50
  92. package/dist/components/generated/pb/decentraland/sdk/components/particle_system.gen.d.ts +0 -241
  93. package/dist/components/generated/pb/decentraland/sdk/components/particle_system.gen.js +0 -717
  94. package/dist/runtime/helpers/vectors.d.ts +0 -1
  95. package/dist/runtime/helpers/vectors.js +0 -36
  96. package/dist/serialization/crdt/network/utils.d.ts +0 -9
  97. package/dist/serialization/crdt/network/utils.js +0 -60
  98. package/dist/systems/physics-force.d.ts +0 -1
  99. package/dist/systems/physics-force.js +0 -140
  100. package/dist/systems/physics-impulse.d.ts +0 -12
  101. package/dist/systems/physics-impulse.js +0 -85
  102. package/dist/systems/physics.d.ts +0 -77
  103. package/dist/systems/physics.js +0 -18
  104. package/dist-cjs/components/extended/ParticleSystem.d.ts +0 -24
  105. package/dist-cjs/components/extended/ParticleSystem.js +0 -28
  106. package/dist-cjs/components/generated/ParticleSystem.gen.d.ts +0 -1
  107. package/dist-cjs/components/generated/ParticleSystem.gen.js +0 -28
  108. package/dist-cjs/components/generated/pb/decentraland/common/floats.gen.d.ts +0 -16
  109. package/dist-cjs/components/generated/pb/decentraland/common/floats.gen.js +0 -56
  110. package/dist-cjs/components/generated/pb/decentraland/sdk/components/particle_system.gen.d.ts +0 -241
  111. package/dist-cjs/components/generated/pb/decentraland/sdk/components/particle_system.gen.js +0 -723
  112. package/dist-cjs/runtime/helpers/vectors.d.ts +0 -1
  113. package/dist-cjs/runtime/helpers/vectors.js +0 -39
  114. package/dist-cjs/serialization/crdt/network/utils.d.ts +0 -9
  115. package/dist-cjs/serialization/crdt/network/utils.js +0 -67
  116. package/dist-cjs/systems/physics-force.d.ts +0 -1
  117. package/dist-cjs/systems/physics-force.js +0 -167
  118. package/dist-cjs/systems/physics-impulse.d.ts +0 -12
  119. package/dist-cjs/systems/physics-impulse.js +0 -112
  120. package/dist-cjs/systems/physics.d.ts +0 -77
  121. package/dist-cjs/systems/physics.js +0 -23
@@ -1,50 +1,20 @@
1
1
  "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
25
2
  Object.defineProperty(exports, "__esModule", { value: true });
26
- exports.crdtSceneSystem = exports.LIVEKIT_MAX_SIZE = void 0;
3
+ exports.crdtSceneSystem = void 0;
27
4
  const entity_1 = require("../../engine/entity");
28
5
  const ByteBuffer_1 = require("../../serialization/ByteBuffer");
29
6
  const crdt_1 = require("../../serialization/crdt");
30
7
  const deleteComponent_1 = require("../../serialization/crdt/deleteComponent");
31
8
  const deleteEntity_1 = require("../../serialization/crdt/deleteEntity");
32
9
  const putComponent_1 = require("../../serialization/crdt/putComponent");
10
+ const authoritativePutComponent_1 = require("../../serialization/crdt/authoritativePutComponent");
33
11
  const types_1 = require("../../serialization/crdt/types");
34
- const putComponentNetwork_1 = require("../../serialization/crdt/network/putComponentNetwork");
35
- const components_1 = require("../../components");
36
- const networkUtils = __importStar(require("../../serialization/crdt/network/utils"));
37
- // NetworkMessages can only have a MAX_SIZE of 12kb. So we need to send it in chunks.
38
- exports.LIVEKIT_MAX_SIZE = 12;
39
12
  /**
40
13
  * @internal
41
14
  */
42
15
  function crdtSceneSystem(engine, onProcessEntityComponentChange) {
43
16
  const transports = [];
44
- // Components that we used on this system
45
- const NetworkEntity = (0, components_1.NetworkEntity)(engine);
46
- const NetworkParent = (0, components_1.NetworkParent)(engine);
47
- const Transform = (0, components_1.Transform)(engine);
17
+ // No network components needed - pure CRDT processing only
48
18
  // Messages that we received at transport.onMessage waiting to be processed
49
19
  const receivedMessages = [];
50
20
  // Messages already processed by the engine but that we need to broadcast to other transports.
@@ -69,27 +39,20 @@ function crdtSceneSystem(engine, onProcessEntityComponentChange) {
69
39
  if (header.type === types_1.CrdtMessageType.DELETE_COMPONENT) {
70
40
  message = deleteComponent_1.DeleteComponent.read(buffer);
71
41
  }
72
- else if (header.type === types_1.CrdtMessageType.DELETE_COMPONENT_NETWORK) {
73
- message = crdt_1.DeleteComponentNetwork.read(buffer);
74
- }
75
42
  else if (header.type === types_1.CrdtMessageType.PUT_COMPONENT) {
76
43
  message = putComponent_1.PutComponentOperation.read(buffer);
77
44
  }
78
- else if (header.type === types_1.CrdtMessageType.PUT_COMPONENT_NETWORK) {
79
- message = putComponentNetwork_1.PutNetworkComponentOperation.read(buffer);
45
+ else if (header.type === types_1.CrdtMessageType.AUTHORITATIVE_PUT_COMPONENT) {
46
+ message = authoritativePutComponent_1.AuthoritativePutComponentOperation.read(buffer);
80
47
  }
81
48
  else if (header.type === types_1.CrdtMessageType.DELETE_ENTITY) {
82
49
  message = deleteEntity_1.DeleteEntity.read(buffer);
83
50
  }
84
- else if (header.type === types_1.CrdtMessageType.DELETE_ENTITY_NETWORK) {
85
- message = crdt_1.DeleteEntityNetwork.read(buffer);
86
- }
87
51
  else if (header.type === types_1.CrdtMessageType.APPEND_VALUE) {
88
52
  message = crdt_1.AppendValueOperation.read(buffer);
89
- // Unknown message, we skip it
90
53
  }
91
54
  else {
92
- // consume the message
55
+ // Unknown message, we skip it (including NETWORK messages)
93
56
  buffer.incrementReadOffset(header.length);
94
57
  }
95
58
  if (message) {
@@ -110,22 +73,6 @@ function crdtSceneSystem(engine, onProcessEntityComponentChange) {
110
73
  const messagesToProcess = value.splice(0, value.length);
111
74
  return messagesToProcess;
112
75
  }
113
- /**
114
- * Find the local entityId associated to the network component message.
115
- * It's a mapping Network -> to Local
116
- * If it's not a network message, return the entityId received by the message
117
- */
118
- function findNetworkId(msg) {
119
- const hasNetworkId = 'networkId' in msg;
120
- if (hasNetworkId) {
121
- for (const [entityId, network] of engine.getEntitiesWith(NetworkEntity)) {
122
- if (network.networkId === msg.networkId && network.entityId === msg.entityId) {
123
- return { entityId, network };
124
- }
125
- }
126
- }
127
- return { entityId: msg.entityId };
128
- }
129
76
  /**
130
77
  * This fn will be called on every tick.
131
78
  * Process all the messages queue received by the transport
@@ -134,46 +81,52 @@ function crdtSceneSystem(engine, onProcessEntityComponentChange) {
134
81
  const messagesToProcess = getMessages(receivedMessages);
135
82
  const entitiesShouldBeCleaned = [];
136
83
  for (const msg of messagesToProcess) {
137
- let { entityId, network } = findNetworkId(msg);
138
- // We receive a new Entity. Create the localEntity and map it to the NetworkEntity component
139
- if (networkUtils.isNetworkMessage(msg) && !network) {
140
- entityId = engine.addEntity();
141
- network = { entityId: msg.entityId, networkId: msg.networkId };
142
- NetworkEntity.createOrReplace(entityId, network);
143
- }
144
- if (msg.type === types_1.CrdtMessageType.DELETE_ENTITY || msg.type === types_1.CrdtMessageType.DELETE_ENTITY_NETWORK) {
145
- entitiesShouldBeCleaned.push(entityId);
84
+ // Simple CRDT processing - no network logic
85
+ if (msg.type === types_1.CrdtMessageType.DELETE_ENTITY) {
86
+ entitiesShouldBeCleaned.push(msg.entityId);
146
87
  broadcastMessages.push(msg);
147
88
  }
148
89
  else {
149
- const entityState = engine.entityContainer.getEntityState(entityId);
150
- // Skip updates from removed entityes
90
+ const entityState = engine.entityContainer.getEntityState(msg.entityId);
91
+ // Skip updates from removed entities
151
92
  if (entityState === entity_1.EntityState.Removed)
152
93
  continue;
153
- // Entities with unknown entities should update its entity state
94
+ // Entities with unknown state should update its entity state
154
95
  if (entityState === entity_1.EntityState.Unknown) {
155
- engine.entityContainer.updateUsedEntity(entityId);
156
- }
157
- const component = engine.getComponentOrNull(msg.componentId);
158
- /* istanbul ignore else */
159
- if (component) {
160
- if (msg.type === types_1.CrdtMessageType.PUT_COMPONENT &&
161
- component.componentId === Transform.componentId &&
162
- NetworkEntity.has(entityId) &&
163
- NetworkParent.has(entityId)) {
164
- msg.data = networkUtils.fixTransformParent(msg);
96
+ engine.entityContainer.updateUsedEntity(msg.entityId);
97
+ }
98
+ // Only process component-related messages (not DELETE_ENTITY)
99
+ if ('componentId' in msg) {
100
+ const component = engine.getComponentOrNull(msg.componentId);
101
+ if (component) {
102
+ // Handle authoritative messages differently - they force the state regardless of timestamp
103
+ const tryUpdate = () => {
104
+ try {
105
+ return msg.type === types_1.CrdtMessageType.AUTHORITATIVE_PUT_COMPONENT
106
+ ? component.__forceUpdateFromCrdt(msg)
107
+ : component.updateFromCrdt(msg);
108
+ }
109
+ catch (e) {
110
+ console.error('[receiveMessages] ERROR processing message', msg, e);
111
+ return null;
112
+ }
113
+ };
114
+ const result = tryUpdate();
115
+ if (!result)
116
+ continue;
117
+ const [conflictMessage, value] = result;
118
+ if (!conflictMessage) {
119
+ // Add message to broadcast queue when no conflict
120
+ broadcastMessages.push(msg);
121
+ onProcessEntityComponentChange && onProcessEntityComponentChange(msg.entityId, msg.type, component, value);
122
+ }
165
123
  }
166
- const [conflictMessage, value] = component.updateFromCrdt({ ...msg, entityId });
167
- if (!conflictMessage) {
168
- // Add message to transport queue to be processed by others transports
124
+ else {
125
+ // Component not found - still broadcast for editor compatibility
126
+ /* istanbul ignore next */
169
127
  broadcastMessages.push(msg);
170
- onProcessEntityComponentChange && onProcessEntityComponentChange(entityId, msg.type, component, value);
171
128
  }
172
129
  }
173
- else {
174
- // TODO: test this line, it is fundammental to make the editor work
175
- broadcastMessages.push(msg);
176
- }
177
130
  }
178
131
  }
179
132
  // the last stage of the syncrhonization is to delete the entities
@@ -187,16 +140,17 @@ function crdtSceneSystem(engine, onProcessEntityComponentChange) {
187
140
  }
188
141
  }
189
142
  /**
190
- * Iterates the dirty map and generates crdt messages to be send
143
+ * Simple CRDT message broadcasting - no network-specific logic
191
144
  */
192
145
  async function sendMessages(entitiesDeletedThisTick) {
193
- // CRDT Messages will be the merge between the recieved transport messages and the new crdt messages
146
+ // Get messages from broadcast queue and component updates
194
147
  const crdtMessages = getMessages(broadcastMessages);
195
148
  const buffer = new ByteBuffer_1.ReadWriteByteBuffer();
149
+ // Generate CRDT messages from component updates
196
150
  for (const component of engine.componentsIter()) {
197
151
  for (const message of component.getCrdtUpdates()) {
198
152
  const offset = buffer.currentWriteOffset();
199
- // Avoid creating messages if there is no transport that will handle it
153
+ // Only create messages if there's a transport that will handle it
200
154
  if (transports.some((t) => t.filter(message))) {
201
155
  if (message.type === types_1.CrdtMessageType.PUT_COMPONENT) {
202
156
  putComponent_1.PutComponentOperation.write(message.entityId, message.timestamp, message.componentId, message.data, buffer);
@@ -220,7 +174,7 @@ function crdtSceneSystem(engine, onProcessEntityComponentChange) {
220
174
  }
221
175
  }
222
176
  }
223
- // After all updates, I execute the DeletedEntity messages
177
+ // Handle deleted entities
224
178
  for (const entityId of entitiesDeletedThisTick) {
225
179
  const offset = buffer.currentWriteOffset();
226
180
  deleteEntity_1.DeleteEntity.write(entityId, buffer);
@@ -231,87 +185,19 @@ function crdtSceneSystem(engine, onProcessEntityComponentChange) {
231
185
  });
232
186
  onProcessEntityComponentChange && onProcessEntityComponentChange(entityId, types_1.CrdtMessageType.DELETE_ENTITY);
233
187
  }
234
- // Send CRDT messages to transports
235
- const transportBuffer = new ByteBuffer_1.ReadWriteByteBuffer();
236
- for (const index in transports) {
237
- const __NetworkMessagesBuffer = [];
238
- const transportIndex = Number(index);
239
- const transport = transports[transportIndex];
240
- const isRendererTransport = transport.type === 'renderer';
241
- const isNetworkTransport = transport.type === 'network';
242
- // Reset Buffer for each Transport
243
- transportBuffer.resetBuffer();
244
- const buffer = new ByteBuffer_1.ReadWriteByteBuffer();
245
- // Then we send all the new crdtMessages that the transport needs to process
188
+ // Simple transport broadcasting - no network-specific transforms
189
+ for (const transport of transports) {
190
+ const transportBuffer = new ByteBuffer_1.ReadWriteByteBuffer();
246
191
  for (const message of crdtMessages) {
247
192
  // Avoid echo messages
248
- if (message.transportId === transportIndex)
249
- continue;
250
- // Redundant message for the transport
251
- if (!transport.filter(message))
252
- continue;
253
- // Check if adding this message would exceed the size limit
254
- const currentBufferSize = transportBuffer.toBinary().byteLength;
255
- const messageSize = message.messageBuffer.byteLength;
256
- if (isNetworkTransport && (currentBufferSize + messageSize) / 1024 > exports.LIVEKIT_MAX_SIZE) {
257
- // If the current buffer has content, save it as a chunk
258
- if (currentBufferSize > 0) {
259
- __NetworkMessagesBuffer.push(transportBuffer.toCopiedBinary());
260
- transportBuffer.resetBuffer();
261
- }
262
- // If the message itself is larger than the limit, we need to handle it specially
263
- // For now, we'll skip it to prevent infinite loops
264
- if (messageSize / 1024 > exports.LIVEKIT_MAX_SIZE) {
265
- console.error(`Message too large (${messageSize} bytes), skipping message for entity ${message.entityId}`);
266
- continue;
267
- }
268
- }
269
- const { entityId } = findNetworkId(message);
270
- const transformNeedsFix = 'componentId' in message &&
271
- message.componentId === Transform.componentId &&
272
- Transform.has(entityId) &&
273
- NetworkParent.has(entityId) &&
274
- NetworkEntity.has(entityId);
275
- // If there was a LOCAL change in the transform. Add the parent to that transform
276
- if (isRendererTransport && message.type === types_1.CrdtMessageType.PUT_COMPONENT && transformNeedsFix) {
277
- const parent = findNetworkId(NetworkParent.get(entityId));
278
- const transformData = networkUtils.fixTransformParent(message, Transform.get(entityId), parent.entityId);
279
- const offset = buffer.currentWriteOffset();
280
- putComponent_1.PutComponentOperation.write(entityId, message.timestamp, message.componentId, transformData, buffer);
281
- transportBuffer.writeBuffer(buffer.buffer().subarray(offset, buffer.currentWriteOffset()), false);
193
+ if (message.transportId === transports.indexOf(transport))
282
194
  continue;
195
+ // Check if transport wants this message
196
+ if (transport.filter(message)) {
197
+ transportBuffer.writeBuffer(message.messageBuffer, false);
283
198
  }
284
- if (isRendererTransport && networkUtils.isNetworkMessage(message)) {
285
- // If it's the renderer transport and its a NetworkMessage, we need to fix the entityId field and convert it to a known Message.
286
- // PUT_NETWORK_COMPONENT -> PUT_COMPONENT
287
- let transformData = 'data' in message ? message.data : new Uint8Array();
288
- if (transformNeedsFix) {
289
- const parent = findNetworkId(NetworkParent.get(entityId));
290
- transformData = networkUtils.fixTransformParent(message, Transform.get(entityId), parent.entityId);
291
- }
292
- networkUtils.networkMessageToLocal({ ...message, data: transformData }, entityId, buffer, transportBuffer);
293
- // Iterate the next message
294
- continue;
295
- }
296
- // If its a network transport and its a PUT_COMPONENT that has a NetworkEntity component, we need to send this message
297
- // through comms with the EntityID and NetworkID from ther NetworkEntity so everyone can recieve this message and map to their custom entityID.
298
- if (isNetworkTransport && !networkUtils.isNetworkMessage(message)) {
299
- const networkData = NetworkEntity.getOrNull(message.entityId);
300
- // If it has networkData convert the message to PUT_NETWORK_COMPONENT.
301
- if (networkData) {
302
- networkUtils.localMessageToNetwork(message, networkData, buffer, transportBuffer);
303
- // Iterate the next message
304
- continue;
305
- }
306
- }
307
- // Common message
308
- transportBuffer.writeBuffer(message.messageBuffer, false);
309
- }
310
- if (isNetworkTransport && transportBuffer.currentWriteOffset()) {
311
- __NetworkMessagesBuffer.push(transportBuffer.toBinary());
312
199
  }
313
- const message = isNetworkTransport ? __NetworkMessagesBuffer : transportBuffer.toBinary();
314
- await transport.send(message);
200
+ await transport.send(transportBuffer.toBinary());
315
201
  }
316
202
  }
317
203
  /**
@@ -17,7 +17,6 @@ export type EventSystemOptions = {
17
17
  showFeedback?: boolean;
18
18
  showHighlight?: boolean;
19
19
  maxPlayerDistance?: number;
20
- priority?: number;
21
20
  };
22
21
  export declare const getDefaultOpts: (opts?: Partial<EventSystemOptions>) => EventSystemOptions;
23
22
  /**
@@ -48,30 +47,6 @@ export interface PointerEventsSystem {
48
47
  * @param entity - Entity where the callback was attached
49
48
  */
50
49
  removeOnPointerHoverLeave(entity: Entity): void;
51
- /**
52
- * @public
53
- * Remove the callback for onProximityDown event
54
- * @param entity - Entity where the callback was attached
55
- */
56
- removeOnProximityDown(entity: Entity): void;
57
- /**
58
- * @public
59
- * Remove the callback for onProximityUp event
60
- * @param entity - Entity where the callback was attached
61
- */
62
- removeOnProximityUp(entity: Entity): void;
63
- /**
64
- * @public
65
- * Remove the callback for onProximityEnter event
66
- * @param entity - Entity where the callback was attached
67
- */
68
- removeOnProximityEnter(entity: Entity): void;
69
- /**
70
- * @public
71
- * Remove the callback for onProximityLeave event
72
- * @param entity - Entity where the callback was attached
73
- */
74
- removeOnProximityLeave(entity: Entity): void;
75
50
  /**
76
51
  * @public
77
52
  * Execute callback when the user press the InputButton pointing at the entity
@@ -126,46 +101,6 @@ export interface PointerEventsSystem {
126
101
  entity: Entity;
127
102
  opts?: Partial<EventSystemOptions>;
128
103
  }, cb: EventSystemCallback): void;
129
- /**
130
- * @public
131
- * Execute callback when the user presses the proximity button on the entity
132
- * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
133
- * @param cb - Function to execute when click fires
134
- */
135
- onProximityDown(pointerData: {
136
- entity: Entity;
137
- opts?: Partial<EventSystemOptions>;
138
- }, cb: EventSystemCallback): void;
139
- /**
140
- * @public
141
- * Execute callback when the user releases the proximity button on the entity
142
- * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
143
- * @param cb - Function to execute when event fires
144
- */
145
- onProximityUp(pointerData: {
146
- entity: Entity;
147
- opts?: Partial<EventSystemOptions>;
148
- }, cb: EventSystemCallback): void;
149
- /**
150
- * @public
151
- * Execute callback when the entity enters the proximity zone of the user
152
- * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
153
- * @param cb - Function to execute when event fires
154
- */
155
- onProximityEnter(pointerData: {
156
- entity: Entity;
157
- opts?: Partial<EventSystemOptions>;
158
- }, cb: EventSystemCallback): void;
159
- /**
160
- * @public
161
- * Execute callback when the entity leaves the proximity zone of the user
162
- * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
163
- * @param cb - Function to execute when event fires
164
- */
165
- onProximityLeave(pointerData: {
166
- entity: Entity;
167
- opts?: Partial<EventSystemOptions>;
168
- }, cb: EventSystemCallback): void;
169
104
  }
170
105
  /**
171
106
  * @public
@@ -45,14 +45,12 @@ function createPointerEventsSystem(engine, inputSystem) {
45
45
  EventType[EventType["Up"] = 2] = "Up";
46
46
  EventType[EventType["HoverEnter"] = 3] = "HoverEnter";
47
47
  EventType[EventType["HoverLeave"] = 4] = "HoverLeave";
48
- EventType[EventType["ProximityEnter"] = 5] = "ProximityEnter";
49
- EventType[EventType["ProximityLeave"] = 6] = "ProximityLeave";
50
48
  })(EventType || (EventType = {}));
51
49
  const eventsMap = new Map();
52
50
  function getEvent(entity) {
53
51
  return eventsMap.get(entity) || eventsMap.set(entity, new Map()).get(entity);
54
52
  }
55
- function setPointerEvent(entity, type, opts, interactionType = 0 /* InteractionType.CURSOR */) {
53
+ function setPointerEvent(entity, type, opts) {
56
54
  const pointerEvent = PointerEvents.getMutableOrNull(entity) || PointerEvents.create(entity);
57
55
  pointerEvent.pointerEvents.push({
58
56
  eventType: type,
@@ -62,19 +60,15 @@ function createPointerEventsSystem(engine, inputSystem) {
62
60
  showHighlight: opts.showHighlight,
63
61
  hoverText: opts.hoverText,
64
62
  maxDistance: opts.maxDistance,
65
- maxPlayerDistance: opts.maxPlayerDistance,
66
- priority: opts.priority
67
- },
68
- interactionType: interactionType ?? 0 /* InteractionType.CURSOR */
63
+ maxPlayerDistance: opts.maxPlayerDistance
64
+ }
69
65
  });
70
66
  }
71
- function removePointerEvent(entity, type, button, interactionType = 0 /* InteractionType.CURSOR */) {
67
+ function removePointerEvent(entity, type, button) {
72
68
  const pointerEvent = PointerEvents.getMutableOrNull(entity);
73
69
  if (!pointerEvent)
74
70
  return;
75
- pointerEvent.pointerEvents = pointerEvent.pointerEvents.filter((pointer) => !(pointer.eventInfo?.button === button &&
76
- pointer.eventType === type &&
77
- pointer.interactionType === interactionType));
71
+ pointerEvent.pointerEvents = pointerEvent.pointerEvents.filter((pointer) => !(pointer.eventInfo?.button === button && pointer.eventType === type));
78
72
  }
79
73
  function getPointerEvent(eventType) {
80
74
  if (eventType === EventType.Up) {
@@ -86,15 +80,9 @@ function createPointerEventsSystem(engine, inputSystem) {
86
80
  else if (eventType === EventType.HoverEnter) {
87
81
  return 2 /* PointerEventType.PET_HOVER_ENTER */;
88
82
  }
89
- else if (eventType === EventType.ProximityEnter) {
90
- return 4 /* PointerEventType.PET_PROXIMITY_ENTER */;
91
- }
92
- else if (eventType === EventType.ProximityLeave) {
93
- return 5 /* PointerEventType.PET_PROXIMITY_LEAVE */;
94
- }
95
83
  return 1 /* PointerEventType.PET_DOWN */;
96
84
  }
97
- function removeEvent(entity, type, interactionType = 0 /* InteractionType.CURSOR */) {
85
+ function removeEvent(entity, type) {
98
86
  const event = getEvent(entity);
99
87
  const pointerEvent = event.get(type);
100
88
  if (pointerEvent?.opts.hoverText) {
@@ -117,9 +105,7 @@ function createPointerEventsSystem(engine, inputSystem) {
117
105
  if (eventType === EventType.Down ||
118
106
  eventType === EventType.Up ||
119
107
  eventType === EventType.HoverEnter ||
120
- eventType === EventType.HoverLeave ||
121
- eventType === EventType.ProximityEnter ||
122
- eventType === EventType.ProximityLeave) {
108
+ eventType === EventType.HoverLeave) {
123
109
  const command = inputSystem.getInputCommand(opts.button, getPointerEvent(eventType), entity);
124
110
  if (command) {
125
111
  (0, invariant_1.checkNotThenable)(cb(command), 'Event handler returned a thenable. Only synchronous functions are allowed');
@@ -166,38 +152,6 @@ function createPointerEventsSystem(engine, inputSystem) {
166
152
  getEvent(entity).set(EventType.HoverLeave, { cb, opts: options });
167
153
  setPointerEvent(entity, 3 /* PointerEventType.PET_HOVER_LEAVE */, options);
168
154
  };
169
- const onProximityDown = (...args) => {
170
- const [data, cb] = args;
171
- const { entity, opts } = data;
172
- const options = (0, exports.getDefaultOpts)(opts);
173
- removeEvent(entity, EventType.Down, 1 /* InteractionType.PROXIMITY */);
174
- getEvent(entity).set(EventType.Down, { cb, opts: options });
175
- setPointerEvent(entity, 1 /* PointerEventType.PET_DOWN */, options, 1 /* InteractionType.PROXIMITY */);
176
- };
177
- const onProximityUp = (...args) => {
178
- const [data, cb] = args;
179
- const { entity, opts } = data;
180
- const options = (0, exports.getDefaultOpts)(opts);
181
- removeEvent(entity, EventType.Up, 1 /* InteractionType.PROXIMITY */);
182
- getEvent(entity).set(EventType.Up, { cb, opts: options });
183
- setPointerEvent(entity, 0 /* PointerEventType.PET_UP */, options, 1 /* InteractionType.PROXIMITY */);
184
- };
185
- const onProximityEnter = (...args) => {
186
- const [data, cb] = args;
187
- const { entity, opts } = data;
188
- const options = (0, exports.getDefaultOpts)(opts);
189
- removeEvent(entity, EventType.ProximityEnter, 1 /* InteractionType.PROXIMITY */);
190
- getEvent(entity).set(EventType.ProximityEnter, { cb, opts: options });
191
- setPointerEvent(entity, 4 /* PointerEventType.PET_PROXIMITY_ENTER */, options, 1 /* InteractionType.PROXIMITY */);
192
- };
193
- const onProximityLeave = (...args) => {
194
- const [data, cb] = args;
195
- const { entity, opts } = data;
196
- const options = (0, exports.getDefaultOpts)(opts);
197
- removeEvent(entity, EventType.ProximityLeave, 1 /* InteractionType.PROXIMITY */);
198
- getEvent(entity).set(EventType.ProximityLeave, { cb, opts: options });
199
- setPointerEvent(entity, 5 /* PointerEventType.PET_PROXIMITY_LEAVE */, options, 1 /* InteractionType.PROXIMITY */);
200
- };
201
155
  return {
202
156
  removeOnClick(entity) {
203
157
  removeEvent(entity, EventType.Click);
@@ -214,18 +168,6 @@ function createPointerEventsSystem(engine, inputSystem) {
214
168
  removeOnPointerHoverLeave(entity) {
215
169
  removeEvent(entity, EventType.HoverLeave);
216
170
  },
217
- removeOnProximityDown(entity) {
218
- removeEvent(entity, EventType.Down, 1 /* InteractionType.PROXIMITY */);
219
- },
220
- removeOnProximityUp(entity) {
221
- removeEvent(entity, EventType.Up, 1 /* InteractionType.PROXIMITY */);
222
- },
223
- removeOnProximityEnter(entity) {
224
- removeEvent(entity, EventType.ProximityEnter, 1 /* InteractionType.PROXIMITY */);
225
- },
226
- removeOnProximityLeave(entity) {
227
- removeEvent(entity, EventType.ProximityLeave, 1 /* InteractionType.PROXIMITY */);
228
- },
229
171
  onClick(value, cb) {
230
172
  const { entity } = value;
231
173
  const options = (0, exports.getDefaultOpts)(value.opts);
@@ -238,11 +180,7 @@ function createPointerEventsSystem(engine, inputSystem) {
238
180
  onPointerDown,
239
181
  onPointerUp,
240
182
  onPointerHoverEnter,
241
- onPointerHoverLeave,
242
- onProximityDown,
243
- onProximityUp,
244
- onProximityEnter,
245
- onProximityLeave
183
+ onPointerHoverLeave
246
184
  };
247
185
  }
248
186
  exports.createPointerEventsSystem = createPointerEventsSystem;
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@dcl/ecs",
3
3
  "description": "Decentraland ECS",
4
- "version": "7.22.4",
4
+ "version": "7.22.5-24776890516.commit-b10e9ab",
5
5
  "author": "DCL",
6
6
  "bugs": "https://github.com/decentraland/ecs/issues",
7
7
  "files": [
@@ -31,8 +31,7 @@
31
31
  "displayName": "ECS",
32
32
  "tsconfig": "./tsconfig.json"
33
33
  },
34
- "dependencies": {},
35
34
  "types": "./dist/index.d.ts",
36
35
  "typings": "./dist/index.d.ts",
37
- "commit": "1309a552442670f22b64ad4cea1d88136188ad2f"
36
+ "commit": "b10e9abdf4afd09b5c4cf0abc3e86eb6ed035ab0"
38
37
  }
@@ -1,24 +0,0 @@
1
- import { IEngine, LastWriteWinElementSetComponentDefinition } from '../../engine';
2
- import { PBParticleSystem, PBParticleSystem_BlendMode, PBParticleSystem_PlaybackState, PBParticleSystem_Point, PBParticleSystem_Sphere, PBParticleSystem_Cone, PBParticleSystem_Box } from '../generated/index.gen';
3
- export { PBParticleSystem_BlendMode as ParticleSystemBlendMode, PBParticleSystem_PlaybackState as ParticleSystemPlaybackState };
4
- /**
5
- * @public
6
- */
7
- export interface ParticleSystemHelper {
8
- /** Emit from a single point */
9
- Point: (point?: PBParticleSystem_Point) => PBParticleSystem['shape'];
10
- /** Emit from the surface or volume of a sphere */
11
- Sphere: (sphere?: PBParticleSystem_Sphere) => PBParticleSystem['shape'];
12
- /** Emit from the base of a cone, projecting outward */
13
- Cone: (cone?: PBParticleSystem_Cone) => PBParticleSystem['shape'];
14
- /** Emit from the surface or volume of a box */
15
- Box: (box?: PBParticleSystem_Box) => PBParticleSystem['shape'];
16
- }
17
- /**
18
- * @public
19
- */
20
- export interface ParticleSystemComponentDefinitionExtended extends LastWriteWinElementSetComponentDefinition<PBParticleSystem> {
21
- /** Helpers for constructing emitter shapes */
22
- Shape: ParticleSystemHelper;
23
- }
24
- export declare function defineParticleSystemComponent(engine: Pick<IEngine, 'defineComponentFromSchema'>): ParticleSystemComponentDefinitionExtended;
@@ -1,23 +0,0 @@
1
- import { ParticleSystem, PBParticleSystem_BlendMode, PBParticleSystem_PlaybackState } from '../generated/index.gen';
2
- export { PBParticleSystem_BlendMode as ParticleSystemBlendMode, PBParticleSystem_PlaybackState as ParticleSystemPlaybackState };
3
- const ParticleSystemShapeHelper = {
4
- Point(point = {}) {
5
- return { $case: 'point', point };
6
- },
7
- Sphere(sphere = {}) {
8
- return { $case: 'sphere', sphere };
9
- },
10
- Cone(cone = {}) {
11
- return { $case: 'cone', cone };
12
- },
13
- Box(box = {}) {
14
- return { $case: 'box', box };
15
- }
16
- };
17
- export function defineParticleSystemComponent(engine) {
18
- const theComponent = ParticleSystem(engine);
19
- return {
20
- ...theComponent,
21
- Shape: ParticleSystemShapeHelper
22
- };
23
- }
@@ -1 +0,0 @@
1
- export {};
@@ -1,25 +0,0 @@
1
- import { PBParticleSystem } from './pb/decentraland/sdk/components/particle_system.gen';
2
- /**
3
- * @internal
4
- */
5
- export const ParticleSystemSchema = {
6
- COMPONENT_ID: 1217,
7
- serialize(value, builder) {
8
- const writer = PBParticleSystem.encode(value);
9
- const buffer = new Uint8Array(writer.finish(), 0, writer.len);
10
- builder.writeBuffer(buffer, false);
11
- },
12
- deserialize(reader) {
13
- return PBParticleSystem.decode(reader.buffer(), reader.remainingBytes());
14
- },
15
- create() {
16
- // TODO: this is a hack.
17
- return PBParticleSystem.decode(new Uint8Array());
18
- },
19
- jsonSchema: {
20
- type: "object",
21
- properties: {},
22
- serializationType: "protocol-buffer",
23
- protocolBuffer: "PBParticleSystem"
24
- }
25
- };
@@ -1,16 +0,0 @@
1
- import _m0 from "protobufjs/minimal";
2
- /** A range of float values. Randomized or lerped between start and end. */
3
- /**
4
- * @public
5
- */
6
- export interface FloatRange {
7
- start: number;
8
- end: number;
9
- }
10
- /**
11
- * @public
12
- */
13
- export declare namespace FloatRange {
14
- function encode(message: FloatRange, writer?: _m0.Writer): _m0.Writer;
15
- function decode(input: _m0.Reader | Uint8Array, length?: number): FloatRange;
16
- }