diff --git a/packages/frontend/assets/room/objects/power-strip/power-strip.blend b/packages/frontend/assets/room/objects/power-strip/power-strip.blend new file mode 100644 index 0000000000..7acd1e7205 Binary files /dev/null and b/packages/frontend/assets/room/objects/power-strip/power-strip.blend differ diff --git a/packages/frontend/assets/room/objects/power-strip/power-strip.glb b/packages/frontend/assets/room/objects/power-strip/power-strip.glb new file mode 100644 index 0000000000..2e222e3fc1 Binary files /dev/null and b/packages/frontend/assets/room/objects/power-strip/power-strip.glb differ diff --git a/packages/frontend/assets/room/objects/snakeplant/snakeplant.blend b/packages/frontend/assets/room/objects/snakeplant/snakeplant.blend new file mode 100644 index 0000000000..565b9ea377 Binary files /dev/null and b/packages/frontend/assets/room/objects/snakeplant/snakeplant.blend differ diff --git a/packages/frontend/assets/room/objects/snakeplant/snakeplant.glb b/packages/frontend/assets/room/objects/snakeplant/snakeplant.glb new file mode 100644 index 0000000000..1b9a0575d2 Binary files /dev/null and b/packages/frontend/assets/room/objects/snakeplant/snakeplant.glb differ diff --git a/packages/frontend/assets/room/rooms/default/300-wall-demado.glb b/packages/frontend/assets/room/rooms/default/300-wall-demado.glb index 67e3659e0e..d2db281582 100644 Binary files a/packages/frontend/assets/room/rooms/default/300-wall-demado.glb and b/packages/frontend/assets/room/rooms/default/300-wall-demado.glb differ diff --git a/packages/frontend/assets/room/rooms/default/default.blend b/packages/frontend/assets/room/rooms/default/default.blend index 0150c264eb..d28972e9f6 100644 Binary files a/packages/frontend/assets/room/rooms/default/default.blend and b/packages/frontend/assets/room/rooms/default/default.blend differ diff --git a/packages/frontend/src/pages/room.vue b/packages/frontend/src/pages/room.vue index f631f1f253..217926f36f 100644 --- a/packages/frontend/src/pages/room.vue +++ b/packages/frontend/src/pages/room.vue @@ -69,7 +69,7 @@ onMounted(() => { id: 'c', type: 'desk', position: [-115, 0, 85], - rotation: [0, 0, 0], + rotation: [0, Math.PI, 0], }, { id: 'd', type: 'monitor', @@ -80,7 +80,7 @@ onMounted(() => { id: 'd2', type: 'keyboard', position: [-110, 70, 85], - rotation: [0, 0, 0], + rotation: [0, Math.PI, 0], sticky: 'c', }, { id: 'e', @@ -97,6 +97,11 @@ onMounted(() => { type: 'monstera', position: [-55, 90, 175], rotation: [0, 0, 0], + }, { + id: 'f3', + type: 'snakeplant', + position: [-25, 90, 170], + rotation: [0, 0, 0], }, { id: 'g', type: 'mug', @@ -123,6 +128,12 @@ onMounted(() => { position: [130, 100, 115], rotation: [0, Math.PI / 2, 0], sticky: 'j', + }, { + id: 'j3', + type: 'power-strip', + position: [130, 13, 115], + rotation: [0, Math.PI / 2, 0], + sticky: 'j', }, { id: 'k', type: 'cup-noodle', @@ -145,7 +156,7 @@ onMounted(() => { id: 'n', type: 'milk', position: [-120, 70, 130], - rotation: [0, -1.5, 0], + rotation: [0, 1.5, 0], sticky: 'c', }, { id: 'o', diff --git a/packages/frontend/src/utility/room/engine.ts b/packages/frontend/src/utility/room/engine.ts index 2bb6957492..1df0e54abf 100644 --- a/packages/frontend/src/utility/room/engine.ts +++ b/packages/frontend/src/utility/room/engine.ts @@ -305,6 +305,12 @@ const OBJECTS = { 'wood-sound-absorbing-panel': { placement: 'side', }, + 'power-strip': { + placement: 'top', + }, + 'snakeplant': { + placement: 'top', + }, } as Record; const _assumedFramesPerSecond = 60;