@dcl/ecs 7.25.1-30633801568.commit-bf777ec → 7.25.1-30828532396.commit-0c215c3
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 +10 -0
- package/dist/components/extended/AvatarEquippedData.js +15 -0
- package/dist/components/extended/AvatarShape.d.ts +10 -0
- package/dist/components/extended/AvatarShape.js +15 -0
- package/dist/components/extended/MeshCollider.d.ts +8 -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/{UiInputBinding.gen.js → AvatarMovement.gen.js} +7 -7
- 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/{AudioAnalysis.gen.js → TextureCamera.gen.js} +7 -7
- 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 -3
- package/dist/components/generated/global.gen.d.ts +20 -6
- package/dist/components/generated/global.gen.js +10 -3
- package/dist/components/generated/index.gen.d.ts +40 -12
- package/dist/components/generated/index.gen.js +50 -15
- 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_emote_command.gen.d.ts +2 -5
- package/dist/components/generated/pb/decentraland/sdk/components/avatar_emote_command.gen.js +1 -10
- 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 +43 -0
- package/dist/components/generated/pb/decentraland/sdk/components/avatar_modifier_area.gen.js +151 -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/billboard.gen.d.ts +2 -9
- package/dist/components/generated/pb/decentraland/sdk/components/billboard.gen.js +1 -10
- 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/{ui_input_binding.gen.js → camera_layers.gen.js} +12 -12
- package/dist/components/generated/pb/decentraland/sdk/components/camera_mode_area.gen.d.ts +37 -1
- package/dist/components/generated/pb/decentraland/sdk/components/camera_mode_area.gen.js +119 -1
- package/dist/components/generated/pb/decentraland/sdk/components/common/input_action.gen.d.ts +4 -2
- package/dist/components/generated/pb/decentraland/sdk/components/common/input_action.gen.js +3 -1
- 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 +22 -3
- package/dist/components/generated/pb/decentraland/sdk/components/mesh_collider.gen.js +58 -3
- 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/particle_system.gen.d.ts +1 -14
- package/dist/components/generated/pb/decentraland/sdk/components/particle_system.gen.js +4 -42
- 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_text.gen.d.ts +4 -0
- package/dist/components/generated/pb/decentraland/sdk/components/ui_text.gen.js +20 -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/generated/pb/decentraland/sdk/components/virtual_camera.gen.d.ts +0 -3
- package/dist/components/generated/pb/decentraland/sdk/components/virtual_camera.gen.js +1 -10
- package/dist/components/generated/types.gen.d.ts +0 -1
- package/dist/components/generated/types.gen.js +0 -2
- package/dist/components/index.d.ts +11 -13
- package/dist/components/index.js +11 -10
- package/dist/components/types.d.ts +2 -2
- package/dist/engine/input.d.ts +6 -0
- package/dist/engine/input.js +7 -1
- package/dist/index.d.ts +2 -3
- package/dist/index.js +1 -3
- package/dist/runtime/globals.d.ts +2 -1
- package/dist/runtime/globals.js +2 -1
- package/dist/systems/events.d.ts +100 -1
- package/dist/systems/events.js +171 -107
- package/dist/systems/raycast.d.ts +3 -1
- package/dist/systems/raycast.js +2 -0
- package/dist/systems/triggerArea.js +1 -2
- package/dist-cjs/components/extended/AvatarEquippedData.d.ts +10 -0
- package/dist-cjs/components/extended/AvatarEquippedData.js +19 -0
- package/dist-cjs/components/extended/AvatarShape.d.ts +10 -0
- package/dist-cjs/components/extended/AvatarShape.js +19 -0
- package/dist-cjs/components/extended/MeshCollider.d.ts +8 -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.js +28 -0
- package/dist-cjs/components/generated/AvatarMovementInfo.gen.js +28 -0
- package/dist-cjs/components/generated/CameraLayer.gen.js +28 -0
- package/dist-cjs/components/generated/CameraLayers.gen.js +28 -0
- package/dist-cjs/components/generated/GlobalLight.gen.js +28 -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/{AudioAnalysis.gen.js → TextureCamera.gen.js} +8 -8
- 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/{UiInputBinding.gen.js → UiScrollResult.gen.js} +8 -8
- package/dist-cjs/components/generated/component-names.gen.js +10 -3
- package/dist-cjs/components/generated/global.gen.d.ts +20 -6
- package/dist-cjs/components/generated/global.gen.js +12 -5
- package/dist-cjs/components/generated/index.gen.d.ts +40 -12
- package/dist-cjs/components/generated/index.gen.js +62 -20
- 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_emote_command.gen.d.ts +2 -5
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_emote_command.gen.js +1 -10
- 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 +43 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_modifier_area.gen.js +152 -2
- 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/billboard.gen.d.ts +2 -9
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/billboard.gen.js +1 -10
- 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/{ui_input_binding.gen.js → camera_layers.gen.js} +13 -13
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/camera_mode_area.gen.d.ts +37 -1
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/camera_mode_area.gen.js +120 -2
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/common/input_action.gen.d.ts +4 -2
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/common/input_action.gen.js +3 -1
- 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 +22 -3
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/mesh_collider.gen.js +59 -4
- 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/particle_system.gen.d.ts +1 -14
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/particle_system.gen.js +5 -43
- 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_text.gen.d.ts +4 -0
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/ui_text.gen.js +20 -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/generated/pb/decentraland/sdk/components/virtual_camera.gen.d.ts +0 -3
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/virtual_camera.gen.js +1 -10
- package/dist-cjs/components/generated/types.gen.d.ts +0 -1
- package/dist-cjs/components/generated/types.gen.js +0 -2
- package/dist-cjs/components/index.d.ts +11 -13
- package/dist-cjs/components/index.js +15 -14
- package/dist-cjs/components/types.d.ts +2 -2
- package/dist-cjs/engine/input.d.ts +6 -0
- package/dist-cjs/engine/input.js +7 -1
- package/dist-cjs/index.d.ts +2 -3
- package/dist-cjs/index.js +2 -4
- package/dist-cjs/runtime/globals.d.ts +2 -1
- package/dist-cjs/runtime/globals.js +2 -1
- package/dist-cjs/systems/events.d.ts +100 -1
- package/dist-cjs/systems/events.js +171 -107
- package/dist-cjs/systems/raycast.d.ts +3 -1
- package/dist-cjs/systems/raycast.js +2 -0
- package/dist-cjs/systems/triggerArea.js +1 -2
- package/package.json +2 -2
- package/dist/components/extended/AudioAnalysis.d.ts +0 -55
- package/dist/components/extended/AudioAnalysis.js +0 -66
- package/dist/components/extended/TouchScreenControls.d.ts +0 -30
- package/dist/components/extended/TouchScreenControls.js +0 -77
- package/dist/components/generated/TouchScreenControls.gen.js +0 -25
- package/dist/components/generated/pb/decentraland/sdk/components/audio_analysis.gen.d.ts +0 -37
- package/dist/components/generated/pb/decentraland/sdk/components/audio_analysis.gen.js +0 -161
- package/dist/components/generated/pb/decentraland/sdk/components/common/avatar_mask.gen.d.ts +0 -7
- package/dist/components/generated/pb/decentraland/sdk/components/common/avatar_mask.gen.js +0 -10
- package/dist/components/generated/pb/decentraland/sdk/components/touch_screen_controls.gen.d.ts +0 -63
- package/dist/components/generated/pb/decentraland/sdk/components/touch_screen_controls.gen.js +0 -125
- package/dist/components/generated/pb/decentraland/sdk/components/ui_input_binding.gen.d.ts +0 -36
- package/dist-cjs/components/extended/AudioAnalysis.d.ts +0 -55
- package/dist-cjs/components/extended/AudioAnalysis.js +0 -70
- package/dist-cjs/components/extended/TouchScreenControls.d.ts +0 -30
- package/dist-cjs/components/extended/TouchScreenControls.js +0 -81
- package/dist-cjs/components/generated/TouchScreenControls.gen.js +0 -28
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/audio_analysis.gen.d.ts +0 -37
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/audio_analysis.gen.js +0 -167
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/common/avatar_mask.gen.d.ts +0 -7
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/common/avatar_mask.gen.js +0 -13
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/touch_screen_controls.gen.d.ts +0 -63
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/touch_screen_controls.gen.js +0 -131
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/ui_input_binding.gen.d.ts +0 -36
- /package/dist-cjs/components/generated/{AudioAnalysis.gen.d.ts → AvatarMovement.gen.d.ts} +0 -0
- /package/dist-cjs/components/generated/{TouchScreenControls.gen.d.ts → AvatarMovementInfo.gen.d.ts} +0 -0
- /package/dist-cjs/components/generated/{UiInputBinding.gen.d.ts → CameraLayer.gen.d.ts} +0 -0
- /package/{dist/components/generated/AudioAnalysis.gen.d.ts → dist-cjs/components/generated/CameraLayers.gen.d.ts} +0 -0
- /package/{dist/components/generated/TouchScreenControls.gen.d.ts → dist-cjs/components/generated/GlobalLight.gen.d.ts} +0 -0
- /package/{dist/components/generated/UiInputBinding.gen.d.ts → dist-cjs/components/generated/GltfNode.gen.d.ts} +0 -0
|
@@ -45,8 +45,11 @@ function createPointerEventsSystem(engine, inputSystem) {
|
|
|
45
45
|
EventType[EventType["Up"] = 2] = "Up";
|
|
46
46
|
EventType[EventType["HoverEnter"] = 3] = "HoverEnter";
|
|
47
47
|
EventType[EventType["HoverLeave"] = 4] = "HoverLeave";
|
|
48
|
-
EventType[EventType["
|
|
49
|
-
EventType[EventType["
|
|
48
|
+
EventType[EventType["Drag"] = 5] = "Drag";
|
|
49
|
+
EventType[EventType["DragLocked"] = 6] = "DragLocked";
|
|
50
|
+
EventType[EventType["DragEnd"] = 7] = "DragEnd";
|
|
51
|
+
EventType[EventType["ProximityEnter"] = 8] = "ProximityEnter";
|
|
52
|
+
EventType[EventType["ProximityLeave"] = 9] = "ProximityLeave";
|
|
50
53
|
})(EventType || (EventType = {}));
|
|
51
54
|
const eventsMap = new Map();
|
|
52
55
|
function getEvent(entity) {
|
|
@@ -56,6 +59,7 @@ function createPointerEventsSystem(engine, inputSystem) {
|
|
|
56
59
|
const pointerEvent = PointerEvents.getMutableOrNull(entity) || PointerEvents.create(entity);
|
|
57
60
|
pointerEvent.pointerEvents.push({
|
|
58
61
|
eventType: type,
|
|
62
|
+
interactionType,
|
|
59
63
|
eventInfo: {
|
|
60
64
|
button: opts.button,
|
|
61
65
|
showFeedback: opts.showFeedback,
|
|
@@ -64,8 +68,7 @@ function createPointerEventsSystem(engine, inputSystem) {
|
|
|
64
68
|
maxDistance: opts.maxDistance,
|
|
65
69
|
maxPlayerDistance: opts.maxPlayerDistance,
|
|
66
70
|
priority: opts.priority
|
|
67
|
-
}
|
|
68
|
-
interactionType: interactionType ?? 0 /* InteractionType.CURSOR */
|
|
71
|
+
}
|
|
69
72
|
});
|
|
70
73
|
}
|
|
71
74
|
function removePointerEvent(entity, type, button, interactionType = 0 /* InteractionType.CURSOR */) {
|
|
@@ -86,6 +89,15 @@ function createPointerEventsSystem(engine, inputSystem) {
|
|
|
86
89
|
else if (eventType === EventType.HoverEnter) {
|
|
87
90
|
return 2 /* PointerEventType.PET_HOVER_ENTER */;
|
|
88
91
|
}
|
|
92
|
+
else if (eventType === EventType.Drag) {
|
|
93
|
+
return 7 /* PointerEventType.PET_DRAG */;
|
|
94
|
+
}
|
|
95
|
+
else if (eventType === EventType.DragLocked) {
|
|
96
|
+
return 6 /* PointerEventType.PET_DRAG_LOCKED */;
|
|
97
|
+
}
|
|
98
|
+
else if (eventType === EventType.DragEnd) {
|
|
99
|
+
return 8 /* PointerEventType.PET_DRAG_END */;
|
|
100
|
+
}
|
|
89
101
|
else if (eventType === EventType.ProximityEnter) {
|
|
90
102
|
return 4 /* PointerEventType.PET_PROXIMITY_ENTER */;
|
|
91
103
|
}
|
|
@@ -94,109 +106,157 @@ function createPointerEventsSystem(engine, inputSystem) {
|
|
|
94
106
|
}
|
|
95
107
|
return 1 /* PointerEventType.PET_DOWN */;
|
|
96
108
|
}
|
|
109
|
+
function getEventType(pet) {
|
|
110
|
+
if (pet === 0 /* PointerEventType.PET_UP */) {
|
|
111
|
+
return EventType.Up;
|
|
112
|
+
}
|
|
113
|
+
else if (pet === 2 /* PointerEventType.PET_HOVER_ENTER */) {
|
|
114
|
+
return EventType.HoverEnter;
|
|
115
|
+
}
|
|
116
|
+
else if (pet === 3 /* PointerEventType.PET_HOVER_LEAVE */) {
|
|
117
|
+
return EventType.HoverLeave;
|
|
118
|
+
}
|
|
119
|
+
else if (pet === 7 /* PointerEventType.PET_DRAG */) {
|
|
120
|
+
return EventType.Drag;
|
|
121
|
+
}
|
|
122
|
+
else if (pet === 6 /* PointerEventType.PET_DRAG_LOCKED */) {
|
|
123
|
+
return EventType.DragLocked;
|
|
124
|
+
}
|
|
125
|
+
else if (pet === 8 /* PointerEventType.PET_DRAG_END */) {
|
|
126
|
+
return EventType.DragEnd;
|
|
127
|
+
}
|
|
128
|
+
else if (pet === 4 /* PointerEventType.PET_PROXIMITY_ENTER */) {
|
|
129
|
+
return EventType.ProximityEnter;
|
|
130
|
+
}
|
|
131
|
+
else if (pet === 5 /* PointerEventType.PET_PROXIMITY_LEAVE */) {
|
|
132
|
+
return EventType.ProximityLeave;
|
|
133
|
+
}
|
|
134
|
+
else {
|
|
135
|
+
return EventType.Down;
|
|
136
|
+
}
|
|
137
|
+
}
|
|
97
138
|
function removeEvent(entity, type, interactionType = 0 /* InteractionType.CURSOR */) {
|
|
98
139
|
const event = getEvent(entity);
|
|
99
|
-
const
|
|
100
|
-
if (
|
|
101
|
-
|
|
140
|
+
const pointerEventList = event.get(type);
|
|
141
|
+
if (pointerEventList === undefined) {
|
|
142
|
+
return;
|
|
143
|
+
}
|
|
144
|
+
for (const button of pointerEventList.keys()) {
|
|
145
|
+
removePointerEvent(entity, getPointerEvent(type), button, interactionType);
|
|
102
146
|
}
|
|
103
147
|
event.delete(type);
|
|
104
148
|
}
|
|
105
149
|
engine.addSystem(function EventSystem() {
|
|
106
|
-
|
|
150
|
+
if (eventsMap.size === 0) {
|
|
151
|
+
return;
|
|
152
|
+
}
|
|
153
|
+
for (const entity of eventsMap.keys()) {
|
|
107
154
|
if (engine.getEntityState(entity) === entity_1.EntityState.Removed) {
|
|
108
155
|
eventsMap.delete(entity);
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
for (const command of inputSystem.getInputCommands()) {
|
|
159
|
+
const entity = command.hit?.entityId;
|
|
160
|
+
if (entity === undefined) {
|
|
109
161
|
continue;
|
|
110
162
|
}
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
163
|
+
const entityMap = eventsMap.get(entity);
|
|
164
|
+
if (entityMap === undefined) {
|
|
165
|
+
continue;
|
|
166
|
+
}
|
|
167
|
+
const typeMap = entityMap.get(getEventType(command.state));
|
|
168
|
+
if (typeMap) {
|
|
169
|
+
const data = typeMap.get(command.button);
|
|
170
|
+
if (data) {
|
|
171
|
+
(0, invariant_1.checkNotThenable)(data.cb(command), 'Event handler returned a thenable. Only synchronous functions are allowed');
|
|
172
|
+
}
|
|
173
|
+
const anyData = typeMap.get(3 /* InputAction.IA_ANY */);
|
|
174
|
+
if (anyData) {
|
|
175
|
+
(0, invariant_1.checkNotThenable)(anyData.cb(command), 'Event handler returned a thenable. Only synchronous functions are allowed');
|
|
116
176
|
}
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
177
|
+
}
|
|
178
|
+
// check clicks separately
|
|
179
|
+
if (command.state === 0 /* PointerEventType.PET_UP */) {
|
|
180
|
+
const clickMap = entityMap.get(EventType.Click);
|
|
181
|
+
if (clickMap) {
|
|
182
|
+
const data = clickMap.get(command.button);
|
|
183
|
+
if (data && inputSystem.getClick(command.button, entity)) {
|
|
184
|
+
(0, invariant_1.checkNotThenable)(data.cb(command), 'Click event returned a thenable. Only synchronous functions are allowed');
|
|
185
|
+
}
|
|
186
|
+
const anyData = clickMap.get(3 /* InputAction.IA_ANY */);
|
|
187
|
+
if (anyData && inputSystem.getClick(command.button, entity)) {
|
|
188
|
+
(0, invariant_1.checkNotThenable)(anyData.cb(command), 'Event handler returned a thenable. Only synchronous functions are allowed');
|
|
126
189
|
}
|
|
127
190
|
}
|
|
128
191
|
}
|
|
129
192
|
}
|
|
130
193
|
});
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
setPointerEvent(entity, 0 /* PointerEventType.PET_UP */, options, 1 /* InteractionType.PROXIMITY */);
|
|
184
|
-
};
|
|
185
|
-
const onProximityEnter = (...args) => {
|
|
186
|
-
const [data, cb] = args;
|
|
187
|
-
const { entity, opts } = data;
|
|
188
|
-
const options = (0, exports.getDefaultOpts)(opts);
|
|
189
|
-
removeEvent(entity, EventType.ProximityEnter, 1 /* InteractionType.PROXIMITY */);
|
|
190
|
-
getEvent(entity).set(EventType.ProximityEnter, { cb, opts: options });
|
|
191
|
-
setPointerEvent(entity, 4 /* PointerEventType.PET_PROXIMITY_ENTER */, options, 1 /* InteractionType.PROXIMITY */);
|
|
194
|
+
// return a function with the correct event type.
|
|
195
|
+
// we use onPointerDown as the "archetype" for the returned function, but it fits with
|
|
196
|
+
// all the onPointer* declarations
|
|
197
|
+
const onPointerFunction = (ty) => {
|
|
198
|
+
return (arg0, arg1, arg2) => {
|
|
199
|
+
let entity;
|
|
200
|
+
let optsList;
|
|
201
|
+
if (typeof arg0 === 'number') {
|
|
202
|
+
// called as onPointerDown(entity: Entity, cb: EventSystemCallback, opts?: Partial<EventSystemOptions>): void
|
|
203
|
+
entity = arg0;
|
|
204
|
+
const cb = arg1;
|
|
205
|
+
const opts = arg2;
|
|
206
|
+
optsList = [{ cb, ...(0, exports.getDefaultOpts)(opts) }];
|
|
207
|
+
}
|
|
208
|
+
else if (typeof arg1 === 'function') {
|
|
209
|
+
// called as onPointerDown(pointerData: { entity: Entity; opts?: Partial<EventSystemOptions> }, cb: EventSystemCallback): void
|
|
210
|
+
const { entity: e, opts } = arg0;
|
|
211
|
+
const cb = arg1;
|
|
212
|
+
entity = e;
|
|
213
|
+
optsList = [{ cb, ...(0, exports.getDefaultOpts)(opts) }];
|
|
214
|
+
}
|
|
215
|
+
else {
|
|
216
|
+
// called as onPointerDown(pointerData: { entity: Entity; optsList: EventSystemOptionsCallback[] }): void
|
|
217
|
+
const { entity: e, optsList: o } = arg0;
|
|
218
|
+
entity = e;
|
|
219
|
+
optsList = o;
|
|
220
|
+
}
|
|
221
|
+
const previous = getEvent(entity).get(ty) ?? new Map();
|
|
222
|
+
const callbacks = new Map();
|
|
223
|
+
for (const opts of optsList) {
|
|
224
|
+
const prevOpts = previous.get(opts.button);
|
|
225
|
+
if (prevOpts !== undefined) {
|
|
226
|
+
if (prevOpts.hoverText !== opts.hoverText ||
|
|
227
|
+
prevOpts.maxDistance !== opts.maxDistance ||
|
|
228
|
+
prevOpts.showFeedback !== opts.showFeedback ||
|
|
229
|
+
prevOpts.showHighlight !== opts.showHighlight) {
|
|
230
|
+
removePointerEvent(entity, getPointerEvent(ty), opts.button);
|
|
231
|
+
setPointerEvent(entity, getPointerEvent(ty), opts);
|
|
232
|
+
}
|
|
233
|
+
}
|
|
234
|
+
else {
|
|
235
|
+
setPointerEvent(entity, getPointerEvent(ty), opts);
|
|
236
|
+
}
|
|
237
|
+
callbacks.set(opts.button, opts);
|
|
238
|
+
}
|
|
239
|
+
for (const button of previous.keys()) {
|
|
240
|
+
if (!callbacks.has(button)) {
|
|
241
|
+
removePointerEvent(entity, getPointerEvent(ty), button);
|
|
242
|
+
}
|
|
243
|
+
}
|
|
244
|
+
getEvent(entity).set(ty, callbacks);
|
|
245
|
+
};
|
|
192
246
|
};
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
247
|
+
// proximity events mirror the cursor setters but tag the PointerEvents entry
|
|
248
|
+
// with InteractionType.PROXIMITY so the renderer sources them from the avatar's
|
|
249
|
+
// position rather than the cursor ray (single-callback shape, as upstream).
|
|
250
|
+
const onProximityFunction = (ty, pet) => {
|
|
251
|
+
return (pointerData, cb) => {
|
|
252
|
+
const { entity, opts } = pointerData;
|
|
253
|
+
const options = (0, exports.getDefaultOpts)(opts);
|
|
254
|
+
removeEvent(entity, ty, 1 /* InteractionType.PROXIMITY */);
|
|
255
|
+
const callbacks = getEvent(entity).get(ty) ?? new Map();
|
|
256
|
+
callbacks.set(options.button, { cb, ...options });
|
|
257
|
+
getEvent(entity).set(ty, callbacks);
|
|
258
|
+
setPointerEvent(entity, pet, options, 1 /* InteractionType.PROXIMITY */);
|
|
259
|
+
};
|
|
200
260
|
};
|
|
201
261
|
return {
|
|
202
262
|
removeOnClick(entity) {
|
|
@@ -214,6 +274,23 @@ function createPointerEventsSystem(engine, inputSystem) {
|
|
|
214
274
|
removeOnPointerHoverLeave(entity) {
|
|
215
275
|
removeEvent(entity, EventType.HoverLeave);
|
|
216
276
|
},
|
|
277
|
+
removeOnPointerDrag(entity) {
|
|
278
|
+
removeEvent(entity, EventType.Drag);
|
|
279
|
+
},
|
|
280
|
+
removeOnPointerDragLocked(entity) {
|
|
281
|
+
removeEvent(entity, EventType.DragLocked);
|
|
282
|
+
},
|
|
283
|
+
removeOnPointerDragEnd(entity) {
|
|
284
|
+
removeEvent(entity, EventType.DragEnd);
|
|
285
|
+
},
|
|
286
|
+
onClick: onPointerFunction(EventType.Click),
|
|
287
|
+
onPointerDown: onPointerFunction(EventType.Down),
|
|
288
|
+
onPointerUp: onPointerFunction(EventType.Up),
|
|
289
|
+
onPointerHoverEnter: onPointerFunction(EventType.HoverEnter),
|
|
290
|
+
onPointerHoverLeave: onPointerFunction(EventType.HoverLeave),
|
|
291
|
+
onPointerDrag: onPointerFunction(EventType.Drag),
|
|
292
|
+
onPointerDragLocked: onPointerFunction(EventType.DragLocked),
|
|
293
|
+
onPointerDragEnd: onPointerFunction(EventType.DragEnd),
|
|
217
294
|
removeOnProximityDown(entity) {
|
|
218
295
|
removeEvent(entity, EventType.Down, 1 /* InteractionType.PROXIMITY */);
|
|
219
296
|
},
|
|
@@ -226,23 +303,10 @@ function createPointerEventsSystem(engine, inputSystem) {
|
|
|
226
303
|
removeOnProximityLeave(entity) {
|
|
227
304
|
removeEvent(entity, EventType.ProximityLeave, 1 /* InteractionType.PROXIMITY */);
|
|
228
305
|
},
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
removeEvent(entity, EventType.Click);
|
|
234
|
-
// Set new event
|
|
235
|
-
getEvent(entity).set(EventType.Click, { cb, opts: options });
|
|
236
|
-
setPointerEvent(entity, 1 /* PointerEventType.PET_DOWN */, options);
|
|
237
|
-
},
|
|
238
|
-
onPointerDown,
|
|
239
|
-
onPointerUp,
|
|
240
|
-
onPointerHoverEnter,
|
|
241
|
-
onPointerHoverLeave,
|
|
242
|
-
onProximityDown,
|
|
243
|
-
onProximityUp,
|
|
244
|
-
onProximityEnter,
|
|
245
|
-
onProximityLeave
|
|
306
|
+
onProximityDown: onProximityFunction(EventType.Down, 1 /* PointerEventType.PET_DOWN */),
|
|
307
|
+
onProximityUp: onProximityFunction(EventType.Up, 0 /* PointerEventType.PET_UP */),
|
|
308
|
+
onProximityEnter: onProximityFunction(EventType.ProximityEnter, 4 /* PointerEventType.PET_PROXIMITY_ENTER */),
|
|
309
|
+
onProximityLeave: onProximityFunction(EventType.ProximityLeave, 5 /* PointerEventType.PET_PROXIMITY_LEAVE */)
|
|
246
310
|
};
|
|
247
311
|
}
|
|
248
312
|
exports.createPointerEventsSystem = createPointerEventsSystem;
|
|
@@ -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,8 @@ export type RaycastSystemOptions = {
|
|
|
14
14
|
queryType: RaycastQueryType;
|
|
15
15
|
continuous?: boolean | undefined;
|
|
16
16
|
collisionMask?: number | undefined;
|
|
17
|
+
shape?: RaycastShape | undefined;
|
|
18
|
+
includeWorld?: boolean | undefined;
|
|
17
19
|
};
|
|
18
20
|
export type LocalDirectionRaycastSystemOptions = {
|
|
19
21
|
direction?: Vector3;
|
|
@@ -84,6 +84,8 @@ function createRaycastSystem(engine) {
|
|
|
84
84
|
raycast.direction = raycastValue.directionRawValue;
|
|
85
85
|
raycast.continuous = raycastValue.continuous;
|
|
86
86
|
raycast.queryType = raycastValue.queryType;
|
|
87
|
+
raycast.shape = raycastValue.shape;
|
|
88
|
+
raycast.includeWorld = raycastValue.includeWorld;
|
|
87
89
|
entitiesCallbackResultMap.set(entity, { callback: callback });
|
|
88
90
|
};
|
|
89
91
|
nextTickRaycasts.push(onNextTick);
|
|
@@ -203,8 +203,7 @@ function createTriggerAreaEventsSystem(engine) {
|
|
|
203
203
|
// Pass 2: synthesize per-tick onStay callbacks
|
|
204
204
|
// -----------------------------------------------------------------------
|
|
205
205
|
// Only run if an onStay callback is registered and there are tracked triggerers.
|
|
206
|
-
if (data.triggerCallbackMap.has(1 /* TriggerAreaEventType.TAET_STAY */) &&
|
|
207
|
-
data.insideTriggerers.size > 0) {
|
|
206
|
+
if (data.triggerCallbackMap.has(1 /* TriggerAreaEventType.TAET_STAY */) && data.insideTriggerers.size > 0) {
|
|
208
207
|
const onStay = data.triggerCallbackMap.get(1 /* TriggerAreaEventType.TAET_STAY */);
|
|
209
208
|
const currentTimestamp = Date.now();
|
|
210
209
|
for (const [triggererEntity, cachedResult] of data.insideTriggerers) {
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dcl/ecs",
|
|
3
3
|
"description": "Decentraland ECS",
|
|
4
|
-
"version": "7.25.1-
|
|
4
|
+
"version": "7.25.1-30828532396.commit-0c215c3",
|
|
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": "0c215c3495851aa943d616f3d4f7cfad5a32285e"
|
|
38
38
|
}
|
|
@@ -1,55 +0,0 @@
|
|
|
1
|
-
import { Entity, IEngine } from '../../engine';
|
|
2
|
-
import { LastWriteWinElementSetComponentDefinition } from '../../engine/component';
|
|
3
|
-
import { PBAudioAnalysis, PBAudioAnalysisMode } from '../generated/pb/decentraland/sdk/components/audio_analysis.gen';
|
|
4
|
-
export interface AudioAnalysisComponentDefinitionExtended extends LastWriteWinElementSetComponentDefinition<PBAudioAnalysis> {
|
|
5
|
-
/**
|
|
6
|
-
* Reads the component data of `entity` into the provided `out` view.
|
|
7
|
-
*
|
|
8
|
-
* @throws Error if the entity does not have an AudioAnalysis component.
|
|
9
|
-
* @param entity - The entity whose AudioAnalysis data will be read.
|
|
10
|
-
* @param out - An existing AudioAnalysisView to populate with the latest values.
|
|
11
|
-
*/
|
|
12
|
-
readIntoView(entity: Entity, out: AudioAnalysisView): void;
|
|
13
|
-
/**
|
|
14
|
-
* Attempts to read the component data of `entity` into the provided `out` view.
|
|
15
|
-
*
|
|
16
|
-
* @returns `true` if the component exists and data was written into `out`,
|
|
17
|
-
* `false` if the entity does not have an AudioAnalysis component.
|
|
18
|
-
* @param entity - The entity whose AudioAnalysis data will be read.
|
|
19
|
-
* @param out - An existing AudioAnalysisView to populate.
|
|
20
|
-
*/
|
|
21
|
-
tryReadIntoView(entity: Entity, out: AudioAnalysisView): boolean;
|
|
22
|
-
/**
|
|
23
|
-
* Creates an AudioAnalysis component for the given `entity`.
|
|
24
|
-
*
|
|
25
|
-
* If a component already exists on the entity, this call fails (does not replace).
|
|
26
|
-
*
|
|
27
|
-
* @param entity - The entity to attach the component to.
|
|
28
|
-
* @param mode - Analysis mode. Defaults to `PBAudioAnalysisMode.MODE_LOGARITHMIC`.
|
|
29
|
-
* @param amplitudeGain - Optional amplitude gain multiplier.
|
|
30
|
-
* @param bandsGain - Optional gain multiplier applied to all frequency bands.
|
|
31
|
-
*/
|
|
32
|
-
createAudioAnalysis(entity: Entity, mode?: PBAudioAnalysisMode, // default is PBAudioAnalysisMode.MODE_LOGARITHMIC
|
|
33
|
-
amplitudeGain?: number, bandsGain?: number): void;
|
|
34
|
-
/**
|
|
35
|
-
* Creates the AudioAnalysis component if missing, or replaces the existing one.
|
|
36
|
-
*
|
|
37
|
-
* @param entity - The target entity.
|
|
38
|
-
* @param mode - Analysis mode. Defaults to `PBAudioAnalysisMode.MODE_LOGARITHMIC`.
|
|
39
|
-
* @param amplitudeGain - Optional amplitude gain multiplier.
|
|
40
|
-
* @param bandsGain - Optional gain multiplier applied to the frequency bands.
|
|
41
|
-
*/
|
|
42
|
-
createOrReplaceAudioAnalysis(entity: Entity, mode?: PBAudioAnalysisMode, // default is PBAudioAnalysisMode.MODE_LOGARITHMIC
|
|
43
|
-
amplitudeGain?: number, bandsGain?: number): void;
|
|
44
|
-
}
|
|
45
|
-
/**
|
|
46
|
-
* A read-only JavaScript-friendly view of AudioAnalysis ECS data.
|
|
47
|
-
*
|
|
48
|
-
* `amplitude` represents the aggregated signal strength.
|
|
49
|
-
* `bands` represents the processed frequency bands.
|
|
50
|
-
*/
|
|
51
|
-
export type AudioAnalysisView = {
|
|
52
|
-
amplitude: number;
|
|
53
|
-
bands: number[];
|
|
54
|
-
};
|
|
55
|
-
export declare function defineAudioAnalysisComponent(engine: Pick<IEngine, 'defineComponentFromSchema'>): AudioAnalysisComponentDefinitionExtended;
|
|
@@ -1,66 +0,0 @@
|
|
|
1
|
-
import { AudioAnalysis } from '../generated/index.gen';
|
|
2
|
-
export function defineAudioAnalysisComponent(engine) {
|
|
3
|
-
const theComponent = AudioAnalysis(engine);
|
|
4
|
-
return {
|
|
5
|
-
...theComponent,
|
|
6
|
-
readIntoView(entity, out) {
|
|
7
|
-
const audioAnalysis = theComponent.get(entity);
|
|
8
|
-
out.amplitude = audioAnalysis.amplitude;
|
|
9
|
-
out.bands[0] = audioAnalysis.band0;
|
|
10
|
-
out.bands[1] = audioAnalysis.band1;
|
|
11
|
-
out.bands[2] = audioAnalysis.band2;
|
|
12
|
-
out.bands[3] = audioAnalysis.band3;
|
|
13
|
-
out.bands[4] = audioAnalysis.band4;
|
|
14
|
-
out.bands[5] = audioAnalysis.band5;
|
|
15
|
-
out.bands[6] = audioAnalysis.band6;
|
|
16
|
-
out.bands[7] = audioAnalysis.band7;
|
|
17
|
-
},
|
|
18
|
-
tryReadIntoView(entity, out) {
|
|
19
|
-
const audioAnalysis = theComponent.getOrNull(entity);
|
|
20
|
-
if (!audioAnalysis)
|
|
21
|
-
return false;
|
|
22
|
-
out.amplitude = audioAnalysis.amplitude;
|
|
23
|
-
out.bands[0] = audioAnalysis.band0;
|
|
24
|
-
out.bands[1] = audioAnalysis.band1;
|
|
25
|
-
out.bands[2] = audioAnalysis.band2;
|
|
26
|
-
out.bands[3] = audioAnalysis.band3;
|
|
27
|
-
out.bands[4] = audioAnalysis.band4;
|
|
28
|
-
out.bands[5] = audioAnalysis.band5;
|
|
29
|
-
out.bands[6] = audioAnalysis.band6;
|
|
30
|
-
out.bands[7] = audioAnalysis.band7;
|
|
31
|
-
return true;
|
|
32
|
-
},
|
|
33
|
-
createAudioAnalysis(entity, mode, amplitudeGain, bandsGain) {
|
|
34
|
-
theComponent.create(entity, {
|
|
35
|
-
mode: mode || 1 /* PBAudioAnalysisMode.MODE_LOGARITHMIC */,
|
|
36
|
-
amplitudeGain: amplitudeGain ?? undefined,
|
|
37
|
-
bandsGain: bandsGain ?? undefined,
|
|
38
|
-
amplitude: 0,
|
|
39
|
-
band0: 0,
|
|
40
|
-
band1: 0,
|
|
41
|
-
band2: 0,
|
|
42
|
-
band3: 0,
|
|
43
|
-
band4: 0,
|
|
44
|
-
band5: 0,
|
|
45
|
-
band6: 0,
|
|
46
|
-
band7: 0
|
|
47
|
-
});
|
|
48
|
-
},
|
|
49
|
-
createOrReplaceAudioAnalysis(entity, mode, amplitudeGain, bandsGain) {
|
|
50
|
-
theComponent.createOrReplace(entity, {
|
|
51
|
-
mode: mode || 1 /* PBAudioAnalysisMode.MODE_LOGARITHMIC */,
|
|
52
|
-
amplitudeGain: amplitudeGain ?? undefined,
|
|
53
|
-
bandsGain: bandsGain ?? undefined,
|
|
54
|
-
amplitude: 0,
|
|
55
|
-
band0: 0,
|
|
56
|
-
band1: 0,
|
|
57
|
-
band2: 0,
|
|
58
|
-
band3: 0,
|
|
59
|
-
band4: 0,
|
|
60
|
-
band5: 0,
|
|
61
|
-
band6: 0,
|
|
62
|
-
band7: 0
|
|
63
|
-
});
|
|
64
|
-
}
|
|
65
|
-
};
|
|
66
|
-
}
|
|
@@ -1,30 +0,0 @@
|
|
|
1
|
-
import { IEngine, LastWriteWinElementSetComponentDefinition } from '../../engine';
|
|
2
|
-
import { PBTouchScreenControls } from '../generated/index.gen';
|
|
3
|
-
import { InputAction } from '../generated/pb/decentraland/sdk/components/common/input_action.gen';
|
|
4
|
-
/**
|
|
5
|
-
* @public
|
|
6
|
-
* TouchScreenControls with convenience helpers. All helpers write the component onto the
|
|
7
|
-
* RootEntity (where the client reads it) and merge with the current value.
|
|
8
|
-
*/
|
|
9
|
-
export interface TouchScreenControlsComponentDefinitionExtended extends LastWriteWinElementSetComponentDefinition<PBTouchScreenControls> {
|
|
10
|
-
/** Hide every on-screen gamepad button. */
|
|
11
|
-
hideAll(): void;
|
|
12
|
-
/**
|
|
13
|
-
* Show every on-screen gamepad button (clears the button hide list).
|
|
14
|
-
* Does NOT change the joystick/crosshair — use `showJoystick()` / `showCrosshair()` for those.
|
|
15
|
-
*/
|
|
16
|
-
showAll(): void;
|
|
17
|
-
/** Hide the given on-screen buttons (merged into the current config). */
|
|
18
|
-
hide(actions: InputAction[]): void;
|
|
19
|
-
/** Set which action the large central button triggers. */
|
|
20
|
-
setMainAction(action: InputAction): void;
|
|
21
|
-
/** Hide the native virtual joystick. */
|
|
22
|
-
hideJoystick(): void;
|
|
23
|
-
/** Show the native virtual joystick. */
|
|
24
|
-
showJoystick(): void;
|
|
25
|
-
/** Hide the on-screen crosshair / reticle. */
|
|
26
|
-
hideCrosshair(): void;
|
|
27
|
-
/** Show the on-screen crosshair / reticle. */
|
|
28
|
-
showCrosshair(): void;
|
|
29
|
-
}
|
|
30
|
-
export declare function defineTouchScreenControlsComponent(engine: Pick<IEngine, 'defineComponentFromSchema'>): TouchScreenControlsComponentDefinitionExtended;
|
|
@@ -1,77 +0,0 @@
|
|
|
1
|
-
import { TouchScreenControls } from '../generated/index.gen';
|
|
2
|
-
const ROOT_ENTITY = 0;
|
|
3
|
-
// Every on-screen gamepad action button.
|
|
4
|
-
const ALL_BUTTONS = [
|
|
5
|
-
0 /* InputAction.IA_POINTER */,
|
|
6
|
-
1 /* InputAction.IA_PRIMARY */,
|
|
7
|
-
2 /* InputAction.IA_SECONDARY */,
|
|
8
|
-
8 /* InputAction.IA_JUMP */,
|
|
9
|
-
10 /* InputAction.IA_ACTION_3 */,
|
|
10
|
-
11 /* InputAction.IA_ACTION_4 */,
|
|
11
|
-
12 /* InputAction.IA_ACTION_5 */,
|
|
12
|
-
13 /* InputAction.IA_ACTION_6 */
|
|
13
|
-
];
|
|
14
|
-
export function defineTouchScreenControlsComponent(engine) {
|
|
15
|
-
const theComponent = TouchScreenControls(engine);
|
|
16
|
-
// A mutable copy of the current RootEntity value (or a fresh default).
|
|
17
|
-
function current() {
|
|
18
|
-
const value = theComponent.getOrNull(ROOT_ENTITY);
|
|
19
|
-
return {
|
|
20
|
-
touchInputs: value?.touchInputs
|
|
21
|
-
? value.touchInputs.map((t) => ({ ...t, icon: t.icon ? { ...t.icon } : t.icon }))
|
|
22
|
-
: [],
|
|
23
|
-
mainAction: value?.mainAction,
|
|
24
|
-
hideJoystick: value?.hideJoystick ?? false,
|
|
25
|
-
hideCrosshair: value?.hideCrosshair ?? false
|
|
26
|
-
};
|
|
27
|
-
}
|
|
28
|
-
function setHidden(actions) {
|
|
29
|
-
const value = current();
|
|
30
|
-
const byAction = new Map();
|
|
31
|
-
for (const input of value.touchInputs)
|
|
32
|
-
byAction.set(input.inputAction, input);
|
|
33
|
-
for (const action of actions)
|
|
34
|
-
byAction.set(action, { ...byAction.get(action), inputAction: action, hide: true });
|
|
35
|
-
value.touchInputs = [...byAction.values()];
|
|
36
|
-
theComponent.createOrReplace(ROOT_ENTITY, value);
|
|
37
|
-
}
|
|
38
|
-
return {
|
|
39
|
-
...theComponent,
|
|
40
|
-
hideAll() {
|
|
41
|
-
setHidden(ALL_BUTTONS);
|
|
42
|
-
},
|
|
43
|
-
showAll() {
|
|
44
|
-
const value = current();
|
|
45
|
-
value.touchInputs = [];
|
|
46
|
-
theComponent.createOrReplace(ROOT_ENTITY, value);
|
|
47
|
-
},
|
|
48
|
-
hide(actions) {
|
|
49
|
-
setHidden(actions);
|
|
50
|
-
},
|
|
51
|
-
setMainAction(action) {
|
|
52
|
-
const value = current();
|
|
53
|
-
value.mainAction = action;
|
|
54
|
-
theComponent.createOrReplace(ROOT_ENTITY, value);
|
|
55
|
-
},
|
|
56
|
-
hideJoystick() {
|
|
57
|
-
const value = current();
|
|
58
|
-
value.hideJoystick = true;
|
|
59
|
-
theComponent.createOrReplace(ROOT_ENTITY, value);
|
|
60
|
-
},
|
|
61
|
-
showJoystick() {
|
|
62
|
-
const value = current();
|
|
63
|
-
value.hideJoystick = false;
|
|
64
|
-
theComponent.createOrReplace(ROOT_ENTITY, value);
|
|
65
|
-
},
|
|
66
|
-
hideCrosshair() {
|
|
67
|
-
const value = current();
|
|
68
|
-
value.hideCrosshair = true;
|
|
69
|
-
theComponent.createOrReplace(ROOT_ENTITY, value);
|
|
70
|
-
},
|
|
71
|
-
showCrosshair() {
|
|
72
|
-
const value = current();
|
|
73
|
-
value.hideCrosshair = false;
|
|
74
|
-
theComponent.createOrReplace(ROOT_ENTITY, value);
|
|
75
|
-
}
|
|
76
|
-
};
|
|
77
|
-
}
|