diff --git a/packages/frontend/assets/room/objects/book/book.glb b/packages/frontend/assets/room/objects/book/book.glb index dd9114a851..ab9eb74faf 100644 Binary files a/packages/frontend/assets/room/objects/book/book.glb and b/packages/frontend/assets/room/objects/book/book.glb differ diff --git a/packages/frontend/assets/room/objects/book/textures/book.png b/packages/frontend/assets/room/objects/book/textures/book.png index 65c306d8ee..ce894995c2 100644 Binary files a/packages/frontend/assets/room/objects/book/textures/book.png and b/packages/frontend/assets/room/objects/book/textures/book.png differ diff --git a/packages/frontend/assets/room/objects/book2/barcode.png b/packages/frontend/assets/room/objects/book2/barcode.png deleted file mode 100644 index 37cfe5add3..0000000000 Binary files a/packages/frontend/assets/room/objects/book2/barcode.png and /dev/null differ diff --git a/packages/frontend/assets/room/objects/book2/book2.blend b/packages/frontend/assets/room/objects/book2/book2.blend deleted file mode 100644 index e0fdb48101..0000000000 Binary files a/packages/frontend/assets/room/objects/book2/book2.blend and /dev/null differ diff --git a/packages/frontend/assets/room/objects/book2/book2.glb b/packages/frontend/assets/room/objects/book2/book2.glb deleted file mode 100644 index 2b26402f8c..0000000000 Binary files a/packages/frontend/assets/room/objects/book2/book2.glb and /dev/null differ diff --git a/packages/frontend/assets/room/objects/book2/texture.afdesign b/packages/frontend/assets/room/objects/book2/texture.afdesign deleted file mode 100644 index b63771607a..0000000000 Binary files a/packages/frontend/assets/room/objects/book2/texture.afdesign and /dev/null differ diff --git a/packages/frontend/assets/room/objects/book2/texture.png b/packages/frontend/assets/room/objects/book2/texture.png deleted file mode 100644 index 5aa84f0340..0000000000 Binary files a/packages/frontend/assets/room/objects/book2/texture.png and /dev/null differ diff --git a/packages/frontend/assets/room/objects/book2/uv.png b/packages/frontend/assets/room/objects/book2/uv.png deleted file mode 100644 index 61c4fb0400..0000000000 Binary files a/packages/frontend/assets/room/objects/book2/uv.png and /dev/null differ diff --git a/packages/frontend/src/pages/room.vue b/packages/frontend/src/pages/room.vue index 26a0fe37eb..c6339ad2ae 100644 --- a/packages/frontend/src/pages/room.vue +++ b/packages/frontend/src/pages/room.vue @@ -158,7 +158,7 @@ onMounted(() => { type: 'book', position: [10, 100, 10], rotation: [0, 0, 0], - variation: '1', + variation: 1, }, { id: 'u', type: 'bed', diff --git a/packages/frontend/src/utility/room/engine.ts b/packages/frontend/src/utility/room/engine.ts index cfd929957d..5b948272fd 100644 --- a/packages/frontend/src/utility/room/engine.ts +++ b/packages/frontend/src/utility/room/engine.ts @@ -105,21 +105,18 @@ const OBJECTS = { const mesh = obj.meshes[2] as BABYLON.Mesh; console.log(obj.meshes); mesh.markVerticesDataAsUpdatable(BABYLON.VertexBuffer.UVKind, true); - if (o.variation === '1') { - const index = 0; - const x = index % 8; - const y = Math.floor(index / 8); + const index = o.variation; + const x = index % 8; + const y = Math.floor(index / 8); - const uvs = mesh.getVerticesData(BABYLON.VertexBuffer.UVKind)!; - for (let i = 0; i < uvs.length / 2; i++) { - const u = uvs[i * 2]; - const v = uvs[i * 2 + 1]; - - uvs[i * 2] = u / 8; - uvs[i * 2 + 1] = v / 8; - } - mesh.updateVerticesData(BABYLON.VertexBuffer.UVKind, uvs); + const uvs = mesh.getVerticesData(BABYLON.VertexBuffer.UVKind)!; + for (let i = 0; i < uvs.length / 2; i++) { + const u = uvs[i * 2]; + const v = uvs[i * 2 + 1]; + uvs[i * 2] = (u / 8) + (x / 8); + uvs[i * 2 + 1] = (v / 8) + (y / 8); } + mesh.updateVerticesData(BABYLON.VertexBuffer.UVKind, uvs); }, }, 'lava-lamp': {