@dcl/ecs 7.20.5-22639691829.commit-b96024f → 7.20.5-22673942652.commit-fcc5752

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 (85) hide show
  1. package/dist/components/extended/Tween.d.ts +48 -1
  2. package/dist/components/extended/Tween.js +66 -0
  3. package/dist/components/generated/PhysicsCombinedForce.gen.d.ts +1 -0
  4. package/dist/components/generated/PhysicsCombinedForce.gen.js +25 -0
  5. package/dist/components/generated/PhysicsCombinedImpulse.gen.d.ts +1 -0
  6. package/dist/components/generated/PhysicsCombinedImpulse.gen.js +25 -0
  7. package/dist/components/generated/component-names.gen.js +2 -0
  8. package/dist/components/generated/global.gen.d.ts +4 -0
  9. package/dist/components/generated/global.gen.js +2 -0
  10. package/dist/components/generated/index.gen.d.ts +8 -0
  11. package/dist/components/generated/index.gen.js +10 -0
  12. package/dist/components/generated/pb/decentraland/sdk/components/input_modifier.gen.d.ts +2 -0
  13. package/dist/components/generated/pb/decentraland/sdk/components/input_modifier.gen.js +20 -0
  14. package/dist/components/generated/pb/decentraland/sdk/components/physics_combined_force.gen.d.ts +25 -0
  15. package/dist/components/generated/pb/decentraland/sdk/components/physics_combined_force.gen.js +42 -0
  16. package/dist/components/generated/pb/decentraland/sdk/components/physics_combined_impulse.gen.d.ts +28 -0
  17. package/dist/components/generated/pb/decentraland/sdk/components/physics_combined_impulse.gen.js +51 -0
  18. package/dist/components/generated/pb/decentraland/sdk/components/tween.gen.d.ts +21 -0
  19. package/dist/components/generated/pb/decentraland/sdk/components/tween.gen.js +99 -0
  20. package/dist/components/index.d.ts +0 -5
  21. package/dist/components/index.js +2 -5
  22. package/dist/components/manual/Transform.d.ts +0 -9
  23. package/dist/components/manual/Transform.js +3 -3
  24. package/dist/components/types.d.ts +1 -2
  25. package/dist/engine/component.d.ts +1 -52
  26. package/dist/engine/grow-only-value-set-component-definition.js +2 -45
  27. package/dist/engine/lww-element-set-component-definition.d.ts +1 -3
  28. package/dist/engine/lww-element-set-component-definition.js +12 -65
  29. package/dist/index.d.ts +1 -2
  30. package/dist/index.js +0 -1
  31. package/dist/serialization/crdt/index.d.ts +0 -1
  32. package/dist/serialization/crdt/index.js +0 -1
  33. package/dist/serialization/crdt/network/utils.d.ts +9 -0
  34. package/dist/serialization/crdt/network/utils.js +60 -0
  35. package/dist/serialization/crdt/types.d.ts +3 -25
  36. package/dist/serialization/crdt/types.js +1 -3
  37. package/dist/systems/crdt/index.d.ts +1 -0
  38. package/dist/systems/crdt/index.js +146 -55
  39. package/dist-cjs/components/extended/Tween.d.ts +48 -1
  40. package/dist-cjs/components/extended/Tween.js +66 -0
  41. package/dist-cjs/components/generated/PhysicsCombinedForce.gen.d.ts +1 -0
  42. package/dist-cjs/components/generated/PhysicsCombinedForce.gen.js +28 -0
  43. package/dist-cjs/components/generated/PhysicsCombinedImpulse.gen.d.ts +1 -0
  44. package/dist-cjs/components/generated/PhysicsCombinedImpulse.gen.js +28 -0
  45. package/dist-cjs/components/generated/component-names.gen.js +2 -0
  46. package/dist-cjs/components/generated/global.gen.d.ts +4 -0
  47. package/dist-cjs/components/generated/global.gen.js +3 -1
  48. package/dist-cjs/components/generated/index.gen.d.ts +8 -0
  49. package/dist-cjs/components/generated/index.gen.js +14 -2
  50. package/dist-cjs/components/generated/pb/decentraland/sdk/components/input_modifier.gen.d.ts +2 -0
  51. package/dist-cjs/components/generated/pb/decentraland/sdk/components/input_modifier.gen.js +20 -0
  52. package/dist-cjs/components/generated/pb/decentraland/sdk/components/physics_combined_force.gen.d.ts +25 -0
  53. package/dist-cjs/components/generated/pb/decentraland/sdk/components/physics_combined_force.gen.js +48 -0
  54. package/dist-cjs/components/generated/pb/decentraland/sdk/components/physics_combined_impulse.gen.d.ts +28 -0
  55. package/dist-cjs/components/generated/pb/decentraland/sdk/components/physics_combined_impulse.gen.js +57 -0
  56. package/dist-cjs/components/generated/pb/decentraland/sdk/components/tween.gen.d.ts +21 -0
  57. package/dist-cjs/components/generated/pb/decentraland/sdk/components/tween.gen.js +100 -1
  58. package/dist-cjs/components/index.d.ts +0 -5
  59. package/dist-cjs/components/index.js +3 -7
  60. package/dist-cjs/components/manual/Transform.d.ts +0 -9
  61. package/dist-cjs/components/manual/Transform.js +3 -3
  62. package/dist-cjs/components/types.d.ts +1 -2
  63. package/dist-cjs/engine/component.d.ts +1 -52
  64. package/dist-cjs/engine/grow-only-value-set-component-definition.js +1 -44
  65. package/dist-cjs/engine/lww-element-set-component-definition.d.ts +1 -3
  66. package/dist-cjs/engine/lww-element-set-component-definition.js +13 -68
  67. package/dist-cjs/index.d.ts +1 -2
  68. package/dist-cjs/index.js +1 -2
  69. package/dist-cjs/serialization/crdt/index.d.ts +0 -1
  70. package/dist-cjs/serialization/crdt/index.js +0 -1
  71. package/dist-cjs/serialization/crdt/network/utils.d.ts +9 -0
  72. package/dist-cjs/serialization/crdt/network/utils.js +67 -0
  73. package/dist-cjs/serialization/crdt/types.d.ts +3 -25
  74. package/dist-cjs/serialization/crdt/types.js +1 -3
  75. package/dist-cjs/systems/crdt/index.d.ts +1 -0
  76. package/dist-cjs/systems/crdt/index.js +169 -55
  77. package/package.json +2 -2
  78. package/dist/components/manual/CreatedBy.d.ts +0 -9
  79. package/dist/components/manual/CreatedBy.js +0 -8
  80. package/dist/serialization/crdt/authoritativePutComponent.d.ts +0 -15
  81. package/dist/serialization/crdt/authoritativePutComponent.js +0 -47
  82. package/dist-cjs/components/manual/CreatedBy.d.ts +0 -9
  83. package/dist-cjs/components/manual/CreatedBy.js +0 -10
  84. package/dist-cjs/serialization/crdt/authoritativePutComponent.d.ts +0 -15
  85. package/dist-cjs/serialization/crdt/authoritativePutComponent.js +0 -50
