diff --git a/magic-mirror/src/scene/root.js b/magic-mirror/src/scene/root.js index 1e4ec1c..226affa 100644 --- a/magic-mirror/src/scene/root.js +++ b/magic-mirror/src/scene/root.js @@ -10,6 +10,7 @@ import { createRats } from './rat.js'; import { PictureFrame } from './PictureFrame.js'; import painting1 from '/textures/painting1.jpg'; import painting2 from '/textures/painting2.jpg'; +import painting3 from '/textures/painting3.jpg'; import floorTextureUrl from '/textures/stone_floor.png'; import tableTextureUrl from '/textures/wood.png'; @@ -147,6 +148,7 @@ export function createSceneObjects() { createBookshelf(-state.roomSize/2 + 0.2, state.roomSize/2*0.7, Math.PI/2, 0); createBookshelf(-state.roomSize/2 * 0.7, -state.roomSize/2+0.3, 0, 1); + // next to bookshelf const pictureFrame = new PictureFrame(state.scene, { position: new THREE.Vector3(-state.roomSize/2, 1.7, -state.roomSize/2 + 0.7), width: 0.7, @@ -157,20 +159,22 @@ export function createSceneObjects() { state.pictureFrames.push(pictureFrame); + // on fireplace const pictureFrame2 = new PictureFrame(state.scene, { - position: new THREE.Vector3(state.roomSize/2 - 0.9, 1.7, -1.1), - width: 0.8, - height: 0.5, - imageUrls: [painting2, painting1], + position: new THREE.Vector3(state.roomSize/2 - 0.9, 1.8, -1.1), + width: 0.5, + height: 0.7, + imageUrls: [painting2, painting1, painting3], rotationY: -Math.PI / 2 }); state.pictureFrames.push(pictureFrame2); + // next to fireplace const pictureFrame3 = new PictureFrame(state.scene, { position: new THREE.Vector3(state.roomSize/2, 1.7, 0.75), width: 0.7, height: 1.2, - imageUrls: [painting2, painting1], + imageUrls: [painting3, painting2, painting1, painting3], rotationY: -Math.PI / 2 }); state.pictureFrames.push(pictureFrame3); diff --git a/magic-mirror/textures/painting1.jpg b/magic-mirror/textures/painting1.jpg index 8ff623c..1dd5a1f 100644 Binary files a/magic-mirror/textures/painting1.jpg and b/magic-mirror/textures/painting1.jpg differ diff --git a/magic-mirror/textures/painting2.jpg b/magic-mirror/textures/painting2.jpg index 5a542cc..f78c306 100644 Binary files a/magic-mirror/textures/painting2.jpg and b/magic-mirror/textures/painting2.jpg differ diff --git a/magic-mirror/textures/painting3.jpg b/magic-mirror/textures/painting3.jpg new file mode 100644 index 0000000..ed02f6a Binary files /dev/null and b/magic-mirror/textures/painting3.jpg differ