@shapediver/viewer.session-engine.session-engine 2.8.5 → 2.9.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/OutputLoader.d.ts +12 -1
- package/dist/implementation/OutputLoader.d.ts.map +1 -1
- package/dist/implementation/OutputLoader.js +55 -21
- package/dist/implementation/OutputLoader.js.map +1 -1
- package/dist/implementation/SessionEngine.d.ts +4 -3
- package/dist/implementation/SessionEngine.d.ts.map +1 -1
- package/dist/implementation/SessionEngine.js +106 -41
- package/dist/implementation/SessionEngine.js.map +1 -1
- package/dist/implementation/dto/Export.js.map +1 -1
- package/dist/implementation/dto/Output.js.map +1 -1
- package/dist/interfaces/ISessionEngine.d.ts +4 -3
- package/dist/interfaces/ISessionEngine.d.ts.map +1 -1
- package/dist/interfaces/ISessionEngine.js.map +1 -1
- package/package.json +10 -10
- package/src/implementation/OutputLoader.ts +81 -23
- package/src/implementation/SessionEngine.ts +119 -52
- package/src/implementation/dto/Export.ts +1 -1
- package/src/implementation/dto/Output.ts +1 -1
- package/src/interfaces/ISessionEngine.ts +4 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Export.js","sourceRoot":"","sources":["../../../src/implementation/dto/Export.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AACA,+
|
|
1
|
+
{"version":3,"file":"Export.js","sourceRoot":"","sources":["../../../src/implementation/dto/Export.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Output.js","sourceRoot":"","sources":["../../../src/implementation/dto/Output.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAEA,+
|
|
1
|
+
{"version":3,"file":"Output.js","sourceRoot":"","sources":["../../../src/implementation/dto/Output.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { ShapeDiverRequestGltfUploadQueryConversion, ShapeDiverResponseDto, ShapeDiverResponseExport } from '@shapediver/sdk.geometry-api-sdk-v2';
|
|
2
2
|
import { ITreeNode } from '@shapediver/viewer.shared.node-tree';
|
|
3
3
|
import { SettingsEngine } from '@shapediver/viewer.shared.services';
|
|
4
|
+
import { OutputLoaderTaskEventInfo } from '../implementation/OutputLoader';
|
|
4
5
|
import { IExport } from './dto/IExport';
|
|
5
6
|
import { IOutput } from './dto/IOutput';
|
|
6
7
|
import { IParameter } from './dto/IParameter';
|
|
@@ -125,8 +126,8 @@ export interface ISessionEngine {
|
|
|
125
126
|
init(parameterValues?: {
|
|
126
127
|
[key: string]: string;
|
|
127
128
|
}): Promise<void>;
|
|
128
|
-
loadOutputs(cancelRequest: () => boolean): Promise<ITreeNode>;
|
|
129
|
-
loadOutputsParallel(responseDto: ShapeDiverResponseDto, cancelRequest: () => boolean): Promise<ITreeNode>;
|
|
129
|
+
loadOutputs(cancelRequest: () => boolean, taskEventInfo: OutputLoaderTaskEventInfo): Promise<ITreeNode>;
|
|
130
|
+
loadOutputsParallel(responseDto: ShapeDiverResponseDto, cancelRequest: () => boolean, taskEventInfo: OutputLoaderTaskEventInfo): Promise<ITreeNode>;
|
|
130
131
|
requestExport(exportId: string, parameters: {
|
|
131
132
|
[key: string]: string;
|
|
132
133
|
}, maxWaitTime: number): Promise<ShapeDiverResponseExport>;
|
|
@@ -134,7 +135,7 @@ export interface ISessionEngine {
|
|
|
134
135
|
saveDefaultParameterValues(): Promise<boolean>;
|
|
135
136
|
saveSettings(viewportId?: string): Promise<boolean>;
|
|
136
137
|
saveUiProperties(): Promise<boolean>;
|
|
137
|
-
updateOutputs(): Promise<ITreeNode>;
|
|
138
|
+
updateOutputs(taskEventInfo?: OutputLoaderTaskEventInfo): Promise<ITreeNode>;
|
|
138
139
|
uploadFile(parameterId: string, data: File, type: string): Promise<string>;
|
|
139
140
|
uploadGLTF(blob: Blob, conversion?: ShapeDiverRequestGltfUploadQueryConversion): Promise<ShapeDiverResponseDto>;
|
|
140
141
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ISessionEngine.d.ts","sourceRoot":"","sources":["../../src/interfaces/ISessionEngine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0CAA0C,EAAE,qBAAqB,EAAE,wBAAwB,EAAyD,MAAM,qCAAqC,CAAC;AACzM,OAAO,EAAE,SAAS,EAAY,MAAM,qCAAqC,CAAA;AACzE,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C;;GAEG;AACH,oBAAY,cAAc;IACxB,KAAK,UAAU;IACf,GAAG,QAAQ;IACX,IAAI,SAAS;IACb,GAAG,QAAQ;IACX,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,UAAU,eAAe;IACzB,IAAI,SAAS;IACb,IAAI,SAAS;IACb,IAAI,SAAS;IACb,OAAO,YAAY;IACnB,QAAQ,aAAa;IACrB,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,KAAK,UAAU;IACf,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,SAAS,cAAc;IACvB,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,OAAO,YAAY;IACnB,IAAI,SAAS;IACb,MAAM,WAAW;IACjB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,KAAK,UAAU;IACf,QAAQ,aAAa;IACrB,KAAK,UAAU;IACf,OAAO,YAAY;CACpB;AAED;;GAEG;AACH,oBAAY,uBAAuB;IACjC,MAAM,WAAW;IACjB,QAAQ,aAAa;IACrB,KAAK,UAAU;IACf,QAAQ,aAAa;IACrB,SAAS,cAAc;IACvB,KAAK,UAAU;IACf,QAAQ,aAAa;IACrB,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,IAAI,SAAS;IACb,IAAI,SAAS;CACd;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,EAAE;QACN,SAAS,CAAC,EAAE;YACR,0EAA0E;YAC1E,WAAW,CAAC,EAAE,OAAO,CAAC;YACtB,oEAAoE;YACpE,KAAK,CAAC,EAAE,OAAO,CAAC;YAChB,2EAA2E;YAC3E,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,oEAAoE;YACpE,KAAK,CAAC,EAAE,OAAO,CAAA;SAClB,CAAC;QACF,MAAM,CAAC,EAAE;YACL,uEAAuE;YACvE,WAAW,CAAC,EAAE,OAAO,CAAC;YACtB,iEAAiE;YACjE,KAAK,CAAC,EAAE,OAAO,CAAC;YAChB,wEAAwE;YACxE,MAAM,CAAC,EAAE,OAAO,CAAA;SACnB,CAAA;KACJ,CAAC;IACF,QAAQ,CAAC,EAAE;QACP,wDAAwD;QACxD,EAAE,CAAC,EAAE,OAAO,CAAC;QACb,2DAA2D;QAC3D,KAAK,CAAC,EAAE,OAAO,CAAC;QAChB,4DAA4D;QAC5D,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,2DAA2D;QAC3D,KAAK,CAAC,EAAE,OAAO,CAAC;QAChB,iEAAiE;QACjE,WAAW,CAAC,EAAE,OAAO,CAAA;QACrB,6DAA6D;QAC7D,OAAO,CAAC,EAAE,OAAO,CAAA;KACpB,CAAA;CACF;AAED,MAAM,WAAW,cAAc;IAG7B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,OAAO,CAAC;IACvB,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IACpC,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IACpC,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,CAAA;KAAE,CAAC;IAC/C,kBAAkB,EAAE,CAAC,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,SAAS,CAAC;IACxD,cAAc,EAAE,cAAc,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,CAAC,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC;IAM1E,aAAa,CAAC,QAAQ,EAAE,qBAAqB,EAAE,QAAQ,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACnF,SAAS,IAAI,OAAO,CAAC;IACrB,YAAY,IAAI,OAAO,CAAC;IACxB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IAC9C,iBAAiB,CAAC,eAAe,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IAClF,MAAM,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC;IAC7B,SAAS,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC;IAChC,IAAI,CAAC,eAAe,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClE,WAAW,CAAC,aAAa,EAAE,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"ISessionEngine.d.ts","sourceRoot":"","sources":["../../src/interfaces/ISessionEngine.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ISessionEngine.js","sourceRoot":"","sources":["../../src/interfaces/ISessionEngine.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"ISessionEngine.js","sourceRoot":"","sources":["../../src/interfaces/ISessionEngine.ts"],"names":[],"mappings":";;;AAQA;;GAEG;AACH,IAAY,cAgCX;AAhCD,WAAY,cAAc;IACxB,iCAAe,CAAA;IACf,6BAAW,CAAA;IACX,+BAAa,CAAA;IACb,6BAAW,CAAA;IACX,mCAAiB,CAAA;IACjB,iCAAe,CAAA;IACf,2CAAyB,CAAA;IACzB,+BAAa,CAAA;IACb,+BAAa,CAAA;IACb,+BAAa,CAAA;IACb,qCAAmB,CAAA;IACnB,uCAAqB,CAAA;IACrB,qCAAmB,CAAA;IACnB,mCAAiB,CAAA;IACjB,iCAAe,CAAA;IACf,iCAAe,CAAA;IACf,qCAAmB,CAAA;IACnB,qCAAmB,CAAA;IACnB,yCAAuB,CAAA;IACvB,mCAAiB,CAAA;IACjB,iCAAe,CAAA;IACf,qCAAmB,CAAA;IACnB,+BAAa,CAAA;IACb,mCAAiB,CAAA;IACjB,2CAAyB,CAAA;IACzB,mCAAiB,CAAA;IACjB,qCAAmB,CAAA;IACnB,iCAAe,CAAA;IACf,uCAAqB,CAAA;IACrB,iCAAe,CAAA;IACf,qCAAmB,CAAA;AACrB,CAAC,EAhCW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAgCzB;AAED;;GAEG;AACH,IAAY,uBAaX;AAbD,WAAY,uBAAuB;IACjC,4CAAiB,CAAA;IACjB,gDAAqB,CAAA;IACrB,0CAAe,CAAA;IACf,gDAAqB,CAAA;IACrB,kDAAuB,CAAA;IACvB,0CAAe,CAAA;IACf,gDAAqB,CAAA;IACrB,4CAAiB,CAAA;IACjB,4CAAiB,CAAA;IACjB,4CAAiB,CAAA;IACjB,wCAAa,CAAA;IACb,wCAAa,CAAA;AACf,CAAC,EAbW,uBAAuB,GAAvB,+BAAuB,KAAvB,+BAAuB,QAalC;AAqCA,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shapediver/viewer.session-engine.session-engine",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.9.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"author": "Michael Oppitz <michael@shapediver.com>",
|
|
@@ -39,17 +39,17 @@
|
|
|
39
39
|
"testEnvironment": "node"
|
|
40
40
|
},
|
|
41
41
|
"dependencies": {
|
|
42
|
-
"@shapediver/sdk.geometry-api-sdk-v2": "1.
|
|
43
|
-
"@shapediver/viewer.data-engine.data-engine": "2.
|
|
44
|
-
"@shapediver/viewer.data-engine.shared-types": "2.
|
|
45
|
-
"@shapediver/viewer.settings": "0.
|
|
46
|
-
"@shapediver/viewer.shared.build-data": "2.
|
|
47
|
-
"@shapediver/viewer.shared.node-tree": "2.
|
|
48
|
-
"@shapediver/viewer.shared.services": "2.
|
|
49
|
-
"@shapediver/viewer.shared.types": "2.
|
|
42
|
+
"@shapediver/sdk.geometry-api-sdk-v2": "1.4.0",
|
|
43
|
+
"@shapediver/viewer.data-engine.data-engine": "2.9.0",
|
|
44
|
+
"@shapediver/viewer.data-engine.shared-types": "2.9.0",
|
|
45
|
+
"@shapediver/viewer.settings": "0.4.2",
|
|
46
|
+
"@shapediver/viewer.shared.build-data": "2.9.0",
|
|
47
|
+
"@shapediver/viewer.shared.node-tree": "2.9.0",
|
|
48
|
+
"@shapediver/viewer.shared.services": "2.9.0",
|
|
49
|
+
"@shapediver/viewer.shared.types": "2.9.0",
|
|
50
50
|
"@shapediver/viewer.utils.mime-type": "1.0.0",
|
|
51
51
|
"axios": "^1.2.6",
|
|
52
52
|
"gl-matrix": "3.3.0"
|
|
53
53
|
},
|
|
54
|
-
"gitHead": "
|
|
54
|
+
"gitHead": "6afb546a9c788a179b33091396819f3a738e25ad"
|
|
55
55
|
}
|
|
@@ -1,19 +1,30 @@
|
|
|
1
|
-
import { IMaterialAbstractData, GeometryData, AbstractMaterialData } from '@shapediver/viewer.shared.types'
|
|
1
|
+
import { IMaterialAbstractData, GeometryData, AbstractMaterialData, ITaskEvent, TASK_TYPE } from '@shapediver/viewer.shared.types'
|
|
2
2
|
import { DataEngine } from '@shapediver/viewer.data-engine.data-engine'
|
|
3
3
|
import { ITreeNode, Tree, TreeNode } from '@shapediver/viewer.shared.node-tree'
|
|
4
4
|
|
|
5
5
|
import { OutputDelayException } from './OutputDelayException'
|
|
6
6
|
import { SessionTreeNode } from './SessionTreeNode'
|
|
7
7
|
import { SessionOutputData } from './SessionOutputData'
|
|
8
|
-
import { PerformanceEvaluator } from '@shapediver/viewer.shared.services'
|
|
8
|
+
import { EventEngine, EVENTTYPE, IEvent, PerformanceEvaluator, UuidGenerator } from '@shapediver/viewer.shared.services'
|
|
9
9
|
import { ShapeDiverResponseDto, ShapeDiverResponseOutput } from '@shapediver/sdk.geometry-api-sdk-v2'
|
|
10
10
|
import { ISessionTreeNode } from '../interfaces/ISessionTreeNode'
|
|
11
11
|
import { ISessionEngine } from '../interfaces/ISessionEngine'
|
|
12
12
|
|
|
13
|
+
export type OutputLoaderTaskEventInfo = {
|
|
14
|
+
eventId: string,
|
|
15
|
+
type: TASK_TYPE,
|
|
16
|
+
progressRange: {
|
|
17
|
+
min: number,
|
|
18
|
+
max: number
|
|
19
|
+
},
|
|
20
|
+
data: any
|
|
21
|
+
}
|
|
22
|
+
|
|
13
23
|
export class OutputLoader {
|
|
14
24
|
// #region Properties (3)
|
|
15
25
|
|
|
16
26
|
private readonly _dataEngine: DataEngine = DataEngine.instance;
|
|
27
|
+
private readonly _eventEngine: EventEngine = EventEngine.instance;
|
|
17
28
|
private readonly _loadedOutputNodes: {
|
|
18
29
|
[key: string]: {
|
|
19
30
|
[key: string]: ISessionTreeNode
|
|
@@ -46,7 +57,7 @@ export class OutputLoader {
|
|
|
46
57
|
* @param outputs the outputs to load
|
|
47
58
|
* @returns promise with a scene graph node
|
|
48
59
|
*/
|
|
49
|
-
public async loadOutputs(nodeName: string, outputs: { [key: string]: ShapeDiverResponseOutput; }, outputsFreeze: { [key: string]: boolean; }): Promise<SessionTreeNode> {
|
|
60
|
+
public async loadOutputs(nodeName: string, outputs: { [key: string]: ShapeDiverResponseOutput; }, outputsFreeze: { [key: string]: boolean; }, taskEventInfo: OutputLoaderTaskEventInfo): Promise<SessionTreeNode> {
|
|
50
61
|
this._performanceEvaluator.startSection('outputLoading');
|
|
51
62
|
const node = new SessionTreeNode(nodeName);
|
|
52
63
|
let currentNodes: {
|
|
@@ -54,59 +65,106 @@ export class OutputLoader {
|
|
|
54
65
|
[key: string]: ISessionTreeNode
|
|
55
66
|
};
|
|
56
67
|
} = {};
|
|
68
|
+
let outputInfo: { [key: string]: {
|
|
69
|
+
version:string,
|
|
70
|
+
contentFormat: string[],
|
|
71
|
+
} } = {};
|
|
57
72
|
let promises: Promise<ITreeNode>[] = [];
|
|
58
73
|
let promisesNodes: ISessionTreeNode[] = [];
|
|
59
74
|
let maxDelay = 0;
|
|
60
75
|
|
|
76
|
+
let progress: {
|
|
77
|
+
[key: string]: number
|
|
78
|
+
} = {};
|
|
79
|
+
|
|
80
|
+
const outputIDs = Object.keys(outputs);
|
|
81
|
+
|
|
82
|
+
const cb = (e: IEvent) => {
|
|
83
|
+
const taskEvent = e as ITaskEvent;
|
|
84
|
+
if(outputIDs.includes(taskEvent.id)) {
|
|
85
|
+
progress[taskEvent.id] = taskEvent.progress;
|
|
86
|
+
|
|
87
|
+
let sum = 0;
|
|
88
|
+
Object.values(progress).forEach(p => { sum += p; });
|
|
89
|
+
|
|
90
|
+
const outputLoadingProgress = (taskEventInfo.progressRange.max - taskEventInfo.progressRange.min) * (sum / outputIDs.length) + taskEventInfo.progressRange.min;
|
|
91
|
+
const eventProgressUpdate: ITaskEvent = { type: taskEventInfo.type, id: taskEventInfo.eventId, progress: outputLoadingProgress, data: taskEventInfo.data, status: 'Output content loading progress.' };
|
|
92
|
+
this._eventEngine.emitEvent(EVENTTYPE.TASK.TASK_PROCESS, eventProgressUpdate);
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
let listenerTokens = [];
|
|
97
|
+
listenerTokens.push(this._eventEngine.addListener(EVENTTYPE.TASK.TASK_START, cb));
|
|
98
|
+
listenerTokens.push(this._eventEngine.addListener(EVENTTYPE.TASK.TASK_PROCESS, cb));
|
|
99
|
+
listenerTokens.push(this._eventEngine.addListener(EVENTTYPE.TASK.TASK_CANCEL, cb));
|
|
100
|
+
listenerTokens.push(this._eventEngine.addListener(EVENTTYPE.TASK.TASK_END, cb));
|
|
101
|
+
|
|
61
102
|
for (let outputID in outputs) {
|
|
103
|
+
// we store some necessary information as this data may have been changed after the await (see warning below)
|
|
104
|
+
outputInfo[outputID] = {
|
|
105
|
+
version: outputs[outputID].version,
|
|
106
|
+
contentFormat: outputs[outputID].content ? outputs[outputID].content!.map(c => c.format) : []
|
|
107
|
+
}
|
|
108
|
+
|
|
62
109
|
currentNodes[outputID] = {};
|
|
63
110
|
if(!this._loadedOutputNodes[outputID])
|
|
64
111
|
this._loadedOutputNodes[outputID] = {};
|
|
65
112
|
|
|
66
113
|
if(outputsFreeze[outputID]) {
|
|
67
|
-
currentNodes[outputID][
|
|
114
|
+
currentNodes[outputID][outputInfo[outputID].version] = this._lastOutputNodes[outputID];
|
|
115
|
+
// no loading necessary, progress done
|
|
116
|
+
progress[outputID] = 1;
|
|
68
117
|
} else if(outputs[outputID].delay) {
|
|
69
118
|
maxDelay = Math.max(maxDelay, outputs[outputID].delay!);
|
|
70
|
-
} else if(!this._loadedOutputNodes[outputID][
|
|
71
|
-
currentNodes[outputID][
|
|
72
|
-
currentNodes[outputID][
|
|
119
|
+
} else if(!this._loadedOutputNodes[outputID][outputInfo[outputID].version]) {
|
|
120
|
+
currentNodes[outputID][outputInfo[outputID].version] = new SessionTreeNode(outputID);
|
|
121
|
+
currentNodes[outputID][outputInfo[outputID].version].data.push(new SessionOutputData(outputs[outputID]));
|
|
73
122
|
if(outputs[outputID].content) {
|
|
74
123
|
for (let i = 0, len = outputs[outputID].content!.length; i < len; i++) {
|
|
75
|
-
promises.push(this._dataEngine.loadContent(outputs[outputID].content![i], this._sessionEngine.bearerToken))
|
|
76
|
-
promisesNodes.push(currentNodes[outputID][
|
|
124
|
+
promises.push(this._dataEngine.loadContent(outputs[outputID].content![i], this._sessionEngine.bearerToken, outputID))
|
|
125
|
+
promisesNodes.push(currentNodes[outputID][outputInfo[outputID].version])
|
|
77
126
|
}
|
|
78
127
|
}
|
|
79
128
|
} else {
|
|
80
|
-
currentNodes[outputID][
|
|
129
|
+
currentNodes[outputID][outputInfo[outputID].version] = this._loadedOutputNodes[outputID][outputInfo[outputID].version];
|
|
130
|
+
// no loading necessary, progress done
|
|
131
|
+
progress[outputID] = 1;
|
|
81
132
|
}
|
|
82
133
|
}
|
|
83
134
|
|
|
84
135
|
if(maxDelay)
|
|
85
136
|
throw new OutputDelayException(maxDelay);
|
|
86
137
|
|
|
138
|
+
/**
|
|
139
|
+
* WARNING: After this point outputs object cannot be used anymore.
|
|
140
|
+
* This can happen when fast consecutive scene updates are done.
|
|
141
|
+
* Therefore, we stored the data in the outputInfo.
|
|
142
|
+
*/
|
|
143
|
+
|
|
87
144
|
await Promise.all(promises);
|
|
88
145
|
|
|
146
|
+
listenerTokens.forEach(t => this._eventEngine.removeListener(t));
|
|
147
|
+
|
|
89
148
|
// all promises are resolved, await in the next lines is just for structural purposes
|
|
90
149
|
for(let i = 0; i < promises.length; i++)
|
|
91
150
|
promisesNodes[i].addChild(await promises[i])
|
|
92
151
|
|
|
93
152
|
// here we assign all outputs just to the node and return it
|
|
94
|
-
for (let outputID in
|
|
95
|
-
node.addChild(currentNodes[outputID][
|
|
96
|
-
}
|
|
153
|
+
for (let outputID in outputInfo)
|
|
154
|
+
node.addChild(currentNodes[outputID][outputInfo[outputID].version]);
|
|
97
155
|
|
|
98
156
|
// save the nodes as the last available version
|
|
99
|
-
for (let outputID in
|
|
157
|
+
for (let outputID in outputInfo) {
|
|
100
158
|
this._loadedOutputNodes[outputID] = {};
|
|
101
|
-
this._loadedOutputNodes[outputID][
|
|
102
|
-
this._lastOutputNodes[outputID] = currentNodes[outputID][
|
|
159
|
+
this._loadedOutputNodes[outputID][outputInfo[outputID].version] = currentNodes[outputID][outputInfo[outputID].version];
|
|
160
|
+
this._lastOutputNodes[outputID] = currentNodes[outputID][outputInfo[outputID].version];
|
|
103
161
|
}
|
|
104
162
|
|
|
105
|
-
for (let outputID in
|
|
106
|
-
if(currentNodes[outputID][
|
|
107
|
-
for (let i = 0, len =
|
|
108
|
-
if(
|
|
109
|
-
this.mergeContentNodes(currentNodes[outputID][
|
|
163
|
+
for (let outputID in outputInfo) {
|
|
164
|
+
if(currentNodes[outputID][outputInfo[outputID].version].children.length > 1) {
|
|
165
|
+
for (let i = 0, len = outputInfo[outputID].contentFormat!.length; i < len; i++) {
|
|
166
|
+
if(outputInfo[outputID].contentFormat[i] === 'sdtf') {
|
|
167
|
+
this.mergeContentNodes(currentNodes[outputID][outputInfo[outputID].version])
|
|
110
168
|
break;
|
|
111
169
|
}
|
|
112
170
|
}
|
|
@@ -127,9 +185,9 @@ export class OutputLoader {
|
|
|
127
185
|
for (let i = 0; i < node.data.length; i++) {
|
|
128
186
|
if (node.data[i] instanceof GeometryData) {
|
|
129
187
|
const geometry = <GeometryData>node.data[i];
|
|
130
|
-
const currentMaterial = geometry.
|
|
188
|
+
const currentMaterial = geometry.material;
|
|
131
189
|
if(currentMaterial === null || currentMaterial.materialOutput === true) {
|
|
132
|
-
geometry.
|
|
190
|
+
geometry.material = material;
|
|
133
191
|
}
|
|
134
192
|
}
|
|
135
193
|
}
|