@@ -11,8 +11,7 @@ export declare enum CrdtMessageType {
11
11
  PUT_COMPONENT_NETWORK = 5,
12
12
  DELETE_COMPONENT_NETWORK = 6,
13
13
  DELETE_ENTITY_NETWORK = 7,
14
- AUTHORITATIVE_PUT_COMPONENT = 8,
15
- MAX_MESSAGE_TYPE = 9
14
+ MAX_MESSAGE_TYPE = 8
16
15
  }
17
16
  /**
18
17
  * Min length = 8 bytes
@@ -49,23 +48,6 @@ export type PutNetworkComponentMessageBody = Omit<PutComponentMessageBody, 'type
49
48
  type: CrdtMessageType.PUT_COMPONENT_NETWORK;
50
49
  networkId: number;
51
50
  };
52
- /**
53
- * Server authoritative message - identical to PutComponentMessageBody but with forced processing
54
- * Min. length = header (8 bytes) + 16 bytes = 24 bytes
55
- *
56
- * @param entity - Uint32 number of the entity
57
- * @param componentId - Uint32 number of id
58
- * @param timestamp - Uint32 Lamport timestamp (server's authoritative timestamp)
59
- * @param data - Uint8[] data of component => length(4 bytes) + block of bytes[0..length-1]
60
- * @public
61
- */
62
- export type AuthoritativePutComponentMessageBody = {
63
- type: CrdtMessageType.AUTHORITATIVE_PUT_COMPONENT;
64
- entityId: Entity;
65
- componentId: number;
66
- timestamp: number;
67
- data: Uint8Array;
68
- };
69
51
  /**
70
52
  * Min. length = header (8 bytes) + 16 bytes = 24 bytes
71
53
  *
@@ -132,10 +114,6 @@ export type AppendValueMessage = CrdtMessageHeader & AppendValueMessageBody;
132
114
  * @public
133
115
  */
134
116
  export type PutComponentMessage = CrdtMessageHeader & PutComponentMessageBody;
135
- /**
136
- * @public
137
- */
138
- export type AuthoritativePutComponentMessage = CrdtMessageHeader & AuthoritativePutComponentMessageBody;
139
117
  /**
140
118
  * @public
141
119
  */
@@ -159,7 +137,7 @@ export type DeleteEntityNetworkMessage = CrdtMessageHeader & DeleteEntityNetwork
159
137
  /**
160
138
  * @public
161
139
  */
162
- export type CrdtMessage = PutComponentMessage | AuthoritativePutComponentMessage | DeleteComponentMessage | AppendValueMessage | DeleteEntityMessage | PutNetworkComponentMessage | DeleteComponentNetworkMessage | DeleteEntityNetworkMessage;
140
+ export type CrdtMessage = PutComponentMessage | DeleteComponentMessage | AppendValueMessage | DeleteEntityMessage | PutNetworkComponentMessage | DeleteComponentNetworkMessage | DeleteEntityNetworkMessage;
163
141
  /**
164
142
  * @public
165
143
  */
@@ -167,7 +145,7 @@ export type CrdtNetworkMessageBody = PutNetworkComponentMessageBody | DeleteComp
167
145
  /**
168
146
  * @public
169
147
  */
