diff --git a/packages/frontend/assets/room/objects/bed/bed.blend b/packages/frontend/assets/room/objects/bed/bed.blend index 731df76d0c..49e1943fe4 100644 Binary files a/packages/frontend/assets/room/objects/bed/bed.blend and b/packages/frontend/assets/room/objects/bed/bed.blend differ diff --git a/packages/frontend/assets/room/objects/bed/bed.glb b/packages/frontend/assets/room/objects/bed/bed.glb index f35ecb9ef4..566d4eda70 100644 Binary files a/packages/frontend/assets/room/objects/bed/bed.glb and b/packages/frontend/assets/room/objects/bed/bed.glb differ diff --git a/packages/frontend/assets/room/rooms/default.blend b/packages/frontend/assets/room/rooms/default.blend index 6431dc1eea..d38326f845 100644 Binary files a/packages/frontend/assets/room/rooms/default.blend and b/packages/frontend/assets/room/rooms/default.blend differ diff --git a/packages/frontend/assets/room/rooms/default.glb b/packages/frontend/assets/room/rooms/default.glb index 3f41b8a451..149484d48f 100644 Binary files a/packages/frontend/assets/room/rooms/default.glb and b/packages/frontend/assets/room/rooms/default.glb differ diff --git a/packages/frontend/src/pages/room.vue b/packages/frontend/src/pages/room.vue index 23d743446c..26a0fe37eb 100644 --- a/packages/frontend/src/pages/room.vue +++ b/packages/frontend/src/pages/room.vue @@ -136,7 +136,7 @@ onMounted(() => { }, { id: 'p', type: 'tv', - position: [-115, 0, -85], + position: [-135, 88, -5], rotation: [0, 0, 0], }, { id: 'q', @@ -159,6 +159,11 @@ onMounted(() => { position: [10, 100, 10], rotation: [0, 0, 0], variation: '1', + }, { + id: 'u', + type: 'bed', + position: [-30, 0, -100], + rotation: [0, 0, 0], }], }, { canvas: canvas.value!, diff --git a/packages/frontend/src/utility/room/engine.ts b/packages/frontend/src/utility/room/engine.ts index ed209584f4..cfd929957d 100644 --- a/packages/frontend/src/utility/room/engine.ts +++ b/packages/frontend/src/utility/room/engine.ts @@ -212,6 +212,9 @@ const OBJECTS = { 'opened-cardboard-box': { placement: 'top', }, + 'bed': { + placement: 'top', + }, } as Record; function vecToLocal(vector: BABYLON.Vector3, mesh: BABYLON.Mesh): BABYLON.Vector3 { @@ -354,7 +357,7 @@ export class RoomEngine { descendantStickyObjectIds: string[]; } | null = null; private highlightedObjectId: string | null = null; - private time: 0 | 1 | 2 = 1; // 0: 昼, 1: 夕, 2: 夜 + private time: 0 | 1 | 2 = 0; // 0: 昼, 1: 夕, 2: 夜 private roomCollisionMeshes: BABYLON.AbstractMesh[] = []; private def: RoomDef; public enableGridSnapping = false; @@ -665,7 +668,7 @@ export class RoomEngine { grabbing.ghost.position.x = Math.round(grabbing.ghost.position.x / scale) * scale; grabbing.ghost.position.y = Math.round(grabbing.ghost.position.y / scale) * scale; grabbing.ghost.position.z = Math.round(grabbing.ghost.position.z / scale) * scale; - grabbing.ghost.rotation.y = Math.round(grabbing.ghost.rotation.y / (Math.PI / 4)) * (Math.PI / 4); + grabbing.ghost.rotation.y = Math.round(grabbing.ghost.rotation.y / (Math.PI / 8)) * (Math.PI / 8); } const newPos = grabbing.ghost.position.clone();