From 23a7dcbd332d59445718bd65f6137be95e6c7794 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 19 Aug 2019 02:19:37 +0900 Subject: [PATCH] Improve readability --- src/client/app/common/scripts/room/room.ts | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/client/app/common/scripts/room/room.ts b/src/client/app/common/scripts/room/room.ts index b277da92a..4966302ef 100644 --- a/src/client/app/common/scripts/room/room.ts +++ b/src/client/app/common/scripts/room/room.ts @@ -21,6 +21,9 @@ type Options = { useOrthographicCamera: boolean; }; +/** + * MisskeyRoom Core Engine + */ export class Room { private clock: THREE.Clock; private scene: THREE.Scene; @@ -450,6 +453,7 @@ export class Room { const furniture = this.furnitures.find(furniture => furniture.id === model.name); const def = furnitureDefs.find(d => d.id === furniture.type); if (def.texture == null) return; + model.traverse(child => { if (!(child instanceof THREE.Mesh)) return; for (const t of Object.keys(def.texture)) { @@ -520,13 +524,12 @@ export class Room { if (intersects.length > 0) { const intersected = this.getRoot(intersects[0].object); - if (!this.isSelectedObject(intersected)) { - intersected.traverse(child => { - if (child instanceof THREE.Mesh) { - (child.material as THREE.MeshStandardMaterial).emissive.setHex(0x191919); - } - }); - } + if (this.isSelectedObject(intersected)) return; + intersected.traverse(child => { + if (child instanceof THREE.Mesh) { + (child.material as THREE.MeshStandardMaterial).emissive.setHex(0x191919); + } + }); } }