170
- export type CrdtMessageBody = PutComponentMessageBody | AuthoritativePutComponentMessageBody | DeleteComponentMessageBody | DeleteEntityMessageBody | AppendValueMessageBody | CrdtNetworkMessageBody;
148
+ export type CrdtMessageBody = PutComponentMessageBody | DeleteComponentMessageBody | DeleteEntityMessageBody | AppendValueMessageBody | CrdtNetworkMessageBody;
171
149
  export declare enum ProcessMessageResultType {
172
150
  /**
173
151
  * Typical message and new state set.
@@ -13,9 +13,7 @@ export var CrdtMessageType;
13
13
  CrdtMessageType[CrdtMessageType["PUT_COMPONENT_NETWORK"] = 5] = "PUT_COMPONENT_NETWORK";
14
14
  CrdtMessageType[CrdtMessageType["DELETE_COMPONENT_NETWORK"] = 6] = "DELETE_COMPONENT_NETWORK";
15
15
  CrdtMessageType[CrdtMessageType["DELETE_ENTITY_NETWORK"] = 7] = "DELETE_ENTITY_NETWORK";
16
- // Server authoritative operation - forces component state regardless of timestamp
17
- CrdtMessageType[CrdtMessageType["AUTHORITATIVE_PUT_COMPONENT"] = 8] = "AUTHORITATIVE_PUT_COMPONENT";
18
- CrdtMessageType[CrdtMessageType["MAX_MESSAGE_TYPE"] = 9] = "MAX_MESSAGE_TYPE";
16
+ CrdtMessageType[CrdtMessageType["MAX_MESSAGE_TYPE"] = 8] = "MAX_MESSAGE_TYPE";
19
17
  })(CrdtMessageType || (CrdtMessageType = {}));
20
18
  /**
21
19
  * @public
@@ -1,6 +1,7 @@
1
1
  import { Entity } from '../../engine/entity';
2
2
  import type { ComponentDefinition } from '../../engine';
3
3
  import { CrdtMessageType } from '../../serialization/crdt/types';
4
+ export declare const LIVEKIT_MAX_SIZE = 12;
4
5
  /**
5
6
  * @public
6
7
  */
@@ -1,17 +1,24 @@
1
1
  import { EntityState } from '../../engine/entity';
2
2
  import { ReadWriteByteBuffer } from '../../serialization/ByteBuffer';
3
- import { AppendValueOperation, CrdtMessageProtocol } from '../../serialization/crdt';
3
+ import { AppendValueOperation, CrdtMessageProtocol, DeleteComponentNetwork, DeleteEntityNetwork } from '../../serialization/crdt';
4
4
  import { DeleteComponent } from '../../serialization/crdt/deleteComponent';
5
5
  import { DeleteEntity } from '../../serialization/crdt/deleteEntity';
6
6
  import { PutComponentOperation } from '../../serialization/crdt/putComponent';
7
- import { AuthoritativePutComponentOperation } from '../../serialization/crdt/authoritativePutComponent';
8
7
  import { CrdtMessageType } from '../../serialization/crdt/types';
8
+ import { PutNetworkComponentOperation } from '../../serialization/crdt/network/putComponentNetwork';
9
+ import { NetworkEntity as defineNetworkEntity, NetworkParent as defineNetworkParent, Transform as defineTransform } from '../../components';
10
+ import * as networkUtils from '../../serialization/crdt/network/utils';
11
+ // NetworkMessages can only have a MAX_SIZE of 12kb. So we need to send it in chunks.
12
+ export const LIVEKIT_MAX_SIZE = 12;
9
13
  /**
10
14
  * @internal
11
15
  */
12
16
  export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
13
17
  const transports = [];
14
- // No network components needed - pure CRDT processing only
18
+ // Components that we used on this system
19
+ const NetworkEntity = defineNetworkEntity(engine);
20
+ const NetworkParent = defineNetworkParent(engine);
21
+ const Transform = defineTransform(engine);
15
22
  // Messages that we received at transport.onMessage waiting to be processed
16
23
  const receivedMessages = [];
17
24
  // Messages already processed by the engine but that we need to broadcast to other transports.
@@ -36,20 +43,27 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
36
43
  if (header.type === CrdtMessageType.DELETE_COMPONENT) {
37
44
  message = DeleteComponent.read(buffer);
38
45
  }
46
+ else if (header.type === CrdtMessageType.DELETE_COMPONENT_NETWORK) {
47
+ message = DeleteComponentNetwork.read(buffer);
48
+ }
39
49
  else if (header.type === CrdtMessageType.PUT_COMPONENT) {
40
50
  message = PutComponentOperation.read(buffer);
41
51
  }
42
- else if (header.type === CrdtMessageType.AUTHORITATIVE_PUT_COMPONENT) {
43
- message = AuthoritativePutComponentOperation.read(buffer);
52
+ else if (header.type === CrdtMessageType.PUT_COMPONENT_NETWORK) {
53
+ message = PutNetworkComponentOperation.read(buffer);
44
54
  }
45
55
  else if (header.type === CrdtMessageType.DELETE_ENTITY) {
46
56
  message = DeleteEntity.read(buffer);
47
57
  }
58
+ else if (header.type === CrdtMessageType.DELETE_ENTITY_NETWORK) {
59
+ message = DeleteEntityNetwork.read(buffer);
60
+ }
48
61
  else if (header.type === CrdtMessageType.APPEND_VALUE) {
49
62
  message = AppendValueOperation.read(buffer);
63
+ // Unknown message, we skip it
50
64
  }
51
65
  else {
52
- // Unknown message, we skip it (including NETWORK messages)
66
+ // consume the message
53
67
  buffer.incrementReadOffset(header.length);
54
68
  }
55
69
  if (message) {
@@ -70,6 +84,22 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
70
84
  const messagesToProcess = value.splice(0, value.length);
71
85
  return messagesToProcess;
72
86
  }
87
+ /**
88
+ * Find the local entityId associated to the network component message.
89
+ * It's a mapping Network -> to Local
90
+ * If it's not a network message, return the entityId received by the message
91
+ */
92
+ function findNetworkId(msg) {
93
+ const hasNetworkId = 'networkId' in msg;
94
+ if (hasNetworkId) {
95
+ for (const [entityId, network] of engine.getEntitiesWith(NetworkEntity)) {
96
+ if (network.networkId === msg.networkId && network.entityId === msg.entityId) {
97
+ return { entityId, network };
98
+ }
99
+ }
100
+ }
101
+ return { entityId: msg.entityId };
102
+ }
73
103
  /**
74
104
  * This fn will be called on every tick.
75
105
  * Process all the messages queue received by the transport
@@ -78,52 +108,46 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
78
108
  const messagesToProcess = getMessages(receivedMessages);
79
109
  const entitiesShouldBeCleaned = [];
80
110
  for (const msg of messagesToProcess) {
81
- // Simple CRDT processing - no network logic
82
- if (msg.type === CrdtMessageType.DELETE_ENTITY) {
83
- entitiesShouldBeCleaned.push(msg.entityId);
111
+ let { entityId, network } = findNetworkId(msg);
112
+ // We receive a new Entity. Create the localEntity and map it to the NetworkEntity component
113
+ if (networkUtils.isNetworkMessage(msg) && !network) {
114
+ entityId = engine.addEntity();
115
+ network = { entityId: msg.entityId, networkId: msg.networkId };
116
+ NetworkEntity.createOrReplace(entityId, network);
117
+ }
118
+ if (msg.type === CrdtMessageType.DELETE_ENTITY || msg.type === CrdtMessageType.DELETE_ENTITY_NETWORK) {
119
+ entitiesShouldBeCleaned.push(entityId);
84
120
  broadcastMessages.push(msg);
85
121
  }
86
122
  else {
87
- const entityState = engine.entityContainer.getEntityState(msg.entityId);
88
- // Skip updates from removed entities
123
+ const entityState = engine.entityContainer.getEntityState(entityId);
124
+ // Skip updates from removed entityes
89
125
  if (entityState === EntityState.Removed)
90
126
  continue;
91
- // Entities with unknown state should update its entity state
127
+ // Entities with unknown entities should update its entity state
92
128
  if (entityState === EntityState.Unknown) {
93
- engine.entityContainer.updateUsedEntity(msg.entityId);
94
- }
95
- // Only process component-related messages (not DELETE_ENTITY)
96
- if ('componentId' in msg) {
97
- const component = engine.getComponentOrNull(msg.componentId);
98
- if (component) {
99
- // Handle authoritative messages differently - they force the state regardless of timestamp
100
- const tryUpdate = () => {
101
- try {
102
- return msg.type === CrdtMessageType.AUTHORITATIVE_PUT_COMPONENT
103
- ? component.__forceUpdateFromCrdt(msg)
104
- : component.updateFromCrdt(msg);
105
- }
106
- catch (e) {
107
- console.error('[receiveMessages] ERROR processing message', msg, e);
108
- return null;
109
- }
110
- };
111
- const result = tryUpdate();
112
- if (!result)
113
- continue;
114
- const [conflictMessage, value] = result;
115
- if (!conflictMessage) {
116
- // Add message to broadcast queue when no conflict
117
- broadcastMessages.push(msg);
118
- onProcessEntityComponentChange && onProcessEntityComponentChange(msg.entityId, msg.type, component, value);
119
- }
129
+ engine.entityContainer.updateUsedEntity(entityId);
130
+ }
131
+ const component = engine.getComponentOrNull(msg.componentId);
132
+ /* istanbul ignore else */
133
+ if (component) {
134
+ if (msg.type === CrdtMessageType.PUT_COMPONENT &&
135
+ component.componentId === Transform.componentId &&
136
+ NetworkEntity.has(entityId) &&
137
+ NetworkParent.has(entityId)) {
138
+ msg.data = networkUtils.fixTransformParent(msg);
120
139
  }
121
- else {
122
- // Component not found - still broadcast for editor compatibility
123
- /* istanbul ignore next */
140
+ const [conflictMessage, value] = component.updateFromCrdt({ ...msg, entityId });
141
+ if (!conflictMessage) {
142
+ // Add message to transport queue to be processed by others transports
124
143
  broadcastMessages.push(msg);
144
+ onProcessEntityComponentChange && onProcessEntityComponentChange(entityId, msg.type, component, value);
125
145
  }
126
146
  }
147
+ else {
148
+ // TODO: test this line, it is fundammental to make the editor work
149
+ broadcastMessages.push(msg);
150
+ }
127
151
  }
128
152
  }
129
153
  // the last stage of the syncrhonization is to delete the entities
@@ -137,17 +161,16 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
137
161
  }
