@dcl/ecs 7.9.5 → 7.9.6-16908909596.commit-3302d67

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (174) hide show
  1. package/dist/components/extended/AvatarEquippedData.d.ts +10 -0
  2. package/dist/components/extended/AvatarEquippedData.js +15 -0
  3. package/dist/components/extended/AvatarShape.d.ts +10 -0
  4. package/dist/components/extended/AvatarShape.js +15 -0
  5. package/dist/components/extended/MeshCollider.d.ts +8 -0
  6. package/dist/components/extended/MeshCollider.js +6 -0
  7. package/dist/components/extended/MeshRenderer.d.ts +8 -0
  8. package/dist/components/extended/MeshRenderer.js +5 -0
  9. package/dist/components/generated/CameraLayer.gen.d.ts +1 -0
  10. package/dist/components/generated/{SkyboxTime.gen.js → CameraLayer.gen.js} +6 -6
  11. package/dist/components/generated/CameraLayers.gen.d.ts +1 -0
  12. package/dist/components/generated/CameraLayers.gen.js +25 -0
  13. package/dist/components/generated/GlobalLight.gen.d.ts +1 -0
  14. package/dist/components/generated/GlobalLight.gen.js +25 -0
  15. package/dist/components/generated/GltfNode.gen.d.ts +1 -0
  16. package/dist/components/generated/GltfNode.gen.js +25 -0
  17. package/dist/components/generated/GltfNodeState.gen.d.ts +1 -0
  18. package/dist/components/generated/GltfNodeState.gen.js +25 -0
  19. package/dist/components/generated/TextureCamera.gen.d.ts +1 -0
  20. package/dist/components/generated/TextureCamera.gen.js +25 -0
  21. package/dist/components/generated/UiCanvas.gen.d.ts +1 -0
  22. package/dist/components/generated/UiCanvas.gen.js +25 -0
  23. package/dist/components/generated/UiScrollResult.gen.d.ts +1 -0
  24. package/dist/components/generated/UiScrollResult.gen.js +25 -0
  25. package/dist/components/generated/component-names.gen.js +8 -2
  26. package/dist/components/generated/global.gen.d.ts +16 -4
  27. package/dist/components/generated/global.gen.js +8 -2
  28. package/dist/components/generated/index.gen.d.ts +32 -8
  29. package/dist/components/generated/index.gen.js +40 -10
  30. package/dist/components/generated/pb/decentraland/common/texture.gen.d.ts +20 -0
  31. package/dist/components/generated/pb/decentraland/common/texture.gen.js +65 -0
  32. package/dist/components/generated/pb/decentraland/sdk/components/avatar_equipped_data.gen.d.ts +2 -0
  33. package/dist/components/generated/pb/decentraland/sdk/components/avatar_equipped_data.gen.js +10 -1
  34. package/dist/components/generated/pb/decentraland/sdk/components/avatar_modifier_area.gen.d.ts +43 -0
  35. package/dist/components/generated/pb/decentraland/sdk/components/avatar_modifier_area.gen.js +151 -1
  36. package/dist/components/generated/pb/decentraland/sdk/components/avatar_shape.gen.d.ts +2 -2
  37. package/dist/components/generated/pb/decentraland/sdk/components/avatar_shape.gen.js +5 -5
  38. package/dist/components/generated/pb/decentraland/sdk/components/camera_layer.gen.d.ts +30 -0
  39. package/dist/components/generated/pb/decentraland/sdk/components/camera_layer.gen.js +104 -0
  40. package/dist/components/generated/pb/decentraland/sdk/components/camera_layers.gen.d.ts +14 -0
  41. package/dist/components/generated/pb/decentraland/sdk/components/camera_layers.gen.js +50 -0
  42. package/dist/components/generated/pb/decentraland/sdk/components/camera_mode_area.gen.d.ts +37 -1
  43. package/dist/components/generated/pb/decentraland/sdk/components/camera_mode_area.gen.js +119 -1
  44. package/dist/components/generated/pb/decentraland/sdk/components/common/input_action.gen.d.ts +4 -1
  45. package/dist/components/generated/pb/decentraland/sdk/components/common/input_action.gen.js +3 -0
  46. package/dist/components/generated/pb/decentraland/sdk/components/global_light.gen.d.ts +34 -0
  47. package/dist/components/generated/pb/decentraland/sdk/components/global_light.gen.js +61 -0
  48. package/dist/components/generated/pb/decentraland/sdk/components/gltf_container_loading_state.gen.d.ts +19 -0
  49. package/dist/components/generated/pb/decentraland/sdk/components/gltf_container_loading_state.gen.js +46 -1
  50. package/dist/components/generated/pb/decentraland/sdk/components/gltf_node.gen.d.ts +50 -0
  51. package/dist/components/generated/pb/decentraland/sdk/components/gltf_node.gen.js +41 -0
  52. package/dist/components/generated/pb/decentraland/sdk/components/gltf_node_state.gen.d.ts +27 -0
  53. package/dist/components/generated/pb/decentraland/sdk/components/gltf_node_state.gen.js +59 -0
  54. package/dist/components/generated/pb/decentraland/sdk/components/material.gen.d.ts +22 -0
  55. package/dist/components/generated/pb/decentraland/sdk/components/material.gen.js +57 -1
  56. package/dist/components/generated/pb/decentraland/sdk/components/mesh_collider.gen.d.ts +20 -0
  57. package/dist/components/generated/pb/decentraland/sdk/components/mesh_collider.gen.js +56 -0
  58. package/dist/components/generated/pb/decentraland/sdk/components/mesh_renderer.gen.d.ts +21 -3
  59. package/dist/components/generated/pb/decentraland/sdk/components/mesh_renderer.gen.js +56 -0
  60. package/dist/components/generated/pb/decentraland/sdk/components/primary_pointer_info.gen.d.ts +8 -2
  61. package/dist/components/generated/pb/decentraland/sdk/components/primary_pointer_info.gen.js +3 -0
  62. package/dist/components/generated/pb/decentraland/sdk/components/texture_camera.gen.d.ts +74 -0
  63. package/dist/components/generated/pb/decentraland/sdk/components/texture_camera.gen.js +191 -0
  64. package/dist/components/generated/pb/decentraland/sdk/components/ui_canvas.gen.d.ts +19 -0
  65. package/dist/components/generated/pb/decentraland/sdk/components/ui_canvas.gen.js +60 -0
  66. package/dist/components/generated/pb/decentraland/sdk/components/ui_scroll_result.gen.d.ts +15 -0
  67. package/dist/components/generated/pb/decentraland/sdk/components/ui_scroll_result.gen.js +42 -0
  68. package/dist/components/generated/pb/decentraland/sdk/components/ui_text.gen.d.ts +4 -0
  69. package/dist/components/generated/pb/decentraland/sdk/components/ui_text.gen.js +20 -0
  70. package/dist/components/generated/pb/decentraland/sdk/components/ui_transform.gen.d.ts +35 -0
  71. package/dist/components/generated/pb/decentraland/sdk/components/ui_transform.gen.js +90 -0
  72. package/dist/components/index.d.ts +11 -7
  73. package/dist/components/index.js +11 -5
  74. package/dist/components/types.d.ts +2 -1
  75. package/dist/engine/input.d.ts +6 -0
  76. package/dist/engine/input.js +7 -1
  77. package/dist/index.d.ts +5 -2
  78. package/dist/index.js +3 -1
  79. package/dist/systems/crdt/index.d.ts +0 -1
  80. package/dist/systems/crdt/index.js +5 -17
  81. package/dist/systems/events.d.ts +100 -1
  82. package/dist/systems/events.js +143 -65
  83. package/dist-cjs/components/extended/AvatarEquippedData.d.ts +10 -0
  84. package/dist-cjs/components/extended/AvatarEquippedData.js +19 -0
  85. package/dist-cjs/components/extended/AvatarShape.d.ts +10 -0
  86. package/dist-cjs/components/extended/AvatarShape.js +19 -0
  87. package/dist-cjs/components/extended/MeshCollider.d.ts +8 -0
  88. package/dist-cjs/components/extended/MeshCollider.js +6 -0
  89. package/dist-cjs/components/extended/MeshRenderer.d.ts +8 -0
  90. package/dist-cjs/components/extended/MeshRenderer.js +5 -0
  91. package/dist-cjs/components/generated/{SkyboxTime.gen.js → CameraLayer.gen.js} +7 -7
  92. package/dist-cjs/components/generated/CameraLayers.gen.js +28 -0
  93. package/dist-cjs/components/generated/GlobalLight.gen.js +28 -0
  94. package/dist-cjs/components/generated/GltfNode.gen.js +28 -0
  95. package/dist-cjs/components/generated/GltfNodeState.gen.d.ts +1 -0
  96. package/dist-cjs/components/generated/GltfNodeState.gen.js +28 -0
  97. package/dist-cjs/components/generated/TextureCamera.gen.d.ts +1 -0
  98. package/dist-cjs/components/generated/TextureCamera.gen.js +28 -0
  99. package/dist-cjs/components/generated/UiCanvas.gen.d.ts +1 -0
  100. package/dist-cjs/components/generated/UiCanvas.gen.js +28 -0
  101. package/dist-cjs/components/generated/UiScrollResult.gen.d.ts +1 -0
  102. package/dist-cjs/components/generated/UiScrollResult.gen.js +28 -0
  103. package/dist-cjs/components/generated/component-names.gen.js +8 -2
  104. package/dist-cjs/components/generated/global.gen.d.ts +16 -4
  105. package/dist-cjs/components/generated/global.gen.js +9 -3
  106. package/dist-cjs/components/generated/index.gen.d.ts +32 -8
  107. package/dist-cjs/components/generated/index.gen.js +50 -13
  108. package/dist-cjs/components/generated/pb/decentraland/common/texture.gen.d.ts +20 -0
  109. package/dist-cjs/components/generated/pb/decentraland/common/texture.gen.js +66 -1
  110. package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_equipped_data.gen.d.ts +2 -0
  111. package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_equipped_data.gen.js +10 -1
  112. package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_modifier_area.gen.d.ts +43 -0
  113. package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_modifier_area.gen.js +152 -2
  114. package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_shape.gen.d.ts +2 -2
  115. package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_shape.gen.js +5 -5
  116. package/dist-cjs/components/generated/pb/decentraland/sdk/components/camera_layer.gen.d.ts +30 -0
  117. package/dist-cjs/components/generated/pb/decentraland/sdk/components/camera_layer.gen.js +110 -0
  118. package/dist-cjs/components/generated/pb/decentraland/sdk/components/camera_layers.gen.d.ts +14 -0
  119. package/dist-cjs/components/generated/pb/decentraland/sdk/components/camera_layers.gen.js +56 -0
  120. package/dist-cjs/components/generated/pb/decentraland/sdk/components/camera_mode_area.gen.d.ts +37 -1
  121. package/dist-cjs/components/generated/pb/decentraland/sdk/components/camera_mode_area.gen.js +120 -2
  122. package/dist-cjs/components/generated/pb/decentraland/sdk/components/common/input_action.gen.d.ts +4 -1
  123. package/dist-cjs/components/generated/pb/decentraland/sdk/components/common/input_action.gen.js +3 -0
  124. package/dist-cjs/components/generated/pb/decentraland/sdk/components/global_light.gen.d.ts +34 -0
  125. package/dist-cjs/components/generated/pb/decentraland/sdk/components/global_light.gen.js +67 -0
  126. package/dist-cjs/components/generated/pb/decentraland/sdk/components/gltf_container_loading_state.gen.d.ts +19 -0
  127. package/dist-cjs/components/generated/pb/decentraland/sdk/components/gltf_container_loading_state.gen.js +46 -1
  128. package/dist-cjs/components/generated/pb/decentraland/sdk/components/gltf_node.gen.d.ts +50 -0
  129. package/dist-cjs/components/generated/pb/decentraland/sdk/components/gltf_node.gen.js +47 -0
  130. package/dist-cjs/components/generated/pb/decentraland/sdk/components/gltf_node_state.gen.d.ts +27 -0
  131. package/dist-cjs/components/generated/pb/decentraland/sdk/components/gltf_node_state.gen.js +65 -0
  132. package/dist-cjs/components/generated/pb/decentraland/sdk/components/material.gen.d.ts +22 -0
  133. package/dist-cjs/components/generated/pb/decentraland/sdk/components/material.gen.js +58 -2
  134. package/dist-cjs/components/generated/pb/decentraland/sdk/components/mesh_collider.gen.d.ts +20 -0
  135. package/dist-cjs/components/generated/pb/decentraland/sdk/components/mesh_collider.gen.js +57 -1
  136. package/dist-cjs/components/generated/pb/decentraland/sdk/components/mesh_renderer.gen.d.ts +21 -3
  137. package/dist-cjs/components/generated/pb/decentraland/sdk/components/mesh_renderer.gen.js +57 -1
  138. package/dist-cjs/components/generated/pb/decentraland/sdk/components/primary_pointer_info.gen.d.ts +8 -2
  139. package/dist-cjs/components/generated/pb/decentraland/sdk/components/primary_pointer_info.gen.js +3 -0
  140. package/dist-cjs/components/generated/pb/decentraland/sdk/components/texture_camera.gen.d.ts +74 -0
  141. package/dist-cjs/components/generated/pb/decentraland/sdk/components/texture_camera.gen.js +197 -0
  142. package/dist-cjs/components/generated/pb/decentraland/sdk/components/ui_canvas.gen.d.ts +19 -0
  143. package/dist-cjs/components/generated/pb/decentraland/sdk/components/{skybox_time.gen.js → ui_canvas.gen.js} +25 -26
  144. package/dist-cjs/components/generated/pb/decentraland/sdk/components/ui_scroll_result.gen.d.ts +15 -0
  145. package/dist-cjs/components/generated/pb/decentraland/sdk/components/ui_scroll_result.gen.js +48 -0
  146. package/dist-cjs/components/generated/pb/decentraland/sdk/components/ui_text.gen.d.ts +4 -0
  147. package/dist-cjs/components/generated/pb/decentraland/sdk/components/ui_text.gen.js +20 -0
  148. package/dist-cjs/components/generated/pb/decentraland/sdk/components/ui_transform.gen.d.ts +35 -0
  149. package/dist-cjs/components/generated/pb/decentraland/sdk/components/ui_transform.gen.js +91 -1
  150. package/dist-cjs/components/index.d.ts +11 -7
  151. package/dist-cjs/components/index.js +15 -7
  152. package/dist-cjs/components/types.d.ts +2 -1
  153. package/dist-cjs/engine/input.d.ts +6 -0
  154. package/dist-cjs/engine/input.js +7 -1
  155. package/dist-cjs/index.d.ts +5 -2
  156. package/dist-cjs/index.js +4 -2
  157. package/dist-cjs/systems/crdt/index.d.ts +0 -1
  158. package/dist-cjs/systems/crdt/index.js +6 -18
  159. package/dist-cjs/systems/events.d.ts +100 -1
  160. package/dist-cjs/systems/events.js +143 -65
  161. package/package.json +2 -2
  162. package/dist/components/generated/GltfNodeModifiers.gen.js +0 -25
  163. package/dist/components/generated/pb/decentraland/sdk/components/gltf_node_modifiers.gen.d.ts +0 -43
  164. package/dist/components/generated/pb/decentraland/sdk/components/gltf_node_modifiers.gen.js +0 -98
  165. package/dist/components/generated/pb/decentraland/sdk/components/skybox_time.gen.d.ts +0 -31
  166. package/dist/components/generated/pb/decentraland/sdk/components/skybox_time.gen.js +0 -61
  167. package/dist-cjs/components/generated/GltfNodeModifiers.gen.js +0 -28
  168. package/dist-cjs/components/generated/pb/decentraland/sdk/components/gltf_node_modifiers.gen.d.ts +0 -43
  169. package/dist-cjs/components/generated/pb/decentraland/sdk/components/gltf_node_modifiers.gen.js +0 -104
  170. package/dist-cjs/components/generated/pb/decentraland/sdk/components/skybox_time.gen.d.ts +0 -31
  171. /package/dist-cjs/components/generated/{GltfNodeModifiers.gen.d.ts → CameraLayer.gen.d.ts} +0 -0
  172. /package/dist-cjs/components/generated/{SkyboxTime.gen.d.ts → CameraLayers.gen.d.ts} +0 -0
  173. /package/{dist/components/generated/GltfNodeModifiers.gen.d.ts → dist-cjs/components/generated/GlobalLight.gen.d.ts} +0 -0
  174. /package/{dist/components/generated/SkyboxTime.gen.d.ts → dist-cjs/components/generated/GltfNode.gen.d.ts} +0 -0
