@vcmap/core 5.3.1 → 6.0.0-rc.1
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/src/util/flight/flightPlayer.d.ts +11 -6
- package/dist/src/util/flight/flightPlayer.js +52 -16
- package/dist/src/util/flight/flightPlayer.js.map +1 -1
- package/dist/tests/unit/helpers/cesiumHelpers.js +2 -0
- package/dist/tests/unit/helpers/cesiumHelpers.js.map +1 -1
- package/package.json +2 -2
- package/src/util/flight/flightPlayer.ts +64 -22
|
@@ -2,19 +2,24 @@ import FlightInstance from './flightInstance.js';
|
|
|
2
2
|
import VcsEvent from '../../vcsEvent.js';
|
|
3
3
|
import VcsApp from '../../vcsApp.js';
|
|
4
4
|
export type FlightPlayerClock = {
|
|
5
|
-
startTime: number;
|
|
6
|
-
endTime: number;
|
|
7
|
-
currentTime: number;
|
|
8
|
-
times: number[];
|
|
9
|
-
currentSystemTime
|
|
5
|
+
readonly startTime: number;
|
|
6
|
+
readonly endTime: number;
|
|
7
|
+
readonly currentTime: number;
|
|
8
|
+
readonly times: number[];
|
|
9
|
+
currentSystemTime: undefined | number;
|
|
10
|
+
readonly changed: VcsEvent<FlightPlayerClock>;
|
|
11
|
+
setCurrentTime(this: FlightPlayerClock, time: number): number;
|
|
12
|
+
reset(this: FlightPlayerClock): void;
|
|
13
|
+
setTimes(this: FlightPlayerClock, times: number[]): void;
|
|
14
|
+
destroy(this: FlightPlayerClock): void;
|
|
10
15
|
};
|
|
11
16
|
export type FlightPlayerState = 'playing' | 'paused' | 'stopped';
|
|
12
17
|
export type FlightPlayer = {
|
|
13
18
|
readonly flightInstanceName: string;
|
|
19
|
+
readonly clock: FlightPlayerClock;
|
|
14
20
|
readonly state: FlightPlayerState;
|
|
15
21
|
readonly stateChanged: VcsEvent<FlightPlayerState>;
|
|
16
22
|
readonly destroyed: VcsEvent<void>;
|
|
17
|
-
clock: FlightPlayerClock;
|
|
18
23
|
play(): void;
|
|
19
24
|
stop(): void;
|
|
20
25
|
pause(): void;
|
|
@@ -6,12 +6,46 @@ import { getSplineAndTimesForInstance } from './flightHelpers.js';
|
|
|
6
6
|
import FlightInstance from './flightInstance.js';
|
|
7
7
|
import VcsEvent from '../../vcsEvent.js';
|
|
8
8
|
import VcsApp from '../../vcsApp.js';
|
|
9
|
-
function
|
|
9
|
+
function createFlightPlayerClock() {
|
|
10
|
+
let currentTime = 0;
|
|
11
|
+
let startTime = 0;
|
|
12
|
+
let endTime = 0;
|
|
13
|
+
let times = [];
|
|
10
14
|
return {
|
|
11
|
-
startTime
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
+
get startTime() {
|
|
16
|
+
return startTime;
|
|
17
|
+
},
|
|
18
|
+
get endTime() {
|
|
19
|
+
return endTime;
|
|
20
|
+
},
|
|
21
|
+
get currentTime() {
|
|
22
|
+
return currentTime;
|
|
23
|
+
},
|
|
24
|
+
get times() {
|
|
25
|
+
return times;
|
|
26
|
+
},
|
|
27
|
+
currentSystemTime: undefined,
|
|
28
|
+
changed: new VcsEvent(),
|
|
29
|
+
setCurrentTime(time) {
|
|
30
|
+
currentTime = time;
|
|
31
|
+
this.changed.raiseEvent(this);
|
|
32
|
+
return this.currentTime;
|
|
33
|
+
},
|
|
34
|
+
reset() {
|
|
35
|
+
currentTime = 0;
|
|
36
|
+
startTime = 0;
|
|
37
|
+
endTime = 0;
|
|
38
|
+
times = [];
|
|
39
|
+
this.changed.raiseEvent(this);
|
|
40
|
+
},
|
|
41
|
+
setTimes(newTimes) {
|
|
42
|
+
times = newTimes.slice();
|
|
43
|
+
endTime = times[times.length - 1];
|
|
44
|
+
this.changed.raiseEvent(this);
|
|
45
|
+
},
|
|
46
|
+
destroy() {
|
|
47
|
+
this.changed.destroy();
|
|
48
|
+
},
|
|
15
49
|
};
|
|
16
50
|
}
|
|
17
51
|
export async function createFlightPlayer(instance, app) {
|
|
@@ -24,7 +58,7 @@ export async function createFlightPlayer(instance, app) {
|
|
|
24
58
|
throw new Error('Cannot start a flight player without a cesium map');
|
|
25
59
|
}
|
|
26
60
|
await instance.initialize();
|
|
27
|
-
const clock =
|
|
61
|
+
const clock = createFlightPlayerClock();
|
|
28
62
|
let playerState = 'stopped';
|
|
29
63
|
const stateChanged = new VcsEvent();
|
|
30
64
|
const setState = (state) => {
|
|
@@ -47,21 +81,20 @@ export async function createFlightPlayer(instance, app) {
|
|
|
47
81
|
resetMapControls = undefined;
|
|
48
82
|
}
|
|
49
83
|
setState('stopped');
|
|
50
|
-
clock.currentTime = 0;
|
|
51
84
|
clock.currentSystemTime = undefined;
|
|
85
|
+
clock.setCurrentTime(0);
|
|
52
86
|
}
|
|
53
87
|
};
|
|
54
88
|
const updateSplines = () => {
|
|
55
89
|
if (!instance.isValid()) {
|
|
56
90
|
stop();
|
|
57
|
-
|
|
91
|
+
clock.reset();
|
|
58
92
|
}
|
|
59
93
|
else {
|
|
60
94
|
const splines = getSplineAndTimesForInstance(instance);
|
|
61
95
|
({ destinationSpline, quaternionSpline } = splines);
|
|
62
96
|
const { times } = splines;
|
|
63
|
-
clock.
|
|
64
|
-
clock.times = times;
|
|
97
|
+
clock.setTimes(times);
|
|
65
98
|
}
|
|
66
99
|
};
|
|
67
100
|
updateSplines();
|
|
@@ -105,11 +138,11 @@ export async function createFlightPlayer(instance, app) {
|
|
|
105
138
|
}
|
|
106
139
|
return;
|
|
107
140
|
}
|
|
108
|
-
clock.currentTime
|
|
141
|
+
clock.setCurrentTime(clock.currentTime + seconds * instance.multiplier);
|
|
109
142
|
if (clock.currentTime > clock.endTime) {
|
|
110
143
|
if (instance.loop && clock.endTime > 0) {
|
|
111
144
|
while (clock.currentTime > clock.endTime) {
|
|
112
|
-
clock.currentTime
|
|
145
|
+
clock.setCurrentTime(clock.currentTime - clock.endTime);
|
|
113
146
|
}
|
|
114
147
|
}
|
|
115
148
|
else {
|
|
@@ -118,10 +151,10 @@ export async function createFlightPlayer(instance, app) {
|
|
|
118
151
|
}
|
|
119
152
|
else if (clock.currentTime < clock.startTime) {
|
|
120
153
|
if (instance.loop) {
|
|
121
|
-
clock.
|
|
154
|
+
clock.setCurrentTime(clock.endTime + clock.currentTime);
|
|
122
155
|
}
|
|
123
156
|
else {
|
|
124
|
-
clock.
|
|
157
|
+
clock.setCurrentTime(clock.startTime);
|
|
125
158
|
return;
|
|
126
159
|
}
|
|
127
160
|
}
|
|
@@ -174,8 +207,8 @@ export async function createFlightPlayer(instance, app) {
|
|
|
174
207
|
getLogger('FlightPlayer').warning(`time: ${time} out of range`);
|
|
175
208
|
return;
|
|
176
209
|
}
|
|
177
|
-
clock.currentTime = time;
|
|
178
210
|
clock.currentSystemTime = undefined;
|
|
211
|
+
clock.setCurrentTime(time);
|
|
179
212
|
if (playerState !== 'playing') {
|
|
180
213
|
const view = getView(clock.currentTime);
|
|
181
214
|
if (view) {
|
|
@@ -199,6 +232,7 @@ export async function createFlightPlayer(instance, app) {
|
|
|
199
232
|
listeners.forEach((cb) => {
|
|
200
233
|
cb();
|
|
201
234
|
});
|
|
235
|
+
clock.destroy();
|
|
202
236
|
stateChanged.destroy();
|
|
203
237
|
destroyed.raiseEvent();
|
|
204
238
|
destroyed.destroy();
|
|
@@ -213,10 +247,12 @@ export async function createFlightPlayer(instance, app) {
|
|
|
213
247
|
}
|
|
214
248
|
}));
|
|
215
249
|
return {
|
|
216
|
-
clock,
|
|
217
250
|
get flightInstanceName() {
|
|
218
251
|
return instance.name;
|
|
219
252
|
},
|
|
253
|
+
get clock() {
|
|
254
|
+
return clock;
|
|
255
|
+
},
|
|
220
256
|
get state() {
|
|
221
257
|
return playerState;
|
|
222
258
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flightPlayer.js","sourceRoot":"","sources":["../../../../src/util/flight/flightPlayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,gBAAgB,GAIjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,SAAS,MAAM,wBAAwB,CAAC;AAC/C,OAAO,EAAE,4BAA4B,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,cAAc,MAAM,qBAAqB,CAAC;AACjD,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AACzC,OAAO,MAAM,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"flightPlayer.js","sourceRoot":"","sources":["../../../../src/util/flight/flightPlayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cesiumHelpers.js","sourceRoot":"","sources":["../../../../tests/unit/helpers/cesiumHelpers.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cesiumHelpers.js","sourceRoot":"","sources":["../../../../tests/unit/helpers/cesiumHelpers.js"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vcmap/core",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "6.0.0-rc.1",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"type": "module",
|
|
@@ -65,7 +65,7 @@
|
|
|
65
65
|
"typescript": "^5.0.4"
|
|
66
66
|
},
|
|
67
67
|
"peerDependencies": {
|
|
68
|
-
"@vcmap-cesium/engine": "^
|
|
68
|
+
"@vcmap-cesium/engine": "^10.0.1",
|
|
69
69
|
"ol": "^7.5.2"
|
|
70
70
|
},
|
|
71
71
|
"eslintConfig": {
|
|
@@ -15,21 +15,26 @@ import VcsEvent from '../../vcsEvent.js';
|
|
|
15
15
|
import VcsApp from '../../vcsApp.js';
|
|
16
16
|
|
|
17
17
|
export type FlightPlayerClock = {
|
|
18
|
-
startTime: number;
|
|
19
|
-
endTime: number;
|
|
20
|
-
currentTime: number;
|
|
21
|
-
times: number[];
|
|
22
|
-
currentSystemTime
|
|
18
|
+
readonly startTime: number;
|
|
19
|
+
readonly endTime: number;
|
|
20
|
+
readonly currentTime: number;
|
|
21
|
+
readonly times: number[];
|
|
22
|
+
currentSystemTime: undefined | number;
|
|
23
|
+
readonly changed: VcsEvent<FlightPlayerClock>;
|
|
24
|
+
setCurrentTime(this: FlightPlayerClock, time: number): number;
|
|
25
|
+
reset(this: FlightPlayerClock): void;
|
|
26
|
+
setTimes(this: FlightPlayerClock, times: number[]): void;
|
|
27
|
+
destroy(this: FlightPlayerClock): void;
|
|
23
28
|
};
|
|
24
29
|
|
|
25
30
|
export type FlightPlayerState = 'playing' | 'paused' | 'stopped';
|
|
26
31
|
|
|
27
32
|
export type FlightPlayer = {
|
|
28
33
|
readonly flightInstanceName: string;
|
|
34
|
+
readonly clock: FlightPlayerClock;
|
|
29
35
|
readonly state: FlightPlayerState;
|
|
30
36
|
readonly stateChanged: VcsEvent<FlightPlayerState>;
|
|
31
37
|
readonly destroyed: VcsEvent<void>;
|
|
32
|
-
clock: FlightPlayerClock;
|
|
33
38
|
play(): void;
|
|
34
39
|
stop(): void;
|
|
35
40
|
pause(): void;
|
|
@@ -43,12 +48,47 @@ export type FlightPlayer = {
|
|
|
43
48
|
destroy(): void;
|
|
44
49
|
};
|
|
45
50
|
|
|
46
|
-
function
|
|
51
|
+
function createFlightPlayerClock(): FlightPlayerClock {
|
|
52
|
+
let currentTime = 0;
|
|
53
|
+
let startTime = 0;
|
|
54
|
+
let endTime = 0;
|
|
55
|
+
let times: number[] = [];
|
|
56
|
+
|
|
47
57
|
return {
|
|
48
|
-
startTime:
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
58
|
+
get startTime(): number {
|
|
59
|
+
return startTime;
|
|
60
|
+
},
|
|
61
|
+
get endTime(): number {
|
|
62
|
+
return endTime;
|
|
63
|
+
},
|
|
64
|
+
get currentTime(): number {
|
|
65
|
+
return currentTime;
|
|
66
|
+
},
|
|
67
|
+
get times(): number[] {
|
|
68
|
+
return times;
|
|
69
|
+
},
|
|
70
|
+
currentSystemTime: undefined,
|
|
71
|
+
changed: new VcsEvent<FlightPlayerClock>(),
|
|
72
|
+
setCurrentTime(time: number): number {
|
|
73
|
+
currentTime = time;
|
|
74
|
+
this.changed.raiseEvent(this);
|
|
75
|
+
return this.currentTime;
|
|
76
|
+
},
|
|
77
|
+
reset(): void {
|
|
78
|
+
currentTime = 0;
|
|
79
|
+
startTime = 0;
|
|
80
|
+
endTime = 0;
|
|
81
|
+
times = [];
|
|
82
|
+
this.changed.raiseEvent(this);
|
|
83
|
+
},
|
|
84
|
+
setTimes(newTimes: number[]): void {
|
|
85
|
+
times = newTimes.slice();
|
|
86
|
+
endTime = times[times.length - 1];
|
|
87
|
+
this.changed.raiseEvent(this);
|
|
88
|
+
},
|
|
89
|
+
destroy(): void {
|
|
90
|
+
this.changed.destroy();
|
|
91
|
+
},
|
|
52
92
|
};
|
|
53
93
|
}
|
|
54
94
|
|
|
@@ -68,7 +108,7 @@ export async function createFlightPlayer(
|
|
|
68
108
|
}
|
|
69
109
|
await instance.initialize();
|
|
70
110
|
|
|
71
|
-
const clock: FlightPlayerClock =
|
|
111
|
+
const clock: FlightPlayerClock = createFlightPlayerClock();
|
|
72
112
|
|
|
73
113
|
let playerState: FlightPlayerState = 'stopped';
|
|
74
114
|
|
|
@@ -103,22 +143,21 @@ export async function createFlightPlayer(
|
|
|
103
143
|
|
|
104
144
|
setState('stopped');
|
|
105
145
|
|
|
106
|
-
clock.currentTime = 0;
|
|
107
146
|
clock.currentSystemTime = undefined;
|
|
147
|
+
clock.setCurrentTime(0);
|
|
108
148
|
}
|
|
109
149
|
};
|
|
110
150
|
|
|
111
151
|
const updateSplines = (): void => {
|
|
112
152
|
if (!instance.isValid()) {
|
|
113
153
|
stop();
|
|
114
|
-
|
|
154
|
+
clock.reset();
|
|
115
155
|
} else {
|
|
116
156
|
const splines = getSplineAndTimesForInstance(instance);
|
|
117
157
|
|
|
118
158
|
({ destinationSpline, quaternionSpline } = splines);
|
|
119
159
|
const { times } = splines;
|
|
120
|
-
clock.
|
|
121
|
-
clock.times = times;
|
|
160
|
+
clock.setTimes(times);
|
|
122
161
|
}
|
|
123
162
|
};
|
|
124
163
|
updateSplines();
|
|
@@ -174,20 +213,20 @@ export async function createFlightPlayer(
|
|
|
174
213
|
return;
|
|
175
214
|
}
|
|
176
215
|
|
|
177
|
-
clock.currentTime
|
|
216
|
+
clock.setCurrentTime(clock.currentTime + seconds * instance.multiplier);
|
|
178
217
|
if (clock.currentTime > clock.endTime) {
|
|
179
218
|
if (instance.loop && clock.endTime > 0) {
|
|
180
219
|
while (clock.currentTime > clock.endTime) {
|
|
181
|
-
clock.currentTime
|
|
220
|
+
clock.setCurrentTime(clock.currentTime - clock.endTime);
|
|
182
221
|
}
|
|
183
222
|
} else {
|
|
184
223
|
stop();
|
|
185
224
|
}
|
|
186
225
|
} else if (clock.currentTime < clock.startTime) {
|
|
187
226
|
if (instance.loop) {
|
|
188
|
-
clock.
|
|
227
|
+
clock.setCurrentTime(clock.endTime + clock.currentTime);
|
|
189
228
|
} else {
|
|
190
|
-
clock.
|
|
229
|
+
clock.setCurrentTime(clock.startTime);
|
|
191
230
|
return;
|
|
192
231
|
}
|
|
193
232
|
}
|
|
@@ -256,8 +295,8 @@ export async function createFlightPlayer(
|
|
|
256
295
|
getLogger('FlightPlayer').warning(`time: ${time} out of range`);
|
|
257
296
|
return;
|
|
258
297
|
}
|
|
259
|
-
clock.currentTime = time;
|
|
260
298
|
clock.currentSystemTime = undefined;
|
|
299
|
+
clock.setCurrentTime(time);
|
|
261
300
|
if (playerState !== 'playing') {
|
|
262
301
|
const view = getView(clock.currentTime);
|
|
263
302
|
if (view) {
|
|
@@ -284,6 +323,7 @@ export async function createFlightPlayer(
|
|
|
284
323
|
listeners.forEach((cb) => {
|
|
285
324
|
cb();
|
|
286
325
|
});
|
|
326
|
+
clock.destroy();
|
|
287
327
|
stateChanged.destroy();
|
|
288
328
|
destroyed.raiseEvent();
|
|
289
329
|
destroyed.destroy();
|
|
@@ -303,10 +343,12 @@ export async function createFlightPlayer(
|
|
|
303
343
|
);
|
|
304
344
|
|
|
305
345
|
return {
|
|
306
|
-
clock,
|
|
307
346
|
get flightInstanceName(): string {
|
|
308
347
|
return instance.name;
|
|
309
348
|
},
|
|
349
|
+
get clock(): FlightPlayerClock {
|
|
350
|
+
return clock;
|
|
351
|
+
},
|
|
310
352
|
get state(): FlightPlayerState {
|
|
311
353
|
return playerState;
|
|
312
354
|
},
|