138
162
  }
139
163
  /**
140
- * Simple CRDT message broadcasting - no network-specific logic
164
+ * Iterates the dirty map and generates crdt messages to be send
141
165
  */
142
166
  async function sendMessages(entitiesDeletedThisTick) {
143
- // Get messages from broadcast queue and component updates
167
+ // CRDT Messages will be the merge between the recieved transport messages and the new crdt messages
144
168
  const crdtMessages = getMessages(broadcastMessages);
145
169
  const buffer = new ReadWriteByteBuffer();
146
- // Generate CRDT messages from component updates
147
170
  for (const component of engine.componentsIter()) {
148
171
  for (const message of component.getCrdtUpdates()) {
149
172
  const offset = buffer.currentWriteOffset();
150
- // Only create messages if there's a transport that will handle it
173
+ // Avoid creating messages if there is no transport that will handle it
151
174
  if (transports.some((t) => t.filter(message))) {
152
175
  if (message.type === CrdtMessageType.PUT_COMPONENT) {
153
176
  PutComponentOperation.write(message.entityId, message.timestamp, message.componentId, message.data, buffer);
@@ -171,7 +194,7 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
171
194
  }
172
195
  }
173
196
  }
174
- // Handle deleted entities
197
+ // After all updates, I execute the DeletedEntity messages
175
198
  for (const entityId of entitiesDeletedThisTick) {
176
199
  const offset = buffer.currentWriteOffset();
177
200
  DeleteEntity.write(entityId, buffer);
@@ -182,19 +205,87 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
182
205
  });
183
206
  onProcessEntityComponentChange && onProcessEntityComponentChange(entityId, CrdtMessageType.DELETE_ENTITY);
184
207
  }
