@dcl/ecs 7.6.4 → 7.6.5-11672040830.commit-680459b
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/generated/pb/decentraland/sdk/components/pointer_events.gen.d.ts +3 -1
- package/dist/components/generated/pb/decentraland/sdk/components/pointer_events.gen.js +16 -1
- package/dist/systems/events.d.ts +2 -0
- package/dist/systems/events.js +15 -16
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/pointer_events.gen.d.ts +3 -1
- package/dist-cjs/components/generated/pb/decentraland/sdk/components/pointer_events.gen.js +16 -1
- package/dist-cjs/systems/events.d.ts +2 -0
- package/dist-cjs/systems/events.js +20 -20
- package/package.json +2 -2
|
@@ -32,8 +32,10 @@ export interface PBPointerEvents_Info {
|
|
|
32
32
|
hoverText?: string | undefined;
|
|
33
33
|
/** range of interaction (default 10) */
|
|
34
34
|
maxDistance?: number | undefined;
|
|
35
|
-
/** enable or disable hover text (default true) */
|
|
35
|
+
/** enable or disable hover text and highlight (default true) */
|
|
36
36
|
showFeedback?: boolean | undefined;
|
|
37
|
+
/** enable or disable hover highlight (default true) */
|
|
38
|
+
showHighlight?: boolean | undefined;
|
|
37
39
|
}
|
|
38
40
|
/**
|
|
39
41
|
* @public
|
|
@@ -40,7 +40,13 @@ export var PBPointerEvents;
|
|
|
40
40
|
PBPointerEvents.decode = decode;
|
|
41
41
|
})(PBPointerEvents || (PBPointerEvents = {}));
|
|
42
42
|
function createBasePBPointerEvents_Info() {
|
|
43
|
-
return {
|
|
43
|
+
return {
|
|
44
|
+
button: undefined,
|
|
45
|
+
hoverText: undefined,
|
|
46
|
+
maxDistance: undefined,
|
|
47
|
+
showFeedback: undefined,
|
|
48
|
+
showHighlight: undefined,
|
|
49
|
+
};
|
|
44
50
|
}
|
|
45
51
|
/**
|
|
46
52
|
* @public
|
|
@@ -60,6 +66,9 @@ export var PBPointerEvents_Info;
|
|
|
60
66
|
if (message.showFeedback !== undefined) {
|
|
61
67
|
writer.uint32(32).bool(message.showFeedback);
|
|
62
68
|
}
|
|
69
|
+
if (message.showHighlight !== undefined) {
|
|
70
|
+
writer.uint32(40).bool(message.showHighlight);
|
|
71
|
+
}
|
|
63
72
|
return writer;
|
|
64
73
|
}
|
|
65
74
|
PBPointerEvents_Info.encode = encode;
|
|
@@ -94,6 +103,12 @@ export var PBPointerEvents_Info;
|
|
|
94
103
|
}
|
|
95
104
|
message.showFeedback = reader.bool();
|
|
96
105
|
continue;
|
|
106
|
+
case 5:
|
|
107
|
+
if (tag !== 40) {
|
|
108
|
+
break;
|
|
109
|
+
}
|
|
110
|
+
message.showHighlight = reader.bool();
|
|
111
|
+
continue;
|
|
97
112
|
}
|
|
98
113
|
if ((tag & 7) === 4 || tag === 0) {
|
|
99
114
|
break;
|
package/dist/systems/events.d.ts
CHANGED
|
@@ -15,7 +15,9 @@ export type EventSystemOptions = {
|
|
|
15
15
|
hoverText?: string;
|
|
16
16
|
maxDistance?: number;
|
|
17
17
|
showFeedback?: boolean;
|
|
18
|
+
showHighlight?: boolean;
|
|
18
19
|
};
|
|
20
|
+
export declare const getDefaultOpts: (opts?: Partial<EventSystemOptions>) => EventSystemOptions;
|
|
19
21
|
/**
|
|
20
22
|
* @public
|
|
21
23
|
*/
|
package/dist/systems/events.js
CHANGED
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import * as components from '../components';
|
|
2
2
|
import { EntityState } from '../engine/entity';
|
|
3
3
|
import { checkNotThenable } from '../runtime/invariant';
|
|
4
|
+
export const getDefaultOpts = (opts = {}) => ({
|
|
5
|
+
button: 3 /* InputAction.IA_ANY */,
|
|
6
|
+
...opts
|
|
7
|
+
});
|
|
4
8
|
/**
|
|
5
9
|
* @public
|
|
6
10
|
* ___DO NOT USE___ use pointerEventsSystem instead
|
|
@@ -13,27 +17,22 @@ export function createPointerEventsSystem(engine, inputSystem) {
|
|
|
13
17
|
EventType[EventType["Down"] = 1] = "Down";
|
|
14
18
|
EventType[EventType["Up"] = 2] = "Up";
|
|
15
19
|
})(EventType || (EventType = {}));
|
|
16
|
-
const getDefaultOpts = (opts = {}) => ({
|
|
17
|
-
button: 3 /* InputAction.IA_ANY */,
|
|
18
|
-
...opts
|
|
19
|
-
});
|
|
20
20
|
const eventsMap = new Map();
|
|
21
21
|
function getEvent(entity) {
|
|
22
22
|
return eventsMap.get(entity) || eventsMap.set(entity, new Map()).get(entity);
|
|
23
23
|
}
|
|
24
24
|
function setPointerEvent(entity, type, opts) {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
}
|
|
25
|
+
const pointerEvent = PointerEvents.getMutableOrNull(entity) || PointerEvents.create(entity);
|
|
26
|
+
pointerEvent.pointerEvents.push({
|
|
27
|
+
eventType: type,
|
|
28
|
+
eventInfo: {
|
|
29
|
+
button: opts.button,
|
|
30
|
+
showFeedback: opts.showFeedback,
|
|
31
|
+
showHighlight: opts.showHighlight,
|
|
32
|
+
hoverText: opts.hoverText,
|
|
33
|
+
maxDistance: opts.maxDistance
|
|
34
|
+
}
|
|
35
|
+
});
|
|
37
36
|
}
|
|
38
37
|
function removePointerEvent(entity, type, button) {
|
|
39
38
|
const pointerEvent = PointerEvents.getMutableOrNull(entity);
|
package/dist-cjs/components/generated/pb/decentraland/sdk/components/pointer_events.gen.d.ts
CHANGED
|
@@ -32,8 +32,10 @@ export interface PBPointerEvents_Info {
|
|
|
32
32
|
hoverText?: string | undefined;
|
|
33
33
|
/** range of interaction (default 10) */
|
|
34
34
|
maxDistance?: number | undefined;
|
|
35
|
-
/** enable or disable hover text (default true) */
|
|
35
|
+
/** enable or disable hover text and highlight (default true) */
|
|
36
36
|
showFeedback?: boolean | undefined;
|
|
37
|
+
/** enable or disable hover highlight (default true) */
|
|
38
|
+
showHighlight?: boolean | undefined;
|
|
37
39
|
}
|
|
38
40
|
/**
|
|
39
41
|
* @public
|
|
@@ -46,7 +46,13 @@ var PBPointerEvents;
|
|
|
46
46
|
PBPointerEvents.decode = decode;
|
|
47
47
|
})(PBPointerEvents = exports.PBPointerEvents || (exports.PBPointerEvents = {}));
|
|
48
48
|
function createBasePBPointerEvents_Info() {
|
|
49
|
-
return {
|
|
49
|
+
return {
|
|
50
|
+
button: undefined,
|
|
51
|
+
hoverText: undefined,
|
|
52
|
+
maxDistance: undefined,
|
|
53
|
+
showFeedback: undefined,
|
|
54
|
+
showHighlight: undefined,
|
|
55
|
+
};
|
|
50
56
|
}
|
|
51
57
|
/**
|
|
52
58
|
* @public
|
|
@@ -66,6 +72,9 @@ var PBPointerEvents_Info;
|
|
|
66
72
|
if (message.showFeedback !== undefined) {
|
|
67
73
|
writer.uint32(32).bool(message.showFeedback);
|
|
68
74
|
}
|
|
75
|
+
if (message.showHighlight !== undefined) {
|
|
76
|
+
writer.uint32(40).bool(message.showHighlight);
|
|
77
|
+
}
|
|
69
78
|
return writer;
|
|
70
79
|
}
|
|
71
80
|
PBPointerEvents_Info.encode = encode;
|
|
@@ -100,6 +109,12 @@ var PBPointerEvents_Info;
|
|
|
100
109
|
}
|
|
101
110
|
message.showFeedback = reader.bool();
|
|
102
111
|
continue;
|
|
112
|
+
case 5:
|
|
113
|
+
if (tag !== 40) {
|
|
114
|
+
break;
|
|
115
|
+
}
|
|
116
|
+
message.showHighlight = reader.bool();
|
|
117
|
+
continue;
|
|
103
118
|
}
|
|
104
119
|
if ((tag & 7) === 4 || tag === 0) {
|
|
105
120
|
break;
|
|
@@ -15,7 +15,9 @@ export type EventSystemOptions = {
|
|
|
15
15
|
hoverText?: string;
|
|
16
16
|
maxDistance?: number;
|
|
17
17
|
showFeedback?: boolean;
|
|
18
|
+
showHighlight?: boolean;
|
|
18
19
|
};
|
|
20
|
+
export declare const getDefaultOpts: (opts?: Partial<EventSystemOptions>) => EventSystemOptions;
|
|
19
21
|
/**
|
|
20
22
|
* @public
|
|
21
23
|
*/
|
|
@@ -23,10 +23,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.createPointerEventsSystem = void 0;
|
|
26
|
+
exports.createPointerEventsSystem = exports.getDefaultOpts = void 0;
|
|
27
27
|
const components = __importStar(require("../components"));
|
|
28
28
|
const entity_1 = require("../engine/entity");
|
|
29
29
|
const invariant_1 = require("../runtime/invariant");
|
|
30
|
+
const getDefaultOpts = (opts = {}) => ({
|
|
31
|
+
button: 3 /* InputAction.IA_ANY */,
|
|
32
|
+
...opts
|
|
33
|
+
});
|
|
34
|
+
exports.getDefaultOpts = getDefaultOpts;
|
|
30
35
|
/**
|
|
31
36
|
* @public
|
|
32
37
|
* ___DO NOT USE___ use pointerEventsSystem instead
|
|
@@ -39,27 +44,22 @@ function createPointerEventsSystem(engine, inputSystem) {
|
|
|
39
44
|
EventType[EventType["Down"] = 1] = "Down";
|
|
40
45
|
EventType[EventType["Up"] = 2] = "Up";
|
|
41
46
|
})(EventType || (EventType = {}));
|
|
42
|
-
const getDefaultOpts = (opts = {}) => ({
|
|
43
|
-
button: 3 /* InputAction.IA_ANY */,
|
|
44
|
-
...opts
|
|
45
|
-
});
|
|
46
47
|
const eventsMap = new Map();
|
|
47
48
|
function getEvent(entity) {
|
|
48
49
|
return eventsMap.get(entity) || eventsMap.set(entity, new Map()).get(entity);
|
|
49
50
|
}
|
|
50
51
|
function setPointerEvent(entity, type, opts) {
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
}
|
|
52
|
+
const pointerEvent = PointerEvents.getMutableOrNull(entity) || PointerEvents.create(entity);
|
|
53
|
+
pointerEvent.pointerEvents.push({
|
|
54
|
+
eventType: type,
|
|
55
|
+
eventInfo: {
|
|
56
|
+
button: opts.button,
|
|
57
|
+
showFeedback: opts.showFeedback,
|
|
58
|
+
showHighlight: opts.showHighlight,
|
|
59
|
+
hoverText: opts.hoverText,
|
|
60
|
+
maxDistance: opts.maxDistance
|
|
61
|
+
}
|
|
62
|
+
});
|
|
63
63
|
}
|
|
64
64
|
function removePointerEvent(entity, type, button) {
|
|
65
65
|
const pointerEvent = PointerEvents.getMutableOrNull(entity);
|
|
@@ -108,7 +108,7 @@ function createPointerEventsSystem(engine, inputSystem) {
|
|
|
108
108
|
return onPointerDown({ entity: data, opts: maybeOpts ?? {} }, cb);
|
|
109
109
|
}
|
|
110
110
|
const { entity, opts } = data;
|
|
111
|
-
const options = getDefaultOpts(opts);
|
|
111
|
+
const options = (0, exports.getDefaultOpts)(opts);
|
|
112
112
|
removeEvent(entity, EventType.Down);
|
|
113
113
|
getEvent(entity).set(EventType.Down, { cb, opts: options });
|
|
114
114
|
setPointerEvent(entity, 1 /* PointerEventType.PET_DOWN */, options);
|
|
@@ -119,7 +119,7 @@ function createPointerEventsSystem(engine, inputSystem) {
|
|
|
119
119
|
return onPointerUp({ entity: data, opts: maybeOpts ?? {} }, cb);
|
|
120
120
|
}
|
|
121
121
|
const { entity, opts } = data;
|
|
122
|
-
const options = getDefaultOpts(opts);
|
|
122
|
+
const options = (0, exports.getDefaultOpts)(opts);
|
|
123
123
|
removeEvent(entity, EventType.Up);
|
|
124
124
|
getEvent(entity).set(EventType.Up, { cb, opts: options });
|
|
125
125
|
setPointerEvent(entity, 0 /* PointerEventType.PET_UP */, options);
|
|
@@ -136,7 +136,7 @@ function createPointerEventsSystem(engine, inputSystem) {
|
|
|
136
136
|
},
|
|
137
137
|
onClick(value, cb) {
|
|
138
138
|
const { entity } = value;
|
|
139
|
-
const options = getDefaultOpts(value.opts);
|
|
139
|
+
const options = (0, exports.getDefaultOpts)(value.opts);
|
|
140
140
|
// Clear previous event with over feedback included
|
|
141
141
|
removeEvent(entity, EventType.Click);
|
|
142
142
|
// Set new event
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dcl/ecs",
|
|
3
3
|
"description": "Decentraland ECS",
|
|
4
|
-
"version": "7.6.
|
|
4
|
+
"version": "7.6.5-11672040830.commit-680459b",
|
|
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": "
|
|
36
|
+
"commit": "680459b70e094fd92c59c9f041546792d160056d"
|
|
37
37
|
}
|