@@ -17,6 +17,12 @@ export type EventSystemOptions = {
17
17
  showFeedback?: boolean;
18
18
  showHighlight?: boolean;
19
19
  };
20
+ /**
21
+ * @public
22
+ */
23
+ export type EventSystemOptionsCallback = EventSystemOptions & {
24
+ cb: EventSystemCallback;
25
+ };
20
26
  export declare const getDefaultOpts: (opts?: Partial<EventSystemOptions>) => EventSystemOptions;
21
27
  /**
22
28
  * @public
@@ -46,11 +52,37 @@ export interface PointerEventsSystem {
46
52
  * @param entity - Entity where the callback was attached
47
53
  */
48
54
  removeOnPointerHoverLeave(entity: Entity): void;
55
+ /**
56
+ * @public
57
+ * Remove the callback for onPointerDrag event
58
+ * @param entity - Entity where the callback was attached
59
+ */
60
+ removeOnPointerDrag(entity: Entity): void;
61
+ /**
62
+ * @public
63
+ * Remove the callback for onPointerDragLocked event
64
+ * @param entity - Entity where the callback was attached
65
+ */
66
+ removeOnPointerDragLocked(entity: Entity): void;
67
+ /**
68
+ * @public
69
+ * Remove the callback for onPointerDragEnd event
70
+ * @param entity - Entity where the callback was attached
71
+ */
72
+ removeOnPointerDragEnd(entity: Entity): void;
73
+ /**
74
+ * @public
75
+ * Execute callbacks when the user presses one of the InputButtons pointing at the entity
76
+ * @param pointerData - Entity to attach the callbacks, list of options to trigger Feedback, Button, and Callback
77
+ */
78
+ onPointerDown(pointerData: {
79
+ entity: Entity;
80
+ optsList: EventSystemOptionsCallback[];
81
+ }): void;
49
82
  /**
50
83
  * @public
51
84
  * Execute callback when the user press the InputButton pointing at the entity
52
85
  * @param pointerData - Entity to attach the callback, Opts to trigger Feedback and Button
53
- * @param cb - Function to execute when click fires
54
86
  */