185
- // Simple transport broadcasting - no network-specific transforms
186
- for (const transport of transports) {
187
- const transportBuffer = new ReadWriteByteBuffer();
208
+ // Send CRDT messages to transports
209
+ const transportBuffer = new ReadWriteByteBuffer();
210
+ for (const index in transports) {
211
+ const __NetworkMessagesBuffer = [];
212
+ const transportIndex = Number(index);
213
+ const transport = transports[transportIndex];
214
+ const isRendererTransport = transport.type === 'renderer';
215
+ const isNetworkTransport = transport.type === 'network';
216
+ // Reset Buffer for each Transport
217
+ transportBuffer.resetBuffer();
218
+ const buffer = new ReadWriteByteBuffer();
219
+ // Then we send all the new crdtMessages that the transport needs to process
188
220
  for (const message of crdtMessages) {
221
+ // Check if adding this message would exceed the size limit
222
+ const currentBufferSize = transportBuffer.toBinary().byteLength;
223
+ const messageSize = message.messageBuffer.byteLength;
224
+ if (isNetworkTransport && (currentBufferSize + messageSize) / 1024 > LIVEKIT_MAX_SIZE) {
225
+ // If the current buffer has content, save it as a chunk
226
+ if (currentBufferSize > 0) {
227
+ __NetworkMessagesBuffer.push(transportBuffer.toCopiedBinary());
228
+ transportBuffer.resetBuffer();
229
+ }
230
+ // If the message itself is larger than the limit, we need to handle it specially
231
+ // For now, we'll skip it to prevent infinite loops
232
+ if (messageSize / 1024 > LIVEKIT_MAX_SIZE) {
233
+ console.error(`Message too large (${messageSize} bytes), skipping message for entity ${message.entityId}`);
234
+ continue;
235
+ }
236
+ }
189
237
  // Avoid echo messages
190
- if (message.transportId === transports.indexOf(transport))
238
+ if (message.transportId === transportIndex)
239
+ continue;
240
+ // Redundant message for the transport
241
+ if (!transport.filter(message))
242
+ continue;
243
+ const { entityId } = findNetworkId(message);
244
+ const transformNeedsFix = 'componentId' in message &&
245
+ message.componentId === Transform.componentId &&
246
+ Transform.has(entityId) &&
247
+ NetworkParent.has(entityId) &&
248
+ NetworkEntity.has(entityId);
249
+ // If there was a LOCAL change in the transform. Add the parent to that transform
250
+ if (isRendererTransport && message.type === CrdtMessageType.PUT_COMPONENT && transformNeedsFix) {
251
+ const parent = findNetworkId(NetworkParent.get(entityId));
252
+ const transformData = networkUtils.fixTransformParent(message, Transform.get(entityId), parent.entityId);
253
+ const offset = buffer.currentWriteOffset();
254
+ PutComponentOperation.write(entityId, message.timestamp, message.componentId, transformData, buffer);
255
+ transportBuffer.writeBuffer(buffer.buffer().subarray(offset, buffer.currentWriteOffset()), false);
191
256
  continue;
192
- // Check if transport wants this message
193
- if (transport.filter(message)) {
194
- transportBuffer.writeBuffer(message.messageBuffer, false);
195
257
  }
258
+ if (isRendererTransport && networkUtils.isNetworkMessage(message)) {
259
+ // If it's the renderer transport and its a NetworkMessage, we need to fix the entityId field and convert it to a known Message.
260
+ // PUT_NETWORK_COMPONENT -> PUT_COMPONENT
261
+ let transformData = 'data' in message ? message.data : new Uint8Array();
262
+ if (transformNeedsFix) {
263
+ const parent = findNetworkId(NetworkParent.get(entityId));
264
+ transformData = networkUtils.fixTransformParent(message, Transform.get(entityId), parent.entityId);
265
+ }
266
+ networkUtils.networkMessageToLocal({ ...message, data: transformData }, entityId, buffer, transportBuffer);
267
+ // Iterate the next message
268
+ continue;
269
+ }
270
+ // If its a network transport and its a PUT_COMPONENT that has a NetworkEntity component, we need to send this message
271
+ // through comms with the EntityID and NetworkID from ther NetworkEntity so everyone can recieve this message and map to their custom entityID.
272
+ if (isNetworkTransport && !networkUtils.isNetworkMessage(message)) {
273
+ const networkData = NetworkEntity.getOrNull(message.entityId);
274
+ // If it has networkData convert the message to PUT_NETWORK_COMPONENT.
275
+ if (networkData) {
276
+ networkUtils.localMessageToNetwork(message, networkData, buffer, transportBuffer);
277
+ // Iterate the next message
278
+ continue;
279
+ }
280
+ }
281
+ // Common message
282
+ transportBuffer.writeBuffer(message.messageBuffer, false);
283
+ }
284
+ if (isNetworkTransport && transportBuffer.currentWriteOffset()) {
285
+ __NetworkMessagesBuffer.push(transportBuffer.toBinary());
196
286
  }
197
- await transport.send(transportBuffer.toBinary());
287
+ const message = isNetworkTransport ? __NetworkMessagesBuffer : transportBuffer.toBinary();
288
+ await transport.send(message);
198
289
  }
199
290
  }
200
291
  /**
@@ -1,6 +1,38 @@
1
1
  import { Entity, IEngine, LastWriteWinElementSetComponentDefinition } from '../../engine';
2
2
  import { Quaternion, Vector2, Vector3 } from '../generated/pb/decentraland/common/vectors.gen';
3
3
  import { EasingFunction, Move, MoveContinuous, PBTween, Rotate, RotateContinuous, Scale, TextureMove, TextureMoveContinuous, TextureMovementType } from '../generated/index.gen';
4
+ /**
5
+ * @public
6
+ * Partial params for Tween.Mode.MoveRotateScale(). At least one of position, rotation, or scale must be provided.
7
+ * Use this when building a mode for Tween.createOrReplace() or TweenSequence (e.g. only positionStart/positionEnd).
8
+ */
9
+ export interface MoveRotateScaleModeParams {
10
+ /** Position tween (start → end). Optional. */
11
+ position?: {
12
+ start: Vector3;
13
+ end: Vector3;
14
+ };
15
+ /** Rotation tween (start → end). Optional. */
16
+ rotation?: {
17
+ start: Quaternion;
18
+ end: Quaternion;
19
+ };
20
+ /** Scale tween (start → end). Optional. */
21
+ scale?: {
22
+ start: Vector3;
23
+ end: Vector3;
24
+ };
25
+ }
26
+ /**
27
+ * @public
28
+ * Parameters for setMoveRotateScale. At least one of position, rotation, or scale must be provided.
29
+ */
30
+ export interface SetMoveRotateScaleParams extends MoveRotateScaleModeParams {
31
+ /** Duration of the tween in milliseconds. */
32
+ duration: number;
33
+ /** Easing function (defaults to EF_LINEAR). */
34
+ easingFunction?: EasingFunction;
35
+ }
4
36
  /**
5
37
  * @public
6
38
  */
@@ -33,13 +65,18 @@ export interface TweenHelper {
33
65
  * @returns a texture-move-continuous mode tween
34
66
  */
35
67
  TextureMoveContinuous: (textureMove: TextureMoveContinuous) => PBTween['mode'];
68
+ /**
69
+ * @returns a move-rotate-scale mode tween
70
+ * @param params - partial transform (at least one of position, rotation, scale); omit axes you don't need
71
+ */
72
+ MoveRotateScale: (params: MoveRotateScaleModeParams) => PBTween['mode'];
36
73
  }
37
74
  /**
38
75
  * @public
39
76
  */
40
77
  export interface TweenComponentDefinitionExtended extends LastWriteWinElementSetComponentDefinition<PBTween> {
41
78
  /**
42
- * Texture helpers with constructor
79
+ * Helpers with constructor
43
80
  */
44
81
  Mode: TweenHelper;
45
82
  /**
@@ -118,5 +155,15 @@ export interface TweenComponentDefinitionExtended extends LastWriteWinElementSet
118
155
  * @param duration - duration of the tween in milliseconds (defaults to 0 for infinite)
119
156
  */
120
157
  setTextureMoveContinuous(entity: Entity, direction: Vector2, speed: number, movementType?: TextureMovementType, duration?: number): void;
158
+ /**
159
+ * @public
160
+ *
161
+ * Creates or replaces a move-rotate-scale tween component that simultaneously animates
162
+ * an entity's position, rotation, and/or scale from start to end. Provide only the
163
+ * properties you need (at least one of position, rotation, or scale).
164
+ * @param entity - entity to apply the tween to
165
+ * @param params - object with optional position, rotation, scale (each with start/end), duration, and optional easingFunction
166
+ */
167
+ setMoveRotateScale(entity: Entity, params: SetMoveRotateScaleParams): void;
121
168
  }
122
169
  export declare function defineTweenComponent(engine: Pick<IEngine, 'defineComponentFromSchema'>): TweenComponentDefinitionExtended;
@@ -2,6 +2,35 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.defineTweenComponent = void 0;
4
4
  const index_gen_1 = require("../generated/index.gen");
5
+ function assertDuration(duration, apiName) {
6
+ if (!Number.isFinite(duration) || duration < 0) {
7
+ throw new Error(`${apiName}: duration must be a non-negative finite number`);
8
+ }
9
+ }
10
+ /** Shared validation for params that have optional position/rotation/scale with start & end. */
11
+ function assertMoveRotateScaleAxesStartEnd(params, apiName) {
12
+ if (!params.position && !params.rotation && !params.scale) {
13
+ throw new Error(`${apiName}: at least one of position, rotation, or scale must be provided`);
14
+ }
15
+ if (params.position) {
16
+ const pos = params.position;
17
+ if (!pos.start || !pos.end) {
18
+ throw new Error(`${apiName}: position must have both start and end`);
19
+ }
20
+ }
21
+ if (params.rotation) {
22
+ const rot = params.rotation;
23
+ if (!rot.start || !rot.end) {
24
+ throw new Error(`${apiName}: rotation must have both start and end`);
25
+ }
26
+ }
27
+ if (params.scale) {
28
+ const scl = params.scale;
29
+ if (!scl.start || !scl.end) {
30
+ throw new Error(`${apiName}: scale must have both start and end`);
31
+ }
32
+ }
33
+ }
5
34
  const TweenHelper = {
6
35
  Move(move) {
7
36
  return {
@@ -44,6 +73,21 @@ const TweenHelper = {
44
73
  $case: 'textureMoveContinuous',
45
74
  textureMoveContinuous
46
75
  };
76
+ },
77
+ MoveRotateScale(params) {
78
+ assertMoveRotateScaleAxesStartEnd(params, 'Tween.Mode.MoveRotateScale');
79
+ const moveRotateScale = {
80
+ positionStart: params.position ? params.position.start : undefined,
81
+ positionEnd: params.position ? params.position.end : undefined,
82
+ rotationStart: params.rotation ? params.rotation.start : undefined,
83
+ rotationEnd: params.rotation ? params.rotation.end : undefined,
84
+ scaleStart: params.scale ? params.scale.start : undefined,
85
+ scaleEnd: params.scale ? params.scale.end : undefined
86
+ };
87
+ return {
88
+ $case: 'moveRotateScale',
89
+ moveRotateScale
90
+ };
47
91
  }
48
92
  };
49
93
  function defineTweenComponent(engine) {
@@ -150,6 +194,28 @@ function defineTweenComponent(engine) {
150
194
  easingFunction: 0 /* EasingFunction.EF_LINEAR */,
151
195
  playing: true
152
196
  });
197
+ },
198
+ setMoveRotateScale(entity, params) {
199
+ assertMoveRotateScaleAxesStartEnd(params, 'setMoveRotateScale');
200
+ assertDuration(params.duration, 'setMoveRotateScale');
201
+ const { position, rotation, scale, duration, easingFunction = 0 /* EasingFunction.EF_LINEAR */ } = params;
202
+ const moveRotateScale = {
203
+ positionStart: position ? position.start : undefined,
204
+ positionEnd: position ? position.end : undefined,
205
+ rotationStart: rotation ? rotation.start : undefined,
206
+ rotationEnd: rotation ? rotation.end : undefined,
207
+ scaleStart: scale ? scale.start : undefined,
208
+ scaleEnd: scale ? scale.end : undefined
209
+ };
210
+ theComponent.createOrReplace(entity, {
211
+ mode: {
212
+ $case: 'moveRotateScale',
213
+ moveRotateScale
214
+ },
215
+ duration,
216
+ easingFunction,
217
+ playing: true
218
+ });
153
219
  }
154
220
  };
