@colijnit/configurator 262.1.0 → 262.1.2
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.
|
@@ -196,6 +196,9 @@ class ConfiguratorSettings {
|
|
|
196
196
|
jwtEnabled;
|
|
197
197
|
gtm;
|
|
198
198
|
dracoPath = 'https?://cdn1.colijn-it.nl/draco/';
|
|
199
|
+
mainUrl;
|
|
200
|
+
mainSchema;
|
|
201
|
+
mainVersion;
|
|
199
202
|
options = new SettingOptions();
|
|
200
203
|
catalogParameters;
|
|
201
204
|
renderParameters = new RenderParameters();
|
|
@@ -823,12 +826,12 @@ class ConfiguratorService {
|
|
|
823
826
|
this._mainApi = null;
|
|
824
827
|
this._articleApi = null;
|
|
825
828
|
}
|
|
826
|
-
async initConnector(options, forceReload) {
|
|
829
|
+
async initConnector(options, forceReload, mainUrl, mainSchema, mainVersion) {
|
|
827
830
|
let createdConnection = false;
|
|
828
831
|
const renewConnector = (this._configuratorApi ? this._configuratorApi.url !== options.url : false) || forceReload;
|
|
829
832
|
if (!this._configuratorApi || renewConnector) {
|
|
830
833
|
this._configuratorApi = new Configurator(options);
|
|
831
|
-
this.loginResponse = await this._configuratorApi.connect();
|
|
834
|
+
this.loginResponse = await this._configuratorApi.connect(mainUrl, mainSchema, mainVersion);
|
|
832
835
|
this._configuratorApi.showLoader.subscribe(value => this.showLoader.next(value));
|
|
833
836
|
this._configuratorApi.connectionResetInactivity.subscribe(value => this.connectionReset.next());
|
|
834
837
|
}
|
|
@@ -1115,7 +1118,7 @@ class ConfiguratorConnectorService {
|
|
|
1115
1118
|
this._imageCache.clear();
|
|
1116
1119
|
this._subs.forEach(sub => sub.unsubscribe());
|
|
1117
1120
|
}
|
|
1118
|
-
async initConnection(forceReload,
|
|
1121
|
+
async initConnection(forceReload, mainUrl, mainSchema, mainVersion) {
|
|
1119
1122
|
if ((this._initialized || this._initializing) && !forceReload) {
|
|
1120
1123
|
return;
|
|
1121
1124
|
}
|
|
@@ -1127,7 +1130,7 @@ class ConfiguratorConnectorService {
|
|
|
1127
1130
|
}
|
|
1128
1131
|
this._connectorOptions = Object.assign(new Options(), settings);
|
|
1129
1132
|
this._subs.push(this._configuratorService.showLoader.subscribe(showLoader => this.onShowLoaderChange(showLoader)), this._configuratorService.connectionReset.subscribe(() => this.onConnectionReset()));
|
|
1130
|
-
await this._configuratorService.initConnector(this._connectorOptions, forceReload);
|
|
1133
|
+
await this._configuratorService.initConnector(this._connectorOptions, forceReload, mainUrl, mainSchema, mainVersion);
|
|
1131
1134
|
await this._settingsService.checkAdditionalParameters();
|
|
1132
1135
|
this.controllerInitialized.next(true);
|
|
1133
1136
|
this._initialized = true;
|
|
@@ -1806,7 +1809,7 @@ class AppInitializerService {
|
|
|
1806
1809
|
}
|
|
1807
1810
|
async initializeApp(settings) {
|
|
1808
1811
|
await this._settingsService.initializeSettings(settings);
|
|
1809
|
-
await this._configuratorConnectorService.initConnection(true);
|
|
1812
|
+
await this._configuratorConnectorService.initConnection(true, settings.mainUrl, settings.mainSchema, settings.mainVersion);
|
|
1810
1813
|
this.appInitialized.next(true);
|
|
1811
1814
|
}
|
|
1812
1815
|
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.18", ngImport: i0, type: AppInitializerService, deps: [{ token: SettingsService }, { token: ConfiguratorConnectorService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
@@ -9877,6 +9880,7 @@ class BuildFurnitureService extends BuildFurnitureBaseService {
|
|
|
9877
9880
|
this.configuratorConnectorService.emptySelections();
|
|
9878
9881
|
this.full3DObjectToUse.children.forEach(c => c.visible = true);
|
|
9879
9882
|
result.object = this.full3DObjectToUse;
|
|
9883
|
+
result.resultType = ResultType.Loaded;
|
|
9880
9884
|
// Scene3DUtil.updatePivot(result.object);
|
|
9881
9885
|
if (result.default180) {
|
|
9882
9886
|
result.object.rotation.set(this.defaultRotation.x, this.defaultRotation.y, this.defaultRotation.z);
|