worldcone/cherrypick
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

cors

Browse source
This commit is contained in:
syuilo 2019-08-18 20:32:04 +09:00
parent 743ebc17b9
commit 0f9e09f4bd
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/client/app/common/scripts/room/room.ts
View file

@ -1,4 +1,5 @@
import autobind from 'autobind-decorator'; import autobind from 'autobind-decorator';
import { v4 as uuid } from 'uuid';
import * as THREE from 'three'; import * as THREE from 'three';
import { GLTFLoader, GLTF } from 'three/examples/jsm/loaders/GLTFLoader'; import { GLTFLoader, GLTF } from 'three/examples/jsm/loaders/GLTFLoader';
import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls.js'; 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 { FXAAShader } from 'three/examples/jsm/shaders/FXAAShader.js';
import { TransformControls } from 'three/examples/jsm/controls/TransformControls.js'; import { TransformControls } from 'three/examples/jsm/controls/TransformControls.js';
import { Furniture, RoomInfo } from './furniture'; import { Furniture, RoomInfo } from './furniture';
import { v4 as uuid } from 'uuid'; import { query as urlQuery } from '../../../../../prelude/url';
const furnitureDefs = require('./furnitures.json5'); const furnitureDefs = require('./furnitures.json5');
THREE.ImageUtils.crossOrigin = ''; THREE.ImageUtils.crossOrigin = '';
@ -208,7 +209,7 @@ export class Room {
//#region Label //#region Label
//#region Avatar //#region Avatar
const avatarUrl = user.avatarUrl; const avatarUrl = `/proxy/?${urlQuery({ url: user.avatarUrl })}`;
const textureLoader = new THREE.TextureLoader(); const textureLoader = new THREE.TextureLoader();
textureLoader.crossOrigin = 'anonymous'; textureLoader.crossOrigin = 'anonymous';