summaryrefslogtreecommitdiff
path: root/src/client/app/common
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2019-08-18 20:32:04 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-08-18 20:32:04 +0900
commit0f9e09f4bdafc35af631c8087f47084ea9ec5153 (patch)
tree817c6c6c7dac5c54da6baf9f17ddadf975136b75 /src/client/app/common
parentFix #5291 (#5294) (diff)
downloadsharkey-0f9e09f4bdafc35af631c8087f47084ea9ec5153.tar.gz
sharkey-0f9e09f4bdafc35af631c8087f47084ea9ec5153.tar.bz2
sharkey-0f9e09f4bdafc35af631c8087f47084ea9ec5153.zip
cors
Diffstat (limited to 'src/client/app/common')
-rw-r--r--src/client/app/common/scripts/room/room.ts5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/client/app/common/scripts/room/room.ts b/src/client/app/common/scripts/room/room.ts
index 1b5a2cbb11..ba8854aad7 100644
--- a/src/client/app/common/scripts/room/room.ts
+++ b/src/client/app/common/scripts/room/room.ts
@@ -1,4 +1,5 @@
import autobind from 'autobind-decorator';
+import { v4 as uuid } from 'uuid';
import * as THREE from 'three';
import { GLTFLoader, GLTF } from 'three/examples/jsm/loaders/GLTFLoader';
import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls.js';
@@ -9,7 +10,7 @@ import { BloomPass } from 'three/examples/jsm/postprocessing/BloomPass.js';
import { FXAAShader } from 'three/examples/jsm/shaders/FXAAShader.js';
import { TransformControls } from 'three/examples/jsm/controls/TransformControls.js';
import { Furniture, RoomInfo } from './furniture';
-import { v4 as uuid } from 'uuid';
+import { query as urlQuery } from '../../../../../prelude/url';
const furnitureDefs = require('./furnitures.json5');
THREE.ImageUtils.crossOrigin = '';
@@ -208,7 +209,7 @@ export class Room {
//#region Label
//#region Avatar
- const avatarUrl = user.avatarUrl;
+ const avatarUrl = `/proxy/?${urlQuery({ url: user.avatarUrl })}`;
const textureLoader = new THREE.TextureLoader();
textureLoader.crossOrigin = 'anonymous';