@fmsim/board 2.0.0-beta.6 → 2.0.0-beta.61
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/custom-elements.json +4356 -2852
- package/demo/index-modeller.html +1 -1
- package/demo/index-player.html +2 -2
- package/demo/index-viewer.html +2 -2
- package/demo/index.html +2 -2
- package/dist/src/component/etc.js +35 -0
- package/dist/src/component/etc.js.map +1 -1
- package/dist/src/data-storage/board-model-cache.d.ts +13 -0
- package/dist/src/data-storage/board-model-cache.js +66 -0
- package/dist/src/data-storage/board-model-cache.js.map +1 -0
- package/dist/src/index.d.ts +3 -0
- package/dist/src/index.js +2 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/layers/movement-layer.js +2 -4
- package/dist/src/layers/movement-layer.js.map +1 -1
- package/dist/src/modeller/edit-toolbar-style.js +43 -3
- package/dist/src/modeller/edit-toolbar-style.js.map +1 -1
- package/dist/src/modeller/edit-toolbar.d.ts +8 -14
- package/dist/src/modeller/edit-toolbar.js +208 -211
- package/dist/src/modeller/edit-toolbar.js.map +1 -1
- package/dist/src/modeller/property-sidebar/shapes/shapes.js +31 -0
- package/dist/src/modeller/property-sidebar/shapes/shapes.js.map +1 -1
- package/dist/src/modeller/property-sidebar/specifics/specifics.d.ts +1 -0
- package/dist/src/modeller/property-sidebar/specifics/specifics.js +10 -0
- package/dist/src/modeller/property-sidebar/specifics/specifics.js.map +1 -1
- package/dist/src/modeller/scene-viewer/ox-scene-viewer.d.ts +2 -1
- package/dist/src/modeller/scene-viewer/ox-scene-viewer.js +5 -1
- package/dist/src/modeller/scene-viewer/ox-scene-viewer.js.map +1 -1
- package/dist/src/ox-board-component-info.d.ts +1 -0
- package/dist/src/ox-board-component-info.js +5 -1
- package/dist/src/ox-board-component-info.js.map +1 -1
- package/dist/src/ox-board-list.js +2 -2
- package/dist/src/ox-board-list.js.map +1 -1
- package/dist/src/ox-board-modeller.d.ts +5 -2
- package/dist/src/ox-board-modeller.js +14 -4
- package/dist/src/ox-board-modeller.js.map +1 -1
- package/dist/src/ox-board-viewer.d.ts +60 -13
- package/dist/src/ox-board-viewer.js +434 -86
- package/dist/src/ox-board-viewer.js.map +1 -1
- package/dist/src/ox-editor-board-selector.d.ts +3 -0
- package/dist/src/ox-editor-board-selector.js +38 -9
- package/dist/src/ox-editor-board-selector.js.map +1 -1
- package/dist/src/ox-playback-controls.d.ts +74 -0
- package/dist/src/ox-playback-controls.js +587 -0
- package/dist/src/ox-playback-controls.js.map +1 -0
- package/dist/src/playback/playback-engine.d.ts +106 -0
- package/dist/src/playback/playback-engine.js +395 -0
- package/dist/src/playback/playback-engine.js.map +1 -0
- package/dist/src/selector/board-creation-popup.js +2 -2
- package/dist/src/selector/board-creation-popup.js.map +1 -1
- package/dist/src/selector/board-thumbnail-card.js +6 -6
- package/dist/src/selector/board-thumbnail-card.js.map +1 -1
- package/dist/src/selector/ox-board-creation-card.js +2 -2
- package/dist/src/selector/ox-board-creation-card.js.map +1 -1
- package/dist/src/selector/ox-board-selector.js +21 -10
- package/dist/src/selector/ox-board-selector.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/icons/components/text.png +0 -0
- package/icons/icon-htoolbar.png +0 -0
- package/package.json +3 -3
|
@@ -4,10 +4,12 @@ import '@material/web/icon/icon.js';
|
|
|
4
4
|
import './layers/movement-layer.js';
|
|
5
5
|
import './ox-board-component-info.js';
|
|
6
6
|
import './layers/mcs-mouse-event-handler.js';
|
|
7
|
-
import
|
|
7
|
+
import './ox-playback-controls.js';
|
|
8
|
+
import { css, html, LitElement, nothing } from 'lit';
|
|
8
9
|
import { customElement, property, query, state } from 'lit/decorators.js';
|
|
9
|
-
import {
|
|
10
|
-
import {
|
|
10
|
+
import { PlaybackEngine } from './playback/playback-engine.js';
|
|
11
|
+
import { create, LoadTracker, LoadingOverlay, SCENE_MODE } from '@hatiolab/things-scene';
|
|
12
|
+
import { isIOS, fullscreen, exitfullscreen, togglefullscreen } from '@operato/utils';
|
|
11
13
|
import { ScrollbarStyles } from '@operato/styles';
|
|
12
14
|
import { DataStorage } from './data-storage/data-storage.js';
|
|
13
15
|
import { runScenario, startScenario, DataSubscriptionProviderImpl, isRestfulAvailable } from '@fmsim/api';
|
|
@@ -24,6 +26,8 @@ let BoardViewer = class BoardViewer extends LitElement {
|
|
|
24
26
|
this._forward = [];
|
|
25
27
|
this._backward = [];
|
|
26
28
|
this._oldtarget = null;
|
|
29
|
+
this._fabExpanded = false;
|
|
30
|
+
this._playbackActive = false;
|
|
27
31
|
this.currentBoardId = (_a = this.board) === null || _a === void 0 ? void 0 : _a.id;
|
|
28
32
|
this.popup = null;
|
|
29
33
|
this.lastComponent = null;
|
|
@@ -33,7 +37,6 @@ let BoardViewer = class BoardViewer extends LitElement {
|
|
|
33
37
|
const id = e.detail.value;
|
|
34
38
|
const components = (_a = this._scene) === null || _a === void 0 ? void 0 : _a.findAll(`#${id}`);
|
|
35
39
|
if (!components || components.length == 0) {
|
|
36
|
-
console.log('No equipment was found.');
|
|
37
40
|
return;
|
|
38
41
|
}
|
|
39
42
|
window.dispatchEvent(new CustomEvent('clickComponent', { detail: components[0] }));
|
|
@@ -173,22 +176,63 @@ let BoardViewer = class BoardViewer extends LitElement {
|
|
|
173
176
|
var _a;
|
|
174
177
|
(_a = this._scene) === null || _a === void 0 ? void 0 : _a.root.trigger('deco-reset');
|
|
175
178
|
};
|
|
179
|
+
this._pointerMoveHandler = () => this.transientShowButtons();
|
|
180
|
+
/**
|
|
181
|
+
* playback 모드는 전체화면 모드와 한 몸 — 어떤 경로로든 전체화면이 해제되면
|
|
182
|
+
* playback 도 함께 종료. (단독 전체화면 토글은 기존처럼 동작하도록 `_playbackActive` 가드.)
|
|
183
|
+
*/
|
|
184
|
+
this._fullscreenChangeHandler = () => {
|
|
185
|
+
if (!document.fullscreenElement && this._playbackActive) {
|
|
186
|
+
this._onPlaybackStop();
|
|
187
|
+
}
|
|
188
|
+
};
|
|
176
189
|
this.resizeHandler = () => {
|
|
177
190
|
this._scene && this._scene.fit();
|
|
178
191
|
};
|
|
192
|
+
// ── Data Subscription ──
|
|
193
|
+
this._dataSubscriptionProvider = isRestfulAvailable() ? undefined : new DataSubscriptionProviderImpl();
|
|
194
|
+
}
|
|
195
|
+
get _is3dMode() {
|
|
196
|
+
var _a, _b, _c;
|
|
197
|
+
return !!((_c = (_b = (_a = this._scene) === null || _a === void 0 ? void 0 : _a.root) === null || _b === void 0 ? void 0 : _b.rootModel) === null || _c === void 0 ? void 0 : _c.is3dMode);
|
|
179
198
|
}
|
|
180
199
|
render() {
|
|
181
|
-
var
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
200
|
+
var _a, _b;
|
|
201
|
+
var fabGroup = this.hideFullscreen
|
|
202
|
+
? html ``
|
|
203
|
+
: html `
|
|
204
|
+
<div
|
|
205
|
+
fab-group
|
|
206
|
+
?expanded=${this._fabExpanded}
|
|
186
207
|
@mouseover=${(e) => this.transientShowButtons(true)}
|
|
187
208
|
@mouseout=${(e) => this.transientShowButtons()}
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
209
|
+
>
|
|
210
|
+
<md-fab
|
|
211
|
+
class="main-fab"
|
|
212
|
+
?expanded=${this._fabExpanded}
|
|
213
|
+
@click=${() => { this._fabExpanded = !this._fabExpanded; }}
|
|
214
|
+
title="menu"
|
|
215
|
+
><md-icon slot="icon">add</md-icon></md-fab>
|
|
216
|
+
|
|
217
|
+
${isIOS() ? nothing : html `<md-fab
|
|
218
|
+
class="sub-fab"
|
|
219
|
+
@click=${() => { this._fabExpanded = false; this.onTapFullscreen(); }}
|
|
220
|
+
title="fullscreen"
|
|
221
|
+
><md-icon slot="icon">${document.fullscreenElement ? 'fullscreen_exit' : 'fullscreen'}</md-icon></md-fab>`}
|
|
222
|
+
|
|
223
|
+
<md-fab
|
|
224
|
+
class="sub-fab"
|
|
225
|
+
@click=${() => { this._fabExpanded = false; this.onTapPlayback(); }}
|
|
226
|
+
title=${this._playbackActive ? 'stop playback' : 'start playback'}
|
|
227
|
+
><md-icon slot="icon">${this._playbackActive ? 'stop' : 'replay'}</md-icon></md-fab>
|
|
228
|
+
|
|
229
|
+
<md-fab
|
|
230
|
+
class="sub-fab"
|
|
231
|
+
@click=${() => { this._fabExpanded = false; this.onTapToggle3D(); }}
|
|
232
|
+
title=${this._is3dMode ? '2D mode' : '3D mode'}
|
|
233
|
+
><md-icon slot="icon">${this._is3dMode ? 'view_in_ar' : '3d_rotation'}</md-icon></md-fab>
|
|
234
|
+
</div>
|
|
235
|
+
`;
|
|
192
236
|
var prev = !this.hideNavigation
|
|
193
237
|
? html `
|
|
194
238
|
<md-icon
|
|
@@ -216,74 +260,94 @@ let BoardViewer = class BoardViewer extends LitElement {
|
|
|
216
260
|
return html `
|
|
217
261
|
${prev}
|
|
218
262
|
|
|
219
|
-
<div
|
|
220
|
-
id="target"
|
|
221
|
-
@touchstart=${(e) => this.transientShowButtons()}
|
|
222
|
-
@mousemove=${(e) => this.transientShowButtons()}
|
|
223
|
-
></div>
|
|
263
|
+
<div id="target"></div>
|
|
224
264
|
|
|
225
265
|
<slot></slot>
|
|
226
|
-
${next} ${
|
|
266
|
+
${next} ${fabGroup}
|
|
267
|
+
|
|
268
|
+
${this._playbackActive
|
|
269
|
+
? html `<ox-playback-controls
|
|
270
|
+
.playbackState=${((_a = this._playbackEngine) === null || _a === void 0 ? void 0 : _a.state) === 'playing' ? 'playing' : ((_b = this._playbackEngine) === null || _b === void 0 ? void 0 : _b.state) === 'paused' ? 'paused' : 'idle'}
|
|
271
|
+
@playback-start=${this._onPlaybackStart}
|
|
272
|
+
@playback-pause=${this._onPlaybackPause}
|
|
273
|
+
@playback-resume=${this._onPlaybackResume}
|
|
274
|
+
@playback-stop=${this._onPlaybackStop}
|
|
275
|
+
@playback-seek=${this._onPlaybackSeek}
|
|
276
|
+
@playback-seek-start=${this._onPlaybackSeekStart}
|
|
277
|
+
@playback-seek-preview=${this._onPlaybackSeekPreview}
|
|
278
|
+
@playback-speed=${this._onPlaybackSpeed}
|
|
279
|
+
></ox-playback-controls>`
|
|
280
|
+
: nothing}
|
|
227
281
|
`;
|
|
228
282
|
}
|
|
283
|
+
/** connect/disconnect 시 일괄 등록/해제할 window 이벤트 목록 (모니터링 연동) */
|
|
284
|
+
get _monitoringEvents() {
|
|
285
|
+
return [
|
|
286
|
+
['fetchIFactsData', this.fetchIFactsDataHandler], // 장비 아이디 object를 캔버스 가운데로
|
|
287
|
+
['fmbShowMovement', this.fmbShowMovementHandler], // Movement Data 표시
|
|
288
|
+
['fmbMonitoringInit', this.fmbMonitoringInitHandler], // 보드 상태 정사이즈 복원
|
|
289
|
+
['clickComponent', this.clickComponentHandler], // BoardComponentInfo popup
|
|
290
|
+
['fmbStartAnimation', this.fmbStartAnimation], // AnimatedIcon 추가/제거
|
|
291
|
+
['fmbStopAnimation', this.fmbStopAnimation],
|
|
292
|
+
['fmbResetAnimation', this.fmbResetAnimation],
|
|
293
|
+
['fmbShowLegend', this.fmbShowLegendHandler], // 범례 표시
|
|
294
|
+
['fmbHideLegend', this.fmbHideLegendHandler],
|
|
295
|
+
['fmbShowPopup', this.fmbShowPopupHandler], // 팝업 표시
|
|
296
|
+
['fmbHidePopup', this.fmbHidePopupHandler],
|
|
297
|
+
['fmbShowFloatingContainer', this.fmbShowFloatingContainerHandler], // FloatingContainer
|
|
298
|
+
['fmbHideFloatingContainer', this.fmbHideFloatingContainerHandler]
|
|
299
|
+
];
|
|
300
|
+
}
|
|
229
301
|
connectedCallback() {
|
|
230
302
|
super.connectedCallback();
|
|
231
303
|
window.addEventListener('resize', this.resizeHandler);
|
|
304
|
+
// 3D 모드에서도 마우스 움직임 감지 (document 레벨, capture phase)
|
|
305
|
+
document.addEventListener('pointermove', this._pointerMoveHandler, true);
|
|
306
|
+
document.addEventListener('fullscreenchange', this._fullscreenChangeHandler);
|
|
307
|
+
document.addEventListener('webkitfullscreenchange', this._fullscreenChangeHandler);
|
|
232
308
|
this.renderRoot.addEventListener('close-scene', e => {
|
|
233
309
|
e.preventDefault();
|
|
234
310
|
this.onTapPrev();
|
|
235
311
|
}, false);
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
window.addEventListener('fmbShowMovement', this.fmbShowMovementHandler);
|
|
240
|
-
// 모니터링에서 보드 상태를 원래상태 (정사이즈)로 돌려놓는다.
|
|
241
|
-
window.addEventListener('fmbMonitoringInit', this.fmbMonitoringInitHandler);
|
|
242
|
-
// BoardComponentInfo popup을 보여준다.
|
|
243
|
-
window.addEventListener('clickComponent', this.clickComponentHandler);
|
|
244
|
-
// AnimatedIcon 을 추가하거나 제거한다.
|
|
245
|
-
window.addEventListener('fmbStartAnimation', this.fmbStartAnimation);
|
|
246
|
-
window.addEventListener('fmbStopAnimation', this.fmbStopAnimation);
|
|
247
|
-
window.addEventListener('fmbResetAnimation', this.fmbResetAnimation);
|
|
248
|
-
// 모니터링에서 범례를 보여준다.
|
|
249
|
-
window.addEventListener('fmbShowLegend', this.fmbShowLegendHandler);
|
|
250
|
-
window.addEventListener('fmbHideLegend', this.fmbHideLegendHandler);
|
|
251
|
-
// 모니터링에서 범례를 보여준다.
|
|
252
|
-
window.addEventListener('fmbShowPopup', this.fmbShowPopupHandler);
|
|
253
|
-
window.addEventListener('fmbHidePopup', this.fmbHidePopupHandler);
|
|
254
|
-
// 모니터링에서 FloatingContainer를 보여준다.
|
|
255
|
-
window.addEventListener('fmbShowFloatingContainer', this.fmbShowFloatingContainerHandler);
|
|
256
|
-
window.addEventListener('fmbHideFloatingContainer', this.fmbHideFloatingContainerHandler);
|
|
312
|
+
for (const [type, handler] of this._monitoringEvents) {
|
|
313
|
+
window.addEventListener(type, handler);
|
|
314
|
+
}
|
|
257
315
|
}
|
|
258
316
|
disconnectedCallback() {
|
|
317
|
+
var _a, _b, _c;
|
|
259
318
|
super.disconnectedCallback();
|
|
260
319
|
window.removeEventListener('resize', this.resizeHandler);
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
// BoardComponentInfo popup을 보여준다.
|
|
268
|
-
window.removeEventListener('clickComponent', this.clickComponentHandler);
|
|
269
|
-
// AnimatedIcon을 추가하거나 제거한다.
|
|
270
|
-
window.removeEventListener('fmbStartAnimation', this.fmbStartAnimation);
|
|
271
|
-
window.removeEventListener('fmbStopAnimation', this.fmbStopAnimation);
|
|
272
|
-
window.removeEventListener('fmbResetAnimation', this.fmbResetAnimation);
|
|
273
|
-
// 모니터링에서 범례를 보여준다.
|
|
274
|
-
window.removeEventListener('fmbShowLegend', this.fmbShowLegendHandler);
|
|
275
|
-
window.removeEventListener('fmbHideLegend', this.fmbHideLegendHandler);
|
|
276
|
-
// 모니터링에서 범례를 보여준다.
|
|
277
|
-
window.removeEventListener('fmbShowPopup', this.fmbShowPopupHandler);
|
|
278
|
-
window.removeEventListener('fmbHidePopup', this.fmbHidePopupHandler);
|
|
279
|
-
// 모니터링에서 FloatingContainer를 보여준다.
|
|
280
|
-
window.removeEventListener('fmbShowFloatingContainer', this.fmbShowFloatingContainerHandler);
|
|
281
|
-
window.removeEventListener('fmbHideFloatingContainer', this.fmbHideFloatingContainerHandler);
|
|
320
|
+
document.removeEventListener('pointermove', this._pointerMoveHandler, true);
|
|
321
|
+
document.removeEventListener('fullscreenchange', this._fullscreenChangeHandler);
|
|
322
|
+
document.removeEventListener('webkitfullscreenchange', this._fullscreenChangeHandler);
|
|
323
|
+
for (const [type, handler] of this._monitoringEvents) {
|
|
324
|
+
window.removeEventListener(type, handler);
|
|
325
|
+
}
|
|
282
326
|
this.lastComponent = null;
|
|
327
|
+
// 플레이백이 활성 상태면 명시적 stop (provider resume 포함)
|
|
328
|
+
if (this._playbackActive) {
|
|
329
|
+
(_a = this._playbackEngine) === null || _a === void 0 ? void 0 : _a.stop();
|
|
330
|
+
(_b = this._playbackEngine) === null || _b === void 0 ? void 0 : _b.detachScene();
|
|
331
|
+
(_c = this._dataSubscriptionProvider) === null || _c === void 0 ? void 0 : _c.resume();
|
|
332
|
+
this._playbackActive = false;
|
|
333
|
+
}
|
|
334
|
+
if (this._playbackEngine) {
|
|
335
|
+
this._playbackEngine.dispose();
|
|
336
|
+
this._playbackEngine = undefined;
|
|
337
|
+
}
|
|
283
338
|
this.closeScene();
|
|
284
339
|
}
|
|
285
340
|
updated(changes) {
|
|
341
|
+
// loadTracker가 외부에서 전달되면 즉시 overlay 연결 (fetch 중에도 표시)
|
|
342
|
+
if (changes.has('loadTracker') && this.loadTracker) {
|
|
343
|
+
this._ensureOverlay(this.loadTracker);
|
|
344
|
+
}
|
|
286
345
|
if (changes.has('board')) {
|
|
346
|
+
// tracker: 외부에서 안 왔으면 여기서 생성
|
|
347
|
+
if (!this.loadTracker) {
|
|
348
|
+
this.loadTracker = new LoadTracker();
|
|
349
|
+
this._ensureOverlay(this.loadTracker);
|
|
350
|
+
}
|
|
287
351
|
this.hidePopup();
|
|
288
352
|
this.closeScene();
|
|
289
353
|
if (this.board && this.board.id) {
|
|
@@ -303,32 +367,42 @@ let BoardViewer = class BoardViewer extends LitElement {
|
|
|
303
367
|
}
|
|
304
368
|
}
|
|
305
369
|
async initSceneAsync() {
|
|
306
|
-
if (!this.board || !this.board.id)
|
|
370
|
+
if (!this.board || !this.board.id || !this.provider)
|
|
307
371
|
return;
|
|
308
|
-
|
|
309
|
-
|
|
372
|
+
try {
|
|
373
|
+
this._scene = await this.provider.create(this.board.id);
|
|
374
|
+
this.setupScene({ id: this.board.id, scene: this._scene });
|
|
375
|
+
}
|
|
376
|
+
catch (e) {
|
|
377
|
+
console.error('Failed to load scene:', this.board.id, e);
|
|
378
|
+
}
|
|
310
379
|
}
|
|
311
380
|
initScene() {
|
|
312
|
-
if (!this.board || !this.board.id) {
|
|
381
|
+
if (!this.board || !this.board.id || !this.board.model) {
|
|
313
382
|
return;
|
|
314
383
|
}
|
|
315
384
|
this._scene = create({
|
|
316
|
-
model:
|
|
317
|
-
...this.board.model
|
|
318
|
-
},
|
|
385
|
+
model: JSON.parse(JSON.stringify(this.board.model)),
|
|
319
386
|
style: this.board.style,
|
|
320
387
|
mode: SCENE_MODE.VIEW,
|
|
321
388
|
handlers: ['mcs-event-handler', 'zoom-handler', 'shift-handler', 'waypoint-handler'],
|
|
322
389
|
layers: [{ type: 'scroll-layer' }, { type: 'movement-layer', id: 'movement-layer' }],
|
|
323
390
|
refProvider: this.provider,
|
|
324
391
|
dataStorage: this.board.id !== 'preview' ? new DataStorage(this.board.id) : undefined,
|
|
325
|
-
dataSubscriptionProvider:
|
|
392
|
+
dataSubscriptionProvider: this._dataSubscriptionProvider,
|
|
393
|
+
loading: this.loadTracker ? { tracker: this.loadTracker } : undefined
|
|
326
394
|
});
|
|
327
395
|
if (this.baseUrl) {
|
|
328
396
|
this._scene.baseUrl = this.baseUrl;
|
|
329
397
|
}
|
|
330
398
|
this.setupScene({ id: this.board.id, scene: this._scene });
|
|
331
399
|
}
|
|
400
|
+
_ensureOverlay(tracker) {
|
|
401
|
+
if (!this._loadingOverlay) {
|
|
402
|
+
this._loadingOverlay = new LoadingOverlay();
|
|
403
|
+
}
|
|
404
|
+
this._loadingOverlay.attach(this.renderRoot, tracker);
|
|
405
|
+
}
|
|
332
406
|
closeScene() {
|
|
333
407
|
if (this._scene) {
|
|
334
408
|
this.unbindSceneEvents(this._scene);
|
|
@@ -348,6 +422,10 @@ let BoardViewer = class BoardViewer extends LitElement {
|
|
|
348
422
|
}
|
|
349
423
|
setupScene({ id, scene }) {
|
|
350
424
|
var _a;
|
|
425
|
+
// 플레이백 리셋
|
|
426
|
+
if (this._playbackActive) {
|
|
427
|
+
this._onPlaybackStop();
|
|
428
|
+
}
|
|
351
429
|
this._scene = scene;
|
|
352
430
|
const backgroundColor = (_a = this._scene) === null || _a === void 0 ? void 0 : _a.root.state.fillStyle;
|
|
353
431
|
if (typeof backgroundColor === 'string') {
|
|
@@ -371,7 +449,7 @@ let BoardViewer = class BoardViewer extends LitElement {
|
|
|
371
449
|
this.transientShowButtons();
|
|
372
450
|
}
|
|
373
451
|
async showScene(boardId, bindingData) {
|
|
374
|
-
if (!boardId)
|
|
452
|
+
if (!boardId || !this.provider)
|
|
375
453
|
return;
|
|
376
454
|
try {
|
|
377
455
|
var scene = await this.provider.get(boardId, true);
|
|
@@ -424,7 +502,7 @@ let BoardViewer = class BoardViewer extends LitElement {
|
|
|
424
502
|
transientShowButtons(stop) {
|
|
425
503
|
var buttons = [];
|
|
426
504
|
!this.hideNavigation && buttons.push(this._next, this._prev);
|
|
427
|
-
!this.hideFullscreen && buttons.push(this.
|
|
505
|
+
!this.hideFullscreen && buttons.push(this._fabGroup);
|
|
428
506
|
if (buttons.length == 0) {
|
|
429
507
|
return;
|
|
430
508
|
}
|
|
@@ -447,7 +525,7 @@ let BoardViewer = class BoardViewer extends LitElement {
|
|
|
447
525
|
}
|
|
448
526
|
this._forward.length <= 0 ? this._next.setAttribute('hidden', '') : this._next.removeAttribute('hidden');
|
|
449
527
|
this._backward.length <= 0 ? this._prev.setAttribute('hidden', '') : this._prev.removeAttribute('hidden');
|
|
450
|
-
this.
|
|
528
|
+
this._fabGroup && this._fabGroup.removeAttribute('hidden');
|
|
451
529
|
this._fade_animations.forEach(animation => {
|
|
452
530
|
animation.cancel();
|
|
453
531
|
if (stop)
|
|
@@ -485,6 +563,237 @@ let BoardViewer = class BoardViewer extends LitElement {
|
|
|
485
563
|
onTapFullscreen() {
|
|
486
564
|
togglefullscreen(this, () => this.requestUpdate(), () => this.requestUpdate());
|
|
487
565
|
}
|
|
566
|
+
onTapToggle3D() {
|
|
567
|
+
var _a, _b, _c;
|
|
568
|
+
const modelLayer = (_b = (_a = this._scene) === null || _a === void 0 ? void 0 : _a.root) === null || _b === void 0 ? void 0 : _b.rootModel;
|
|
569
|
+
if (!(modelLayer === null || modelLayer === void 0 ? void 0 : modelLayer.toggleThreeD))
|
|
570
|
+
return;
|
|
571
|
+
const entering3D = !modelLayer.is3dMode;
|
|
572
|
+
modelLayer.toggleThreeD();
|
|
573
|
+
this.requestUpdate();
|
|
574
|
+
// fmsim: 3D 진입 시 자동 회전
|
|
575
|
+
if (entering3D && ((_c = modelLayer._threeCapability) === null || _c === void 0 ? void 0 : _c.isInitialized)) {
|
|
576
|
+
modelLayer._threeCapability.controlsManager.reset();
|
|
577
|
+
modelLayer._threeCapability.controlsManager.setAutoRotate(true);
|
|
578
|
+
}
|
|
579
|
+
}
|
|
580
|
+
onTapPlayback() {
|
|
581
|
+
var _a;
|
|
582
|
+
if (this._playbackActive) {
|
|
583
|
+
this._onPlaybackStop();
|
|
584
|
+
}
|
|
585
|
+
else {
|
|
586
|
+
// 플레이백 시작 시 팝업 닫기
|
|
587
|
+
this.hidePopup();
|
|
588
|
+
// 1) 라이브 데이터 구독 실제 종료
|
|
589
|
+
(_a = this._dataSubscriptionProvider) === null || _a === void 0 ? void 0 : _a.pause();
|
|
590
|
+
this._unsubscribeSceneData();
|
|
591
|
+
// 2) 라이브 데이터 초기화 (깨끗한 상태에서 playback 시작)
|
|
592
|
+
this._resetSceneData();
|
|
593
|
+
this._playbackActive = true;
|
|
594
|
+
if (!this._playbackEngine) {
|
|
595
|
+
this._playbackEngine = new PlaybackEngine();
|
|
596
|
+
this._playbackEngine.on('frame', ({ time }) => {
|
|
597
|
+
const controls = this.renderRoot.querySelector('ox-playback-controls');
|
|
598
|
+
if (controls)
|
|
599
|
+
controls.currentTime = time;
|
|
600
|
+
});
|
|
601
|
+
this._playbackEngine.on('state-change', (state) => {
|
|
602
|
+
if (state === 'stopped') {
|
|
603
|
+
const controls = this.renderRoot.querySelector('ox-playback-controls');
|
|
604
|
+
if (controls)
|
|
605
|
+
controls.playbackState = 'stopped';
|
|
606
|
+
}
|
|
607
|
+
this.requestUpdate();
|
|
608
|
+
});
|
|
609
|
+
this._playbackEngine.on('buffer-update', ({ bufferedRanges }) => {
|
|
610
|
+
const controls = this.renderRoot.querySelector('ox-playback-controls');
|
|
611
|
+
if (controls)
|
|
612
|
+
controls.bufferedRanges = bufferedRanges;
|
|
613
|
+
});
|
|
614
|
+
if (this._fetchPlaybackData) {
|
|
615
|
+
this._playbackEngine.setFetchFunction(this._fetchPlaybackData);
|
|
616
|
+
}
|
|
617
|
+
}
|
|
618
|
+
if (this._scene) {
|
|
619
|
+
this._playbackEngine.attachScene(this._scene);
|
|
620
|
+
}
|
|
621
|
+
this.dispatchEvent(new CustomEvent('playback-toggle', {
|
|
622
|
+
bubbles: true,
|
|
623
|
+
composed: true,
|
|
624
|
+
detail: { active: true }
|
|
625
|
+
}));
|
|
626
|
+
// playback 은 전체화면에서만 동작 — 이미 전체화면이면 그대로 유지
|
|
627
|
+
if (!document.fullscreenElement && !isIOS()) {
|
|
628
|
+
fullscreen(this, () => this.requestUpdate(), () => this.requestUpdate());
|
|
629
|
+
}
|
|
630
|
+
}
|
|
631
|
+
}
|
|
632
|
+
async _onPlaybackStart(e) {
|
|
633
|
+
const { fromTime, speed } = e.detail;
|
|
634
|
+
if (!this._playbackEngine)
|
|
635
|
+
return;
|
|
636
|
+
const endTime = new Date(fromTime.getTime() + 3600000);
|
|
637
|
+
if (this._scene)
|
|
638
|
+
this._scene.playbackMode = true;
|
|
639
|
+
try {
|
|
640
|
+
await this._playbackEngine.startChunked(fromTime, endTime, speed);
|
|
641
|
+
}
|
|
642
|
+
catch (ex) {
|
|
643
|
+
console.error('[Playback] load failed:', ex);
|
|
644
|
+
}
|
|
645
|
+
}
|
|
646
|
+
_onPlaybackPause() {
|
|
647
|
+
var _a;
|
|
648
|
+
(_a = this._playbackEngine) === null || _a === void 0 ? void 0 : _a.pause();
|
|
649
|
+
}
|
|
650
|
+
_onPlaybackResume() {
|
|
651
|
+
var _a;
|
|
652
|
+
(_a = this._playbackEngine) === null || _a === void 0 ? void 0 : _a.resume();
|
|
653
|
+
}
|
|
654
|
+
async _onPlaybackStop() {
|
|
655
|
+
var _a, _b, _c;
|
|
656
|
+
const scene = this._scene; // 비동기 구간 scene 교체 감지용 캡처
|
|
657
|
+
// 1) 즉시: 엔진 정지 + 애니메이션 억제 ON (in-flight 애니메이션 즉시 종료)
|
|
658
|
+
(_a = this._playbackEngine) === null || _a === void 0 ? void 0 : _a.detachScene();
|
|
659
|
+
(_b = this._playbackEngine) === null || _b === void 0 ? void 0 : _b.stop();
|
|
660
|
+
this._playbackActive = false;
|
|
661
|
+
if (scene) {
|
|
662
|
+
scene.suppressAnimations = true;
|
|
663
|
+
scene.playbackMode = false;
|
|
664
|
+
}
|
|
665
|
+
// UI 신호 + fullscreen 해제
|
|
666
|
+
this.dispatchEvent(new CustomEvent('playback-toggle', {
|
|
667
|
+
bubbles: true,
|
|
668
|
+
composed: true,
|
|
669
|
+
detail: { active: false }
|
|
670
|
+
}));
|
|
671
|
+
if (document.fullscreenElement) {
|
|
672
|
+
exitfullscreen();
|
|
673
|
+
}
|
|
674
|
+
// 2) 1초 후: 보드 리셋 + live 구독 재개
|
|
675
|
+
await new Promise(resolve => setTimeout(resolve, 1000));
|
|
676
|
+
if (this._playbackActive || this._scene !== scene)
|
|
677
|
+
return;
|
|
678
|
+
if (!scene)
|
|
679
|
+
return;
|
|
680
|
+
this._resetSceneData();
|
|
681
|
+
this._resubscribeSceneData();
|
|
682
|
+
(_c = this._dataSubscriptionProvider) === null || _c === void 0 ? void 0 : _c.resume();
|
|
683
|
+
// 3) 2초 후 (추가 1초): 억제 해제 — 첫 live batch 가 instant 배치된 뒤 정상 애니메이션 복원
|
|
684
|
+
await new Promise(resolve => setTimeout(resolve, 1000));
|
|
685
|
+
if (this._scene === scene) {
|
|
686
|
+
scene.suppressAnimations = false;
|
|
687
|
+
}
|
|
688
|
+
}
|
|
689
|
+
/**
|
|
690
|
+
* 플레이백 시작 시: RESTful data-subscription 컴포넌트의 WebSocket 을 실제 disconnect.
|
|
691
|
+
* GraphQL 경로는 _dataSubscriptionProvider.pause() 에서 일괄 처리.
|
|
692
|
+
*/
|
|
693
|
+
_unsubscribeSceneData() {
|
|
694
|
+
var _a;
|
|
695
|
+
const root = (_a = this._scene) === null || _a === void 0 ? void 0 : _a.root;
|
|
696
|
+
if (!root || typeof root.traverse !== 'function')
|
|
697
|
+
return;
|
|
698
|
+
root.traverse((c) => {
|
|
699
|
+
if (!c || c === root)
|
|
700
|
+
return;
|
|
701
|
+
// RESTful data-subscription 컴포넌트 — 자체 WebSocket disconnect
|
|
702
|
+
if (c.subscription) {
|
|
703
|
+
try {
|
|
704
|
+
c.subscription.unsubscribe();
|
|
705
|
+
}
|
|
706
|
+
catch (_a) { }
|
|
707
|
+
c.subscription = null;
|
|
708
|
+
}
|
|
709
|
+
if (c.client) {
|
|
710
|
+
try {
|
|
711
|
+
c.client.unsubscribeAll();
|
|
712
|
+
c.client.close(true);
|
|
713
|
+
}
|
|
714
|
+
catch (_b) { }
|
|
715
|
+
c.client = null;
|
|
716
|
+
}
|
|
717
|
+
});
|
|
718
|
+
}
|
|
719
|
+
/**
|
|
720
|
+
* 플레이백 종료 시: RESTful data-subscription 컴포넌트의 WebSocket 을 재연결.
|
|
721
|
+
* GraphQL 경로는 _dataSubscriptionProvider.resume() 에서 일괄 처리.
|
|
722
|
+
*/
|
|
723
|
+
_resubscribeSceneData() {
|
|
724
|
+
var _a;
|
|
725
|
+
const root = (_a = this._scene) === null || _a === void 0 ? void 0 : _a.root;
|
|
726
|
+
if (!root || typeof root.traverse !== 'function')
|
|
727
|
+
return;
|
|
728
|
+
root.traverse((c) => {
|
|
729
|
+
if (!c || c === root)
|
|
730
|
+
return;
|
|
731
|
+
// RESTful data-subscription 컴포넌트 — WebSocket 재연결
|
|
732
|
+
if (typeof c.requestData === 'function' && !c.client) {
|
|
733
|
+
c.requestData();
|
|
734
|
+
}
|
|
735
|
+
});
|
|
736
|
+
}
|
|
737
|
+
_resetSceneData() {
|
|
738
|
+
var _a, _b, _c, _d;
|
|
739
|
+
const root = (_a = this._scene) === null || _a === void 0 ? void 0 : _a.root;
|
|
740
|
+
if (!root || typeof root.traverse !== 'function')
|
|
741
|
+
return;
|
|
742
|
+
root.traverse((c) => {
|
|
743
|
+
if (!c || c === root)
|
|
744
|
+
return;
|
|
745
|
+
// null 대신 {} 로 리셋 — typeof null === 'object' 함정 회피 + destructuring 안전 +
|
|
746
|
+
// statusColor 등 data?.X 형태 getter 가 자연스럽게 default 로 폴백
|
|
747
|
+
try {
|
|
748
|
+
if ('data' in c)
|
|
749
|
+
c.data = {};
|
|
750
|
+
}
|
|
751
|
+
catch (_a) { }
|
|
752
|
+
// 차량 등의 위치 캐시 초기화 — 없으면 이전 waypoint 경로로 스냅백되는 잔상 발생
|
|
753
|
+
if ('lastWaypoint' in c)
|
|
754
|
+
c.lastWaypoint = undefined;
|
|
755
|
+
});
|
|
756
|
+
// vehicle 의 waypoint 이동 애니메이션 전체 중단
|
|
757
|
+
// (Animation.stepAnimation 의 suppress 체크만으로는 WaypointHandler 의 animatorMap 이
|
|
758
|
+
// 완전히 비워지지 않을 수 있어 명시적 reset)
|
|
759
|
+
if ((_b = root.waypointHandler) === null || _b === void 0 ? void 0 : _b.reset)
|
|
760
|
+
root.waypointHandler.reset();
|
|
761
|
+
// 모든 decorator 제거 — bouncing-arrow/border-highlighting 같은 SVG 애니메이션 decorator 는
|
|
762
|
+
// decorator-registry 가 붙잡고 있어 data=null 만으로는 제거되지 않음. 명시적 reset 필요.
|
|
763
|
+
try {
|
|
764
|
+
root.trigger('deco-reset');
|
|
765
|
+
}
|
|
766
|
+
catch (_e) { }
|
|
767
|
+
if ((_c = root.carrierManager) === null || _c === void 0 ? void 0 : _c.dispose)
|
|
768
|
+
root.carrierManager.dispose();
|
|
769
|
+
if ((_d = root.transitionEffect) === null || _d === void 0 ? void 0 : _d.dispose)
|
|
770
|
+
root.transitionEffect.dispose();
|
|
771
|
+
}
|
|
772
|
+
_onPlaybackSeek(e) {
|
|
773
|
+
var _a;
|
|
774
|
+
(_a = this._playbackEngine) === null || _a === void 0 ? void 0 : _a.seekTo(e.detail.toTime);
|
|
775
|
+
}
|
|
776
|
+
/**
|
|
777
|
+
* 드래그 시작 신호 — 엔진의 재생 타이머 정지해서 스크러빙 동안
|
|
778
|
+
* scene 이 엔진 시간으로 독립 갱신되지 않도록 함. _state 는 유지되므로
|
|
779
|
+
* 드래그 종료 시 seekTo 가 원래 재생/일시정지 상태로 복원.
|
|
780
|
+
*/
|
|
781
|
+
_onPlaybackSeekStart() {
|
|
782
|
+
var _a;
|
|
783
|
+
(_a = this._playbackEngine) === null || _a === void 0 ? void 0 : _a.pauseForSeek();
|
|
784
|
+
}
|
|
785
|
+
/**
|
|
786
|
+
* 드래그 중 디바운스된 seek preview. 해당 시간의 snapshot 만 scene 에 적용.
|
|
787
|
+
* 보드 리셋 없음, 애니메이션 억제.
|
|
788
|
+
*/
|
|
789
|
+
_onPlaybackSeekPreview(e) {
|
|
790
|
+
var _a;
|
|
791
|
+
(_a = this._playbackEngine) === null || _a === void 0 ? void 0 : _a.seekPreview(e.detail.toTime);
|
|
792
|
+
}
|
|
793
|
+
_onPlaybackSpeed(e) {
|
|
794
|
+
var _a;
|
|
795
|
+
(_a = this._playbackEngine) === null || _a === void 0 ? void 0 : _a.setSpeed(e.detail.speed);
|
|
796
|
+
}
|
|
488
797
|
onRunBoard() {
|
|
489
798
|
this.dispatchEvent(new CustomEvent('run-board', { bubbles: true, composed: true, detail: this.board.id }));
|
|
490
799
|
}
|
|
@@ -578,6 +887,7 @@ let BoardViewer = class BoardViewer extends LitElement {
|
|
|
578
887
|
}
|
|
579
888
|
if (this.popup) {
|
|
580
889
|
this.popup.component = component;
|
|
890
|
+
this.popup.playbackMode = this._playbackActive;
|
|
581
891
|
}
|
|
582
892
|
}
|
|
583
893
|
hidePopup() {
|
|
@@ -643,10 +953,51 @@ BoardViewer.styles = [
|
|
|
643
953
|
right: 5px;
|
|
644
954
|
}
|
|
645
955
|
|
|
646
|
-
|
|
956
|
+
[fab-group] {
|
|
647
957
|
position: absolute;
|
|
648
958
|
bottom: 15px;
|
|
649
959
|
right: 16px;
|
|
960
|
+
display: flex;
|
|
961
|
+
flex-direction: column-reverse;
|
|
962
|
+
align-items: center;
|
|
963
|
+
gap: 12px;
|
|
964
|
+
z-index: 1000;
|
|
965
|
+
}
|
|
966
|
+
|
|
967
|
+
[fab-group] md-fab {
|
|
968
|
+
transition: transform 0.2s ease, opacity 0.2s ease;
|
|
969
|
+
}
|
|
970
|
+
|
|
971
|
+
[fab-group] md-fab.main-fab md-icon {
|
|
972
|
+
transition: transform 0.3s ease;
|
|
973
|
+
}
|
|
974
|
+
|
|
975
|
+
[fab-group] md-fab.main-fab[expanded] md-icon {
|
|
976
|
+
transform: rotate(45deg);
|
|
977
|
+
}
|
|
978
|
+
|
|
979
|
+
[fab-group] md-fab.sub-fab {
|
|
980
|
+
--md-fab-container-width: 40px;
|
|
981
|
+
--md-fab-container-height: 40px;
|
|
982
|
+
--md-icon-size: 20px;
|
|
983
|
+
transform: scale(0);
|
|
984
|
+
opacity: 0;
|
|
985
|
+
pointer-events: none;
|
|
986
|
+
}
|
|
987
|
+
|
|
988
|
+
[fab-group][expanded] md-fab.sub-fab {
|
|
989
|
+
transform: scale(1);
|
|
990
|
+
opacity: 1;
|
|
991
|
+
pointer-events: auto;
|
|
992
|
+
}
|
|
993
|
+
|
|
994
|
+
[fab-group] md-fab.sub-fab[disabled] {
|
|
995
|
+
opacity: 0.4;
|
|
996
|
+
pointer-events: none;
|
|
997
|
+
}
|
|
998
|
+
|
|
999
|
+
ox-playback-controls {
|
|
1000
|
+
transition: opacity 0.3s ease;
|
|
650
1001
|
}
|
|
651
1002
|
|
|
652
1003
|
[hidden] {
|
|
@@ -693,6 +1044,9 @@ __decorate([
|
|
|
693
1044
|
__decorate([
|
|
694
1045
|
property({ type: Object })
|
|
695
1046
|
], BoardViewer.prototype, "values", void 0);
|
|
1047
|
+
__decorate([
|
|
1048
|
+
property({ type: Object })
|
|
1049
|
+
], BoardViewer.prototype, "loadTracker", void 0);
|
|
696
1050
|
__decorate([
|
|
697
1051
|
property({ type: Boolean, reflect: true, attribute: 'hide-fullscreen' })
|
|
698
1052
|
], BoardViewer.prototype, "hideFullscreen", void 0);
|
|
@@ -701,19 +1055,10 @@ __decorate([
|
|
|
701
1055
|
], BoardViewer.prototype, "hideNavigation", void 0);
|
|
702
1056
|
__decorate([
|
|
703
1057
|
state()
|
|
704
|
-
], BoardViewer.prototype, "
|
|
1058
|
+
], BoardViewer.prototype, "_fabExpanded", void 0);
|
|
705
1059
|
__decorate([
|
|
706
1060
|
state()
|
|
707
|
-
], BoardViewer.prototype, "
|
|
708
|
-
__decorate([
|
|
709
|
-
state()
|
|
710
|
-
], BoardViewer.prototype, "_backward", void 0);
|
|
711
|
-
__decorate([
|
|
712
|
-
state()
|
|
713
|
-
], BoardViewer.prototype, "_oldtarget", void 0);
|
|
714
|
-
__decorate([
|
|
715
|
-
state()
|
|
716
|
-
], BoardViewer.prototype, "_fade_animations", void 0);
|
|
1061
|
+
], BoardViewer.prototype, "_playbackActive", void 0);
|
|
717
1062
|
__decorate([
|
|
718
1063
|
query('#target')
|
|
719
1064
|
], BoardViewer.prototype, "_target", void 0);
|
|
@@ -724,8 +1069,11 @@ __decorate([
|
|
|
724
1069
|
query('#next')
|
|
725
1070
|
], BoardViewer.prototype, "_next", void 0);
|
|
726
1071
|
__decorate([
|
|
727
|
-
query('
|
|
728
|
-
], BoardViewer.prototype, "
|
|
1072
|
+
query('[fab-group]')
|
|
1073
|
+
], BoardViewer.prototype, "_fabGroup", void 0);
|
|
1074
|
+
__decorate([
|
|
1075
|
+
property({ attribute: false })
|
|
1076
|
+
], BoardViewer.prototype, "_fetchPlaybackData", void 0);
|
|
729
1077
|
BoardViewer = __decorate([
|
|
730
1078
|
customElement('ox-board-viewer')
|
|
731
1079
|
], BoardViewer);
|