55
87
  onPointerDown(pointerData: {
56
88
  entity: Entity;
@@ -63,6 +95,15 @@ export interface PointerEventsSystem {
63
95
  * @param opts - Opts to trigger Feedback and Button
64
96
  */
65
97
  onPointerDown(entity: Entity, cb: EventSystemCallback, opts?: Partial<EventSystemOptions>): void;
98
+ /**
99
+ * @public
100
+ * Execute callbacks when the user releases one of the InputButtons pointing at the entity
101
+ * @param pointerData - Entity to attach the callbacks, list of options to trigger Feedback, Button, and Callback
102
+ */
103
+ onPointerUp(pointerData: {
104
+ entity: Entity;
105
+ optsList: EventSystemOptionsCallback[];
106
+ }): void;
66
107
  /**
67
108
  * @public
68
109
  * Execute callback when the user releases the InputButton pointing at the entity
@@ -100,6 +141,64 @@ export interface PointerEventsSystem {
100
141
  entity: Entity;
101
142
  opts?: Partial<EventSystemOptions>;
102
143
  }, cb: EventSystemCallback): void;
144
+ /**
145
+ * @public
146
+ * Execute callbacks when the user drags the pointer from inside the entity
147
+ * @param pointerData - Entity to attach the callbacks, list of options to trigger Feedback, Button, and Callback
148
+ */
149
+ onPointerDrag(pointerData: {
150
+ entity: Entity;
151
+ optsList: EventSystemOptionsCallback[];
152
+ }): void;
153
+ /**
154
+ * @public
155
+ * Execute callback when the user clicks and drags the pointer from inside the entity
156
+ * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
157
+ * @param cb - Function to execute when click fires
158
+ */
159
+ onPointerDrag(pointerData: {
160
+ entity: Entity;
161
+ opts?: Partial<EventSystemOptions>;
162
+ }, cb: EventSystemCallback): void;
163
+ /**
164
+ * @public
165
+ * Execute callbacks when the user drags the pointer from inside the entity, locking the cursor in place.
166
+ * @param pointerData - Entity to attach the callbacks, list of options to trigger Feedback, Button, and Callback
167
+ */
168
+ onPointerDragLocked(pointerData: {
169
+ entity: Entity;
170
+ optsList: EventSystemOptionsCallback[];
171
+ }): void;
172
+ /**
173
+ * @public
174
+ * Execute callback when the user clicks and drags the pointer from inside the entity,
175
+ * locking the cursor in place
176
+ * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
177
+ * @param cb - Function to execute when click fires
178
+ */
179
+ onPointerDragLocked(pointerData: {
180
+ entity: Entity;
181
+ opts?: Partial<EventSystemOptions>;
182
+ }, cb: EventSystemCallback): void;
183
+ /**
184
+ * @public
185
+ * Execute callbacks when the user releases a button after a drag
186
+ * @param pointerData - Entity to attach the callbacks, list of options to trigger Feedback, Button, and Callback
187
+ */
188
+ onPointerDragEnd(pointerData: {
189
+ entity: Entity;
190
+ optsList: EventSystemOptionsCallback[];
191
+ }): void;
192
+ /**
193
+ * @public
194
+ * Execute callback when the user releases the button after a drag
195
+ * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
196
+ * @param cb - Function to execute when click fires
197
+ */
198
+ onPointerDragEnd(pointerData: {
199
+ entity: Entity;
200
+ opts?: Partial<EventSystemOptions>;
201
+ }, cb: EventSystemCallback): void;
103
202
  }
104
203
  /**
105
204
  * @public
@@ -45,6 +45,9 @@ 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["Drag"] = 5] = "Drag";
49
+ EventType[EventType["DragLocked"] = 6] = "DragLocked";
50
+ EventType[EventType["DragEnd"] = 7] = "DragEnd";
48
51
  })(EventType || (EventType = {}));
49
52
  const eventsMap = new Map();
50
53
  function getEvent(entity) {
@@ -79,77 +82,148 @@ function createPointerEventsSystem(engine, inputSystem) {
79
82
  else if (eventType === EventType.HoverEnter) {
80
83
  return 2 /* PointerEventType.PET_HOVER_ENTER */;
81
84
  }
85
+ else if (eventType === EventType.Drag) {
86
+ return 5 /* PointerEventType.PET_DRAG */;
87
+ }
88
+ else if (eventType === EventType.DragLocked) {
89
+ return 4 /* PointerEventType.PET_DRAG_LOCKED */;
90
+ }
91
+ else if (eventType === EventType.DragEnd) {
92
+ return 6 /* PointerEventType.PET_DRAG_END */;
93
+ }
82
94
  return 1 /* PointerEventType.PET_DOWN */;
83
95
  }
