@dcl/ecs 7.27.1-33533530571.commit-451d001 → 7.27.1-33669021544.commit-a6216ed
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/AvatarEquippedData.d.ts +15 -0
- package/dist/components/extended/AvatarEquippedData.js +10 -0
- package/dist/components/extended/AvatarShape.d.ts +15 -0
- package/dist/components/extended/AvatarShape.js +10 -0
- package/dist/components/extended/MeshCollider.d.ts +9 -0
- package/dist/components/extended/MeshCollider.js +6 -0
- package/dist/components/extended/MeshRenderer.d.ts +8 -0
- package/dist/components/extended/MeshRenderer.js +5 -0
- package/dist/components/generated/AvatarMovement.gen.d.ts +1 -0
- package/dist/components/generated/AvatarMovement.gen.js +25 -0
- package/dist/components/generated/AvatarMovementInfo.gen.d.ts +1 -0
- package/dist/components/generated/AvatarMovementInfo.gen.js +25 -0
- package/dist/components/generated/CameraLayer.gen.d.ts +1 -0
- package/dist/components/generated/CameraLayer.gen.js +25 -0
- package/dist/components/generated/CameraLayers.gen.d.ts +1 -0
- package/dist/components/generated/CameraLayers.gen.js +25 -0
- package/dist/components/generated/GlobalLight.gen.d.ts +1 -0
- package/dist/components/generated/GlobalLight.gen.js +25 -0
- package/dist/components/generated/GltfNode.gen.d.ts +1 -0
- package/dist/components/generated/GltfNode.gen.js +25 -0
- package/dist/components/generated/GltfNodeState.gen.d.ts +1 -0
- package/dist/components/generated/GltfNodeState.gen.js +25 -0
- package/dist/components/generated/TextureCamera.gen.d.ts +1 -0
- package/dist/components/generated/TextureCamera.gen.js +25 -0
- package/dist/components/generated/UiCanvas.gen.d.ts +1 -0
- package/dist/components/generated/UiCanvas.gen.js +25 -0
- package/dist/components/generated/UiScrollResult.gen.d.ts +1 -0
- package/dist/components/generated/UiScrollResult.gen.js +25 -0
- package/dist/components/generated/component-names.gen.js +10 -0
- package/dist/components/generated/global.gen.d.ts +20 -4
- package/dist/components/generated/global.gen.js +10 -2
- package/dist/components/generated/index.gen.d.ts +40 -0
- package/dist/components/generated/index.gen.js +50 -0
- package/dist/components/generated/pb/decentraland/common/texture.gen.d.ts +20 -0
- package/dist/components/generated/pb/decentraland/common/texture.gen.js +65 -0
- package/dist/components/generated/pb/decentraland/sdk/components/avatar_equipped_data.gen.d.ts +2 -0
- package/dist/components/generated/pb/decentraland/sdk/components/avatar_equipped_data.gen.js +10 -1
- package/dist/components/generated/pb/decentraland/sdk/components/avatar_modifier_area.gen.d.ts +2 -0
- package/dist/components/generated/pb/decentraland/sdk/components/avatar_modifier_area.gen.js +10 -1
- package/dist/components/generated/pb/decentraland/sdk/components/avatar_movement.gen.d.ts +57 -0
- package/dist/components/generated/pb/decentraland/sdk/components/avatar_movement.gen.js +204 -0
- package/dist/components/generated/pb/decentraland/sdk/components/avatar_movement_info.gen.d.ts +65 -0
- package/dist/components/generated/pb/decentraland/sdk/components/avatar_movement_info.gen.js +228 -0
- package/dist/components/generated/pb/decentraland/sdk/components/avatar_shape.gen.d.ts +2 -0
- package/dist/components/generated/pb/decentraland/sdk/components/avatar_shape.gen.js +10 -0
- package/dist/components/generated/pb/decentraland/sdk/components/camera_layer.gen.d.ts +30 -0
- package/dist/components/generated/pb/decentraland/sdk/components/camera_layer.gen.js +104 -0
- package/dist/components/generated/pb/decentraland/sdk/components/camera_layers.gen.d.ts +14 -0
- package/dist/components/generated/pb/decentraland/sdk/components/camera_layers.gen.js +50 -0
- package/dist/components/generated/pb/decentraland/sdk/components/camera_mode_area.gen.d.ts +2 -0
- package/dist/components/generated/pb/decentraland/sdk/components/camera_mode_area.gen.js +10 -1
- package/dist/components/generated/pb/decentraland/sdk/components/common/input_action.gen.d.ts +4 -1
- package/dist/components/generated/pb/decentraland/sdk/components/common/input_action.gen.js +3 -0
- package/dist/components/generated/pb/decentraland/sdk/components/global_light.gen.d.ts +34 -0
- package/dist/components/generated/pb/decentraland/sdk/components/global_light.gen.js +61 -0
- package/dist/components/generated/pb/decentraland/sdk/components/gltf_container_loading_state.gen.d.ts +19 -0
- package/dist/components/generated/pb/decentraland/sdk/components/gltf_container_loading_state.gen.js +46 -1
- package/dist/components/generated/pb/decentraland/sdk/components/gltf_node.gen.d.ts +50 -0
- package/dist/components/generated/pb/decentraland/sdk/components/gltf_node.gen.js +41 -0
- package/dist/components/generated/pb/decentraland/sdk/components/gltf_node_state.gen.d.ts +27 -0
- package/dist/components/generated/pb/decentraland/sdk/components/gltf_node_state.gen.js +59 -0
- package/dist/components/generated/pb/decentraland/sdk/components/material.gen.d.ts +22 -0
- package/dist/components/generated/pb/decentraland/sdk/components/material.gen.js +57 -1
- package/dist/components/generated/pb/decentraland/sdk/components/mesh_collider.gen.d.ts +20 -0
- package/dist/components/generated/pb/decentraland/sdk/components/mesh_collider.gen.js +56 -0
- package/dist/components/generated/pb/decentraland/sdk/components/mesh_renderer.gen.d.ts +21 -3
- package/dist/components/generated/pb/decentraland/sdk/components/mesh_renderer.gen.js +56 -0
- package/dist/components/generated/pb/decentraland/sdk/components/primary_pointer_info.gen.d.ts +8 -2
- package/dist/components/generated/pb/decentraland/sdk/components/primary_pointer_info.gen.js +3 -0
- package/dist/components/generated/pb/decentraland/sdk/components/raycast.gen.d.ts +13 -0
- package/dist/components/generated/pb/decentraland/sdk/components/raycast.gen.js +30 -0
- package/dist/components/generated/pb/decentraland/sdk/components/texture_camera.gen.d.ts +74 -0
- package/dist/components/generated/pb/decentraland/sdk/components/texture_camera.gen.js +191 -0
- package/dist/components/generated/pb/decentraland/sdk/components/ui_canvas.gen.d.ts +19 -0
- package/dist/components/generated/pb/decentraland/sdk/components/ui_canvas.gen.js +60 -0
- package/dist/components/generated/pb/decentraland/sdk/components/ui_input.gen.d.ts +4 -0
- package/dist/components/generated/pb/decentraland/sdk/components/ui_input.gen.js +20 -0
- package/dist/components/generated/pb/decentraland/sdk/components/ui_scroll_result.gen.d.ts +15 -0
- package/dist/components/generated/pb/decentraland/sdk/components/ui_scroll_result.gen.js +42 -0
- package/dist/components/generated/pb/decentraland/sdk/components/ui_transform.gen.d.ts +35 -0
- package/dist/components/generated/pb/decentraland/sdk/components/ui_transform.gen.js +90 -0
- package/dist/components/index.d.ts +4 -5
- package/dist/components/index.js +8 -5
- package/dist/components/manual/Transform.d.ts +0 -9
- package/dist/components/manual/Transform.js +3 -3
- package/dist/components/types.d.ts +2 -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 +13 -68
- package/dist/index.d.ts +3 -2
- package/dist/index.js +3 -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 +143 -76
- package/dist/systems/crdt/types.d.ts +0 -10
- package/dist/systems/events.d.ts +48 -0
- package/dist/systems/events.js +52 -1
- package/dist/systems/raycast.d.ts +5 -1
- package/dist/systems/raycast.js +5 -1
- package/dist-cjs/components/extended/AvatarEquippedData.d.ts +15 -0
- package/dist-cjs/components/extended/AvatarEquippedData.js +14 -0
- package/dist-cjs/components/extended/AvatarShape.d.ts +15 -0
- package/dist-cjs/components/extended/AvatarShape.js +14 -0
- package/dist-cjs/components/extended/MeshCollider.d.ts +9 -0
- package/dist-cjs/components/extended/MeshCollider.js +6 -0
- package/dist-cjs/components/extended/MeshRenderer.d.ts +8 -0
- package/dist-cjs/components/extended/MeshRenderer.js +5 -0
- package/dist-cjs/components/generated/AvatarMovement.gen.d.ts +1 -0
- package/dist-cjs/components/generated/AvatarMovement.gen.js +28 -0
- package/dist-cjs/components/generated/AvatarMovementInfo.gen.d.ts +1 -0
- package/dist-cjs/components/generated/AvatarMovementInfo.gen.js +28 -0
- package/dist-cjs/components/generated/CameraLayer.gen.d.ts +1 -0
- package/dist-cjs/components/generated/CameraLayer.gen.js +28 -0
- package/dist-cjs/components/generated/CameraLayers.gen.d.ts +1 -0
- package/dist-cjs/components/generated/CameraLayers.gen.js +28 -0
- package/dist-cjs/components/generated/GlobalLight.gen.d.ts +1 -0
- package/dist-cjs/components/generated/GlobalLight.gen.js +28 -0
- package/dist-cjs/components/generated/GltfNode.gen.d.ts +1 -0
- package/dist-cjs/components/generated/GltfNode.gen.js +28 -0
- package/dist-cjs/components/generated/GltfNodeState.gen.d.ts +1 -0
- package/dist-cjs/components/generated/GltfNodeState.gen.js +28 -0
- package/dist-cjs/components/generated/TextureCamera.gen.d.ts +1 -0
- package/dist-cjs/components/generated/TextureCamera.gen.js +28 -0
- package/dist-cjs/components/generated/UiCanvas.gen.d.ts +1 -0
- package/dist-cjs/components/generated/UiCanvas.gen.js +28 -0
- package/dist-cjs/components/generated/UiScrollResult.gen.d.ts +1 -0
- package/dist-cjs/components/generated/UiScrollResult.gen.js +28 -0
- package/dist-cjs/components/generated/component-names.gen.js +10 -0
- package/dist-cjs/components/generated/global.gen.d.ts +20 -4
- package/dist-cjs/components/generated/global.gen.js +12 -4
- package/dist-cjs/components/generated/index.gen.d.ts +40 -0
- package/dist-cjs/components/generated/index.gen.js +62 -2
- package/dist-cjs/components/generated/pb/decentraland/common/texture.gen.d.ts +20 -0
- package/dist-cjs/components/generated/pb/decentraland/common/texture.gen.js +66 -1
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_equipped_data.gen.d.ts +2 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_equipped_data.gen.js +10 -1
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_modifier_area.gen.d.ts +2 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_modifier_area.gen.js +10 -1
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_movement.gen.d.ts +57 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_movement.gen.js +210 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_movement_info.gen.d.ts +65 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_movement_info.gen.js +234 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_shape.gen.d.ts +2 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_shape.gen.js +10 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/camera_layer.gen.d.ts +30 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/camera_layer.gen.js +110 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/camera_layers.gen.d.ts +14 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/camera_layers.gen.js +56 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/camera_mode_area.gen.d.ts +2 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/camera_mode_area.gen.js +10 -1
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/common/input_action.gen.d.ts +4 -1
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/common/input_action.gen.js +3 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/global_light.gen.d.ts +34 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/global_light.gen.js +67 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/gltf_container_loading_state.gen.d.ts +19 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/gltf_container_loading_state.gen.js +46 -1
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/gltf_node.gen.d.ts +50 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/gltf_node.gen.js +47 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/gltf_node_state.gen.d.ts +27 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/gltf_node_state.gen.js +65 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/material.gen.d.ts +22 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/material.gen.js +58 -2
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/mesh_collider.gen.d.ts +20 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/mesh_collider.gen.js +57 -1
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/mesh_renderer.gen.d.ts +21 -3
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/mesh_renderer.gen.js +57 -1
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/primary_pointer_info.gen.d.ts +8 -2
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/primary_pointer_info.gen.js +3 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/raycast.gen.d.ts +13 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/raycast.gen.js +31 -1
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/texture_camera.gen.d.ts +74 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/texture_camera.gen.js +197 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/ui_canvas.gen.d.ts +19 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/ui_canvas.gen.js +66 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/ui_input.gen.d.ts +4 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/ui_input.gen.js +20 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/ui_scroll_result.gen.d.ts +15 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/ui_scroll_result.gen.js +48 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/ui_transform.gen.d.ts +35 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/ui_transform.gen.js +91 -1
- package/dist-cjs/components/index.d.ts +4 -5
- package/dist-cjs/components/index.js +11 -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 +2 -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 +14 -71
- package/dist-cjs/index.d.ts +3 -2
- package/dist-cjs/index.js +4 -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 +166 -76
- package/dist-cjs/systems/crdt/types.d.ts +0 -10
- package/dist-cjs/systems/events.d.ts +48 -0
- package/dist-cjs/systems/events.js +52 -1
- package/dist-cjs/systems/raycast.d.ts +5 -1
- package/dist-cjs/systems/raycast.js +5 -1
- 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
|
@@ -1,20 +1,50 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.crdtSceneSystem = void 0;
|
|
26
|
+
exports.crdtSceneSystem = exports.LIVEKIT_MAX_SIZE = void 0;
|
|
4
27
|
const entity_1 = require("../../engine/entity");
|
|
5
28
|
const ByteBuffer_1 = require("../../serialization/ByteBuffer");
|
|
6
29
|
const crdt_1 = require("../../serialization/crdt");
|
|
7
30
|
const deleteComponent_1 = require("../../serialization/crdt/deleteComponent");
|
|
8
31
|
const deleteEntity_1 = require("../../serialization/crdt/deleteEntity");
|
|
9
32
|
const putComponent_1 = require("../../serialization/crdt/putComponent");
|
|
10
|
-
const authoritativePutComponent_1 = require("../../serialization/crdt/authoritativePutComponent");
|
|
11
33
|
const types_1 = require("../../serialization/crdt/types");
|
|
34
|
+
const putComponentNetwork_1 = require("../../serialization/crdt/network/putComponentNetwork");
|
|
35
|
+
const components_1 = require("../../components");
|
|
36
|
+
const networkUtils = __importStar(require("../../serialization/crdt/network/utils"));
|
|
37
|
+
// NetworkMessages can only have a MAX_SIZE of 12kb. So we need to send it in chunks.
|
|
38
|
+
exports.LIVEKIT_MAX_SIZE = 12;
|
|
12
39
|
/**
|
|
13
40
|
* @internal
|
|
14
41
|
*/
|
|
15
42
|
function crdtSceneSystem(engine, onProcessEntityComponentChange) {
|
|
16
43
|
const transports = [];
|
|
17
|
-
//
|
|
44
|
+
// Components that we used on this system
|
|
45
|
+
const NetworkEntity = (0, components_1.NetworkEntity)(engine);
|
|
46
|
+
const NetworkParent = (0, components_1.NetworkParent)(engine);
|
|
47
|
+
const Transform = (0, components_1.Transform)(engine);
|
|
18
48
|
// Messages that we received at transport.onMessage waiting to be processed
|
|
19
49
|
const receivedMessages = [];
|
|
20
50
|
// Messages already processed by the engine but that we need to broadcast to other transports.
|
|
@@ -39,20 +69,27 @@ function crdtSceneSystem(engine, onProcessEntityComponentChange) {
|
|
|
39
69
|
if (header.type === types_1.CrdtMessageType.DELETE_COMPONENT) {
|
|
40
70
|
message = deleteComponent_1.DeleteComponent.read(buffer);
|
|
41
71
|
}
|
|
72
|
+
else if (header.type === types_1.CrdtMessageType.DELETE_COMPONENT_NETWORK) {
|
|
73
|
+
message = crdt_1.DeleteComponentNetwork.read(buffer);
|
|
74
|
+
}
|
|
42
75
|
else if (header.type === types_1.CrdtMessageType.PUT_COMPONENT) {
|
|
43
76
|
message = putComponent_1.PutComponentOperation.read(buffer);
|
|
44
77
|
}
|
|
45
|
-
else if (header.type === types_1.CrdtMessageType.
|
|
46
|
-
message =
|
|
78
|
+
else if (header.type === types_1.CrdtMessageType.PUT_COMPONENT_NETWORK) {
|
|
79
|
+
message = putComponentNetwork_1.PutNetworkComponentOperation.read(buffer);
|
|
47
80
|
}
|
|
48
81
|
else if (header.type === types_1.CrdtMessageType.DELETE_ENTITY) {
|
|
49
82
|
message = deleteEntity_1.DeleteEntity.read(buffer);
|
|
50
83
|
}
|
|
84
|
+
else if (header.type === types_1.CrdtMessageType.DELETE_ENTITY_NETWORK) {
|
|
85
|
+
message = crdt_1.DeleteEntityNetwork.read(buffer);
|
|
86
|
+
}
|
|
51
87
|
else if (header.type === types_1.CrdtMessageType.APPEND_VALUE) {
|
|
52
88
|
message = crdt_1.AppendValueOperation.read(buffer);
|
|
89
|
+
// Unknown message, we skip it
|
|
53
90
|
}
|
|
54
91
|
else {
|
|
55
|
-
//
|
|
92
|
+
// consume the message
|
|
56
93
|
buffer.incrementReadOffset(header.length);
|
|
57
94
|
}
|
|
58
95
|
if (message) {
|
|
@@ -74,12 +111,20 @@ function crdtSceneSystem(engine, onProcessEntityComponentChange) {
|
|
|
74
111
|
return messagesToProcess;
|
|
75
112
|
}
|
|
76
113
|
/**
|
|
77
|
-
*
|
|
78
|
-
*
|
|
79
|
-
*
|
|
114
|
+
* Find the local entityId associated to the network component message.
|
|
115
|
+
* It's a mapping Network -> to Local
|
|
116
|
+
* If it's not a network message, return the entityId received by the message
|
|
80
117
|
*/
|
|
81
|
-
function
|
|
82
|
-
|
|
118
|
+
function findNetworkId(msg) {
|
|
119
|
+
const hasNetworkId = 'networkId' in msg;
|
|
120
|
+
if (hasNetworkId) {
|
|
121
|
+
for (const [entityId, network] of engine.getEntitiesWith(NetworkEntity)) {
|
|
122
|
+
if (network.networkId === msg.networkId && network.entityId === msg.entityId) {
|
|
123
|
+
return { entityId, network };
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
return { entityId: msg.entityId };
|
|
83
128
|
}
|
|
84
129
|
/**
|
|
85
130
|
* This fn will be called on every tick.
|
|
@@ -89,68 +134,46 @@ function crdtSceneSystem(engine, onProcessEntityComponentChange) {
|
|
|
89
134
|
const messagesToProcess = getMessages(receivedMessages);
|
|
90
135
|
const entitiesShouldBeCleaned = [];
|
|
91
136
|
for (const msg of messagesToProcess) {
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
}
|
|
102
|
-
entitiesShouldBeCleaned.push(msg.entityId);
|
|
137
|
+
let { entityId, network } = findNetworkId(msg);
|
|
138
|
+
// We receive a new Entity. Create the localEntity and map it to the NetworkEntity component
|
|
139
|
+
if (networkUtils.isNetworkMessage(msg) && !network) {
|
|
140
|
+
entityId = engine.addEntity();
|
|
141
|
+
network = { entityId: msg.entityId, networkId: msg.networkId };
|
|
142
|
+
NetworkEntity.createOrReplace(entityId, network);
|
|
143
|
+
}
|
|
144
|
+
if (msg.type === types_1.CrdtMessageType.DELETE_ENTITY || msg.type === types_1.CrdtMessageType.DELETE_ENTITY_NETWORK) {
|
|
145
|
+
entitiesShouldBeCleaned.push(entityId);
|
|
103
146
|
broadcastMessages.push(msg);
|
|
104
147
|
}
|
|
105
148
|
else {
|
|
106
|
-
const entityState = engine.entityContainer.getEntityState(
|
|
107
|
-
// Skip updates from removed
|
|
149
|
+
const entityState = engine.entityContainer.getEntityState(entityId);
|
|
150
|
+
// Skip updates from removed entityes
|
|
108
151
|
if (entityState === entity_1.EntityState.Removed)
|
|
109
152
|
continue;
|
|
110
|
-
//
|
|
111
|
-
// which bypasses timestamps entirely) on reserved entities from untrusted
|
|
112
|
-
// transports. Dropping before updateFromCrdt keeps local LWW timestamps
|
|
113
|
-
// unpoisoned by forged high timestamps, and also prevents the
|
|
114
|
-
// unknown-component rebroadcast below from relaying forged reserved-entity
|
|
115
|
-
// data to other transports (including the renderer).
|
|
116
|
-
if (entityState === entity_1.EntityState.Reserved && !isTrustedForReservedEntities(msg.transportId))
|
|
117
|
-
continue;
|
|
118
|
-
// Entities with unknown state should update its entity state
|
|
153
|
+
// Entities with unknown entities should update its entity state
|
|
119
154
|
if (entityState === entity_1.EntityState.Unknown) {
|
|
120
|
-
engine.entityContainer.updateUsedEntity(
|
|
121
|
-
}
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
if (
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
? component.__forceUpdateFromCrdt(msg)
|
|
131
|
-
: component.updateFromCrdt(msg);
|
|
132
|
-
}
|
|
133
|
-
catch (e) {
|
|
134
|
-
console.error('[receiveMessages] ERROR processing message', msg, e);
|
|
135
|
-
return null;
|
|
136
|
-
}
|
|
137
|
-
};
|
|
138
|
-
const result = tryUpdate();
|
|
139
|
-
if (!result)
|
|
140
|
-
continue;
|
|
141
|
-
const [conflictMessage, value] = result;
|
|
142
|
-
if (!conflictMessage) {
|
|
143
|
-
// Add message to broadcast queue when no conflict
|
|
144
|
-
broadcastMessages.push(msg);
|
|
145
|
-
onProcessEntityComponentChange && onProcessEntityComponentChange(msg.entityId, msg.type, component, value);
|
|
146
|
-
}
|
|
155
|
+
engine.entityContainer.updateUsedEntity(entityId);
|
|
156
|
+
}
|
|
157
|
+
const component = engine.getComponentOrNull(msg.componentId);
|
|
158
|
+
/* istanbul ignore else */
|
|
159
|
+
if (component) {
|
|
160
|
+
if (msg.type === types_1.CrdtMessageType.PUT_COMPONENT &&
|
|
161
|
+
component.componentId === Transform.componentId &&
|
|
162
|
+
NetworkEntity.has(entityId) &&
|
|
163
|
+
NetworkParent.has(entityId)) {
|
|
164
|
+
msg.data = networkUtils.fixTransformParent(msg);
|
|
147
165
|
}
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
166
|
+
const [conflictMessage, value] = component.updateFromCrdt({ ...msg, entityId });
|
|
167
|
+
if (!conflictMessage) {
|
|
168
|
+
// Add message to transport queue to be processed by others transports
|
|
151
169
|
broadcastMessages.push(msg);
|
|
170
|
+
onProcessEntityComponentChange && onProcessEntityComponentChange(entityId, msg.type, component, value);
|
|
152
171
|
}
|
|
153
172
|
}
|
|
173
|
+
else {
|
|
174
|
+
// TODO: test this line, it is fundammental to make the editor work
|
|
175
|
+
broadcastMessages.push(msg);
|
|
176
|
+
}
|
|
154
177
|
}
|
|
155
178
|
}
|
|
156
179
|
// the last stage of the syncrhonization is to delete the entities
|
|
@@ -164,17 +187,16 @@ function crdtSceneSystem(engine, onProcessEntityComponentChange) {
|
|
|
164
187
|
}
|
|
165
188
|
}
|
|
166
189
|
/**
|
|
167
|
-
*
|
|
190
|
+
* Iterates the dirty map and generates crdt messages to be send
|
|
168
191
|
*/
|
|
169
192
|
async function sendMessages(entitiesDeletedThisTick) {
|
|
170
|
-
//
|
|
193
|
+
// CRDT Messages will be the merge between the recieved transport messages and the new crdt messages
|
|
171
194
|
const crdtMessages = getMessages(broadcastMessages);
|
|
172
195
|
const buffer = new ByteBuffer_1.ReadWriteByteBuffer();
|
|
173
|
-
// Generate CRDT messages from component updates
|
|
174
196
|
for (const component of engine.componentsIter()) {
|
|
175
197
|
for (const message of component.getCrdtUpdates()) {
|
|
176
198
|
const offset = buffer.currentWriteOffset();
|
|
177
|
-
//
|
|
199
|
+
// Avoid creating messages if there is no transport that will handle it
|
|
178
200
|
if (transports.some((t) => t.filter(message))) {
|
|
179
201
|
if (message.type === types_1.CrdtMessageType.PUT_COMPONENT) {
|
|
180
202
|
putComponent_1.PutComponentOperation.write(message.entityId, message.timestamp, message.componentId, message.data, buffer);
|
|
@@ -198,7 +220,7 @@ function crdtSceneSystem(engine, onProcessEntityComponentChange) {
|
|
|
198
220
|
}
|
|
199
221
|
}
|
|
200
222
|
}
|
|
201
|
-
//
|
|
223
|
+
// After all updates, I execute the DeletedEntity messages
|
|
202
224
|
for (const entityId of entitiesDeletedThisTick) {
|
|
203
225
|
const offset = buffer.currentWriteOffset();
|
|
204
226
|
deleteEntity_1.DeleteEntity.write(entityId, buffer);
|
|
@@ -209,19 +231,87 @@ function crdtSceneSystem(engine, onProcessEntityComponentChange) {
|
|
|
209
231
|
});
|
|
210
232
|
onProcessEntityComponentChange && onProcessEntityComponentChange(entityId, types_1.CrdtMessageType.DELETE_ENTITY);
|
|
211
233
|
}
|
|
212
|
-
//
|
|
213
|
-
|
|
214
|
-
|
|
234
|
+
// Send CRDT messages to transports
|
|
235
|
+
const transportBuffer = new ByteBuffer_1.ReadWriteByteBuffer();
|
|
236
|
+
for (const index in transports) {
|
|
237
|
+
const __NetworkMessagesBuffer = [];
|
|
238
|
+
const transportIndex = Number(index);
|
|
239
|
+
const transport = transports[transportIndex];
|
|
240
|
+
const isRendererTransport = transport.type === 'renderer';
|
|
241
|
+
const isNetworkTransport = transport.type === 'network';
|
|
242
|
+
// Reset Buffer for each Transport
|
|
243
|
+
transportBuffer.resetBuffer();
|
|
244
|
+
const buffer = new ByteBuffer_1.ReadWriteByteBuffer();
|
|
245
|
+
// Then we send all the new crdtMessages that the transport needs to process
|
|
215
246
|
for (const message of crdtMessages) {
|
|
216
247
|
// Avoid echo messages
|
|
217
|
-
if (message.transportId ===
|
|
248
|
+
if (message.transportId === transportIndex)
|
|
249
|
+
continue;
|
|
250
|
+
// Redundant message for the transport
|
|
251
|
+
if (!transport.filter(message))
|
|
252
|
+
continue;
|
|
253
|
+
// Check if adding this message would exceed the size limit
|
|
254
|
+
const currentBufferSize = transportBuffer.toBinary().byteLength;
|
|
255
|
+
const messageSize = message.messageBuffer.byteLength;
|
|
256
|
+
if (isNetworkTransport && (currentBufferSize + messageSize) / 1024 > exports.LIVEKIT_MAX_SIZE) {
|
|
257
|
+
// If the current buffer has content, save it as a chunk
|
|
258
|
+
if (currentBufferSize > 0) {
|
|
259
|
+
__NetworkMessagesBuffer.push(transportBuffer.toCopiedBinary());
|
|
260
|
+
transportBuffer.resetBuffer();
|
|
261
|
+
}
|
|
262
|
+
// If the message itself is larger than the limit, we need to handle it specially
|
|
263
|
+
// For now, we'll skip it to prevent infinite loops
|
|
264
|
+
if (messageSize / 1024 > exports.LIVEKIT_MAX_SIZE) {
|
|
265
|
+
console.error(`Message too large (${messageSize} bytes), skipping message for entity ${message.entityId}`);
|
|
266
|
+
continue;
|
|
267
|
+
}
|
|
268
|
+
}
|
|
269
|
+
const { entityId } = findNetworkId(message);
|
|
270
|
+
const transformNeedsFix = 'componentId' in message &&
|
|
271
|
+
message.componentId === Transform.componentId &&
|
|
272
|
+
Transform.has(entityId) &&
|
|
273
|
+
NetworkParent.has(entityId) &&
|
|
274
|
+
NetworkEntity.has(entityId);
|
|
275
|
+
// If there was a LOCAL change in the transform. Add the parent to that transform
|
|
276
|
+
if (isRendererTransport && message.type === types_1.CrdtMessageType.PUT_COMPONENT && transformNeedsFix) {
|
|
277
|
+
const parent = findNetworkId(NetworkParent.get(entityId));
|
|
278
|
+
const transformData = networkUtils.fixTransformParent(message, Transform.get(entityId), parent.entityId);
|
|
279
|
+
const offset = buffer.currentWriteOffset();
|
|
280
|
+
putComponent_1.PutComponentOperation.write(entityId, message.timestamp, message.componentId, transformData, buffer);
|
|
281
|
+
transportBuffer.writeBuffer(buffer.buffer().subarray(offset, buffer.currentWriteOffset()), false);
|
|
218
282
|
continue;
|
|
219
|
-
// Check if transport wants this message
|
|
220
|
-
if (transport.filter(message)) {
|
|
221
|
-
transportBuffer.writeBuffer(message.messageBuffer, false);
|
|
222
283
|
}
|
|
284
|
+
if (isRendererTransport && networkUtils.isNetworkMessage(message)) {
|
|
285
|
+
// If it's the renderer transport and its a NetworkMessage, we need to fix the entityId field and convert it to a known Message.
|
|
286
|
+
// PUT_NETWORK_COMPONENT -> PUT_COMPONENT
|
|
287
|
+
let transformData = 'data' in message ? message.data : new Uint8Array();
|
|
288
|
+
if (transformNeedsFix) {
|
|
289
|
+
const parent = findNetworkId(NetworkParent.get(entityId));
|
|
290
|
+
transformData = networkUtils.fixTransformParent(message, Transform.get(entityId), parent.entityId);
|
|
291
|
+
}
|
|
292
|
+
networkUtils.networkMessageToLocal({ ...message, data: transformData }, entityId, buffer, transportBuffer);
|
|
293
|
+
// Iterate the next message
|
|
294
|
+
continue;
|
|
295
|
+
}
|
|
296
|
+
// If its a network transport and its a PUT_COMPONENT that has a NetworkEntity component, we need to send this message
|
|
297
|
+
// through comms with the EntityID and NetworkID from ther NetworkEntity so everyone can recieve this message and map to their custom entityID.
|
|
298
|
+
if (isNetworkTransport && !networkUtils.isNetworkMessage(message)) {
|
|
299
|
+
const networkData = NetworkEntity.getOrNull(message.entityId);
|
|
300
|
+
// If it has networkData convert the message to PUT_NETWORK_COMPONENT.
|
|
301
|
+
if (networkData) {
|
|
302
|
+
networkUtils.localMessageToNetwork(message, networkData, buffer, transportBuffer);
|
|
303
|
+
// Iterate the next message
|
|
304
|
+
continue;
|
|
305
|
+
}
|
|
306
|
+
}
|
|
307
|
+
// Common message
|
|
308
|
+
transportBuffer.writeBuffer(message.messageBuffer, false);
|
|
309
|
+
}
|
|
310
|
+
if (isNetworkTransport && transportBuffer.currentWriteOffset()) {
|
|
311
|
+
__NetworkMessagesBuffer.push(transportBuffer.toBinary());
|
|
223
312
|
}
|
|
224
|
-
|
|
313
|
+
const message = isNetworkTransport ? __NetworkMessagesBuffer : transportBuffer.toBinary();
|
|
314
|
+
await transport.send(message);
|
|
225
315
|
}
|
|
226
316
|
}
|
|
227
317
|
/**
|
|
@@ -29,14 +29,4 @@ 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;
|
|
42
32
|
};
|
|
@@ -48,6 +48,24 @@ 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;
|
|
51
69
|
/**
|
|
52
70
|
* @public
|
|
53
71
|
* Remove the callback for onProximityDown event
|
|
@@ -126,6 +144,36 @@ export interface PointerEventsSystem {
|
|
|
126
144
|
entity: Entity;
|
|
127
145
|
opts?: Partial<EventSystemOptions>;
|
|
128
146
|
}, 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;
|
|
129
177
|
/**
|
|
130
178
|
* @public
|
|
131
179
|
* Execute callback when the user presses the proximity button on the entity
|
|
@@ -47,6 +47,9 @@ function createPointerEventsSystem(engine, inputSystem) {
|
|
|
47
47
|
EventType[EventType["HoverLeave"] = 4] = "HoverLeave";
|
|
48
48
|
EventType[EventType["ProximityEnter"] = 5] = "ProximityEnter";
|
|
49
49
|
EventType[EventType["ProximityLeave"] = 6] = "ProximityLeave";
|
|
50
|
+
EventType[EventType["Drag"] = 7] = "Drag";
|
|
51
|
+
EventType[EventType["DragLocked"] = 8] = "DragLocked";
|
|
52
|
+
EventType[EventType["DragEnd"] = 9] = "DragEnd";
|
|
50
53
|
})(EventType || (EventType = {}));
|
|
51
54
|
const eventsMap = new Map();
|
|
52
55
|
function getEvent(entity) {
|
|
@@ -92,6 +95,15 @@ function createPointerEventsSystem(engine, inputSystem) {
|
|
|
92
95
|
else if (eventType === EventType.ProximityLeave) {
|
|
93
96
|
return 5 /* PointerEventType.PET_PROXIMITY_LEAVE */;
|
|
94
97
|
}
|
|
98
|
+
else if (eventType === EventType.Drag) {
|
|
99
|
+
return 7 /* PointerEventType.PET_DRAG */;
|
|
100
|
+
}
|
|
101
|
+
else if (eventType === EventType.DragLocked) {
|
|
102
|
+
return 6 /* PointerEventType.PET_DRAG_LOCKED */;
|
|
103
|
+
}
|
|
104
|
+
else if (eventType === EventType.DragEnd) {
|
|
105
|
+
return 8 /* PointerEventType.PET_DRAG_END */;
|
|
106
|
+
}
|
|
95
107
|
return 1 /* PointerEventType.PET_DOWN */;
|
|
96
108
|
}
|
|
97
109
|
function removeEvent(entity, type, interactionType = 0 /* InteractionType.CURSOR */) {
|
|
@@ -119,7 +131,10 @@ function createPointerEventsSystem(engine, inputSystem) {
|
|
|
119
131
|
eventType === EventType.HoverEnter ||
|
|
120
132
|
eventType === EventType.HoverLeave ||
|
|
121
133
|
eventType === EventType.ProximityEnter ||
|
|
122
|
-
eventType === EventType.ProximityLeave
|
|
134
|
+
eventType === EventType.ProximityLeave ||
|
|
135
|
+
eventType === EventType.Drag ||
|
|
136
|
+
eventType === EventType.DragLocked ||
|
|
137
|
+
eventType === EventType.DragEnd) {
|
|
123
138
|
const command = inputSystem.getInputCommand(opts.button, getPointerEvent(eventType), entity);
|
|
124
139
|
if (command) {
|
|
125
140
|
(0, invariant_1.checkNotThenable)(cb(command), 'Event handler returned a thenable. Only synchronous functions are allowed');
|
|
@@ -166,6 +181,30 @@ function createPointerEventsSystem(engine, inputSystem) {
|
|
|
166
181
|
getEvent(entity).set(EventType.HoverLeave, { cb, opts: options });
|
|
167
182
|
setPointerEvent(entity, 3 /* PointerEventType.PET_HOVER_LEAVE */, options);
|
|
168
183
|
};
|
|
184
|
+
const onPointerDrag = (...args) => {
|
|
185
|
+
const [data, cb] = args;
|
|
186
|
+
const { entity, opts } = data;
|
|
187
|
+
const options = (0, exports.getDefaultOpts)(opts);
|
|
188
|
+
removeEvent(entity, EventType.Drag);
|
|
189
|
+
getEvent(entity).set(EventType.Drag, { cb, opts: options });
|
|
190
|
+
setPointerEvent(entity, 7 /* PointerEventType.PET_DRAG */, options);
|
|
191
|
+
};
|
|
192
|
+
const onPointerDragLocked = (...args) => {
|
|
193
|
+
const [data, cb] = args;
|
|
194
|
+
const { entity, opts } = data;
|
|
195
|
+
const options = (0, exports.getDefaultOpts)(opts);
|
|
196
|
+
removeEvent(entity, EventType.DragLocked);
|
|
197
|
+
getEvent(entity).set(EventType.DragLocked, { cb, opts: options });
|
|
198
|
+
setPointerEvent(entity, 6 /* PointerEventType.PET_DRAG_LOCKED */, options);
|
|
199
|
+
};
|
|
200
|
+
const onPointerDragEnd = (...args) => {
|
|
201
|
+
const [data, cb] = args;
|
|
202
|
+
const { entity, opts } = data;
|
|
203
|
+
const options = (0, exports.getDefaultOpts)(opts);
|
|
204
|
+
removeEvent(entity, EventType.DragEnd);
|
|
205
|
+
getEvent(entity).set(EventType.DragEnd, { cb, opts: options });
|
|
206
|
+
setPointerEvent(entity, 8 /* PointerEventType.PET_DRAG_END */, options);
|
|
207
|
+
};
|
|
169
208
|
const onProximityDown = (...args) => {
|
|
170
209
|
const [data, cb] = args;
|
|
171
210
|
const { entity, opts } = data;
|
|
@@ -214,6 +253,15 @@ function createPointerEventsSystem(engine, inputSystem) {
|
|
|
214
253
|
removeOnPointerHoverLeave(entity) {
|
|
215
254
|
removeEvent(entity, EventType.HoverLeave);
|
|
216
255
|
},
|
|
256
|
+
removeOnPointerDrag(entity) {
|
|
257
|
+
removeEvent(entity, EventType.Drag);
|
|
258
|
+
},
|
|
259
|
+
removeOnPointerDragLocked(entity) {
|
|
260
|
+
removeEvent(entity, EventType.DragLocked);
|
|
261
|
+
},
|
|
262
|
+
removeOnPointerDragEnd(entity) {
|
|
263
|
+
removeEvent(entity, EventType.DragEnd);
|
|
264
|
+
},
|
|
217
265
|
removeOnProximityDown(entity) {
|
|
218
266
|
removeEvent(entity, EventType.Down, 1 /* InteractionType.PROXIMITY */);
|
|
219
267
|
},
|
|
@@ -239,6 +287,9 @@ function createPointerEventsSystem(engine, inputSystem) {
|
|
|
239
287
|
onPointerUp,
|
|
240
288
|
onPointerHoverEnter,
|
|
241
289
|
onPointerHoverLeave,
|
|
290
|
+
onPointerDrag,
|
|
291
|
+
onPointerDragLocked,
|
|
292
|
+
onPointerDragEnd,
|
|
242
293
|
onProximityDown,
|
|
243
294
|
onProximityUp,
|
|
244
295
|
onProximityEnter,
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { RaycastQueryType, PBRaycastResult } from '../components';
|
|
1
|
+
import { RaycastQueryType, RaycastShape, 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,6 +14,10 @@ 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;
|
|
17
21
|
};
|
|
18
22
|
export type LocalDirectionRaycastSystemOptions = {
|
|
19
23
|
direction?: Vector3;
|
|
@@ -38,7 +38,9 @@ function createRaycastSystem(engine) {
|
|
|
38
38
|
queryType: 0 /* RaycastQueryType.RQT_HIT_FIRST */,
|
|
39
39
|
continuous: false,
|
|
40
40
|
originOffset: { x: 0, y: 0, z: 0 },
|
|
41
|
-
collisionMask: 2 /* ColliderLayer.CL_PHYSICS
|
|
41
|
+
collisionMask: 2 /* ColliderLayer.CL_PHYSICS */,
|
|
42
|
+
shape: 0 /* RaycastShape.RS_RAY */,
|
|
43
|
+
includeWorld: false
|
|
42
44
|
};
|
|
43
45
|
const getLocalDirectionRaycastDefaultOptions = (options = {}) => ({
|
|
44
46
|
...defaultOptions,
|
|
@@ -84,6 +86,8 @@ function createRaycastSystem(engine) {
|
|
|
84
86
|
raycast.direction = raycastValue.directionRawValue;
|
|
85
87
|
raycast.continuous = raycastValue.continuous;
|
|
86
88
|
raycast.queryType = raycastValue.queryType;
|
|
89
|
+
raycast.shape = raycastValue.shape;
|
|
90
|
+
raycast.includeWorld = raycastValue.includeWorld;
|
|
87
91
|
entitiesCallbackResultMap.set(entity, { callback: callback });
|
|
88
92
|
};
|
|
89
93
|
nextTickRaycasts.push(onNextTick);
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dcl/ecs",
|
|
3
3
|
"description": "Decentraland ECS",
|
|
4
|
-
"version": "7.27.1-
|
|
4
|
+
"version": "7.27.1-33669021544.commit-a6216ed",
|
|
5
5
|
"author": "DCL",
|
|
6
6
|
"bugs": "https://github.com/decentraland/ecs/issues",
|
|
7
7
|
"files": [
|
|
@@ -34,5 +34,5 @@
|
|
|
34
34
|
"dependencies": {},
|
|
35
35
|
"types": "./dist/index.d.ts",
|
|
36
36
|
"typings": "./dist/index.d.ts",
|
|
37
|
-
"commit": "
|
|
37
|
+
"commit": "a6216ed019b3e94bc687847a82d433d07c6e3e9d"
|
|
38
38
|
}
|
|
@@ -1,9 +0,0 @@
|
|
|
1
|
-
import { IEngine, LastWriteWinElementSetComponentDefinition } from '../../engine/types';
|
|
2
|
-
export interface ICreatedByType {
|
|
3
|
-
address: string;
|
|
4
|
-
}
|
|
5
|
-
export type ICreatedBy = LastWriteWinElementSetComponentDefinition<ICreatedByType>;
|
|
6
|
-
declare function defineCreatedBy(engine: Pick<IEngine, 'defineComponent'>): import("../../engine/types").MapComponentDefinition<import("../..").MapResult<{
|
|
7
|
-
address: import("../../schemas").ISchema<string>;
|
|
8
|
-
}>>;
|
|
9
|
-
export default defineCreatedBy;
|
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
import { Entity } from '../../engine/entity';
|
|
2
|
-
import { ByteBuffer } from '../ByteBuffer';
|
|
3
|
-
import { AuthoritativePutComponentMessage } from './types';
|
|
4
|
-
/**
|
|
5
|
-
* @public
|
|
6
|
-
*/
|
|
7
|
-
export declare namespace AuthoritativePutComponentOperation {
|
|
8
|
-
const MESSAGE_HEADER_LENGTH = 16;
|
|
9
|
-
/**
|
|
10
|
-
* Call this function for an optimal writing data passing the ByteBuffer
|
|
11
|
-
* already allocated
|
|
12
|
-
*/
|
|
13
|
-
function write(entity: Entity, timestamp: number, componentId: number, data: Uint8Array, buf: ByteBuffer): void;
|
|
14
|
-
function read(buf: ByteBuffer): AuthoritativePutComponentMessage | null;
|
|
15
|
-
}
|
|
@@ -1,47 +0,0 @@
|
|
|
1
|
-
import { CrdtMessageProtocol } from './crdtMessageProtocol';
|
|
2
|
-
import { CrdtMessageType, CRDT_MESSAGE_HEADER_LENGTH } from './types';
|
|
3
|
-
/**
|
|
4
|
-
* @public
|
|
5
|
-
*/
|
|
6
|
-
export var AuthoritativePutComponentOperation;
|
|
7
|
-
(function (AuthoritativePutComponentOperation) {
|
|
8
|
-
AuthoritativePutComponentOperation.MESSAGE_HEADER_LENGTH = 16;
|
|
9
|
-
/**
|
|
10
|
-
* Call this function for an optimal writing data passing the ByteBuffer
|
|
11
|
-
* already allocated
|
|
12
|
-
*/
|
|
13
|
-
function write(entity, timestamp, componentId, data, buf) {
|
|
14
|
-
// reserve the beginning
|
|
15
|
-
const startMessageOffset = buf.incrementWriteOffset(CRDT_MESSAGE_HEADER_LENGTH + AuthoritativePutComponentOperation.MESSAGE_HEADER_LENGTH);
|
|
16
|
-
// write body
|
|
17
|
-
buf.writeBuffer(data, false);
|
|
18
|
-
const messageLength = buf.currentWriteOffset() - startMessageOffset;
|
|
19
|
-
// Write CrdtMessage header
|
|
20
|
-
buf.setUint32(startMessageOffset, messageLength);
|
|
21
|
-
buf.setUint32(startMessageOffset + 4, CrdtMessageType.AUTHORITATIVE_PUT_COMPONENT);
|
|
22
|
-
// Write ComponentOperation header
|
|
23
|
-
buf.setUint32(startMessageOffset + 8, entity);
|
|
24
|
-
buf.setUint32(startMessageOffset + 12, componentId);
|
|
25
|
-
buf.setUint32(startMessageOffset + 16, timestamp);
|
|
26
|
-
const newLocal = messageLength - AuthoritativePutComponentOperation.MESSAGE_HEADER_LENGTH - CRDT_MESSAGE_HEADER_LENGTH;
|
|
27
|
-
buf.setUint32(startMessageOffset + 20, newLocal);
|
|
28
|
-
}
|
|
29
|
-
AuthoritativePutComponentOperation.write = write;
|
|
30
|
-
function read(buf) {
|
|
31
|
-
const header = CrdtMessageProtocol.readHeader(buf);
|
|
32
|
-
if (!header) {
|
|
33
|
-
return null;
|
|
34
|
-
}
|
|
35
|
-
if (header.type !== CrdtMessageType.AUTHORITATIVE_PUT_COMPONENT) {
|
|
36
|
-
throw new Error('AuthoritativePutComponentOperation tried to read another message type.');
|
|
37
|
-
}
|
|
38
|
-
return {
|
|
39
|
-
...header,
|
|
40
|
-
entityId: buf.readUint32(),
|
|
41
|
-
componentId: buf.readUint32(),
|
|
42
|
-
timestamp: buf.readUint32(),
|
|
43
|
-
data: buf.readBuffer()
|
|
44
|
-
};
|
|
45
|
-
}
|
|
46
|
-
AuthoritativePutComponentOperation.read = read;
|
|
47
|
-
})(AuthoritativePutComponentOperation || (AuthoritativePutComponentOperation = {}));
|