graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-30 13:13:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

Improve readability

Browse source
This commit is contained in:
syuilo 2019-08-19 15:51:00 +09:00
parent 1e43ece637
commit 3b445af6fc
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -343,7 +343,8 @@ export class Room {
@autobind @autobind
private loadRoom() { private loadRoom() {
new GLTFLoader().load(`/assets/room/rooms/${this.roomInfo.roomType}/${this.roomInfo.roomType}.glb`, gltf => { const type = this.roomInfo.roomType;
new GLTFLoader().load(`/assets/room/rooms/${type}/${type}.glb`, gltf => {
gltf.scene.traverse(child => { gltf.scene.traverse(child => {
if (!(child instanceof THREE.Mesh)) return; if (!(child instanceof THREE.Mesh)) return;
@ -429,8 +430,12 @@ export class Room {
private applyCarpetColor() { private applyCarpetColor() {
this.roomObj.traverse(child => { this.roomObj.traverse(child => {
if (!(child instanceof THREE.Mesh)) return; if (!(child instanceof THREE.Mesh)) return;
if (child.material && (child.material as THREE.MeshStandardMaterial).name && (child.material as THREE.MeshStandardMaterial).name === 'Carpet') { if (child.material &&
(child.material as THREE.MeshStandardMaterial).color.setHex(parseInt(this.roomInfo.carpetColor.substr(1), 16)); (child.material as THREE.MeshStandardMaterial).name &&
(child.material as THREE.MeshStandardMaterial).name === 'Carpet'
) {
const colorHex = parseInt(this.roomInfo.carpetColor.substr(1), 16);
(child.material as THREE.MeshStandardMaterial).color.setHex(colorHex);
} }
}); });
} }
@ -443,14 +448,18 @@ export class Room {
model.traverse(child => { model.traverse(child => {
if (!(child instanceof THREE.Mesh)) return; if (!(child instanceof THREE.Mesh)) return;
for (const t of Object.keys(def.color)) { for (const t of Object.keys(def.color)) {
if (!child.material || !(child.material as THREE.MeshStandardMaterial).name || (child.material as THREE.MeshStandardMaterial).name !== t) continue; if (!child.material ||
!(child.material as THREE.MeshStandardMaterial).name ||
(child.material as THREE.MeshStandardMaterial).name !== t
) continue;
const prop = def.color[t]; const prop = def.color[t];
const val = furniture.props ? furniture.props[prop] : undefined; const val = furniture.props ? furniture.props[prop] : undefined;
if (val == null) continue; if (val == null) continue;
(child.material as THREE.MeshStandardMaterial).color.setHex(parseInt(val.substr(1), 16)); const colorHex = parseInt(val.substr(1), 16);
(child.material as THREE.MeshStandardMaterial).color.setHex(colorHex);
} }
}); });
} }
@ -487,7 +496,9 @@ export class Room {
const uvInfo = def.texture[t].uv; const uvInfo = def.texture[t].uv;
const ctx = canvas.getContext('2d'); const ctx = canvas.getContext('2d');
ctx.drawImage(img, 0, 0, img.width, img.height, uvInfo.x, uvInfo.y, uvInfo.width, uvInfo.height); ctx.drawImage(img,
0, 0, img.width, img.height,
uvInfo.x, uvInfo.y, uvInfo.width, uvInfo.height);
const texture = new THREE.Texture(canvas); const texture = new THREE.Texture(canvas);
texture.wrapS = THREE.RepeatWrapping; texture.wrapS = THREE.RepeatWrapping;