@shapediver/viewer.creation-control-center.viewport 3.1.2 → 3.2.0
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/implementation/CreationControlCenterViewport.d.ts.map +1 -1
- package/dist/implementation/CreationControlCenterViewport.js +28 -18
- package/dist/implementation/CreationControlCenterViewport.js.map +1 -1
- package/package.json +8 -8
- package/src/implementation/CreationControlCenterViewport.ts +21 -18
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreationControlCenterViewport.d.ts","sourceRoot":"","sources":["../../src/implementation/CreationControlCenterViewport.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,8BAA8B,EAAE,0BAA0B,EAAE,MAAM,8CAA8C,CAAC;AAC1H,OAAO,EAGH,yBAAyB,EAE5B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAExD,OAAO,EAAE,eAAe,IAAI,sBAAsB,EAAE,MAAM,8DAA8D,CAAC;AAIzH,qBAAa,6BAA8B,YAAW,8BAA8B;;IAShF,OAAO,CAAC,MAAM,CAAC,SAAS,CAAgC;IAExD,SAAgB,eAAe,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,CAAA;KAAE,CAAM;IAEzE,cAAc,CAAC,EAAE,CACpB,eAAe,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,CAAC;KAAE,KAC1D,IAAI,CAAC;IAMV,WAAkB,QAAQ,kCAEzB;IAMM,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,GAAE,yBAAwH,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB3M,mBAAmB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAuB9C,oBAAoB,CAAC,UAAU,EAAE,0BAA0B,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAsGnG,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS;YAc3C,cAAc;
|
|
1
|
+
{"version":3,"file":"CreationControlCenterViewport.d.ts","sourceRoot":"","sources":["../../src/implementation/CreationControlCenterViewport.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,8BAA8B,EAAE,0BAA0B,EAAE,MAAM,8CAA8C,CAAC;AAC1H,OAAO,EAGH,yBAAyB,EAE5B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAExD,OAAO,EAAE,eAAe,IAAI,sBAAsB,EAAE,MAAM,8DAA8D,CAAC;AAIzH,qBAAa,6BAA8B,YAAW,8BAA8B;;IAShF,OAAO,CAAC,MAAM,CAAC,SAAS,CAAgC;IAExD,SAAgB,eAAe,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,CAAA;KAAE,CAAM;IAEzE,cAAc,CAAC,EAAE,CACpB,eAAe,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,CAAC;KAAE,KAC1D,IAAI,CAAC;IAMV,WAAkB,QAAQ,kCAEzB;IAMM,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,GAAE,yBAAwH,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB3M,mBAAmB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAuB9C,oBAAoB,CAAC,UAAU,EAAE,0BAA0B,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAsGnG,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS;YAc3C,cAAc;CAsB/B"}
|
|
@@ -42,13 +42,15 @@ class CreationControlCenterViewport {
|
|
|
42
42
|
// #endregion Public Static Getters And Setters (1)
|
|
43
43
|
// #region Public Methods (4)
|
|
44
44
|
applyViewportSettings(viewportId, settings, sections = { ar: false, scene: false, camera: false, light: false, environment: false, general: false }) {
|
|
45
|
+
var _a;
|
|
45
46
|
sections = sections || {};
|
|
46
47
|
const settingsEngine = new viewer_shared_services_1.SettingsEngine();
|
|
47
48
|
settingsEngine.loadSettings(settings);
|
|
48
49
|
const promises = [];
|
|
49
|
-
__classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").viewportEngines[viewportId].settingsAssigned.reset();
|
|
50
|
+
(_a = __classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").viewportEngines[viewportId]) === null || _a === void 0 ? void 0 : _a.settingsAssigned.reset();
|
|
50
51
|
promises.push(new Promise(resolve => {
|
|
51
|
-
|
|
52
|
+
var _a;
|
|
53
|
+
(_a = __classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").viewportEngines[viewportId]) === null || _a === void 0 ? void 0 : _a.settingsAssigned.then(() => {
|
|
52
54
|
resolve();
|
|
53
55
|
});
|
|
54
56
|
}));
|
|
@@ -56,15 +58,16 @@ class CreationControlCenterViewport {
|
|
|
56
58
|
return new Promise(resolve => Promise.all(promises).then(() => resolve()));
|
|
57
59
|
}
|
|
58
60
|
closeViewportEngine(id) {
|
|
61
|
+
var _a, _b, _c, _d;
|
|
59
62
|
return __awaiter(this, void 0, void 0, function* () {
|
|
60
63
|
if (!this.viewportEngines[id])
|
|
61
64
|
return;
|
|
62
65
|
__classPrivateFieldGet(this, _CreationControlCenterViewport_logger, "f").debugLow(`CreationControlCenter.closeViewportEngine: Closing viewport ${id}.`);
|
|
63
|
-
if (__classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").viewportEngines[id].initialized.resolved === false)
|
|
64
|
-
yield new Promise(resolve => { __classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").viewportEngines[id].initialized.then(() => resolve()); });
|
|
65
|
-
__classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").viewportEngines[id].settingsAssigned.reset();
|
|
66
|
-
__classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").viewportEngines[id].environmentMapLoaded.reset();
|
|
67
|
-
__classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").viewportEngines[id].initialized.reset();
|
|
66
|
+
if (((_a = __classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").viewportEngines[id]) === null || _a === void 0 ? void 0 : _a.initialized.resolved) === false)
|
|
67
|
+
yield new Promise(resolve => { var _a; (_a = __classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").viewportEngines[id]) === null || _a === void 0 ? void 0 : _a.initialized.then(() => resolve()); });
|
|
68
|
+
(_b = __classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").viewportEngines[id]) === null || _b === void 0 ? void 0 : _b.settingsAssigned.reset();
|
|
69
|
+
(_c = __classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").viewportEngines[id]) === null || _c === void 0 ? void 0 : _c.environmentMapLoaded.reset();
|
|
70
|
+
(_d = __classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").viewportEngines[id]) === null || _d === void 0 ? void 0 : _d.initialized.reset();
|
|
68
71
|
yield this.viewportEngines[id].close();
|
|
69
72
|
this.viewportEngines[id] = undefined;
|
|
70
73
|
delete this.viewportEngines[id];
|
|
@@ -76,6 +79,7 @@ class CreationControlCenterViewport {
|
|
|
76
79
|
});
|
|
77
80
|
}
|
|
78
81
|
createViewportEngine(properties) {
|
|
82
|
+
var _a, _b, _c;
|
|
79
83
|
return __awaiter(this, void 0, void 0, function* () {
|
|
80
84
|
const eventId = __classPrivateFieldGet(this, _CreationControlCenterViewport_uuidGenerator, "f").create();
|
|
81
85
|
const viewportEngineId = properties.id || __classPrivateFieldGet(this, _CreationControlCenterViewport_uuidGenerator, "f").create();
|
|
@@ -107,7 +111,7 @@ class CreationControlCenterViewport {
|
|
|
107
111
|
}
|
|
108
112
|
}
|
|
109
113
|
else if (properties.sessionSettingsMode === viewer_shared_services_1.SESSION_SETTINGS_MODE.FIRST) {
|
|
110
|
-
const firstSessionEngine = Object.values(__classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").sessionEngines).find(sessionEngine => sessionEngine.isFirstSession === true);
|
|
114
|
+
const firstSessionEngine = Object.values(__classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").sessionEngines).find(sessionEngine => sessionEngine && sessionEngine.isFirstSession === true);
|
|
111
115
|
if (firstSessionEngine) {
|
|
112
116
|
yield this.assignSettings(viewportEngine.id, firstSessionEngine.id, true);
|
|
113
117
|
}
|
|
@@ -126,6 +130,7 @@ class CreationControlCenterViewport {
|
|
|
126
130
|
// wait for settings to load before showing the scene
|
|
127
131
|
if (__classPrivateFieldGet(this, _CreationControlCenterViewport_sceneTree, "f").root.boundingBox.isEmpty()) {
|
|
128
132
|
__classPrivateFieldGet(this, _CreationControlCenterViewport_eventEngine, "f").addListener(viewer_shared_services_1.EVENTTYPE.SCENE.SCENE_BOUNDING_BOX_CHANGE, (e) => {
|
|
133
|
+
var _a, _b;
|
|
129
134
|
const event = e;
|
|
130
135
|
if (event.viewportId === viewportEngine.id) {
|
|
131
136
|
const boundingBox = new viewer_shared_math_1.Box(event.boundingBox.min, event.boundingBox.max);
|
|
@@ -133,11 +138,11 @@ class CreationControlCenterViewport {
|
|
|
133
138
|
viewportEngine.show = false;
|
|
134
139
|
}
|
|
135
140
|
else {
|
|
136
|
-
if (__classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").viewportEngines[viewportEngineId].settingsAssigned.resolved) {
|
|
141
|
+
if ((_a = __classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").viewportEngines[viewportEngineId]) === null || _a === void 0 ? void 0 : _a.settingsAssigned.resolved) {
|
|
137
142
|
viewportEngine.show = true;
|
|
138
143
|
}
|
|
139
144
|
else {
|
|
140
|
-
__classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").viewportEngines[viewportEngineId].settingsAssigned.then(() => {
|
|
145
|
+
(_b = __classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").viewportEngines[viewportEngineId]) === null || _b === void 0 ? void 0 : _b.settingsAssigned.then(() => {
|
|
141
146
|
viewportEngine.show = true;
|
|
142
147
|
});
|
|
143
148
|
}
|
|
@@ -146,17 +151,17 @@ class CreationControlCenterViewport {
|
|
|
146
151
|
});
|
|
147
152
|
}
|
|
148
153
|
else {
|
|
149
|
-
if (__classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").viewportEngines[viewportEngineId].settingsAssigned.resolved) {
|
|
154
|
+
if ((_a = __classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").viewportEngines[viewportEngineId]) === null || _a === void 0 ? void 0 : _a.settingsAssigned.resolved) {
|
|
150
155
|
viewportEngine.show = true;
|
|
151
156
|
}
|
|
152
157
|
else {
|
|
153
|
-
__classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").viewportEngines[viewportEngineId].settingsAssigned.then(() => {
|
|
158
|
+
(_b = __classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").viewportEngines[viewportEngineId]) === null || _b === void 0 ? void 0 : _b.settingsAssigned.then(() => {
|
|
154
159
|
viewportEngine.show = true;
|
|
155
160
|
});
|
|
156
161
|
}
|
|
157
162
|
}
|
|
158
163
|
}
|
|
159
|
-
__classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").viewportEngines[viewportEngineId].initialized.resolve(true);
|
|
164
|
+
(_c = __classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").viewportEngines[viewportEngineId]) === null || _c === void 0 ? void 0 : _c.initialized.resolve(true);
|
|
160
165
|
__classPrivateFieldGet(this, _CreationControlCenterViewport_logger, "f").debug(`CreationControlCenter.createViewport: Viewport(${viewportEngineId}) created.`);
|
|
161
166
|
const eventEnd = { type: viewer_shared_types_1.TASK_TYPE.VIEWPORT_CREATION, id: eventId, progress: 1, status: 'Viewport created', data: { viewportId: viewportEngineId } };
|
|
162
167
|
if (this.updateViewport)
|
|
@@ -171,7 +176,7 @@ class CreationControlCenterViewport {
|
|
|
171
176
|
try {
|
|
172
177
|
yield this.closeViewportEngine(viewportEngineId);
|
|
173
178
|
}
|
|
174
|
-
catch ( /* empty */
|
|
179
|
+
catch ( /* empty */_d) { /* empty */ }
|
|
175
180
|
const eventCancel2 = { type: viewer_shared_types_1.TASK_TYPE.VIEWPORT_CREATION, id: eventId, progress: 1, status: 'Viewport created failed, exiting', data: { viewportId: viewportEngineId } };
|
|
176
181
|
__classPrivateFieldGet(this, _CreationControlCenterViewport_eventEngine, "f").emitEvent(viewer_shared_services_1.EVENTTYPE.TASK.TASK_CANCEL, eventCancel2);
|
|
177
182
|
throw e;
|
|
@@ -191,16 +196,21 @@ class CreationControlCenterViewport {
|
|
|
191
196
|
assignSettings(viewportEngineId, sessionEngineId, updateViewport = false) {
|
|
192
197
|
return __awaiter(this, void 0, void 0, function* () {
|
|
193
198
|
const viewportEngine = __classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").viewportEngines[viewportEngineId];
|
|
194
|
-
if (
|
|
199
|
+
if (!viewportEngine)
|
|
200
|
+
return;
|
|
201
|
+
if (__classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").sessionEngines[sessionEngineId] && __classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").sessionEngines[sessionEngineId].initialized.resolved === true) {
|
|
195
202
|
// immediate
|
|
196
203
|
viewportEngine.assignSettingsEngine(__classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").sessionEngines[sessionEngineId].settingsEngine);
|
|
197
204
|
yield viewportEngine.applySettings(undefined, undefined, updateViewport);
|
|
198
205
|
}
|
|
199
206
|
else {
|
|
200
207
|
yield new Promise(resolve => {
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
208
|
+
var _a;
|
|
209
|
+
(_a = __classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").sessionEngines[sessionEngineId]) === null || _a === void 0 ? void 0 : _a.initialized.then(() => __awaiter(this, void 0, void 0, function* () {
|
|
210
|
+
if (__classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").sessionEngines[sessionEngineId]) {
|
|
211
|
+
viewportEngine.assignSettingsEngine(__classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").sessionEngines[sessionEngineId].settingsEngine);
|
|
212
|
+
yield viewportEngine.applySettings(undefined, undefined, updateViewport);
|
|
213
|
+
}
|
|
204
214
|
resolve();
|
|
205
215
|
}));
|
|
206
216
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreationControlCenterViewport.js","sourceRoot":"","sources":["../../src/implementation/CreationControlCenterViewport.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,uEAAqD;AACrD,+EAS4C;AAE5C,yEAKyC;AAEzC,iFAAkE;AAClE,mIAAyH;AACzH,6EAA0E;AAC1E,mHAAuF;AAEvF,MAAa,6BAA6B;IAA1C;QACI,yBAAyB;QAEzB,qDAAqC,oCAAW,CAAC,QAAQ,EAAC;QAC1D,gDAA2B,+BAAM,CAAC,QAAQ,EAAC;QAC3C,mDAA6B,8BAAI,CAAC,QAAQ,EAAC;QAC3C,qDAAqC,oCAAW,CAAC,QAAQ,EAAC;QAC1D,uDAAyC,sCAAa,CAAC,QAAQ,EAAC;QAIhD,oBAAe,GAA8C,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"CreationControlCenterViewport.js","sourceRoot":"","sources":["../../src/implementation/CreationControlCenterViewport.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shapediver/viewer.creation-control-center.viewport",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.2.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"author": "Michael Oppitz <michael@shapediver.com>",
|
|
@@ -39,13 +39,13 @@
|
|
|
39
39
|
"testEnvironment": "node"
|
|
40
40
|
},
|
|
41
41
|
"dependencies": {
|
|
42
|
-
"@shapediver/viewer.rendering-engine.rendering-engine": "3.
|
|
43
|
-
"@shapediver/viewer.rendering-engine.rendering-engine-threejs": "3.
|
|
42
|
+
"@shapediver/viewer.rendering-engine.rendering-engine": "3.2.0",
|
|
43
|
+
"@shapediver/viewer.rendering-engine.rendering-engine-threejs": "3.2.0",
|
|
44
44
|
"@shapediver/viewer.settings": "1.0.2",
|
|
45
|
-
"@shapediver/viewer.shared.math": "3.
|
|
46
|
-
"@shapediver/viewer.shared.node-tree": "3.
|
|
47
|
-
"@shapediver/viewer.shared.services": "3.
|
|
48
|
-
"@shapediver/viewer.shared.types": "3.
|
|
45
|
+
"@shapediver/viewer.shared.math": "3.2.0",
|
|
46
|
+
"@shapediver/viewer.shared.node-tree": "3.2.0",
|
|
47
|
+
"@shapediver/viewer.shared.services": "3.2.0",
|
|
48
|
+
"@shapediver/viewer.shared.types": "3.2.0"
|
|
49
49
|
},
|
|
50
|
-
"gitHead": "
|
|
50
|
+
"gitHead": "36007f976342f0390133d7e5cecf4ebf79905c8a"
|
|
51
51
|
}
|
|
@@ -58,9 +58,9 @@ export class CreationControlCenterViewport implements ICreationControlCenterView
|
|
|
58
58
|
settingsEngine.loadSettings(settings);
|
|
59
59
|
|
|
60
60
|
const promises: Promise<unknown>[] = [];
|
|
61
|
-
this.#stateEngine.viewportEngines[viewportId]
|
|
61
|
+
this.#stateEngine.viewportEngines[viewportId]?.settingsAssigned.reset();
|
|
62
62
|
promises.push(new Promise<void>(resolve => {
|
|
63
|
-
this.#stateEngine.viewportEngines[viewportId]
|
|
63
|
+
this.#stateEngine.viewportEngines[viewportId]?.settingsAssigned.then(() => {
|
|
64
64
|
resolve();
|
|
65
65
|
});
|
|
66
66
|
}));
|
|
@@ -73,12 +73,12 @@ export class CreationControlCenterViewport implements ICreationControlCenterView
|
|
|
73
73
|
if (!this.viewportEngines[id]) return;
|
|
74
74
|
|
|
75
75
|
this.#logger.debugLow(`CreationControlCenter.closeViewportEngine: Closing viewport ${id}.`);
|
|
76
|
-
if (this.#stateEngine.viewportEngines[id]
|
|
77
|
-
await new Promise<void>(resolve => { this.#stateEngine.viewportEngines[id]
|
|
76
|
+
if (this.#stateEngine.viewportEngines[id]?.initialized.resolved === false)
|
|
77
|
+
await new Promise<void>(resolve => { this.#stateEngine.viewportEngines[id]?.initialized.then(() => resolve()); });
|
|
78
78
|
|
|
79
|
-
this.#stateEngine.viewportEngines[id]
|
|
80
|
-
this.#stateEngine.viewportEngines[id]
|
|
81
|
-
this.#stateEngine.viewportEngines[id]
|
|
79
|
+
this.#stateEngine.viewportEngines[id]?.settingsAssigned.reset();
|
|
80
|
+
this.#stateEngine.viewportEngines[id]?.environmentMapLoaded.reset();
|
|
81
|
+
this.#stateEngine.viewportEngines[id]?.initialized.reset();
|
|
82
82
|
|
|
83
83
|
await this.viewportEngines[id].close();
|
|
84
84
|
|
|
@@ -126,7 +126,7 @@ export class CreationControlCenterViewport implements ICreationControlCenterView
|
|
|
126
126
|
// in createSession
|
|
127
127
|
}
|
|
128
128
|
} else if (properties.sessionSettingsMode === SESSION_SETTINGS_MODE.FIRST) {
|
|
129
|
-
const firstSessionEngine = Object.values(this.#stateEngine.sessionEngines).find(sessionEngine => sessionEngine.isFirstSession === true);
|
|
129
|
+
const firstSessionEngine = Object.values(this.#stateEngine.sessionEngines).find(sessionEngine => sessionEngine && sessionEngine.isFirstSession === true);
|
|
130
130
|
if (firstSessionEngine) {
|
|
131
131
|
await this.assignSettings(viewportEngine.id, firstSessionEngine.id, true);
|
|
132
132
|
} else {
|
|
@@ -149,10 +149,10 @@ export class CreationControlCenterViewport implements ICreationControlCenterView
|
|
|
149
149
|
if (boundingBox.isEmpty()) {
|
|
150
150
|
viewportEngine.show = false;
|
|
151
151
|
} else {
|
|
152
|
-
if (this.#stateEngine.viewportEngines[viewportEngineId]
|
|
152
|
+
if (this.#stateEngine.viewportEngines[viewportEngineId]?.settingsAssigned.resolved) {
|
|
153
153
|
viewportEngine.show = true;
|
|
154
154
|
} else {
|
|
155
|
-
this.#stateEngine.viewportEngines[viewportEngineId]
|
|
155
|
+
this.#stateEngine.viewportEngines[viewportEngineId]?.settingsAssigned.then(() => {
|
|
156
156
|
viewportEngine.show = true;
|
|
157
157
|
});
|
|
158
158
|
}
|
|
@@ -160,17 +160,17 @@ export class CreationControlCenterViewport implements ICreationControlCenterView
|
|
|
160
160
|
}
|
|
161
161
|
});
|
|
162
162
|
} else {
|
|
163
|
-
if (this.#stateEngine.viewportEngines[viewportEngineId]
|
|
163
|
+
if (this.#stateEngine.viewportEngines[viewportEngineId]?.settingsAssigned.resolved) {
|
|
164
164
|
viewportEngine.show = true;
|
|
165
165
|
} else {
|
|
166
|
-
this.#stateEngine.viewportEngines[viewportEngineId]
|
|
166
|
+
this.#stateEngine.viewportEngines[viewportEngineId]?.settingsAssigned.then(() => {
|
|
167
167
|
viewportEngine.show = true;
|
|
168
168
|
});
|
|
169
169
|
}
|
|
170
170
|
}
|
|
171
171
|
}
|
|
172
172
|
|
|
173
|
-
this.#stateEngine.viewportEngines[viewportEngineId]
|
|
173
|
+
this.#stateEngine.viewportEngines[viewportEngineId]?.initialized.resolve(true);
|
|
174
174
|
|
|
175
175
|
this.#logger.debug(`CreationControlCenter.createViewport: Viewport(${viewportEngineId}) created.`);
|
|
176
176
|
|
|
@@ -210,16 +210,19 @@ export class CreationControlCenterViewport implements ICreationControlCenterView
|
|
|
210
210
|
|
|
211
211
|
private async assignSettings(viewportEngineId: string, sessionEngineId: string, updateViewport: boolean = false) {
|
|
212
212
|
const viewportEngine = this.#stateEngine.viewportEngines[viewportEngineId];
|
|
213
|
+
if (!viewportEngine) return;
|
|
213
214
|
|
|
214
|
-
if (this.#stateEngine.sessionEngines[sessionEngineId].initialized.resolved === true) {
|
|
215
|
+
if (this.#stateEngine.sessionEngines[sessionEngineId] && this.#stateEngine.sessionEngines[sessionEngineId]!.initialized.resolved === true) {
|
|
215
216
|
// immediate
|
|
216
|
-
viewportEngine.assignSettingsEngine(this.#stateEngine.sessionEngines[sessionEngineId]
|
|
217
|
+
viewportEngine.assignSettingsEngine(this.#stateEngine.sessionEngines[sessionEngineId]!.settingsEngine);
|
|
217
218
|
await viewportEngine.applySettings(undefined, undefined, updateViewport);
|
|
218
219
|
} else {
|
|
219
220
|
await new Promise<void>(resolve => {
|
|
220
|
-
this.#stateEngine.sessionEngines[sessionEngineId]
|
|
221
|
-
|
|
222
|
-
|
|
221
|
+
this.#stateEngine.sessionEngines[sessionEngineId]?.initialized.then(async () => {
|
|
222
|
+
if(this.#stateEngine.sessionEngines[sessionEngineId]) {
|
|
223
|
+
viewportEngine.assignSettingsEngine(this.#stateEngine.sessionEngines[sessionEngineId]!.settingsEngine);
|
|
224
|
+
await viewportEngine.applySettings(undefined, undefined, updateViewport);
|
|
225
|
+
}
|
|
223
226
|
resolve();
|
|
224
227
|
});
|
|
225
228
|
});
|