@shapediver/viewer.creation-control-center.viewport 3.2.2 → 3.2.4
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 +1 -1
- package/dist/implementation/CreationControlCenterViewport.d.ts.map +1 -1
- package/dist/implementation/CreationControlCenterViewport.js +7 -7
- package/dist/implementation/CreationControlCenterViewport.js.map +1 -1
- package/package.json +8 -8
- package/src/implementation/CreationControlCenterViewport.ts +6 -6
|
@@ -8,7 +8,7 @@ export declare class CreationControlCenterViewport implements ICreationControlCe
|
|
|
8
8
|
readonly viewportEngines: {
|
|
9
9
|
[key: string]: RenderingEngineThreeJs;
|
|
10
10
|
};
|
|
11
|
-
|
|
11
|
+
updateViewports?: (viewportEngines: {
|
|
12
12
|
[key: string]: RenderingEngineThreeJs;
|
|
13
13
|
}) => void;
|
|
14
14
|
static get instance(): CreationControlCenterViewport;
|
|
@@ -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,
|
|
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,eAAe,CAAC,EAAE,CACrB,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"}
|
|
@@ -73,8 +73,8 @@ class CreationControlCenterViewport {
|
|
|
73
73
|
delete this.viewportEngines[id];
|
|
74
74
|
delete __classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").viewportEngines[id];
|
|
75
75
|
__classPrivateFieldGet(this, _CreationControlCenterViewport_logger, "f").debug('CreationControlCenter.closeViewportEngine: Viewport closed.');
|
|
76
|
-
if (this.
|
|
77
|
-
this.
|
|
76
|
+
if (this.updateViewports)
|
|
77
|
+
this.updateViewports(this.viewportEngines);
|
|
78
78
|
__classPrivateFieldGet(this, _CreationControlCenterViewport_eventEngine, "f").emitEvent(viewer_shared_services_1.EVENTTYPE.VIEWPORT.VIEWPORT_CLOSED, { viewportId: id });
|
|
79
79
|
});
|
|
80
80
|
}
|
|
@@ -164,8 +164,8 @@ class CreationControlCenterViewport {
|
|
|
164
164
|
(_c = __classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").viewportEngines[viewportEngineId]) === null || _c === void 0 ? void 0 : _c.initialized.resolve(true);
|
|
165
165
|
__classPrivateFieldGet(this, _CreationControlCenterViewport_logger, "f").debug(`CreationControlCenter.createViewport: Viewport(${viewportEngineId}) created.`);
|
|
166
166
|
const eventEnd = { type: viewer_shared_types_1.TASK_TYPE.VIEWPORT_CREATION, id: eventId, progress: 1, status: 'Viewport created', data: { viewportId: viewportEngineId } };
|
|
167
|
-
if (this.
|
|
168
|
-
this.
|
|
167
|
+
if (this.updateViewports)
|
|
168
|
+
this.updateViewports(this.viewportEngines);
|
|
169
169
|
__classPrivateFieldGet(this, _CreationControlCenterViewport_eventEngine, "f").emitEvent(viewer_shared_services_1.EVENTTYPE.VIEWPORT.VIEWPORT_CREATED, { viewportId: viewportEngineId });
|
|
170
170
|
__classPrivateFieldGet(this, _CreationControlCenterViewport_eventEngine, "f").emitEvent(viewer_shared_services_1.EVENTTYPE.TASK.TASK_END, eventEnd);
|
|
171
171
|
return this.viewportEngines[viewportEngineId];
|
|
@@ -193,7 +193,7 @@ class CreationControlCenterViewport {
|
|
|
193
193
|
}
|
|
194
194
|
// #endregion Public Methods (4)
|
|
195
195
|
// #region Private Methods (1)
|
|
196
|
-
assignSettings(viewportEngineId, sessionEngineId,
|
|
196
|
+
assignSettings(viewportEngineId, sessionEngineId, updateViewports = false) {
|
|
197
197
|
return __awaiter(this, void 0, void 0, function* () {
|
|
198
198
|
const viewportEngine = __classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").viewportEngines[viewportEngineId];
|
|
199
199
|
if (!viewportEngine)
|
|
@@ -201,7 +201,7 @@ class CreationControlCenterViewport {
|
|
|
201
201
|
if (__classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").sessionEngines[sessionEngineId] && __classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").sessionEngines[sessionEngineId].initialized.resolved === true) {
|
|
202
202
|
// immediate
|
|
203
203
|
viewportEngine.assignSettingsEngine(__classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").sessionEngines[sessionEngineId].settingsEngine);
|
|
204
|
-
yield viewportEngine.applySettings(undefined, undefined,
|
|
204
|
+
yield viewportEngine.applySettings(undefined, undefined, updateViewports);
|
|
205
205
|
}
|
|
206
206
|
else {
|
|
207
207
|
yield new Promise(resolve => {
|
|
@@ -209,7 +209,7 @@ class CreationControlCenterViewport {
|
|
|
209
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
210
|
if (__classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").sessionEngines[sessionEngineId]) {
|
|
211
211
|
viewportEngine.assignSettingsEngine(__classPrivateFieldGet(this, _CreationControlCenterViewport_stateEngine, "f").sessionEngines[sessionEngineId].settingsEngine);
|
|
212
|
-
yield viewportEngine.applySettings(undefined, undefined,
|
|
212
|
+
yield viewportEngine.applySettings(undefined, undefined, updateViewports);
|
|
213
213
|
}
|
|
214
214
|
resolve();
|
|
215
215
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreationControlCenterViewport.js","sourceRoot":"","sources":["../../src/implementation/CreationControlCenterViewport.ts"],"names":[],"mappings":"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
|
|
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.2.
|
|
3
|
+
"version": "3.2.4",
|
|
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.2.
|
|
43
|
-
"@shapediver/viewer.rendering-engine.rendering-engine-threejs": "3.2.
|
|
42
|
+
"@shapediver/viewer.rendering-engine.rendering-engine": "3.2.4",
|
|
43
|
+
"@shapediver/viewer.rendering-engine.rendering-engine-threejs": "3.2.4",
|
|
44
44
|
"@shapediver/viewer.settings": "1.0.2",
|
|
45
|
-
"@shapediver/viewer.shared.math": "3.2.
|
|
46
|
-
"@shapediver/viewer.shared.node-tree": "3.2.
|
|
47
|
-
"@shapediver/viewer.shared.services": "3.2.
|
|
48
|
-
"@shapediver/viewer.shared.types": "3.2.
|
|
45
|
+
"@shapediver/viewer.shared.math": "3.2.4",
|
|
46
|
+
"@shapediver/viewer.shared.node-tree": "3.2.4",
|
|
47
|
+
"@shapediver/viewer.shared.services": "3.2.4",
|
|
48
|
+
"@shapediver/viewer.shared.types": "3.2.4"
|
|
49
49
|
},
|
|
50
|
-
"gitHead": "
|
|
50
|
+
"gitHead": "112bde299c23758fa552f0cf46456f1dbde837d6"
|
|
51
51
|
}
|
|
@@ -35,7 +35,7 @@ export class CreationControlCenterViewport implements ICreationControlCenterView
|
|
|
35
35
|
|
|
36
36
|
public readonly viewportEngines: { [key: string]: RenderingEngineThreeJs } = {};
|
|
37
37
|
|
|
38
|
-
public
|
|
38
|
+
public updateViewports?: (
|
|
39
39
|
viewportEngines: { [key: string]: RenderingEngineThreeJs; },
|
|
40
40
|
) => void;
|
|
41
41
|
|
|
@@ -87,7 +87,7 @@ export class CreationControlCenterViewport implements ICreationControlCenterView
|
|
|
87
87
|
delete this.#stateEngine.viewportEngines[id];
|
|
88
88
|
|
|
89
89
|
this.#logger.debug('CreationControlCenter.closeViewportEngine: Viewport closed.');
|
|
90
|
-
if (this.
|
|
90
|
+
if (this.updateViewports) this.updateViewports(this.viewportEngines);
|
|
91
91
|
|
|
92
92
|
this.#eventEngine.emitEvent(EVENTTYPE.VIEWPORT.VIEWPORT_CLOSED, { viewportId: id });
|
|
93
93
|
}
|
|
@@ -176,7 +176,7 @@ export class CreationControlCenterViewport implements ICreationControlCenterView
|
|
|
176
176
|
|
|
177
177
|
const eventEnd: ITaskEvent = { type: TASK_TYPE.VIEWPORT_CREATION, id: eventId, progress: 1, status: 'Viewport created', data: { viewportId: viewportEngineId } };
|
|
178
178
|
|
|
179
|
-
if (this.
|
|
179
|
+
if (this.updateViewports) this.updateViewports(this.viewportEngines);
|
|
180
180
|
|
|
181
181
|
this.#eventEngine.emitEvent(EVENTTYPE.VIEWPORT.VIEWPORT_CREATED, { viewportId: viewportEngineId });
|
|
182
182
|
this.#eventEngine.emitEvent(EVENTTYPE.TASK.TASK_END, eventEnd);
|
|
@@ -208,20 +208,20 @@ export class CreationControlCenterViewport implements ICreationControlCenterView
|
|
|
208
208
|
|
|
209
209
|
// #region Private Methods (1)
|
|
210
210
|
|
|
211
|
-
private async assignSettings(viewportEngineId: string, sessionEngineId: string,
|
|
211
|
+
private async assignSettings(viewportEngineId: string, sessionEngineId: string, updateViewports: boolean = false) {
|
|
212
212
|
const viewportEngine = this.#stateEngine.viewportEngines[viewportEngineId];
|
|
213
213
|
if (!viewportEngine) return;
|
|
214
214
|
|
|
215
215
|
if (this.#stateEngine.sessionEngines[sessionEngineId] && this.#stateEngine.sessionEngines[sessionEngineId]!.initialized.resolved === true) {
|
|
216
216
|
// immediate
|
|
217
217
|
viewportEngine.assignSettingsEngine(this.#stateEngine.sessionEngines[sessionEngineId]!.settingsEngine);
|
|
218
|
-
await viewportEngine.applySettings(undefined, undefined,
|
|
218
|
+
await viewportEngine.applySettings(undefined, undefined, updateViewports);
|
|
219
219
|
} else {
|
|
220
220
|
await new Promise<void>(resolve => {
|
|
221
221
|
this.#stateEngine.sessionEngines[sessionEngineId]?.initialized.then(async () => {
|
|
222
222
|
if(this.#stateEngine.sessionEngines[sessionEngineId]) {
|
|
223
223
|
viewportEngine.assignSettingsEngine(this.#stateEngine.sessionEngines[sessionEngineId]!.settingsEngine);
|
|
224
|
-
await viewportEngine.applySettings(undefined, undefined,
|
|
224
|
+
await viewportEngine.applySettings(undefined, undefined, updateViewports);
|
|
225
225
|
}
|
|
226
226
|
resolve();
|
|
227
227
|
});
|