@dcl/ecs 7.27.1-33247605236.commit-732120a → 7.27.1-33533530571.commit-451d001
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/MeshCollider.d.ts +0 -9
- package/dist/components/extended/MeshCollider.js +0 -6
- package/dist/components/extended/MeshRenderer.d.ts +0 -8
- package/dist/components/extended/MeshRenderer.js +0 -5
- package/dist/components/generated/component-names.gen.js +0 -10
- package/dist/components/generated/global.gen.d.ts +4 -20
- package/dist/components/generated/global.gen.js +2 -10
- package/dist/components/generated/index.gen.d.ts +0 -40
- package/dist/components/generated/index.gen.js +0 -50
- package/dist/components/generated/pb/decentraland/common/texture.gen.d.ts +0 -20
- package/dist/components/generated/pb/decentraland/common/texture.gen.js +0 -65
- package/dist/components/generated/pb/decentraland/sdk/components/avatar_equipped_data.gen.d.ts +0 -2
- package/dist/components/generated/pb/decentraland/sdk/components/avatar_equipped_data.gen.js +1 -10
- package/dist/components/generated/pb/decentraland/sdk/components/avatar_modifier_area.gen.d.ts +0 -2
- package/dist/components/generated/pb/decentraland/sdk/components/avatar_modifier_area.gen.js +1 -10
- package/dist/components/generated/pb/decentraland/sdk/components/avatar_shape.gen.d.ts +0 -2
- package/dist/components/generated/pb/decentraland/sdk/components/avatar_shape.gen.js +0 -10
- package/dist/components/generated/pb/decentraland/sdk/components/camera_mode_area.gen.d.ts +0 -2
- package/dist/components/generated/pb/decentraland/sdk/components/camera_mode_area.gen.js +1 -10
- package/dist/components/generated/pb/decentraland/sdk/components/common/input_action.gen.d.ts +1 -4
- package/dist/components/generated/pb/decentraland/sdk/components/common/input_action.gen.js +0 -3
- package/dist/components/generated/pb/decentraland/sdk/components/gltf_container_loading_state.gen.d.ts +0 -19
- package/dist/components/generated/pb/decentraland/sdk/components/gltf_container_loading_state.gen.js +1 -46
- package/dist/components/generated/pb/decentraland/sdk/components/material.gen.d.ts +0 -22
- package/dist/components/generated/pb/decentraland/sdk/components/material.gen.js +1 -57
- package/dist/components/generated/pb/decentraland/sdk/components/mesh_collider.gen.d.ts +0 -20
- package/dist/components/generated/pb/decentraland/sdk/components/mesh_collider.gen.js +0 -56
- package/dist/components/generated/pb/decentraland/sdk/components/mesh_renderer.gen.d.ts +3 -21
- package/dist/components/generated/pb/decentraland/sdk/components/mesh_renderer.gen.js +0 -56
- package/dist/components/generated/pb/decentraland/sdk/components/primary_pointer_info.gen.d.ts +2 -8
- package/dist/components/generated/pb/decentraland/sdk/components/primary_pointer_info.gen.js +0 -3
- package/dist/components/generated/pb/decentraland/sdk/components/raycast.gen.d.ts +0 -13
- package/dist/components/generated/pb/decentraland/sdk/components/raycast.gen.js +0 -30
- package/dist/components/generated/pb/decentraland/sdk/components/ui_input.gen.d.ts +0 -4
- package/dist/components/generated/pb/decentraland/sdk/components/ui_input.gen.js +0 -20
- package/dist/components/generated/pb/decentraland/sdk/components/ui_transform.gen.d.ts +0 -35
- package/dist/components/generated/pb/decentraland/sdk/components/ui_transform.gen.js +0 -90
- package/dist/components/index.d.ts +5 -4
- package/dist/components/index.js +5 -8
- package/dist/components/manual/CreatedBy.d.ts +9 -0
- package/dist/components/manual/CreatedBy.js +8 -0
- package/dist/components/manual/Transform.d.ts +9 -0
- package/dist/components/manual/Transform.js +3 -3
- package/dist/components/types.d.ts +1 -2
- package/dist/engine/component.d.ts +52 -1
- package/dist/engine/grow-only-value-set-component-definition.js +45 -2
- package/dist/engine/lww-element-set-component-definition.d.ts +3 -1
- package/dist/engine/lww-element-set-component-definition.js +68 -13
- package/dist/index.d.ts +2 -3
- package/dist/index.js +1 -3
- package/dist/serialization/crdt/authoritativePutComponent.d.ts +15 -0
- package/dist/serialization/crdt/authoritativePutComponent.js +47 -0
- package/dist/serialization/crdt/index.d.ts +1 -0
- package/dist/serialization/crdt/index.js +1 -0
- package/dist/serialization/crdt/types.d.ts +25 -3
- package/dist/serialization/crdt/types.js +3 -1
- package/dist/systems/crdt/index.d.ts +0 -1
- package/dist/systems/crdt/index.js +76 -143
- package/dist/systems/crdt/types.d.ts +10 -0
- package/dist/systems/events.d.ts +0 -48
- package/dist/systems/events.js +1 -52
- package/dist/systems/raycast.d.ts +1 -5
- package/dist/systems/raycast.js +1 -5
- package/dist-cjs/components/extended/MeshCollider.d.ts +0 -9
- package/dist-cjs/components/extended/MeshCollider.js +0 -6
- package/dist-cjs/components/extended/MeshRenderer.d.ts +0 -8
- package/dist-cjs/components/extended/MeshRenderer.js +0 -5
- package/dist-cjs/components/generated/component-names.gen.js +0 -10
- package/dist-cjs/components/generated/global.gen.d.ts +4 -20
- package/dist-cjs/components/generated/global.gen.js +4 -12
- package/dist-cjs/components/generated/index.gen.d.ts +0 -40
- package/dist-cjs/components/generated/index.gen.js +2 -62
- package/dist-cjs/components/generated/pb/decentraland/common/texture.gen.d.ts +0 -20
- package/dist-cjs/components/generated/pb/decentraland/common/texture.gen.js +1 -66
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_equipped_data.gen.d.ts +0 -2
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_equipped_data.gen.js +1 -10
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_modifier_area.gen.d.ts +0 -2
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_modifier_area.gen.js +1 -10
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_shape.gen.d.ts +0 -2
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_shape.gen.js +0 -10
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/camera_mode_area.gen.d.ts +0 -2
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/camera_mode_area.gen.js +1 -10
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/common/input_action.gen.d.ts +1 -4
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/common/input_action.gen.js +0 -3
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/gltf_container_loading_state.gen.d.ts +0 -19
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/gltf_container_loading_state.gen.js +1 -46
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/material.gen.d.ts +0 -22
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/material.gen.js +2 -58
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/mesh_collider.gen.d.ts +0 -20
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/mesh_collider.gen.js +1 -57
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/mesh_renderer.gen.d.ts +3 -21
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/mesh_renderer.gen.js +1 -57
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/primary_pointer_info.gen.d.ts +2 -8
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/primary_pointer_info.gen.js +0 -3
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/raycast.gen.d.ts +0 -13
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/raycast.gen.js +1 -31
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/ui_input.gen.d.ts +0 -4
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/ui_input.gen.js +0 -20
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/ui_transform.gen.d.ts +0 -35
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/ui_transform.gen.js +1 -91
- package/dist-cjs/components/index.d.ts +5 -4
- package/dist-cjs/components/index.js +7 -11
- package/dist-cjs/components/manual/CreatedBy.d.ts +9 -0
- package/dist-cjs/components/manual/CreatedBy.js +10 -0
- package/dist-cjs/components/manual/Transform.d.ts +9 -0
- package/dist-cjs/components/manual/Transform.js +3 -3
- package/dist-cjs/components/types.d.ts +1 -2
- package/dist-cjs/engine/component.d.ts +52 -1
- package/dist-cjs/engine/grow-only-value-set-component-definition.js +44 -1
- package/dist-cjs/engine/lww-element-set-component-definition.d.ts +3 -1
- package/dist-cjs/engine/lww-element-set-component-definition.js +71 -14
- package/dist-cjs/index.d.ts +2 -3
- package/dist-cjs/index.js +2 -4
- package/dist-cjs/serialization/crdt/authoritativePutComponent.d.ts +15 -0
- package/dist-cjs/serialization/crdt/authoritativePutComponent.js +50 -0
- package/dist-cjs/serialization/crdt/index.d.ts +1 -0
- package/dist-cjs/serialization/crdt/index.js +1 -0
- package/dist-cjs/serialization/crdt/types.d.ts +25 -3
- package/dist-cjs/serialization/crdt/types.js +3 -1
- package/dist-cjs/systems/crdt/index.d.ts +0 -1
- package/dist-cjs/systems/crdt/index.js +76 -166
- package/dist-cjs/systems/crdt/types.d.ts +10 -0
- package/dist-cjs/systems/events.d.ts +0 -48
- package/dist-cjs/systems/events.js +1 -52
- package/dist-cjs/systems/raycast.d.ts +1 -5
- package/dist-cjs/systems/raycast.js +1 -5
- package/package.json +2 -2
- package/dist/components/extended/AvatarEquippedData.d.ts +0 -15
- package/dist/components/extended/AvatarEquippedData.js +0 -10
- package/dist/components/extended/AvatarShape.d.ts +0 -15
- package/dist/components/extended/AvatarShape.js +0 -10
- package/dist/components/generated/AvatarMovement.gen.d.ts +0 -1
- package/dist/components/generated/AvatarMovement.gen.js +0 -25
- package/dist/components/generated/AvatarMovementInfo.gen.d.ts +0 -1
- package/dist/components/generated/AvatarMovementInfo.gen.js +0 -25
- package/dist/components/generated/CameraLayer.gen.d.ts +0 -1
- package/dist/components/generated/CameraLayer.gen.js +0 -25
- package/dist/components/generated/CameraLayers.gen.d.ts +0 -1
- package/dist/components/generated/CameraLayers.gen.js +0 -25
- package/dist/components/generated/GlobalLight.gen.d.ts +0 -1
- package/dist/components/generated/GlobalLight.gen.js +0 -25
- package/dist/components/generated/GltfNode.gen.d.ts +0 -1
- package/dist/components/generated/GltfNode.gen.js +0 -25
- package/dist/components/generated/GltfNodeState.gen.d.ts +0 -1
- package/dist/components/generated/GltfNodeState.gen.js +0 -25
- package/dist/components/generated/TextureCamera.gen.d.ts +0 -1
- package/dist/components/generated/TextureCamera.gen.js +0 -25
- package/dist/components/generated/UiCanvas.gen.d.ts +0 -1
- package/dist/components/generated/UiCanvas.gen.js +0 -25
- package/dist/components/generated/UiScrollResult.gen.d.ts +0 -1
- package/dist/components/generated/UiScrollResult.gen.js +0 -25
- package/dist/components/generated/pb/decentraland/sdk/components/avatar_movement.gen.d.ts +0 -57
- package/dist/components/generated/pb/decentraland/sdk/components/avatar_movement.gen.js +0 -204
- package/dist/components/generated/pb/decentraland/sdk/components/avatar_movement_info.gen.d.ts +0 -65
- package/dist/components/generated/pb/decentraland/sdk/components/avatar_movement_info.gen.js +0 -228
- package/dist/components/generated/pb/decentraland/sdk/components/camera_layer.gen.d.ts +0 -30
- package/dist/components/generated/pb/decentraland/sdk/components/camera_layer.gen.js +0 -104
- package/dist/components/generated/pb/decentraland/sdk/components/camera_layers.gen.d.ts +0 -14
- package/dist/components/generated/pb/decentraland/sdk/components/camera_layers.gen.js +0 -50
- package/dist/components/generated/pb/decentraland/sdk/components/global_light.gen.d.ts +0 -34
- package/dist/components/generated/pb/decentraland/sdk/components/global_light.gen.js +0 -61
- package/dist/components/generated/pb/decentraland/sdk/components/gltf_node.gen.d.ts +0 -50
- package/dist/components/generated/pb/decentraland/sdk/components/gltf_node.gen.js +0 -41
- package/dist/components/generated/pb/decentraland/sdk/components/gltf_node_state.gen.d.ts +0 -27
- package/dist/components/generated/pb/decentraland/sdk/components/gltf_node_state.gen.js +0 -59
- package/dist/components/generated/pb/decentraland/sdk/components/texture_camera.gen.d.ts +0 -74
- package/dist/components/generated/pb/decentraland/sdk/components/texture_camera.gen.js +0 -191
- package/dist/components/generated/pb/decentraland/sdk/components/ui_canvas.gen.d.ts +0 -19
- package/dist/components/generated/pb/decentraland/sdk/components/ui_canvas.gen.js +0 -60
- package/dist/components/generated/pb/decentraland/sdk/components/ui_scroll_result.gen.d.ts +0 -15
- package/dist/components/generated/pb/decentraland/sdk/components/ui_scroll_result.gen.js +0 -42
- package/dist/serialization/crdt/network/utils.d.ts +0 -9
- package/dist/serialization/crdt/network/utils.js +0 -60
- package/dist-cjs/components/extended/AvatarEquippedData.d.ts +0 -15
- package/dist-cjs/components/extended/AvatarEquippedData.js +0 -14
- package/dist-cjs/components/extended/AvatarShape.d.ts +0 -15
- package/dist-cjs/components/extended/AvatarShape.js +0 -14
- package/dist-cjs/components/generated/AvatarMovement.gen.d.ts +0 -1
- package/dist-cjs/components/generated/AvatarMovement.gen.js +0 -28
- package/dist-cjs/components/generated/AvatarMovementInfo.gen.d.ts +0 -1
- package/dist-cjs/components/generated/AvatarMovementInfo.gen.js +0 -28
- package/dist-cjs/components/generated/CameraLayer.gen.d.ts +0 -1
- package/dist-cjs/components/generated/CameraLayer.gen.js +0 -28
- package/dist-cjs/components/generated/CameraLayers.gen.d.ts +0 -1
- package/dist-cjs/components/generated/CameraLayers.gen.js +0 -28
- package/dist-cjs/components/generated/GlobalLight.gen.d.ts +0 -1
- package/dist-cjs/components/generated/GlobalLight.gen.js +0 -28
- package/dist-cjs/components/generated/GltfNode.gen.d.ts +0 -1
- package/dist-cjs/components/generated/GltfNode.gen.js +0 -28
- package/dist-cjs/components/generated/GltfNodeState.gen.d.ts +0 -1
- package/dist-cjs/components/generated/GltfNodeState.gen.js +0 -28
- package/dist-cjs/components/generated/TextureCamera.gen.d.ts +0 -1
- package/dist-cjs/components/generated/TextureCamera.gen.js +0 -28
- package/dist-cjs/components/generated/UiCanvas.gen.d.ts +0 -1
- package/dist-cjs/components/generated/UiCanvas.gen.js +0 -28
- package/dist-cjs/components/generated/UiScrollResult.gen.d.ts +0 -1
- package/dist-cjs/components/generated/UiScrollResult.gen.js +0 -28
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_movement.gen.d.ts +0 -57
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_movement.gen.js +0 -210
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_movement_info.gen.d.ts +0 -65
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_movement_info.gen.js +0 -234
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/camera_layer.gen.d.ts +0 -30
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/camera_layer.gen.js +0 -110
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/camera_layers.gen.d.ts +0 -14
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/camera_layers.gen.js +0 -56
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/global_light.gen.d.ts +0 -34
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/global_light.gen.js +0 -67
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/gltf_node.gen.d.ts +0 -50
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/gltf_node.gen.js +0 -47
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/gltf_node_state.gen.d.ts +0 -27
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/gltf_node_state.gen.js +0 -65
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/texture_camera.gen.d.ts +0 -74
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/texture_camera.gen.js +0 -197
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/ui_canvas.gen.d.ts +0 -19
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/ui_canvas.gen.js +0 -66
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/ui_scroll_result.gen.d.ts +0 -15
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/ui_scroll_result.gen.js +0 -48
- package/dist-cjs/serialization/crdt/network/utils.d.ts +0 -9
- package/dist-cjs/serialization/crdt/network/utils.js +0 -67
|
@@ -1,24 +1,17 @@
|
|
|
1
1
|
import { EntityState } from '../../engine/entity';
|
|
2
2
|
import { ReadWriteByteBuffer } from '../../serialization/ByteBuffer';
|
|
3
|
-
import { AppendValueOperation, CrdtMessageProtocol
|
|
3
|
+
import { AppendValueOperation, CrdtMessageProtocol } 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';
|
|
7
8
|
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;
|
|
13
9
|
/**
|
|
14
10
|
* @internal
|
|
15
11
|
*/
|
|
16
12
|
export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
|
|
17
13
|
const transports = [];
|
|
18
|
-
//
|
|
19
|
-
const NetworkEntity = defineNetworkEntity(engine);
|
|
20
|
-
const NetworkParent = defineNetworkParent(engine);
|
|
21
|
-
const Transform = defineTransform(engine);
|
|
14
|
+
// No network components needed - pure CRDT processing only
|
|
22
15
|
// Messages that we received at transport.onMessage waiting to be processed
|
|
23
16
|
const receivedMessages = [];
|
|
24
17
|
// Messages already processed by the engine but that we need to broadcast to other transports.
|
|
@@ -43,27 +36,20 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
|
|
|
43
36
|
if (header.type === CrdtMessageType.DELETE_COMPONENT) {
|
|
44
37
|
message = DeleteComponent.read(buffer);
|
|
45
38
|
}
|
|
46
|
-
else if (header.type === CrdtMessageType.DELETE_COMPONENT_NETWORK) {
|
|
47
|
-
message = DeleteComponentNetwork.read(buffer);
|
|
48
|
-
}
|
|
49
39
|
else if (header.type === CrdtMessageType.PUT_COMPONENT) {
|
|
50
40
|
message = PutComponentOperation.read(buffer);
|
|
51
41
|
}
|
|
52
|
-
else if (header.type === CrdtMessageType.
|
|
53
|
-
message =
|
|
42
|
+
else if (header.type === CrdtMessageType.AUTHORITATIVE_PUT_COMPONENT) {
|
|
43
|
+
message = AuthoritativePutComponentOperation.read(buffer);
|
|
54
44
|
}
|
|
55
45
|
else if (header.type === CrdtMessageType.DELETE_ENTITY) {
|
|
56
46
|
message = DeleteEntity.read(buffer);
|
|
57
47
|
}
|
|
58
|
-
else if (header.type === CrdtMessageType.DELETE_ENTITY_NETWORK) {
|
|
59
|
-
message = DeleteEntityNetwork.read(buffer);
|
|
60
|
-
}
|
|
61
48
|
else if (header.type === CrdtMessageType.APPEND_VALUE) {
|
|
62
49
|
message = AppendValueOperation.read(buffer);
|
|
63
|
-
// Unknown message, we skip it
|
|
64
50
|
}
|
|
65
51
|
else {
|
|
66
|
-
//
|
|
52
|
+
// Unknown message, we skip it (including NETWORK messages)
|
|
67
53
|
buffer.incrementReadOffset(header.length);
|
|
68
54
|
}
|
|
69
55
|
if (message) {
|
|
@@ -85,20 +71,12 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
|
|
|
85
71
|
return messagesToProcess;
|
|
86
72
|
}
|
|
87
73
|
/**
|
|
88
|
-
*
|
|
89
|
-
*
|
|
90
|
-
*
|
|
74
|
+
* Reserved-range entities (root/player/camera + avatars, entity number <
|
|
75
|
+
* RESERVED_STATIC_ENTITIES) are host-owned: only a transport flagged with
|
|
76
|
+
* `allowReservedEntities` (the host/renderer) may mutate or delete them.
|
|
91
77
|
*/
|
|
92
|
-
function
|
|
93
|
-
|
|
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 };
|
|
78
|
+
function isTrustedForReservedEntities(transportId) {
|
|
79
|
+
return transportId !== undefined && !!transports[transportId]?.allowReservedEntities;
|
|
102
80
|
}
|
|
103
81
|
/**
|
|
104
82
|
* This fn will be called on every tick.
|
|
@@ -108,46 +86,68 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
|
|
|
108
86
|
const messagesToProcess = getMessages(receivedMessages);
|
|
109
87
|
const entitiesShouldBeCleaned = [];
|
|
110
88
|
for (const msg of messagesToProcess) {
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
89
|
+
// Simple CRDT processing - no network logic
|
|
90
|
+
if (msg.type === CrdtMessageType.DELETE_ENTITY) {
|
|
91
|
+
// Reject an inbound DELETE_ENTITY on a reserved entity from an untrusted
|
|
92
|
+
// transport (a comms peer, or a scene-added transport). The allocator half
|
|
93
|
+
// is already guarded (engine.removeEntity is a no-op on this range); this
|
|
94
|
+
// closes the receive-side half.
|
|
95
|
+
const isReserved = engine.entityContainer.getEntityState(msg.entityId) === EntityState.Reserved;
|
|
96
|
+
if (isReserved && !isTrustedForReservedEntities(msg.transportId)) {
|
|
97
|
+
continue;
|
|
98
|
+
}
|
|
99
|
+
entitiesShouldBeCleaned.push(msg.entityId);
|
|
120
100
|
broadcastMessages.push(msg);
|
|
121
101
|
}
|
|
122
102
|
else {
|
|
123
|
-
const entityState = engine.entityContainer.getEntityState(entityId);
|
|
124
|
-
// Skip updates from removed
|
|
103
|
+
const entityState = engine.entityContainer.getEntityState(msg.entityId);
|
|
104
|
+
// Skip updates from removed entities
|
|
125
105
|
if (entityState === EntityState.Removed)
|
|
126
106
|
continue;
|
|
127
|
-
//
|
|
107
|
+
// Reject component operations (PUT/DELETE/APPEND, including AUTHORITATIVE_PUT
|
|
108
|
+
// which bypasses timestamps entirely) on reserved entities from untrusted
|
|
109
|
+
// transports. Dropping before updateFromCrdt keeps local LWW timestamps
|
|
110
|
+
// unpoisoned by forged high timestamps, and also prevents the
|
|
111
|
+
// unknown-component rebroadcast below from relaying forged reserved-entity
|
|
112
|
+
// data to other transports (including the renderer).
|
|
113
|
+
if (entityState === EntityState.Reserved && !isTrustedForReservedEntities(msg.transportId))
|
|
114
|
+
continue;
|
|
115
|
+
// Entities with unknown state should update its entity state
|
|
128
116
|
if (entityState === EntityState.Unknown) {
|
|
129
|
-
engine.entityContainer.updateUsedEntity(entityId);
|
|
130
|
-
}
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
if (
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
117
|
+
engine.entityContainer.updateUsedEntity(msg.entityId);
|
|
118
|
+
}
|
|
119
|
+
// Only process component-related messages (not DELETE_ENTITY)
|
|
120
|
+
if ('componentId' in msg) {
|
|
121
|
+
const component = engine.getComponentOrNull(msg.componentId);
|
|
122
|
+
if (component) {
|
|
123
|
+
// Handle authoritative messages differently - they force the state regardless of timestamp
|
|
124
|
+
const tryUpdate = () => {
|
|
125
|
+
try {
|
|
126
|
+
return msg.type === CrdtMessageType.AUTHORITATIVE_PUT_COMPONENT
|
|
127
|
+
? component.__forceUpdateFromCrdt(msg)
|
|
128
|
+
: component.updateFromCrdt(msg);
|
|
129
|
+
}
|
|
130
|
+
catch (e) {
|
|
131
|
+
console.error('[receiveMessages] ERROR processing message', msg, e);
|
|
132
|
+
return null;
|
|
133
|
+
}
|
|
134
|
+
};
|
|
135
|
+
const result = tryUpdate();
|
|
136
|
+
if (!result)
|
|
137
|
+
continue;
|
|
138
|
+
const [conflictMessage, value] = result;
|
|
139
|
+
if (!conflictMessage) {
|
|
140
|
+
// Add message to broadcast queue when no conflict
|
|
141
|
+
broadcastMessages.push(msg);
|
|
142
|
+
onProcessEntityComponentChange && onProcessEntityComponentChange(msg.entityId, msg.type, component, value);
|
|
143
|
+
}
|
|
139
144
|
}
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
145
|
+
else {
|
|
146
|
+
// Component not found - still broadcast for editor compatibility
|
|
147
|
+
/* istanbul ignore next */
|
|
143
148
|
broadcastMessages.push(msg);
|
|
144
|
-
onProcessEntityComponentChange && onProcessEntityComponentChange(entityId, msg.type, component, value);
|
|
145
149
|
}
|
|
146
150
|
}
|
|
147
|
-
else {
|
|
148
|
-
// TODO: test this line, it is fundammental to make the editor work
|
|
149
|
-
broadcastMessages.push(msg);
|
|
150
|
-
}
|
|
151
151
|
}
|
|
152
152
|
}
|
|
153
153
|
// the last stage of the syncrhonization is to delete the entities
|
|
@@ -161,16 +161,17 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
|
|
|
161
161
|
}
|
|
162
162
|
}
|
|
163
163
|
/**
|
|
164
|
-
*
|
|
164
|
+
* Simple CRDT message broadcasting - no network-specific logic
|
|
165
165
|
*/
|
|
166
166
|
async function sendMessages(entitiesDeletedThisTick) {
|
|
167
|
-
//
|
|
167
|
+
// Get messages from broadcast queue and component updates
|
|
168
168
|
const crdtMessages = getMessages(broadcastMessages);
|
|
169
169
|
const buffer = new ReadWriteByteBuffer();
|
|
170
|
+
// Generate CRDT messages from component updates
|
|
170
171
|
for (const component of engine.componentsIter()) {
|
|
171
172
|
for (const message of component.getCrdtUpdates()) {
|
|
172
173
|
const offset = buffer.currentWriteOffset();
|
|
173
|
-
//
|
|
174
|
+
// Only create messages if there's a transport that will handle it
|
|
174
175
|
if (transports.some((t) => t.filter(message))) {
|
|
175
176
|
if (message.type === CrdtMessageType.PUT_COMPONENT) {
|
|
176
177
|
PutComponentOperation.write(message.entityId, message.timestamp, message.componentId, message.data, buffer);
|
|
@@ -194,7 +195,7 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
|
|
|
194
195
|
}
|
|
195
196
|
}
|
|
196
197
|
}
|
|
197
|
-
//
|
|
198
|
+
// Handle deleted entities
|
|
198
199
|
for (const entityId of entitiesDeletedThisTick) {
|
|
199
200
|
const offset = buffer.currentWriteOffset();
|
|
200
201
|
DeleteEntity.write(entityId, buffer);
|
|
@@ -205,87 +206,19 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
|
|
|
205
206
|
});
|
|
206
207
|
onProcessEntityComponentChange && onProcessEntityComponentChange(entityId, CrdtMessageType.DELETE_ENTITY);
|
|
207
208
|
}
|
|
208
|
-
//
|
|
209
|
-
const
|
|
210
|
-
|
|
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
|
|
209
|
+
// Simple transport broadcasting - no network-specific transforms
|
|
210
|
+
for (const transport of transports) {
|
|
211
|
+
const transportBuffer = new ReadWriteByteBuffer();
|
|
220
212
|
for (const message of crdtMessages) {
|
|
221
213
|
// Avoid echo messages
|
|
222
|
-
if (message.transportId ===
|
|
214
|
+
if (message.transportId === transports.indexOf(transport))
|
|
223
215
|
continue;
|
|
224
|
-
//
|
|
225
|
-
if (
|
|
226
|
-
|
|
227
|
-
// Check if adding this message would exceed the size limit
|
|
228
|
-
const currentBufferSize = transportBuffer.toBinary().byteLength;
|
|
229
|
-
const messageSize = message.messageBuffer.byteLength;
|
|
230
|
-
if (isNetworkTransport && (currentBufferSize + messageSize) / 1024 > LIVEKIT_MAX_SIZE) {
|
|
231
|
-
// If the current buffer has content, save it as a chunk
|
|
232
|
-
if (currentBufferSize > 0) {
|
|
233
|
-
__NetworkMessagesBuffer.push(transportBuffer.toCopiedBinary());
|
|
234
|
-
transportBuffer.resetBuffer();
|
|
235
|
-
}
|
|
236
|
-
// If the message itself is larger than the limit, we need to handle it specially
|
|
237
|
-
// For now, we'll skip it to prevent infinite loops
|
|
238
|
-
if (messageSize / 1024 > LIVEKIT_MAX_SIZE) {
|
|
239
|
-
console.error(`Message too large (${messageSize} bytes), skipping message for entity ${message.entityId}`);
|
|
240
|
-
continue;
|
|
241
|
-
}
|
|
216
|
+
// Check if transport wants this message
|
|
217
|
+
if (transport.filter(message)) {
|
|
218
|
+
transportBuffer.writeBuffer(message.messageBuffer, false);
|
|
242
219
|
}
|
|
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);
|
|
256
|
-
continue;
|
|
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());
|
|
286
220
|
}
|
|
287
|
-
|
|
288
|
-
await transport.send(message);
|
|
221
|
+
await transport.send(transportBuffer.toBinary());
|
|
289
222
|
}
|
|
290
223
|
}
|
|
291
224
|
/**
|
|
@@ -29,4 +29,14 @@ export type Transport = {
|
|
|
29
29
|
onmessage?(message: Uint8Array): void;
|
|
30
30
|
filter(message: Omit<TransportMessage, 'messageBuffer'>): boolean;
|
|
31
31
|
type?: string;
|
|
32
|
+
/**
|
|
33
|
+
* Whether this transport is allowed to mutate reserved-range entities
|
|
34
|
+
* (root/player/camera + avatars, entity number below `RESERVED_STATIC_ENTITIES`).
|
|
35
|
+
* Only the trusted host/renderer transport sets this. An inbound DELETE_ENTITY
|
|
36
|
+
* or component operation (PUT_COMPONENT, DELETE_COMPONENT, APPEND_VALUE,
|
|
37
|
+
* AUTHORITATIVE_PUT_COMPONENT) on a reserved entity from a transport without
|
|
38
|
+
* this flag (a comms peer, or any scene-added transport) is rejected — see
|
|
39
|
+
* `receiveMessages`.
|
|
40
|
+
*/
|
|
41
|
+
allowReservedEntities?: boolean;
|
|
32
42
|
};
|
package/dist/systems/events.d.ts
CHANGED
|
@@ -48,24 +48,6 @@ export interface PointerEventsSystem {
|
|
|
48
48
|
* @param entity - Entity where the callback was attached
|
|
49
49
|
*/
|
|
50
50
|
removeOnPointerHoverLeave(entity: Entity): void;
|
|
51
|
-
/**
|
|
52
|
-
* @public
|
|
53
|
-
* Remove the callback for onPointerDrag event
|
|
54
|
-
* @param entity - Entity where the callback was attached
|
|
55
|
-
*/
|
|
56
|
-
removeOnPointerDrag(entity: Entity): void;
|
|
57
|
-
/**
|
|
58
|
-
* @public
|
|
59
|
-
* Remove the callback for onPointerDragLocked event
|
|
60
|
-
* @param entity - Entity where the callback was attached
|
|
61
|
-
*/
|
|
62
|
-
removeOnPointerDragLocked(entity: Entity): void;
|
|
63
|
-
/**
|
|
64
|
-
* @public
|
|
65
|
-
* Remove the callback for onPointerDragEnd event
|
|
66
|
-
* @param entity - Entity where the callback was attached
|
|
67
|
-
*/
|
|
68
|
-
removeOnPointerDragEnd(entity: Entity): void;
|
|
69
51
|
/**
|
|
70
52
|
* @public
|
|
71
53
|
* Remove the callback for onProximityDown event
|
|
@@ -144,36 +126,6 @@ export interface PointerEventsSystem {
|
|
|
144
126
|
entity: Entity;
|
|
145
127
|
opts?: Partial<EventSystemOptions>;
|
|
146
128
|
}, cb: EventSystemCallback): void;
|
|
147
|
-
/**
|
|
148
|
-
* @public
|
|
149
|
-
* Execute callback while the user holds the button pressed and moves the pointer, having pressed it on the entity
|
|
150
|
-
* @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
|
|
151
|
-
* @param cb - Function to execute on every drag update
|
|
152
|
-
*/
|
|
153
|
-
onPointerDrag(pointerData: {
|
|
154
|
-
entity: Entity;
|
|
155
|
-
opts?: Partial<EventSystemOptions>;
|
|
156
|
-
}, cb: EventSystemCallback): void;
|
|
157
|
-
/**
|
|
158
|
-
* @public
|
|
159
|
-
* Same as onPointerDrag, but the cursor is locked in place for the duration of the drag
|
|
160
|
-
* @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
|
|
161
|
-
* @param cb - Function to execute on every drag update
|
|
162
|
-
*/
|
|
163
|
-
onPointerDragLocked(pointerData: {
|
|
164
|
-
entity: Entity;
|
|
165
|
-
opts?: Partial<EventSystemOptions>;
|
|
166
|
-
}, cb: EventSystemCallback): void;
|
|
167
|
-
/**
|
|
168
|
-
* @public
|
|
169
|
-
* Execute callback when the user releases the button after a drag that started on the entity
|
|
170
|
-
* @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
|
|
171
|
-
* @param cb - Function to execute when the drag ends
|
|
172
|
-
*/
|
|
173
|
-
onPointerDragEnd(pointerData: {
|
|
174
|
-
entity: Entity;
|
|
175
|
-
opts?: Partial<EventSystemOptions>;
|
|
176
|
-
}, cb: EventSystemCallback): void;
|
|
177
129
|
/**
|
|
178
130
|
* @public
|
|
179
131
|
* Execute callback when the user presses the proximity button on the entity
|
package/dist/systems/events.js
CHANGED
|
@@ -20,9 +20,6 @@ export function createPointerEventsSystem(engine, inputSystem) {
|
|
|
20
20
|
EventType[EventType["HoverLeave"] = 4] = "HoverLeave";
|
|
21
21
|
EventType[EventType["ProximityEnter"] = 5] = "ProximityEnter";
|
|
22
22
|
EventType[EventType["ProximityLeave"] = 6] = "ProximityLeave";
|
|
23
|
-
EventType[EventType["Drag"] = 7] = "Drag";
|
|
24
|
-
EventType[EventType["DragLocked"] = 8] = "DragLocked";
|
|
25
|
-
EventType[EventType["DragEnd"] = 9] = "DragEnd";
|
|
26
23
|
})(EventType || (EventType = {}));
|
|
27
24
|
const eventsMap = new Map();
|
|
28
25
|
function getEvent(entity) {
|
|
@@ -68,15 +65,6 @@ export function createPointerEventsSystem(engine, inputSystem) {
|
|
|
68
65
|
else if (eventType === EventType.ProximityLeave) {
|
|
69
66
|
return 5 /* PointerEventType.PET_PROXIMITY_LEAVE */;
|
|
70
67
|
}
|
|
71
|
-
else if (eventType === EventType.Drag) {
|
|
72
|
-
return 7 /* PointerEventType.PET_DRAG */;
|
|
73
|
-
}
|
|
74
|
-
else if (eventType === EventType.DragLocked) {
|
|
75
|
-
return 6 /* PointerEventType.PET_DRAG_LOCKED */;
|
|
76
|
-
}
|
|
77
|
-
else if (eventType === EventType.DragEnd) {
|
|
78
|
-
return 8 /* PointerEventType.PET_DRAG_END */;
|
|
79
|
-
}
|
|
80
68
|
return 1 /* PointerEventType.PET_DOWN */;
|
|
81
69
|
}
|
|
82
70
|
function removeEvent(entity, type, interactionType = 0 /* InteractionType.CURSOR */) {
|
|
@@ -104,10 +92,7 @@ export function createPointerEventsSystem(engine, inputSystem) {
|
|
|
104
92
|
eventType === EventType.HoverEnter ||
|
|
105
93
|
eventType === EventType.HoverLeave ||
|
|
106
94
|
eventType === EventType.ProximityEnter ||
|
|
107
|
-
eventType === EventType.ProximityLeave
|
|
108
|
-
eventType === EventType.Drag ||
|
|
109
|
-
eventType === EventType.DragLocked ||
|
|
110
|
-
eventType === EventType.DragEnd) {
|
|
95
|
+
eventType === EventType.ProximityLeave) {
|
|
111
96
|
const command = inputSystem.getInputCommand(opts.button, getPointerEvent(eventType), entity);
|
|
112
97
|
if (command) {
|
|
113
98
|
checkNotThenable(cb(command), 'Event handler returned a thenable. Only synchronous functions are allowed');
|
|
@@ -154,30 +139,6 @@ export function createPointerEventsSystem(engine, inputSystem) {
|
|
|
154
139
|
getEvent(entity).set(EventType.HoverLeave, { cb, opts: options });
|
|
155
140
|
setPointerEvent(entity, 3 /* PointerEventType.PET_HOVER_LEAVE */, options);
|
|
156
141
|
};
|
|
157
|
-
const onPointerDrag = (...args) => {
|
|
158
|
-
const [data, cb] = args;
|
|
159
|
-
const { entity, opts } = data;
|
|
160
|
-
const options = getDefaultOpts(opts);
|
|
161
|
-
removeEvent(entity, EventType.Drag);
|
|
162
|
-
getEvent(entity).set(EventType.Drag, { cb, opts: options });
|
|
163
|
-
setPointerEvent(entity, 7 /* PointerEventType.PET_DRAG */, options);
|
|
164
|
-
};
|
|
165
|
-
const onPointerDragLocked = (...args) => {
|
|
166
|
-
const [data, cb] = args;
|
|
167
|
-
const { entity, opts } = data;
|
|
168
|
-
const options = getDefaultOpts(opts);
|
|
169
|
-
removeEvent(entity, EventType.DragLocked);
|
|
170
|
-
getEvent(entity).set(EventType.DragLocked, { cb, opts: options });
|
|
171
|
-
setPointerEvent(entity, 6 /* PointerEventType.PET_DRAG_LOCKED */, options);
|
|
172
|
-
};
|
|
173
|
-
const onPointerDragEnd = (...args) => {
|
|
174
|
-
const [data, cb] = args;
|
|
175
|
-
const { entity, opts } = data;
|
|
176
|
-
const options = getDefaultOpts(opts);
|
|
177
|
-
removeEvent(entity, EventType.DragEnd);
|
|
178
|
-
getEvent(entity).set(EventType.DragEnd, { cb, opts: options });
|
|
179
|
-
setPointerEvent(entity, 8 /* PointerEventType.PET_DRAG_END */, options);
|
|
180
|
-
};
|
|
181
142
|
const onProximityDown = (...args) => {
|
|
182
143
|
const [data, cb] = args;
|
|
183
144
|
const { entity, opts } = data;
|
|
@@ -226,15 +187,6 @@ export function createPointerEventsSystem(engine, inputSystem) {
|
|
|
226
187
|
removeOnPointerHoverLeave(entity) {
|
|
227
188
|
removeEvent(entity, EventType.HoverLeave);
|
|
228
189
|
},
|
|
229
|
-
removeOnPointerDrag(entity) {
|
|
230
|
-
removeEvent(entity, EventType.Drag);
|
|
231
|
-
},
|
|
232
|
-
removeOnPointerDragLocked(entity) {
|
|
233
|
-
removeEvent(entity, EventType.DragLocked);
|
|
234
|
-
},
|
|
235
|
-
removeOnPointerDragEnd(entity) {
|
|
236
|
-
removeEvent(entity, EventType.DragEnd);
|
|
237
|
-
},
|
|
238
190
|
removeOnProximityDown(entity) {
|
|
239
191
|
removeEvent(entity, EventType.Down, 1 /* InteractionType.PROXIMITY */);
|
|
240
192
|
},
|
|
@@ -260,9 +212,6 @@ export function createPointerEventsSystem(engine, inputSystem) {
|
|
|
260
212
|
onPointerUp,
|
|
261
213
|
onPointerHoverEnter,
|
|
262
214
|
onPointerHoverLeave,
|
|
263
|
-
onPointerDrag,
|
|
264
|
-
onPointerDragLocked,
|
|
265
|
-
onPointerDragEnd,
|
|
266
215
|
onProximityDown,
|
|
267
216
|
onProximityUp,
|
|
268
217
|
onProximityEnter,
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { RaycastQueryType,
|
|
1
|
+
import { RaycastQueryType, PBRaycastResult } from '../components';
|
|
2
2
|
import { DeepReadonlyObject, Entity } from '../engine';
|
|
3
3
|
import { Vector3 } from '../components/generated/pb/decentraland/common/vectors.gen';
|
|
4
4
|
/**
|
|
@@ -14,10 +14,6 @@ export type RaycastSystemOptions = {
|
|
|
14
14
|
queryType: RaycastQueryType;
|
|
15
15
|
continuous?: boolean | undefined;
|
|
16
16
|
collisionMask?: number | undefined;
|
|
17
|
-
/** shape to sweep along the ray, default RS_RAY (a point) */
|
|
18
|
-
shape?: RaycastShape | undefined;
|
|
19
|
-
/** include colliders from other scenes, default false */
|
|
20
|
-
includeWorld?: boolean | undefined;
|
|
21
17
|
};
|
|
22
18
|
export type LocalDirectionRaycastSystemOptions = {
|
|
23
19
|
direction?: Vector3;
|
package/dist/systems/raycast.js
CHANGED
|
@@ -12,9 +12,7 @@ export function createRaycastSystem(engine) {
|
|
|
12
12
|
queryType: 0 /* RaycastQueryType.RQT_HIT_FIRST */,
|
|
13
13
|
continuous: false,
|
|
14
14
|
originOffset: { x: 0, y: 0, z: 0 },
|
|
15
|
-
collisionMask: 2 /* ColliderLayer.CL_PHYSICS
|
|
16
|
-
shape: 0 /* RaycastShape.RS_RAY */,
|
|
17
|
-
includeWorld: false
|
|
15
|
+
collisionMask: 2 /* ColliderLayer.CL_PHYSICS */
|
|
18
16
|
};
|
|
19
17
|
const getLocalDirectionRaycastDefaultOptions = (options = {}) => ({
|
|
20
18
|
...defaultOptions,
|
|
@@ -60,8 +58,6 @@ export function createRaycastSystem(engine) {
|
|
|
60
58
|
raycast.direction = raycastValue.directionRawValue;
|
|
61
59
|
raycast.continuous = raycastValue.continuous;
|
|
62
60
|
raycast.queryType = raycastValue.queryType;
|
|
63
|
-
raycast.shape = raycastValue.shape;
|
|
64
|
-
raycast.includeWorld = raycastValue.includeWorld;
|
|
65
61
|
entitiesCallbackResultMap.set(entity, { callback: callback });
|
|
66
62
|
};
|
|
67
63
|
nextTickRaycasts.push(onNextTick);
|
|
@@ -34,14 +34,5 @@ export interface MeshColliderComponentDefinitionExtended extends LastWriteWinEle
|
|
|
34
34
|
* @param colliderMask - the set of layer where the collider reacts, default: Physics and Pointer
|
|
35
35
|
*/
|
|
36
36
|
setSphere(entity: Entity, colliderLayers?: ColliderLayer | ColliderLayer[]): void;
|
|
37
|
-
/**
|
|
38
|
-
* @public
|
|
39
|
-
* Set a mesh from inside a gltf in the MeshCollider component
|
|
40
|
-
* @param entity - entity to create or replace the MeshCollider component
|
|
41
|
-
* @param source - the path to the gltf
|
|
42
|
-
* @param meshName - the name of the mesh in the gltf (see GltfContainerLoadingState.meshNames)
|
|
43
|
-
* @param colliderMask - the set of layer where the collider reacts, default: Physics and Pointer
|
|
44
|
-
*/
|
|
45
|
-
setGltfMesh(entity: Entity, source: string, meshName: string, colliderLayers?: ColliderLayer | ColliderLayer[]): void;
|
|
46
37
|
}
|
|
47
38
|
export declare function defineMeshColliderComponent(engine: Pick<IEngine, 'defineComponentFromSchema'>): MeshColliderComponentDefinitionExtended;
|
|
@@ -37,12 +37,6 @@ function defineMeshColliderComponent(engine) {
|
|
|
37
37
|
mesh: { $case: 'sphere', sphere: {} },
|
|
38
38
|
collisionMask: getCollisionMask(colliderLayers)
|
|
39
39
|
});
|
|
40
|
-
},
|
|
41
|
-
setGltfMesh(entity, source, meshName, colliderLayers) {
|
|
42
|
-
theComponent.createOrReplace(entity, {
|
|
43
|
-
mesh: { $case: 'gltf', gltf: { gltfSrc: source, name: meshName } },
|
|
44
|
-
collisionMask: getCollisionMask(colliderLayers)
|
|
45
|
-
});
|
|
46
40
|
}
|
|
47
41
|
};
|
|
48
42
|
}
|
|
@@ -32,13 +32,5 @@ export interface MeshRendererComponentDefinitionExtended extends LastWriteWinEle
|
|
|
32
32
|
* @param entity - entity to create or replace the MeshRenderer component
|
|
33
33
|
*/
|
|
34
34
|
setSphere(entity: Entity): void;
|
|
35
|
-
/**
|
|
36
|
-
* @public
|
|
37
|
-
* Set a mesh from inside a gltf in the MeshRenderer component
|
|
38
|
-
* @param entity - entity to create or replace the MeshRenderer component
|
|
39
|
-
* @param source - the path to the gltf
|
|
40
|
-
* @param meshName - the name of the mesh in the gltf (see GltfContainerLoadingState.meshNames)
|
|
41
|
-
*/
|
|
42
|
-
setGltfMesh(entity: Entity, source: string, meshName: string): void;
|
|
43
35
|
}
|
|
44
36
|
export declare function defineMeshRendererComponent(engine: Pick<IEngine, 'defineComponentFromSchema'>): MeshRendererComponentDefinitionExtended;
|
|
@@ -25,11 +25,6 @@ function defineMeshRendererComponent(engine) {
|
|
|
25
25
|
theComponent.createOrReplace(entity, {
|
|
26
26
|
mesh: { $case: 'sphere', sphere: {} }
|
|
27
27
|
});
|
|
28
|
-
},
|
|
29
|
-
setGltfMesh(entity, source, meshName) {
|
|
30
|
-
theComponent.createOrReplace(entity, {
|
|
31
|
-
mesh: { $case: 'gltf', gltf: { gltfSrc: source, name: meshName } }
|
|
32
|
-
});
|
|
33
28
|
}
|
|
34
29
|
};
|
|
35
30
|
}
|
|
@@ -19,22 +19,15 @@ exports.coreComponentMappings = {
|
|
|
19
19
|
"core::AvatarEquippedData": 1091,
|
|
20
20
|
"core::AvatarLocomotionSettings": 1211,
|
|
21
21
|
"core::AvatarModifierArea": 1070,
|
|
22
|
-
"core::AvatarMovement": 1501,
|
|
23
|
-
"core::AvatarMovementInfo": 1500,
|
|
24
22
|
"core::AvatarShape": 1080,
|
|
25
23
|
"core::Billboard": 1090,
|
|
26
|
-
"core::CameraLayer": 1503,
|
|
27
|
-
"core::CameraLayers": 1208,
|
|
28
24
|
"core::CameraMode": 1072,
|
|
29
25
|
"core::CameraModeArea": 1071,
|
|
30
26
|
"core::EngineInfo": 1048,
|
|
31
27
|
"core::ExplorerUiEventsResult": 1220,
|
|
32
|
-
"core::GlobalLight": 1206,
|
|
33
28
|
"core::GltfContainer": 1041,
|
|
34
29
|
"core::GltfContainerLoadingState": 1049,
|
|
35
|
-
"core::GltfNode": 1200,
|
|
36
30
|
"core::GltfNodeModifiers": 1099,
|
|
37
|
-
"core::GltfNodeState": 1201,
|
|
38
31
|
"core::InputModifier": 1078,
|
|
39
32
|
"core::LightSource": 1079,
|
|
40
33
|
"core::MainCamera": 1075,
|
|
@@ -56,7 +49,6 @@ exports.coreComponentMappings = {
|
|
|
56
49
|
"core::RealmInfo": 1106,
|
|
57
50
|
"core::SkyboxTime": 1210,
|
|
58
51
|
"core::TextShape": 1030,
|
|
59
|
-
"core::TextureCamera": 1207,
|
|
60
52
|
"core::TouchScreenControls": 1218,
|
|
61
53
|
"core::TriggerArea": 1060,
|
|
62
54
|
"core::TriggerAreaResult": 1061,
|
|
@@ -64,14 +56,12 @@ exports.coreComponentMappings = {
|
|
|
64
56
|
"core::TweenSequence": 1104,
|
|
65
57
|
"core::TweenState": 1103,
|
|
66
58
|
"core::UiBackground": 1053,
|
|
67
|
-
"core::UiCanvas": 1203,
|
|
68
59
|
"core::UiCanvasInformation": 1054,
|
|
69
60
|
"core::UiDropdown": 1094,
|
|
70
61
|
"core::UiDropdownResult": 1096,
|
|
71
62
|
"core::UiInput": 1093,
|
|
72
63
|
"core::UiInputBinding": 1219,
|
|
73
64
|
"core::UiInputResult": 1095,
|
|
74
|
-
"core::UiScrollResult": 1202,
|
|
75
65
|
"core::UiText": 1052,
|
|
76
66
|
"core::UiTransform": 1050,
|
|
77
67
|
"core::VideoEvent": 1044,
|