155
221
  }
@@ -0,0 +1,28 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.PhysicsCombinedForceSchema = void 0;
4
+ const physics_combined_force_gen_1 = require("./pb/decentraland/sdk/components/physics_combined_force.gen");
5
+ /**
6
+ * @internal
7
+ */
8
+ exports.PhysicsCombinedForceSchema = {
9
+ COMPONENT_ID: 1216,
10
+ serialize(value, builder) {
11
+ const writer = physics_combined_force_gen_1.PBPhysicsCombinedForce.encode(value);
12
+ const buffer = new Uint8Array(writer.finish(), 0, writer.len);
13
+ builder.writeBuffer(buffer, false);
14
+ },
15
+ deserialize(reader) {
16
+ return physics_combined_force_gen_1.PBPhysicsCombinedForce.decode(reader.buffer(), reader.remainingBytes());
17
+ },
18
+ create() {
19
+ // TODO: this is a hack.
20
+ return physics_combined_force_gen_1.PBPhysicsCombinedForce.decode(new Uint8Array());
21
+ },
22
+ jsonSchema: {
23
+ type: "object",
24
+ properties: {},
25
+ serializationType: "protocol-buffer",
26
+ protocolBuffer: "PBPhysicsCombinedForce"
27
+ }
28
+ };
@@ -0,0 +1,28 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.PhysicsCombinedImpulseSchema = void 0;
4
+ const physics_combined_impulse_gen_1 = require("./pb/decentraland/sdk/components/physics_combined_impulse.gen");
5
+ /**
6
+ * @internal
7
+ */
8
+ exports.PhysicsCombinedImpulseSchema = {
9
+ COMPONENT_ID: 1215,
10
+ serialize(value, builder) {
11
+ const writer = physics_combined_impulse_gen_1.PBPhysicsCombinedImpulse.encode(value);
12
+ const buffer = new Uint8Array(writer.finish(), 0, writer.len);
13
+ builder.writeBuffer(buffer, false);
14
+ },
15
+ deserialize(reader) {
16
+ return physics_combined_impulse_gen_1.PBPhysicsCombinedImpulse.decode(reader.buffer(), reader.remainingBytes());
17
+ },
18
+ create() {
19
+ // TODO: this is a hack.
20
+ return physics_combined_impulse_gen_1.PBPhysicsCombinedImpulse.decode(new Uint8Array());
21
+ },
22
+ jsonSchema: {
23
+ type: "object",
24
+ properties: {},
25
+ serializationType: "protocol-buffer",
26
+ protocolBuffer: "PBPhysicsCombinedImpulse"
27
+ }
28
+ };
@@ -33,6 +33,8 @@ exports.coreComponentMappings = {
33
33
  "core::MeshCollider": 1019,
34
34
  "core::MeshRenderer": 1018,
35
35
  "core::NftShape": 1040,
36
+ "core::PhysicsCombinedForce": 1216,
37
+ "core::PhysicsCombinedImpulse": 1215,
36
38
  "core::PlayerIdentityData": 1089,
37
39
  "core::PointerEvents": 1062,
38
40
  "core::PointerEventsResult": 1063,
@@ -22,6 +22,8 @@ import { PBInputModifier } from './pb/decentraland/sdk/components/input_modifier
22
22
  import { PBLightSource } from './pb/decentraland/sdk/components/light_source.gen';
23
23
  import { PBMainCamera } from './pb/decentraland/sdk/components/main_camera.gen';
24
24
  import { PBNftShape } from './pb/decentraland/sdk/components/nft_shape.gen';
25
+ import { PBPhysicsCombinedForce } from './pb/decentraland/sdk/components/physics_combined_force.gen';
26
+ import { PBPhysicsCombinedImpulse } from './pb/decentraland/sdk/components/physics_combined_impulse.gen';
25
27
  import { PBPlayerIdentityData } from './pb/decentraland/sdk/components/player_identity_data.gen';
26
28
  import { PBPointerEvents } from './pb/decentraland/sdk/components/pointer_events.gen';
27
29
  import { PBPointerEventsResult } from './pb/decentraland/sdk/components/pointer_events_result.gen';
@@ -70,6 +72,8 @@ import { PBVisibilityComponent } from './pb/decentraland/sdk/components/visibili
70
72
  /** @public */ export declare const LightSource: LastWriteWinElementSetComponentDefinition<PBLightSource>;
71
73
  /** @public */ export declare const MainCamera: LastWriteWinElementSetComponentDefinition<PBMainCamera>;
72
74
  /** @public */ export declare const NftShape: LastWriteWinElementSetComponentDefinition<PBNftShape>;
75
+ /** @public */ export declare const PhysicsCombinedForce: LastWriteWinElementSetComponentDefinition<PBPhysicsCombinedForce>;
76
+ /** @public */ export declare const PhysicsCombinedImpulse: LastWriteWinElementSetComponentDefinition<PBPhysicsCombinedImpulse>;
73
77
  /** @public */ export declare const PlayerIdentityData: LastWriteWinElementSetComponentDefinition<PBPlayerIdentityData>;
74
78
  /** @public */ export declare const PointerEvents: LastWriteWinElementSetComponentDefinition<PBPointerEvents>;
75
79
  /** @public */ export declare const PointerEventsResult: GrowOnlyValueSetComponentDefinition<PBPointerEventsResult>;
@@ -26,7 +26,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
26
26
  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
27
27
  };