96
+ function getEventType(pet) {
97
+ if (pet === 0 /* PointerEventType.PET_UP */) {
98
+ return EventType.Up;
99
+ }
100
+ else if (pet === 2 /* PointerEventType.PET_HOVER_ENTER */) {
101
+ return EventType.HoverEnter;
102
+ }
103
+ else if (pet === 3 /* PointerEventType.PET_HOVER_LEAVE */) {
104
+ return EventType.HoverLeave;
105
+ }
106
+ else if (pet === 5 /* PointerEventType.PET_DRAG */) {
107
+ return EventType.Drag;
108
+ }
109
+ else if (pet === 4 /* PointerEventType.PET_DRAG_LOCKED */) {
110
+ return EventType.DragLocked;
111
+ }
112
+ else if (pet === 6 /* PointerEventType.PET_DRAG_END */) {
113
+ return EventType.DragEnd;
114
+ }
115
+ else {
116
+ return EventType.Down;
117
+ }
118
+ }
84
119
  function removeEvent(entity, type) {
85
120
  const event = getEvent(entity);
86
- const pointerEvent = event.get(type);
87
- if (pointerEvent?.opts.hoverText) {
88
- removePointerEvent(entity, getPointerEvent(type), pointerEvent.opts.button);
121
+ const pointerEventList = event.get(type);
122
+ if (pointerEventList === undefined) {
123
+ return;
124
+ }
125
+ for (const button of pointerEventList.keys()) {
126
+ removePointerEvent(entity, getPointerEvent(type), button);
89
127
  }
90
128
  event.delete(type);
91
129
  }
92
130
  engine.addSystem(function EventSystem() {
93
- for (const [entity, event] of eventsMap) {
131
+ if (eventsMap.size === 0) {
132
+ return;
133
+ }
134
+ for (const entity of eventsMap.keys()) {
94
135
  if (engine.getEntityState(entity) === entity_1.EntityState.Removed) {
95
136
  eventsMap.delete(entity);
137
+ }
138
+ }
139
+ for (const command of inputSystem.getInputCommands()) {
140
+ const entity = command.hit?.entityId;
141
+ if (entity === undefined) {
142
+ continue;
143
+ }
144
+ const entityMap = eventsMap.get(entity);
145
+ if (entityMap === undefined) {
96
146
  continue;
97
147
  }
98
- for (const [eventType, { cb, opts }] of event) {
99
- if (eventType === EventType.Click) {
100
- const command = inputSystem.getClick(opts.button, entity);
101
- if (command)
102
- (0, invariant_1.checkNotThenable)(cb(command.up), 'Click event returned a thenable. Only synchronous functions are allowed');
148
+ const typeMap = entityMap.get(getEventType(command.state));
149
+ if (typeMap) {
150
+ const data = typeMap.get(command.button);
151
+ if (data) {
152
+ (0, invariant_1.checkNotThenable)(data.cb(command), 'Event handler returned a thenable. Only synchronous functions are allowed');
103
153
  }
104
- if (eventType === EventType.Down ||
105
- eventType === EventType.Up ||
106
- eventType === EventType.HoverEnter ||
107
- eventType === EventType.HoverLeave) {
108
- const command = inputSystem.getInputCommand(opts.button, getPointerEvent(eventType), entity);
109
- if (command) {
110
- (0, invariant_1.checkNotThenable)(cb(command), 'Event handler returned a thenable. Only synchronous functions are allowed');
154
+ const anyData = typeMap.get(3 /* InputAction.IA_ANY */);
155
+ if (anyData) {
156
+ (0, invariant_1.checkNotThenable)(anyData.cb(command), 'Event handler returned a thenable. Only synchronous functions are allowed');
157
+ }
158
+ }
159
+ // check clicks separately
160
+ if (command.state === 0 /* PointerEventType.PET_UP */) {
161
+ const clickMap = entityMap.get(EventType.Click);
162
+ if (clickMap) {
163
+ const data = clickMap.get(command.button);
164
+ if (data && inputSystem.getClick(command.button, entity)) {
165
+ (0, invariant_1.checkNotThenable)(data.cb(command), 'Click event returned a thenable. Only synchronous functions are allowed');
166
+ }
167
+ const anyData = clickMap.get(3 /* InputAction.IA_ANY */);
168
+ if (anyData && inputSystem.getClick(command.button, entity)) {
169
+ (0, invariant_1.checkNotThenable)(anyData.cb(command), 'Event handler returned a thenable. Only synchronous functions are allowed');
111
170
  }
112
171
  }
113
172
  }
114
173
  }
115
174
  });
116
- const onPointerDown = (...args) => {
117
- const [data, cb, maybeOpts] = args;
118
- if (typeof data === 'number') {
119
- return onPointerDown({ entity: data, opts: maybeOpts ?? {} }, cb);
120
- }
121
- const { entity, opts } = data;
122
- const options = (0, exports.getDefaultOpts)(opts);
123
- removeEvent(entity, EventType.Down);
124
- getEvent(entity).set(EventType.Down, { cb, opts: options });
125
- setPointerEvent(entity, 1 /* PointerEventType.PET_DOWN */, options);
126
- };
127
- const onPointerUp = (...args) => {
128
- const [data, cb, maybeOpts] = args;
129
- if (typeof data === 'number') {
130
- return onPointerUp({ entity: data, opts: maybeOpts ?? {} }, cb);
131
- }
132
- const { entity, opts } = data;
133
- const options = (0, exports.getDefaultOpts)(opts);
134
- removeEvent(entity, EventType.Up);
135
- getEvent(entity).set(EventType.Up, { cb, opts: options });
136
- setPointerEvent(entity, 0 /* PointerEventType.PET_UP */, options);
137
- };
138
- const onPointerHoverEnter = (...args) => {
139
- const [data, cb] = args;
140
- const { entity, opts } = data;
141
- const options = (0, exports.getDefaultOpts)(opts);
142
- removeEvent(entity, EventType.HoverEnter);
143
- getEvent(entity).set(EventType.HoverEnter, { cb, opts: options });
144
- setPointerEvent(entity, 2 /* PointerEventType.PET_HOVER_ENTER */, options);
145
- };
146
- const onPointerHoverLeave = (...args) => {
147
- const [data, cb] = args;
148
- const { entity, opts } = data;
149
- const options = (0, exports.getDefaultOpts)(opts);
150
- removeEvent(entity, EventType.HoverLeave);
151
- getEvent(entity).set(EventType.HoverLeave, { cb, opts: options });
152
- setPointerEvent(entity, 3 /* PointerEventType.PET_HOVER_LEAVE */, options);
175
+ // return a function with the correct event type.
176
+ // we use onPointerDown as the "archetype" for the returned function, but it fits with
177
+ // all the onPointer* declarations
178
+ const onPointerFunction = (ty) => {
179
+ return (arg0, arg1, arg2) => {
180
+ let entity;
181
+ let optsList;
182
+ if (typeof arg0 === 'number') {
183
+ // called as onPointerDown(entity: Entity, cb: EventSystemCallback, opts?: Partial<EventSystemOptions>): void
184
+ entity = arg0;
185
+ const cb = arg1;
186
+ const opts = arg2;
187
+ optsList = [{ cb, ...(0, exports.getDefaultOpts)(opts) }];
188
+ }
189
+ else if (typeof arg1 === 'function') {
190
+ // called as onPointerDown(pointerData: { entity: Entity; opts?: Partial<EventSystemOptions> }, cb: EventSystemCallback): void
191
+ const { entity: e, opts } = arg0;
192
+ const cb = arg1;
193
+ entity = e;
194
+ optsList = [{ cb, ...(0, exports.getDefaultOpts)(opts) }];
195
+ }
196
+ else {
197
+ // called as onPointerDown(pointerData: { entity: Entity; optsList: EventSystemOptionsCallback[] }): void
198
+ const { entity: e, optsList: o } = arg0;
199
+ entity = e;
200
+ optsList = o;
201
+ }
202
+ const previous = getEvent(entity).get(ty) ?? new Map();
203
+ const callbacks = new Map();
204
+ for (const opts of optsList) {
205
+ const prevOpts = previous.get(opts.button);
206
+ if (prevOpts !== undefined) {
207
+ if (prevOpts.hoverText !== opts.hoverText ||
208
+ prevOpts.maxDistance !== opts.maxDistance ||
209
+ prevOpts.showFeedback !== opts.showFeedback ||
210
+ prevOpts.showHighlight !== opts.showHighlight) {
211
+ removePointerEvent(entity, getPointerEvent(ty), opts.button);
212
+ setPointerEvent(entity, getPointerEvent(ty), opts);
213
+ }
214
+ }
215
+ else {
216
+ setPointerEvent(entity, getPointerEvent(ty), opts);
217
+ }
218
+ callbacks.set(opts.button, opts);
219
+ }
220
+ for (const button of previous.keys()) {
221
+ if (!callbacks.has(button)) {
222
+ removePointerEvent(entity, getPointerEvent(ty), button);
223
+ }
224
+ }
225
+ getEvent(entity).set(ty, callbacks);
226
+ };
153
227
  };
154
228
  return {
155
229
  removeOnClick(entity) {
@@ -167,19 +241,23 @@ function createPointerEventsSystem(engine, inputSystem) {
167
241
  removeOnPointerHoverLeave(entity) {
168
242
  removeEvent(entity, EventType.HoverLeave);
169
243
  },
170
- onClick(value, cb) {
171
- const { entity } = value;
172
- const options = (0, exports.getDefaultOpts)(value.opts);
173
- // Clear previous event with over feedback included
174
- removeEvent(entity, EventType.Click);
175
- // Set new event
176
- getEvent(entity).set(EventType.Click, { cb, opts: options });
177
- setPointerEvent(entity, 1 /* PointerEventType.PET_DOWN */, options);
244
+ removeOnPointerDrag(entity) {
245
+ removeEvent(entity, EventType.Drag);
246
+ },
247
+ removeOnPointerDragLocked(entity) {
248
+ removeEvent(entity, EventType.DragLocked);
249
+ },
250
+ removeOnPointerDragEnd(entity) {
251
+ removeEvent(entity, EventType.DragEnd);
178
252
  },
179
- onPointerDown,
180
- onPointerUp,
181
- onPointerHoverEnter,
182
- onPointerHoverLeave
253
+ onClick: onPointerFunction(EventType.Click),
254
+ onPointerDown: onPointerFunction(EventType.Down),
255
+ onPointerUp: onPointerFunction(EventType.Up),
256
+ onPointerHoverEnter: onPointerFunction(EventType.HoverEnter),
257
+ onPointerHoverLeave: onPointerFunction(EventType.HoverLeave),
258
+ onPointerDrag: onPointerFunction(EventType.Drag),
259
+ onPointerDragLocked: onPointerFunction(EventType.DragLocked),
260
+ onPointerDragEnd: onPointerFunction(EventType.DragEnd)
183
261
  };
184
262
  }
185
263
  exports.createPointerEventsSystem = createPointerEventsSystem;
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@dcl/ecs",
3
3
  "description": "Decentraland ECS",
4
- "version": "7.9.5",
4
+ "version": "7.9.6-16908909596.commit-3302d67",
5
5
  "author": "DCL",
6
6
  "bugs": "https://github.com/decentraland/ecs/issues",
7
7
  "files": [
@@ -33,5 +33,5 @@
33
33
  },
34
34
  "types": "./dist/index.d.ts",
35
35
  "typings": "./dist/index.d.ts",
36
- "commit": "c2e52dbdacd56024b807a1819d4e5a9a2674ab3a"
36
+ "commit": "3302d67d9b8fa94b40f98fb1d9402a6355df1ec6"
37
37
  }
@@ -1,25 +0,0 @@
1
- import { PBGltfNodeModifiers } from './pb/decentraland/sdk/components/gltf_node_modifiers.gen';
2
- /**
3
- * @internal
4
- */
5
- export const GltfNodeModifiersSchema = {
6
- COMPONENT_ID: 1099,
7
- serialize(value, builder) {
8
- const writer = PBGltfNodeModifiers.encode(value);
9
- const buffer = new Uint8Array(writer.finish(), 0, writer.len);
10
- builder.writeBuffer(buffer, false);
11
- },
12
- deserialize(reader) {
13
- return PBGltfNodeModifiers.decode(reader.buffer(), reader.remainingBytes());
14
- },
15
- create() {
16
- // TODO: this is a hack.
17
- return PBGltfNodeModifiers.decode(new Uint8Array());
18
- },
19
- jsonSchema: {
20
- type: "object",
21
- properties: {},
22
- serializationType: "protocol-buffer",
23
- protocolBuffer: "PBGltfNodeModifiers"
24
- }
25
- };
@@ -1,43 +0,0 @@
1
- import _m0 from "protobufjs/minimal";
2
- import { PBMaterial } from "./material.gen";
3
- /**
4
- * GltfNodeModifiers component is to be used attached to entities that have the GltfContainer component.
5
- *
6
- * This allows to override either the Material or the Casting Shadows behaviour of the target GLTF Node.
7
- *
8
- * * If the 'path' of the first modifier in the collection is an empty string: the configuration will
9
- * affect all of the GLTF Nodes (as a global modifier).
10
- * * Otherwise, for the modifiers whose 'path' is found in the GLTF hierarchy, the modifier will affect only
11
- * the target Nodes.
12
- */
13
- /**
14
- * @public
15
- */
16
- export interface PBGltfNodeModifiers {
17
- modifiers: PBGltfNodeModifiers_GltfNodeModifier[];
18
- }
19
- /**
20
- * @public
21
- */
22
- export interface PBGltfNodeModifiers_GltfNodeModifier {
23
- /** The GLTF hierarchy path of the target Node to be affected */
24
- path: string;
25
- /** The casting shadows enabled override */
26
- castShadows?: boolean | undefined;
27
- /** The Material that will be overridden on the target Node */
28
- material?: PBMaterial | undefined;
29
- }
30
- /**
31
- * @public
32
- */
33
- export declare namespace PBGltfNodeModifiers {
34
- function encode(message: PBGltfNodeModifiers, writer?: _m0.Writer): _m0.Writer;
35
- function decode(input: _m0.Reader | Uint8Array, length?: number): PBGltfNodeModifiers;
36
- }
37
- /**
38
- * @public
39
- */
40
- export declare namespace PBGltfNodeModifiers_GltfNodeModifier {
41
- function encode(message: PBGltfNodeModifiers_GltfNodeModifier, writer?: _m0.Writer): _m0.Writer;
42
- function decode(input: _m0.Reader | Uint8Array, length?: number): PBGltfNodeModifiers_GltfNodeModifier;
43
- }
@@ -1,98 +0,0 @@
1
- /* eslint-disable */
2
- import _m0 from "protobufjs/minimal";
3
- import { PBMaterial } from "./material.gen";
4
- const protobufPackageSarasa = "decentraland.sdk.components";
5
- function createBasePBGltfNodeModifiers() {
6
- return { modifiers: [] };
7
- }
8
- /**
9
- * @public
10
- */
11
- export var PBGltfNodeModifiers;
12
- (function (PBGltfNodeModifiers) {
13
- function encode(message, writer = _m0.Writer.create()) {
14
- for (const v of message.modifiers) {
15
- PBGltfNodeModifiers_GltfNodeModifier.encode(v, writer.uint32(10).fork()).ldelim();
16
- }
17
- return writer;
18
- }
19
- PBGltfNodeModifiers.encode = encode;
20
- function decode(input, length) {
21
- const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
22
- let end = length === undefined ? reader.len : reader.pos + length;
23
- const message = createBasePBGltfNodeModifiers();
24
- while (reader.pos < end) {
25
- const tag = reader.uint32();
26
- switch (tag >>> 3) {
27
- case 1:
28
- if (tag !== 10) {
29
- break;
30
- }
31
- message.modifiers.push(PBGltfNodeModifiers_GltfNodeModifier.decode(reader, reader.uint32()));
32
- continue;
33
- }
34
- if ((tag & 7) === 4 || tag === 0) {
35
- break;
36
- }
37
- reader.skipType(tag & 7);
38
- }
39
- return message;
40
- }
41
- PBGltfNodeModifiers.decode = decode;
42
- })(PBGltfNodeModifiers || (PBGltfNodeModifiers = {}));
43
- function createBasePBGltfNodeModifiers_GltfNodeModifier() {
44
- return { path: "", castShadows: undefined, material: undefined };
45
- }
46
- /**
47
- * @public
48
- */
49
- export var PBGltfNodeModifiers_GltfNodeModifier;
50
- (function (PBGltfNodeModifiers_GltfNodeModifier) {
51
- function encode(message, writer = _m0.Writer.create()) {
52
- if (message.path !== "") {
53
- writer.uint32(10).string(message.path);
54
- }
55
- if (message.castShadows !== undefined) {
56
- writer.uint32(16).bool(message.castShadows);
57
- }
58
- if (message.material !== undefined) {
59
- PBMaterial.encode(message.material, writer.uint32(26).fork()).ldelim();
60
- }
61
- return writer;
62
- }
63
- PBGltfNodeModifiers_GltfNodeModifier.encode = encode;
64
- function decode(input, length) {
65
- const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
66
- let end = length === undefined ? reader.len : reader.pos + length;
67
- const message = createBasePBGltfNodeModifiers_GltfNodeModifier();
68
- while (reader.pos < end) {
69
- const tag = reader.uint32();
70
- switch (tag >>> 3) {
71
- case 1:
72
- if (tag !== 10) {
73
- break;
74
- }
75
- message.path = reader.string();
76
- continue;
77
- case 2:
78
- if (tag !== 16) {
79
- break;
80
- }
81
- message.castShadows = reader.bool();
82
- continue;
83
- case 3:
84
- if (tag !== 26) {
85
- break;
86
- }
87
- message.material = PBMaterial.decode(reader, reader.uint32());
88
- continue;
89
- }
90
- if ((tag & 7) === 4 || tag === 0) {
91
- break;
92
- }
93
- reader.skipType(tag & 7);
94
- }
95
- return message;
96
- }
97
- PBGltfNodeModifiers_GltfNodeModifier.decode = decode;
98
- })(PBGltfNodeModifiers_GltfNodeModifier || (PBGltfNodeModifiers_GltfNodeModifier = {}));
@@ -1,31 +0,0 @@
1
- import _m0 from "protobufjs/minimal";
2
- /** Controls the direction for animated skybox transitions */
3
- /**
4
- * @public
5
- */
6
- export declare const enum TransitionMode {
7
- /** TM_FORWARD - transitions forward (default) */
8
- TM_FORWARD = 0,
9
- /** TM_BACKWARD - transitions backward */
10
- TM_BACKWARD = 1
11
- }
12
- /**
13
- * The SkyboxTime component allows controlling the time of day for the skybox,
14
- * affecting the lighting and appearance of the sky in the scene.
15
- */
16
- /**
17
- * @public
18
- */
19
- export interface PBSkyboxTime {
20
- /** fixed time of day, represented as a number of seconds since the start of the day, where 0 is 00:00hs, 43200 is 12:00hs and 86400 is 24:00hs */
21
- fixedTime: number;
22
- /** default = TransitionMode.TM_FORWARD, controls the direction of time transitions */
23
- transitionMode?: TransitionMode | undefined;
24
- }
25
- /**
26
- * @public
27
- */
28
- export declare namespace PBSkyboxTime {
29
- function encode(message: PBSkyboxTime, writer?: _m0.Writer): _m0.Writer;
30
- function decode(input: _m0.Reader | Uint8Array, length?: number): PBSkyboxTime;
31
- }
@@ -1,61 +0,0 @@
1
- /* eslint-disable */
2
- import _m0 from "protobufjs/minimal";
3
- const protobufPackageSarasa = "decentraland.sdk.components";
4
- /** Controls the direction for animated skybox transitions */
5
- /**
6
- * @public
7
- */
8
- export var TransitionMode;
9
- (function (TransitionMode) {
10
- /** TM_FORWARD - transitions forward (default) */
11
- TransitionMode[TransitionMode["TM_FORWARD"] = 0] = "TM_FORWARD";
12
- /** TM_BACKWARD - transitions backward */
13
- TransitionMode[TransitionMode["TM_BACKWARD"] = 1] = "TM_BACKWARD";
14
- })(TransitionMode || (TransitionMode = {}));
15
- function createBasePBSkyboxTime() {
16
- return { fixedTime: 0, transitionMode: undefined };
17
- }
18
- /**
19
- * @public
20
- */
21
- export var PBSkyboxTime;
22
- (function (PBSkyboxTime) {
23
- function encode(message, writer = _m0.Writer.create()) {
24
- if (message.fixedTime !== 0) {
25
- writer.uint32(8).uint32(message.fixedTime);
26
- }
27
- if (message.transitionMode !== undefined) {
28
- writer.uint32(16).int32(message.transitionMode);
29
- }
30
- return writer;
31
- }
32
- PBSkyboxTime.encode = encode;
33
- function decode(input, length) {
34
- const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
35
- let end = length === undefined ? reader.len : reader.pos + length;
36
- const message = createBasePBSkyboxTime();
37
- while (reader.pos < end) {
38
- const tag = reader.uint32();
39
- switch (tag >>> 3) {
40
- case 1:
41
- if (tag !== 8) {
42
- break;
43
- }
44
- message.fixedTime = reader.uint32();
45
- continue;
46
- case 2:
47
- if (tag !== 16) {
48
- break;
49
- }
50
- message.transitionMode = reader.int32();
51
- continue;
52
- }
53
- if ((tag & 7) === 4 || tag === 0) {
54
- break;
55
- }
56
- reader.skipType(tag & 7);
57
- }
58
- return message;
59
- }
60
- PBSkyboxTime.decode = decode;
61
- })(PBSkyboxTime || (PBSkyboxTime = {}));