From 861d858b84a2d126061f3d8be0e71e2dbdbdea67 Mon Sep 17 00:00:00 2001 From: Nils Petter Fremming Date: Tue, 4 Jun 2024 16:44:33 +0200 Subject: [PATCH 1/2] Fix bounding box problems --- .../api/src/public/migration/Cognite3DViewer.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/viewer/packages/api/src/public/migration/Cognite3DViewer.ts b/viewer/packages/api/src/public/migration/Cognite3DViewer.ts index c98b5bb2bbe..09753f116bf 100644 --- a/viewer/packages/api/src/public/migration/Cognite3DViewer.ts +++ b/viewer/packages/api/src/public/migration/Cognite3DViewer.ts @@ -758,7 +758,9 @@ export class Cognite3DViewer { */ addCadModel(options: AddModelOptions): Promise { const modelLoaderSequencer = this._addModelSequencer.getNextSequencer(); - return this.addCadModelWithSequencer(options, modelLoaderSequencer); + const result = this.addCadModelWithSequencer(options, modelLoaderSequencer); + this.recalculateBoundingBox(); + return result; } private async addCadModelWithSequencer( @@ -777,6 +779,7 @@ export class Cognite3DViewer { this._models.push(model3d); this._sceneHandler.addCadModel(cadNode, cadNode.cadModelIdentifier); }); + this.recalculateBoundingBox(); return model3d; } catch (error) { await modelLoadSequencer(() => {}); @@ -801,7 +804,9 @@ export class Cognite3DViewer { */ addPointCloudModel(options: AddModelOptions): Promise { const sequencerFunction = this._addModelSequencer.getNextSequencer(); - return this.addPointCloudModelWithSequencer(options, sequencerFunction); + const result = this.addPointCloudModelWithSequencer(options, sequencerFunction); + this.recalculateBoundingBox(); + return result; } private async addPointCloudModelWithSequencer(options: AddModelOptions, modelLoadSequencer: SequencerFunction) { @@ -820,6 +825,7 @@ export class Cognite3DViewer { this._sceneHandler.addPointCloudModel(pointCloudNode, pointCloudNode.modelIdentifier); }); + this.recalculateBoundingBox(); return model; } catch (error) { await modelLoadSequencer(() => {}); @@ -976,6 +982,7 @@ export class Cognite3DViewer { assertNever(model.type, `Model type ${model.type} cannot be removed`); } + this.recalculateBoundingBox(); this.revealManager.requestRedraw(); } From 9312da7556b44fea391cc3cb5aaf20092c88818a Mon Sep 17 00:00:00 2001 From: Nils Petter Fremming Date: Tue, 4 Jun 2024 17:00:05 +0200 Subject: [PATCH 2/2] Update Cognite3DViewer.ts --- .../packages/api/src/public/migration/Cognite3DViewer.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/viewer/packages/api/src/public/migration/Cognite3DViewer.ts b/viewer/packages/api/src/public/migration/Cognite3DViewer.ts index 09753f116bf..09479a2ece4 100644 --- a/viewer/packages/api/src/public/migration/Cognite3DViewer.ts +++ b/viewer/packages/api/src/public/migration/Cognite3DViewer.ts @@ -758,9 +758,7 @@ export class Cognite3DViewer { */ addCadModel(options: AddModelOptions): Promise { const modelLoaderSequencer = this._addModelSequencer.getNextSequencer(); - const result = this.addCadModelWithSequencer(options, modelLoaderSequencer); - this.recalculateBoundingBox(); - return result; + return this.addCadModelWithSequencer(options, modelLoaderSequencer); } private async addCadModelWithSequencer( @@ -804,9 +802,7 @@ export class Cognite3DViewer { */ addPointCloudModel(options: AddModelOptions): Promise { const sequencerFunction = this._addModelSequencer.getNextSequencer(); - const result = this.addPointCloudModelWithSequencer(options, sequencerFunction); - this.recalculateBoundingBox(); - return result; + return this.addPointCloudModelWithSequencer(options, sequencerFunction); } private async addPointCloudModelWithSequencer(options: AddModelOptions, modelLoadSequencer: SequencerFunction) {