28
28
  Object.defineProperty(exports, "__esModule", { value: true });
29
- exports.VisibilityComponent = exports.VirtualCamera = exports.VideoPlayer = exports.VideoEvent = exports.UiTransform = exports.UiText = exports.UiInputResult = exports.UiInput = exports.UiDropdownResult = exports.UiDropdown = exports.UiCanvasInformation = exports.UiBackground = exports.TweenState = exports.TweenSequence = exports.TriggerAreaResult = exports.TriggerArea = exports.TextShape = exports.SkyboxTime = exports.RealmInfo = exports.RaycastResult = exports.Raycast = exports.PrimaryPointerInfo = exports.PointerLock = exports.PointerEventsResult = exports.PointerEvents = exports.PlayerIdentityData = exports.NftShape = exports.MainCamera = exports.LightSource = exports.InputModifier = exports.GltfNodeModifiers = exports.GltfContainerLoadingState = exports.GltfContainer = exports.EngineInfo = exports.CameraModeArea = exports.CameraMode = exports.Billboard = exports.AvatarShape = exports.AvatarModifierArea = exports.AvatarEquippedData = exports.AvatarEmoteCommand = exports.AvatarBase = exports.AvatarAttach = exports.AudioStream = exports.AudioSource = exports.AudioEvent = exports.AssetLoadLoadingState = exports.AssetLoad = void 0;
29
+ exports.VisibilityComponent = exports.VirtualCamera = exports.VideoPlayer = exports.VideoEvent = exports.UiTransform = exports.UiText = exports.UiInputResult = exports.UiInput = exports.UiDropdownResult = exports.UiDropdown = exports.UiCanvasInformation = exports.UiBackground = exports.TweenState = exports.TweenSequence = exports.TriggerAreaResult = exports.TriggerArea = exports.TextShape = exports.SkyboxTime = exports.RealmInfo = exports.RaycastResult = exports.Raycast = exports.PrimaryPointerInfo = exports.PointerLock = exports.PointerEventsResult = exports.PointerEvents = exports.PlayerIdentityData = exports.PhysicsCombinedImpulse = exports.PhysicsCombinedForce = exports.NftShape = exports.MainCamera = exports.LightSource = exports.InputModifier = exports.GltfNodeModifiers = exports.GltfContainerLoadingState = exports.GltfContainer = exports.EngineInfo = exports.CameraModeArea = exports.CameraMode = exports.Billboard = exports.AvatarShape = exports.AvatarModifierArea = exports.AvatarEquippedData = exports.AvatarEmoteCommand = exports.AvatarBase = exports.AvatarAttach = exports.AudioStream = exports.AudioSource = exports.AudioEvent = exports.AssetLoadLoadingState = exports.AssetLoad = void 0;
30
30
  const initialization_1 = require("../../runtime/initialization");
31
31
  const components = __importStar(require("./index.gen"));
32
32
  __exportStar(require("./index.gen"), exports);
@@ -52,6 +52,8 @@ __exportStar(require("./index.gen"), exports);
52
52
  /** @public */ exports.LightSource = components.LightSource(initialization_1.engine);
53
53
  /** @public */ exports.MainCamera = components.MainCamera(initialization_1.engine);
54
54
  /** @public */ exports.NftShape = components.NftShape(initialization_1.engine);
55
+ /** @public */ exports.PhysicsCombinedForce = components.PhysicsCombinedForce(initialization_1.engine);
56
+ /** @public */ exports.PhysicsCombinedImpulse = components.PhysicsCombinedImpulse(initialization_1.engine);
55
57
  /** @public */ exports.PlayerIdentityData = components.PlayerIdentityData(initialization_1.engine);
56
58
  /** @public */ exports.PointerEvents = components.PointerEvents(initialization_1.engine);
57
59
  /** @public */ exports.PointerEventsResult = components.PointerEventsResult(initialization_1.engine);