@dcl/ecs 7.20.4-22315533777.commit-7079ccb → 7.20.4-22415882943.commit-7ad895c
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.
- package/dist/components/extended/AudioAnalysis.d.ts +55 -0
- package/dist/components/extended/AudioAnalysis.js +66 -0
- package/dist/components/generated/AudioAnalysis.gen.d.ts +1 -0
- package/dist/components/generated/AudioAnalysis.gen.js +25 -0
- package/dist/components/generated/AvatarLocomotionSettings.gen.d.ts +1 -0
- package/dist/components/generated/AvatarLocomotionSettings.gen.js +25 -0
- package/dist/components/generated/component-names.gen.js +2 -0
- package/dist/components/generated/global.gen.d.ts +4 -0
- package/dist/components/generated/global.gen.js +2 -0
- package/dist/components/generated/index.gen.d.ts +8 -0
- package/dist/components/generated/index.gen.js +10 -0
- package/dist/components/generated/pb/decentraland/sdk/components/audio_analysis.gen.d.ts +37 -0
- package/dist/components/generated/pb/decentraland/sdk/components/audio_analysis.gen.js +161 -0
- package/dist/components/generated/pb/decentraland/sdk/components/avatar_locomotion_settings.gen.d.ts +29 -0
- package/dist/components/generated/pb/decentraland/sdk/components/avatar_locomotion_settings.gen.js +93 -0
- package/dist/components/generated/pb/decentraland/sdk/components/common/input_action.gen.d.ts +2 -1
- package/dist/components/generated/pb/decentraland/sdk/components/common/input_action.gen.js +1 -0
- package/dist/components/generated/pb/decentraland/sdk/components/virtual_camera.gen.d.ts +3 -0
- package/dist/components/generated/pb/decentraland/sdk/components/virtual_camera.gen.js +10 -1
- package/dist/components/index.d.ts +4 -5
- package/dist/components/index.js +5 -5
- package/dist/components/manual/Transform.d.ts +0 -9
- package/dist/components/manual/Transform.js +3 -3
- package/dist/components/types.d.ts +1 -1
- package/dist/engine/component.d.ts +1 -52
- package/dist/engine/grow-only-value-set-component-definition.js +2 -45
- package/dist/engine/lww-element-set-component-definition.d.ts +1 -3
- package/dist/engine/lww-element-set-component-definition.js +12 -65
- package/dist/index.d.ts +2 -2
- package/dist/index.js +1 -1
- package/dist/serialization/crdt/index.d.ts +0 -1
- package/dist/serialization/crdt/index.js +0 -1
- package/dist/serialization/crdt/network/utils.d.ts +9 -0
- package/dist/serialization/crdt/network/utils.js +60 -0
- package/dist/serialization/crdt/types.d.ts +3 -25
- package/dist/serialization/crdt/types.js +1 -3
- package/dist/systems/crdt/index.d.ts +1 -0
- package/dist/systems/crdt/index.js +146 -55
- package/dist-cjs/components/extended/AudioAnalysis.d.ts +55 -0
- package/dist-cjs/components/extended/AudioAnalysis.js +70 -0
- package/dist-cjs/components/generated/AudioAnalysis.gen.d.ts +1 -0
- package/dist-cjs/components/generated/AudioAnalysis.gen.js +28 -0
- package/dist-cjs/components/generated/AvatarLocomotionSettings.gen.d.ts +1 -0
- package/dist-cjs/components/generated/AvatarLocomotionSettings.gen.js +28 -0
- package/dist-cjs/components/generated/component-names.gen.js +2 -0
- package/dist-cjs/components/generated/global.gen.d.ts +4 -0
- package/dist-cjs/components/generated/global.gen.js +3 -1
- package/dist-cjs/components/generated/index.gen.d.ts +8 -0
- package/dist-cjs/components/generated/index.gen.js +14 -2
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/audio_analysis.gen.d.ts +37 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/audio_analysis.gen.js +167 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_locomotion_settings.gen.d.ts +29 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_locomotion_settings.gen.js +99 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/common/input_action.gen.d.ts +2 -1
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/common/input_action.gen.js +1 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/virtual_camera.gen.d.ts +3 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/virtual_camera.gen.js +10 -1
- package/dist-cjs/components/index.d.ts +4 -5
- package/dist-cjs/components/index.js +7 -7
- package/dist-cjs/components/manual/Transform.d.ts +0 -9
- package/dist-cjs/components/manual/Transform.js +3 -3
- package/dist-cjs/components/types.d.ts +1 -1
- package/dist-cjs/engine/component.d.ts +1 -52
- package/dist-cjs/engine/grow-only-value-set-component-definition.js +1 -44
- package/dist-cjs/engine/lww-element-set-component-definition.d.ts +1 -3
- package/dist-cjs/engine/lww-element-set-component-definition.js +13 -68
- package/dist-cjs/index.d.ts +2 -2
- package/dist-cjs/index.js +2 -2
- package/dist-cjs/serialization/crdt/index.d.ts +0 -1
- package/dist-cjs/serialization/crdt/index.js +0 -1
- package/dist-cjs/serialization/crdt/network/utils.d.ts +9 -0
- package/dist-cjs/serialization/crdt/network/utils.js +67 -0
- package/dist-cjs/serialization/crdt/types.d.ts +3 -25
- package/dist-cjs/serialization/crdt/types.js +1 -3
- package/dist-cjs/systems/crdt/index.d.ts +1 -0
- package/dist-cjs/systems/crdt/index.js +169 -55
- package/package.json +2 -2
- package/dist/components/manual/CreatedBy.d.ts +0 -9
- package/dist/components/manual/CreatedBy.js +0 -8
- package/dist/serialization/crdt/authoritativePutComponent.d.ts +0 -15
- package/dist/serialization/crdt/authoritativePutComponent.js +0 -47
- package/dist-cjs/components/manual/CreatedBy.d.ts +0 -9
- package/dist-cjs/components/manual/CreatedBy.js +0 -10
- package/dist-cjs/serialization/crdt/authoritativePutComponent.d.ts +0 -15
- package/dist-cjs/serialization/crdt/authoritativePutComponent.js +0 -50
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
import { ReadWriteByteBuffer } from '../../ByteBuffer';
|
|
2
|
+
import { PutComponentOperation } from '../putComponent';
|
|
3
|
+
import { CrdtMessageType } from '../types';
|
|
4
|
+
import { DeleteComponent } from '../deleteComponent';
|
|
5
|
+
import { DeleteEntity } from '../deleteEntity';
|
|
6
|
+
import { PutNetworkComponentOperation } from './putComponentNetwork';
|
|
7
|
+
import { DeleteComponentNetwork } from './deleteComponentNetwork';
|
|
8
|
+
import { DeleteEntityNetwork } from './deleteEntityNetwork';
|
|
9
|
+
import { TransformSchema } from '../../../components/manual/Transform';
|
|
10
|
+
/* istanbul ignore next */
|
|
11
|
+
export function isNetworkMessage(message) {
|
|
12
|
+
return [
|
|
13
|
+
CrdtMessageType.DELETE_COMPONENT_NETWORK,
|
|
14
|
+
CrdtMessageType.DELETE_ENTITY_NETWORK,
|
|
15
|
+
CrdtMessageType.PUT_COMPONENT_NETWORK
|
|
16
|
+
].includes(message.type);
|
|
17
|
+
}
|
|
18
|
+
/* istanbul ignore next */
|
|
19
|
+
export function networkMessageToLocal(message, localEntityId, buffer, destinationBuffer) {
|
|
20
|
+
const offset = buffer.currentWriteOffset();
|
|
21
|
+
if (message.type === CrdtMessageType.PUT_COMPONENT_NETWORK) {
|
|
22
|
+
PutComponentOperation.write(localEntityId, message.timestamp, message.componentId, message.data, buffer);
|
|
23
|
+
}
|
|
24
|
+
else if (message.type === CrdtMessageType.DELETE_COMPONENT_NETWORK) {
|
|
25
|
+
DeleteComponent.write(localEntityId, message.componentId, message.timestamp, buffer);
|
|
26
|
+
}
|
|
27
|
+
else if (message.type === CrdtMessageType.DELETE_ENTITY_NETWORK) {
|
|
28
|
+
DeleteEntity.write(localEntityId, buffer);
|
|
29
|
+
}
|
|
30
|
+
destinationBuffer.writeBuffer(buffer.buffer().subarray(offset, buffer.currentWriteOffset()), false);
|
|
31
|
+
}
|
|
32
|
+
/* istanbul ignore next */
|
|
33
|
+
export function localMessageToNetwork(message, network, buffer, destinationBuffer) {
|
|
34
|
+
const offset = buffer.currentWriteOffset();
|
|
35
|
+
if (message.type === CrdtMessageType.PUT_COMPONENT) {
|
|
36
|
+
PutNetworkComponentOperation.write(network.entityId, message.timestamp, message.componentId, network.networkId, message.data, buffer);
|
|
37
|
+
}
|
|
38
|
+
else if (message.type === CrdtMessageType.DELETE_COMPONENT) {
|
|
39
|
+
DeleteComponentNetwork.write(network.entityId, message.componentId, message.timestamp, network.networkId, buffer);
|
|
40
|
+
}
|
|
41
|
+
else if (message.type === CrdtMessageType.DELETE_ENTITY) {
|
|
42
|
+
DeleteEntityNetwork.write(network.entityId, network.networkId, buffer);
|
|
43
|
+
}
|
|
44
|
+
destinationBuffer.writeBuffer(buffer.buffer().subarray(offset, buffer.currentWriteOffset()), false);
|
|
45
|
+
}
|
|
46
|
+
const buffer = new ReadWriteByteBuffer();
|
|
47
|
+
/* istanbul ignore next */
|
|
48
|
+
export function fixTransformParent(message, transformValue, parent) {
|
|
49
|
+
buffer.resetBuffer();
|
|
50
|
+
let transform = transformValue;
|
|
51
|
+
if (!transform && 'data' in message) {
|
|
52
|
+
transform = TransformSchema.deserialize(new ReadWriteByteBuffer(message.data));
|
|
53
|
+
}
|
|
54
|
+
if (!transform)
|
|
55
|
+
throw new Error('Invalid parent transform');
|
|
56
|
+
// Generate new transform raw data with the parent
|
|
57
|
+
const newTransform = { ...transform, parent };
|
|
58
|
+
TransformSchema.serialize(newTransform, buffer);
|
|
59
|
+
return buffer.toBinary();
|
|
60
|
+
}
|
|
@@ -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
|
-
|
|
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 |
|
|
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 |
|
|
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
|
-
|
|
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,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
|
-
//
|
|
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.
|
|
43
|
-
message =
|
|
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
|
-
//
|
|
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
|
-
|
|
82
|
-
|
|
83
|
-
|
|
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(
|
|
88
|
-
// Skip updates from removed
|
|
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
|
|
127
|
+
// Entities with unknown entities should update its entity state
|
|
92
128
|
if (entityState === EntityState.Unknown) {
|
|
93
|
-
engine.entityContainer.updateUsedEntity(
|
|
94
|
-
}
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
if (
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
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
|
-
|
|
122
|
-
|
|
123
|
-
|
|
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
|
-
*
|
|
164
|
+
* Iterates the dirty map and generates crdt messages to be send
|
|
141
165
|
*/
|
|
142
166
|
async function sendMessages(entitiesDeletedThisTick) {
|
|
143
|
-
//
|
|
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
|
-
//
|
|
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
|
-
//
|
|
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
|
-
//
|
|
186
|
-
|
|
187
|
-
|
|
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 ===
|
|
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
|
-
|
|
287
|
+
const message = isNetworkTransport ? __NetworkMessagesBuffer : transportBuffer.toBinary();
|
|
288
|
+
await transport.send(message);
|
|
198
289
|
}
|
|
199
290
|
}
|
|
200
291
|
/**
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import { Entity, IEngine } from '../../engine';
|
|
2
|
+
import { LastWriteWinElementSetComponentDefinition } from '../../engine/component';
|
|
3
|
+
import { PBAudioAnalysis, PBAudioAnalysisMode } from '../generated/pb/decentraland/sdk/components/audio_analysis.gen';
|
|
4
|
+
export interface AudioAnalysisComponentDefinitionExtended extends LastWriteWinElementSetComponentDefinition<PBAudioAnalysis> {
|
|
5
|
+
/**
|
|
6
|
+
* Reads the component data of `entity` into the provided `out` view.
|
|
7
|
+
*
|
|
8
|
+
* @throws Error if the entity does not have an AudioAnalysis component.
|
|
9
|
+
* @param entity - The entity whose AudioAnalysis data will be read.
|
|
10
|
+
* @param out - An existing AudioAnalysisView to populate with the latest values.
|
|
11
|
+
*/
|
|
12
|
+
readIntoView(entity: Entity, out: AudioAnalysisView): void;
|
|
13
|
+
/**
|
|
14
|
+
* Attempts to read the component data of `entity` into the provided `out` view.
|
|
15
|
+
*
|
|
16
|
+
* @returns `true` if the component exists and data was written into `out`,
|
|
17
|
+
* `false` if the entity does not have an AudioAnalysis component.
|
|
18
|
+
* @param entity - The entity whose AudioAnalysis data will be read.
|
|
19
|
+
* @param out - An existing AudioAnalysisView to populate.
|
|
20
|
+
*/
|
|
21
|
+
tryReadIntoView(entity: Entity, out: AudioAnalysisView): boolean;
|
|
22
|
+
/**
|
|
23
|
+
* Creates an AudioAnalysis component for the given `entity`.
|
|
24
|
+
*
|
|
25
|
+
* If a component already exists on the entity, this call fails (does not replace).
|
|
26
|
+
*
|
|
27
|
+
* @param entity - The entity to attach the component to.
|
|
28
|
+
* @param mode - Analysis mode. Defaults to `PBAudioAnalysisMode.MODE_LOGARITHMIC`.
|
|
29
|
+
* @param amplitudeGain - Optional amplitude gain multiplier.
|
|
30
|
+
* @param bandsGain - Optional gain multiplier applied to all frequency bands.
|
|
31
|
+
*/
|
|
32
|
+
createAudioAnalysis(entity: Entity, mode?: PBAudioAnalysisMode, // default is PBAudioAnalysisMode.MODE_LOGARITHMIC
|
|
33
|
+
amplitudeGain?: number, bandsGain?: number): void;
|
|
34
|
+
/**
|
|
35
|
+
* Creates the AudioAnalysis component if missing, or replaces the existing one.
|
|
36
|
+
*
|
|
37
|
+
* @param entity - The target entity.
|
|
38
|
+
* @param mode - Analysis mode. Defaults to `PBAudioAnalysisMode.MODE_LOGARITHMIC`.
|
|
39
|
+
* @param amplitudeGain - Optional amplitude gain multiplier.
|
|
40
|
+
* @param bandsGain - Optional gain multiplier applied to the frequency bands.
|
|
41
|
+
*/
|
|
42
|
+
createOrReplaceAudioAnalysis(entity: Entity, mode?: PBAudioAnalysisMode, // default is PBAudioAnalysisMode.MODE_LOGARITHMIC
|
|
43
|
+
amplitudeGain?: number, bandsGain?: number): void;
|
|
44
|
+
}
|
|
45
|
+
/**
|
|
46
|
+
* A read-only JavaScript-friendly view of AudioAnalysis ECS data.
|
|
47
|
+
*
|
|
48
|
+
* `amplitude` represents the aggregated signal strength.
|
|
49
|
+
* `bands` represents the processed frequency bands.
|
|
50
|
+
*/
|
|
51
|
+
export type AudioAnalysisView = {
|
|
52
|
+
amplitude: number;
|
|
53
|
+
bands: number[];
|
|
54
|
+
};
|
|
55
|
+
export declare function defineAudioAnalysisComponent(engine: Pick<IEngine, 'defineComponentFromSchema'>): AudioAnalysisComponentDefinitionExtended;
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.defineAudioAnalysisComponent = void 0;
|
|
4
|
+
const index_gen_1 = require("../generated/index.gen");
|
|
5
|
+
function defineAudioAnalysisComponent(engine) {
|
|
6
|
+
const theComponent = (0, index_gen_1.AudioAnalysis)(engine);
|
|
7
|
+
return {
|
|
8
|
+
...theComponent,
|
|
9
|
+
readIntoView(entity, out) {
|
|
10
|
+
const audioAnalysis = theComponent.get(entity);
|
|
11
|
+
out.amplitude = audioAnalysis.amplitude;
|
|
12
|
+
out.bands[0] = audioAnalysis.band0;
|
|
13
|
+
out.bands[1] = audioAnalysis.band1;
|
|
14
|
+
out.bands[2] = audioAnalysis.band2;
|
|
15
|
+
out.bands[3] = audioAnalysis.band3;
|
|
16
|
+
out.bands[4] = audioAnalysis.band4;
|
|
17
|
+
out.bands[5] = audioAnalysis.band5;
|
|
18
|
+
out.bands[6] = audioAnalysis.band6;
|
|
19
|
+
out.bands[7] = audioAnalysis.band7;
|
|
20
|
+
},
|
|
21
|
+
tryReadIntoView(entity, out) {
|
|
22
|
+
const audioAnalysis = theComponent.getOrNull(entity);
|
|
23
|
+
if (!audioAnalysis)
|
|
24
|
+
return false;
|
|
25
|
+
out.amplitude = audioAnalysis.amplitude;
|
|
26
|
+
out.bands[0] = audioAnalysis.band0;
|
|
27
|
+
out.bands[1] = audioAnalysis.band1;
|
|
28
|
+
out.bands[2] = audioAnalysis.band2;
|
|
29
|
+
out.bands[3] = audioAnalysis.band3;
|
|
30
|
+
out.bands[4] = audioAnalysis.band4;
|
|
31
|
+
out.bands[5] = audioAnalysis.band5;
|
|
32
|
+
out.bands[6] = audioAnalysis.band6;
|
|
33
|
+
out.bands[7] = audioAnalysis.band7;
|
|
34
|
+
return true;
|
|
35
|
+
},
|
|
36
|
+
createAudioAnalysis(entity, mode, amplitudeGain, bandsGain) {
|
|
37
|
+
theComponent.create(entity, {
|
|
38
|
+
mode: mode || 1 /* PBAudioAnalysisMode.MODE_LOGARITHMIC */,
|
|
39
|
+
amplitudeGain: amplitudeGain ?? undefined,
|
|
40
|
+
bandsGain: bandsGain ?? undefined,
|
|
41
|
+
amplitude: 0,
|
|
42
|
+
band0: 0,
|
|
43
|
+
band1: 0,
|
|
44
|
+
band2: 0,
|
|
45
|
+
band3: 0,
|
|
46
|
+
band4: 0,
|
|
47
|
+
band5: 0,
|
|
48
|
+
band6: 0,
|
|
49
|
+
band7: 0
|
|
50
|
+
});
|
|
51
|
+
},
|
|
52
|
+
createOrReplaceAudioAnalysis(entity, mode, amplitudeGain, bandsGain) {
|
|
53
|
+
theComponent.createOrReplace(entity, {
|
|
54
|
+
mode: mode || 1 /* PBAudioAnalysisMode.MODE_LOGARITHMIC */,
|
|
55
|
+
amplitudeGain: amplitudeGain ?? undefined,
|
|
56
|
+
bandsGain: bandsGain ?? undefined,
|
|
57
|
+
amplitude: 0,
|
|
58
|
+
band0: 0,
|
|
59
|
+
band1: 0,
|
|
60
|
+
band2: 0,
|
|
61
|
+
band3: 0,
|
|
62
|
+
band4: 0,
|
|
63
|
+
band5: 0,
|
|
64
|
+
band6: 0,
|
|
65
|
+
band7: 0
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
};
|
|
69
|
+
}
|
|
70
|
+
exports.defineAudioAnalysisComponent = defineAudioAnalysisComponent;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.AudioAnalysisSchema = void 0;
|
|
4
|
+
const audio_analysis_gen_1 = require("./pb/decentraland/sdk/components/audio_analysis.gen");
|
|
5
|
+
/**
|
|
6
|
+
* @internal
|
|
7
|
+
*/
|
|
8
|
+
exports.AudioAnalysisSchema = {
|
|
9
|
+
COMPONENT_ID: 1212,
|
|
10
|
+
serialize(value, builder) {
|
|
11
|
+
const writer = audio_analysis_gen_1.PBAudioAnalysis.encode(value);
|
|
12
|
+
const buffer = new Uint8Array(writer.finish(), 0, writer.len);
|
|
13
|
+
builder.writeBuffer(buffer, false);
|
|
14
|
+
},
|
|
15
|
+
deserialize(reader) {
|
|
16
|
+
return audio_analysis_gen_1.PBAudioAnalysis.decode(reader.buffer(), reader.remainingBytes());
|
|
17
|
+
},
|
|
18
|
+
create() {
|
|
19
|
+
// TODO: this is a hack.
|
|
20
|
+
return audio_analysis_gen_1.PBAudioAnalysis.decode(new Uint8Array());
|
|
21
|
+
},
|
|
22
|
+
jsonSchema: {
|
|
23
|
+
type: "object",
|
|
24
|
+
properties: {},
|
|
25
|
+
serializationType: "protocol-buffer",
|
|
26
|
+
protocolBuffer: "PBAudioAnalysis"
|
|
27
|
+
}
|
|
28
|
+
};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.AvatarLocomotionSettingsSchema = void 0;
|
|
4
|
+
const avatar_locomotion_settings_gen_1 = require("./pb/decentraland/sdk/components/avatar_locomotion_settings.gen");
|
|
5
|
+
/**
|
|
6
|
+
* @internal
|
|
7
|
+
*/
|
|
8
|
+
exports.AvatarLocomotionSettingsSchema = {
|
|
9
|
+
COMPONENT_ID: 1211,
|
|
10
|
+
serialize(value, builder) {
|
|
11
|
+
const writer = avatar_locomotion_settings_gen_1.PBAvatarLocomotionSettings.encode(value);
|
|
12
|
+
const buffer = new Uint8Array(writer.finish(), 0, writer.len);
|
|
13
|
+
builder.writeBuffer(buffer, false);
|
|
14
|
+
},
|
|
15
|
+
deserialize(reader) {
|
|
16
|
+
return avatar_locomotion_settings_gen_1.PBAvatarLocomotionSettings.decode(reader.buffer(), reader.remainingBytes());
|
|
17
|
+
},
|
|
18
|
+
create() {
|
|
19
|
+
// TODO: this is a hack.
|
|
20
|
+
return avatar_locomotion_settings_gen_1.PBAvatarLocomotionSettings.decode(new Uint8Array());
|
|
21
|
+
},
|
|
22
|
+
jsonSchema: {
|
|
23
|
+
type: "object",
|
|
24
|
+
properties: {},
|
|
25
|
+
serializationType: "protocol-buffer",
|
|
26
|
+
protocolBuffer: "PBAvatarLocomotionSettings"
|
|
27
|
+
}
|
|
28
|
+
};
|
|
@@ -9,6 +9,7 @@ exports.coreComponentMappings = {
|
|
|
9
9
|
"core::Animator": 1042,
|
|
10
10
|
"core::AssetLoad": 1213,
|
|
11
11
|
"core::AssetLoadLoadingState": 1214,
|
|
12
|
+
"core::AudioAnalysis": 1212,
|
|
12
13
|
"core::AudioEvent": 1105,
|
|
13
14
|
"core::AudioSource": 1020,
|
|
14
15
|
"core::AudioStream": 1021,
|
|
@@ -16,6 +17,7 @@ exports.coreComponentMappings = {
|
|
|
16
17
|
"core::AvatarBase": 1087,
|
|
17
18
|
"core::AvatarEmoteCommand": 1088,
|
|
18
19
|
"core::AvatarEquippedData": 1091,
|
|
20
|
+
"core::AvatarLocomotionSettings": 1211,
|
|
19
21
|
"core::AvatarModifierArea": 1070,
|
|
20
22
|
"core::AvatarShape": 1080,
|
|
21
23
|
"core::Billboard": 1090,
|