Skip to content

Commit 01b3509

Browse files
authored
Add crossOrigin use-credentials for ThreeJS loaders (#987)
1 parent 52db167 commit 01b3509

File tree

4 files changed

+6
-2
lines changed

4 files changed

+6
-2
lines changed

packages/core/src/services/TextureLoader.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ export class TextureLoader extends AbstractService {
1919
this.loader.setResponseType('blob');
2020
if (this.config.withCredentials) {
2121
this.loader.setWithCredentials(true);
22+
this.loader.setCrossOrigin('use-credentials');
2223
}
2324
}
2425

packages/cubemap-tiles-adapter/src/CubemapTilesAdapter.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ export class CubemapTilesAdapter extends AbstractAdapter<CubemapTilesPanorama |
100100
this.loader = new ImageLoader();
101101
if (this.viewer.config.withCredentials) {
102102
this.loader.setWithCredentials(true);
103+
this.loader.setCrossOrigin('use-credentials');
103104
}
104105
}
105106

packages/equirectangular-tiles-adapter/src/EquirectangularTilesAdapter.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ export class EquirectangularTilesAdapter extends AbstractAdapter<
154154
this.loader = new ImageLoader();
155155
if (this.viewer.config.withCredentials) {
156156
this.loader.setWithCredentials(true);
157+
this.loader.setCrossOrigin('use-credentials');
157158
}
158159
}
159160

@@ -355,7 +356,7 @@ export class EquirectangularTilesAdapter extends AbstractAdapter<
355356
segmentIndex = Math.floor((i / 3 - this.SPHERE_SEGMENTS) / 2) + this.SPHERE_SEGMENTS;
356357
} else {
357358
// last row
358-
segmentIndex = Math.floor((i - this.NB_VERTICES - this.SPHERE_SEGMENTS * NB_VERTICES_BY_SMALL_FACE) / 3)
359+
segmentIndex = Math.floor((i - this.NB_VERTICES - this.SPHERE_SEGMENTS * NB_VERTICES_BY_SMALL_FACE) / 3)
359360
+ this.SPHERE_HORIZONTAL_SEGMENTS * (this.SPHERE_SEGMENTS - 1);
360361
}
361362
const segmentRow = Math.floor(segmentIndex / this.SPHERE_SEGMENTS);

packages/markers-plugin/src/Marker.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export class Marker {
6767

6868
constructor(
6969
private readonly viewer: Viewer,
70-
private readonly plugin: MarkersPlugin,
70+
private readonly plugin: MarkersPlugin,
7171
config: MarkerConfig
7272
) {
7373
if (!config.id) {
@@ -93,6 +93,7 @@ export class Marker {
9393
this.loader = new TextureLoader();
9494
if (this.viewer.config.withCredentials) {
9595
this.loader.setWithCredentials(true);
96+
this.loader.setCrossOrigin('use-credentials');
9697
}
9798
}
9899

0 commit comments

Comments
 (0)