diff --git a/gulpfile.ts b/gulpfile.ts index 2bd61cad2..262c0a503 100644 --- a/gulpfile.ts +++ b/gulpfile.ts @@ -38,7 +38,11 @@ gulp.task('build:copy:locales', cb => { cb(); }); -gulp.task('build:copy', gulp.parallel('build:copy:views', 'build:copy:locales', () => +gulp.task('build:copy:fonts', () => + gulp.src('./node_modules/three/examples/fonts/**/*').pipe(gulp.dest('./built/client/assets/fonts/')) +); + +gulp.task('build:copy', gulp.parallel('build:copy:views', 'build:copy:locales', 'build:copy:fonts', () => gulp.src([ './src/emojilist.json', './src/server/web/views/**/*', diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 5bc978492..ffe0a358a 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -501,6 +501,7 @@ userSilenced: "このユーザーはサイレンスされています。" sidebar: "サイドバー" divider: "分割線" addItem: "項目を追加" +rooms: "ルーム" _theme: explore: "テーマを探す" @@ -736,6 +737,67 @@ _timelines: social: "ソーシャル" global: "グローバル" +_rooms: + roomOf: "{user}のルーム" + addFurniture: "家具を置く" + translate: "移動" + rotate: "回転" + exit: "戻る" + remove: "しまう" + clear: "片付け" + clearConfirm: "全ての家具をしまいますか?" + leaveConfirm: "未保存の変更があります、移動しますか?" + chooseImage: "画像を選択" + roomType: "部屋のタイプ" + carpetColor: "床の色" + _roomType: + default: "デフォルト" + washitsu: "和室" + _furnitures: + milk: "牛乳パック" + bed: "ベッド" + low-table: "ローテーブル" + desk: "デスク" + chair: "チェア" + chair2: "チェア2" + fan: "換気扇" + pc: "パソコン" + plant: "観葉植物" + plant2: "観葉植物2" + eraser: "消しゴム" + pencil: "鉛筆" + pudding: "プリン" + cardboard-box: "段ボール箱" + cardboard-box2: "段ボール箱2" + cardboard-box3: "段ボール箱3" + book: "本" + book2: "本2" + piano: "ピアノ" + facial-tissue: "ティッシュボックス" + server: "サーバー" + moon: "月" + corkboard: "コルクボード" + mousepad: "マウスパッド" + monitor: "モニター" + keyboard: "キーボード" + carpet-stripe: "カーペット(縞)" + mat: "マット" + color-box: "カラーボックス" + wall-clock: "壁掛け時計" + photoframe: "額縁" + cube: "キューブ" + tv: "テレビ" + pinguin: "ピンギン" + rubik-cube: "ルービックキューブ" + poster-h: "ポスター(横長)" + poster-v: "ポスター(縦長)" + sofa: "ソファ" + spiral: "螺旋階段" + bin: "ゴミ箱" + cup-noodle: "カップ麺" + holo-display: "ホログラフィックディスプレイ" + energy-drink: "エナジードリンク" + _pages: newPage: "ページの作成" editPage: "ページの編集" diff --git a/src/client/assets/room/furnitures/bed/bed.blend b/src/client/assets/room/furnitures/bed/bed.blend new file mode 100644 index 000000000..d29f77477 --- /dev/null +++ b/src/client/assets/room/furnitures/bed/bed.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15ccf449b85d73ef668a7742b6d1c7123c622061685644ba3acd7a179cb2abea +size 573584 diff --git a/src/client/assets/room/furnitures/bed/bed.glb b/src/client/assets/room/furnitures/bed/bed.glb new file mode 100644 index 000000000..deed11583 --- /dev/null +++ b/src/client/assets/room/furnitures/bed/bed.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b29c807a0128c4e11e8acf2c523f8932102491a9d25fffad08ac2e46d2accdb7 +size 8944 diff --git a/src/client/assets/room/furnitures/bin/bin.blend b/src/client/assets/room/furnitures/bin/bin.blend new file mode 100644 index 000000000..085ab7d69 --- /dev/null +++ b/src/client/assets/room/furnitures/bin/bin.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:30a73e9b039288782b943fa3bd7115cb9133335156f59773308dc87a6d3afaa9 +size 695512 diff --git a/src/client/assets/room/furnitures/bin/bin.glb b/src/client/assets/room/furnitures/bin/bin.glb new file mode 100644 index 000000000..d103e011d --- /dev/null +++ b/src/client/assets/room/furnitures/bin/bin.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:922de39569c278efb41ff7946be65f41db3009d63e510ff90bbeafb0cbf2e846 +size 22140 diff --git a/src/client/assets/room/furnitures/book/book.blend b/src/client/assets/room/furnitures/book/book.blend new file mode 100644 index 000000000..c3414b35d --- /dev/null +++ b/src/client/assets/room/furnitures/book/book.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82b4157520423c3c3f400bf2773814530083fcb978b2777e5b20fe7945807cd3 +size 511864 diff --git a/src/client/assets/room/furnitures/book/book.glb b/src/client/assets/room/furnitures/book/book.glb new file mode 100644 index 000000000..e4267889f --- /dev/null +++ b/src/client/assets/room/furnitures/book/book.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b0018d07eb02779d2d4df30832cf5dea8093f2e7c8e192c022088b81e2309f3 +size 4304 diff --git a/src/client/assets/room/furnitures/book2/barcode.png b/src/client/assets/room/furnitures/book2/barcode.png new file mode 100644 index 000000000..3060216c3 --- /dev/null +++ b/src/client/assets/room/furnitures/book2/barcode.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0315c2c837d5aacd0dcc0fa39be488718001d88f93eef7c473e85296c0253e85 +size 3505 diff --git a/src/client/assets/room/furnitures/book2/book2.blend b/src/client/assets/room/furnitures/book2/book2.blend new file mode 100644 index 000000000..69d04347d --- /dev/null +++ b/src/client/assets/room/furnitures/book2/book2.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e8add369aaa438e5ca9dda18240b2b132485af5e737629f0ec955f35266b27b1 +size 521456 diff --git a/src/client/assets/room/furnitures/book2/book2.glb b/src/client/assets/room/furnitures/book2/book2.glb new file mode 100644 index 000000000..398bcbde9 --- /dev/null +++ b/src/client/assets/room/furnitures/book2/book2.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:013351dfcbfa131ffe1df7d6fe01085f72ba3fd01fa5492ed1f68927a4ede0e8 +size 82920 diff --git a/src/client/assets/room/furnitures/book2/texture.afdesign b/src/client/assets/room/furnitures/book2/texture.afdesign new file mode 100644 index 000000000..b352ea18c --- /dev/null +++ b/src/client/assets/room/furnitures/book2/texture.afdesign @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f63668362fe42fde57e982c7211fdcca0af9791d646db3bd1ae18aca7e63733b +size 875434 diff --git a/src/client/assets/room/furnitures/book2/texture.png b/src/client/assets/room/furnitures/book2/texture.png new file mode 100644 index 000000000..e17aac0bf --- /dev/null +++ b/src/client/assets/room/furnitures/book2/texture.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8d1e783d043aba4d11be9098aa4e394375a517ebcf6a967d2a6dfcc064b0cfe +size 61019 diff --git a/src/client/assets/room/furnitures/book2/uv.png b/src/client/assets/room/furnitures/book2/uv.png new file mode 100644 index 000000000..854afddef --- /dev/null +++ b/src/client/assets/room/furnitures/book2/uv.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b28aae9b328e153cfe9b3ba77785d1b6c25507abb541c0b38856b007dd8c51c2 +size 8611 diff --git a/src/client/assets/room/furnitures/cardboard-box/cardboard-box.blend b/src/client/assets/room/furnitures/cardboard-box/cardboard-box.blend new file mode 100644 index 000000000..4d0af51ee --- /dev/null +++ b/src/client/assets/room/furnitures/cardboard-box/cardboard-box.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65f5cac6531dc9b862c37f03998038f924f15bb8a71c709f73c2b0dcced74430 +size 515036 diff --git a/src/client/assets/room/furnitures/cardboard-box/cardboard-box.glb b/src/client/assets/room/furnitures/cardboard-box/cardboard-box.glb new file mode 100644 index 000000000..8b80cff8e --- /dev/null +++ b/src/client/assets/room/furnitures/cardboard-box/cardboard-box.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:56b4c466557325b1a2e301f0f241e9e7b1698ab2b01800a9f2d264f330c87de2 +size 4568 diff --git a/src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.blend b/src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.blend new file mode 100644 index 000000000..b241853e6 --- /dev/null +++ b/src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e23e45111feb3947b2d1dec2fc7a084b4fb0c24f9bb316f99a415f565e7e6f35 +size 545788 diff --git a/src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.glb b/src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.glb new file mode 100644 index 000000000..844bf0c17 --- /dev/null +++ b/src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c6e8ccda401f74612e46635879d218bcef7bf9eabf3ab855e4d3ab87a33e87b +size 24084 diff --git a/src/client/assets/room/furnitures/cardboard-box2/texture.png b/src/client/assets/room/furnitures/cardboard-box2/texture.png new file mode 100644 index 000000000..e42a35341 --- /dev/null +++ b/src/client/assets/room/furnitures/cardboard-box2/texture.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e22b6e1536524e61af923e820c646375da2e4c51a8022aa27d3cd66778c47012 +size 16879 diff --git a/src/client/assets/room/furnitures/cardboard-box2/uv.png b/src/client/assets/room/furnitures/cardboard-box2/uv.png new file mode 100644 index 000000000..75c4d9faf --- /dev/null +++ b/src/client/assets/room/furnitures/cardboard-box2/uv.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:018cc95f86fedb0b6009ab72b5dc7d22d63ca8044a995560305cde4764c82f4e +size 4630 diff --git a/src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.blend b/src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.blend new file mode 100644 index 000000000..4a401ebd4 --- /dev/null +++ b/src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a9d8aec2b62d5b83c0c208f3fedbc9869e5bfcf88db36a88d8eb222287f3d28 +size 547868 diff --git a/src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.glb b/src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.glb new file mode 100644 index 000000000..10b8f258d --- /dev/null +++ b/src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e894027574234de83b4cd00c793b03f6a61928c206d2360e8b8797e354e89f03 +size 23668 diff --git a/src/client/assets/room/furnitures/cardboard-box3/texture.png b/src/client/assets/room/furnitures/cardboard-box3/texture.png new file mode 100644 index 000000000..71682dde6 --- /dev/null +++ b/src/client/assets/room/furnitures/cardboard-box3/texture.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5cc095b8fdd976444a167f1d390fdc03d8c1b8a5fda1002605e01fcfebb67905 +size 16204 diff --git a/src/client/assets/room/furnitures/cardboard-box3/texture.xcf b/src/client/assets/room/furnitures/cardboard-box3/texture.xcf new file mode 100644 index 000000000..50c9a6ddb --- /dev/null +++ b/src/client/assets/room/furnitures/cardboard-box3/texture.xcf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c6b5379f1e847686aeae3cb3d427e9bb36b28ea3641097b2c83441379a0d551f +size 242066 diff --git a/src/client/assets/room/furnitures/cardboard-box3/uv.png b/src/client/assets/room/furnitures/cardboard-box3/uv.png new file mode 100644 index 000000000..39349c56f --- /dev/null +++ b/src/client/assets/room/furnitures/cardboard-box3/uv.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97108bd40e8fcf8606a111c0edeb207b36a74ac04cf768ba9875159a6ccc8374 +size 3598 diff --git a/src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.blend b/src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.blend new file mode 100644 index 000000000..f38c7b382 --- /dev/null +++ b/src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c67916c00bbb2238fd8801bd33ddd8619aaf2f58a53da8dd5b4c096279487613 +size 481784 diff --git a/src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.glb b/src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.glb new file mode 100644 index 000000000..9970d95bc --- /dev/null +++ b/src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1885b00a8c0a89d2e3900ef050ab6fa7fdb09f8b210708d566dc8ea2478ca8f4 +size 4956 diff --git a/src/client/assets/room/furnitures/chair/chair.blend b/src/client/assets/room/furnitures/chair/chair.blend new file mode 100644 index 000000000..723d3e930 --- /dev/null +++ b/src/client/assets/room/furnitures/chair/chair.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88e68d22f3aca5ca26a2511dbbb99720d882081f89dee424379b2641d4479014 +size 500696 diff --git a/src/client/assets/room/furnitures/chair/chair.glb b/src/client/assets/room/furnitures/chair/chair.glb new file mode 100644 index 000000000..6a70ec971 --- /dev/null +++ b/src/client/assets/room/furnitures/chair/chair.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fda0768a319578ba7a672d8ca6ca950998e1f84ba35e4b0e15a4808a5f1fddd4 +size 4252 diff --git a/src/client/assets/room/furnitures/chair2/chair2.blend b/src/client/assets/room/furnitures/chair2/chair2.blend new file mode 100644 index 000000000..a8bc3c0f6 --- /dev/null +++ b/src/client/assets/room/furnitures/chair2/chair2.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe61ce7c2c55624aab45345ef014b23437f4b30a30f251ab7e8967b18bb9f760 +size 523036 diff --git a/src/client/assets/room/furnitures/chair2/chair2.glb b/src/client/assets/room/furnitures/chair2/chair2.glb new file mode 100644 index 000000000..b7a8d57f0 --- /dev/null +++ b/src/client/assets/room/furnitures/chair2/chair2.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:086182612b99abb5f710d5794caab88a858e8b8e9756f1b14c2e002cf330cc6b +size 6140 diff --git a/src/client/assets/room/furnitures/color-box/color-box.blend b/src/client/assets/room/furnitures/color-box/color-box.blend new file mode 100644 index 000000000..492609d74 --- /dev/null +++ b/src/client/assets/room/furnitures/color-box/color-box.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:894eec14bb5cfd5ef12222c741f740b0a183748aefc2803d16e5afda52387677 +size 631168 diff --git a/src/client/assets/room/furnitures/color-box/color-box.glb b/src/client/assets/room/furnitures/color-box/color-box.glb new file mode 100644 index 000000000..b4ff5818b --- /dev/null +++ b/src/client/assets/room/furnitures/color-box/color-box.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd09a7d9b7b3430d375bb4d670740b28a3ecb43c0013d8611abf2c4408ca2116 +size 7492 diff --git a/src/client/assets/room/furnitures/corkboard/corkboard.blend b/src/client/assets/room/furnitures/corkboard/corkboard.blend new file mode 100644 index 000000000..f0b32a1f2 --- /dev/null +++ b/src/client/assets/room/furnitures/corkboard/corkboard.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a7f3e3c3716f284a89f09392f50c4a8c9988ef9905f08749c08e5e6b93d58a2 +size 565404 diff --git a/src/client/assets/room/furnitures/corkboard/corkboard.glb b/src/client/assets/room/furnitures/corkboard/corkboard.glb new file mode 100644 index 000000000..42b5bbd81 --- /dev/null +++ b/src/client/assets/room/furnitures/corkboard/corkboard.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9036429f384589d5154960ba23852a031d3b8c67e21f983879335ae71895dc57 +size 7180 diff --git a/src/client/assets/room/furnitures/cube/cube.blend b/src/client/assets/room/furnitures/cube/cube.blend new file mode 100644 index 000000000..3e39d13b2 --- /dev/null +++ b/src/client/assets/room/furnitures/cube/cube.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:acda43ccfbc21f46076a14cb12a22f1d246244835922015541f6f4930012893b +size 646184 diff --git a/src/client/assets/room/furnitures/cube/cube.glb b/src/client/assets/room/furnitures/cube/cube.glb new file mode 100644 index 000000000..e7582ade5 --- /dev/null +++ b/src/client/assets/room/furnitures/cube/cube.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f70817e90861ddc17173e79986f5ac02447635c0cc6edd8eec8f8eabd685678a +size 188392 diff --git a/src/client/assets/room/furnitures/cup-noodle/cup-noodle.blend b/src/client/assets/room/furnitures/cup-noodle/cup-noodle.blend new file mode 100644 index 000000000..634d9b968 --- /dev/null +++ b/src/client/assets/room/furnitures/cup-noodle/cup-noodle.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe74414b9ee97aa5e7c4277a55fa2b435f88e9a433836b6ab6f7492d28bffbc7 +size 855164 diff --git a/src/client/assets/room/furnitures/cup-noodle/cup-noodle.glb b/src/client/assets/room/furnitures/cup-noodle/cup-noodle.glb new file mode 100644 index 000000000..6bebc35b0 --- /dev/null +++ b/src/client/assets/room/furnitures/cup-noodle/cup-noodle.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e3049adb1616d738128742ede31ac73fccb7f3f9a7847985b8c33bdd74b967b +size 318332 diff --git a/src/client/assets/room/furnitures/cup-noodle/noodle.png b/src/client/assets/room/furnitures/cup-noodle/noodle.png new file mode 100644 index 000000000..360dffd4c --- /dev/null +++ b/src/client/assets/room/furnitures/cup-noodle/noodle.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:79d46dbef576aa8cb1ad71d985ad3fbb0c7e6a0e0f0cb2842b4b0b80155bde5b +size 297154 diff --git a/src/client/assets/room/furnitures/desk/desk.blend b/src/client/assets/room/furnitures/desk/desk.blend new file mode 100644 index 000000000..500e42ef9 --- /dev/null +++ b/src/client/assets/room/furnitures/desk/desk.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a69dcce9ae9e36d023681d6ef5662b90150f97a7feeca496483963285f4d4718 +size 541980 diff --git a/src/client/assets/room/furnitures/desk/desk.glb b/src/client/assets/room/furnitures/desk/desk.glb new file mode 100644 index 000000000..553fdce70 --- /dev/null +++ b/src/client/assets/room/furnitures/desk/desk.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5225fd9d3b6888182b6a68e79178cf56354687124db3ffc75f2de0ccaca3459b +size 10184 diff --git a/src/client/assets/room/furnitures/energy-drink/energy-drink.blend b/src/client/assets/room/furnitures/energy-drink/energy-drink.blend new file mode 100644 index 000000000..ca586fe11 --- /dev/null +++ b/src/client/assets/room/furnitures/energy-drink/energy-drink.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bce900486f2ec4b146ba783aa367e97ba726945cc03c55ec61cc808f9313e7fc +size 724764 diff --git a/src/client/assets/room/furnitures/energy-drink/energy-drink.glb b/src/client/assets/room/furnitures/energy-drink/energy-drink.glb new file mode 100644 index 000000000..f07d2f696 --- /dev/null +++ b/src/client/assets/room/furnitures/energy-drink/energy-drink.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2dada764e73fa2ad36f8687bd8a723bb4975564ef7133051fdd08d25be7e8daf +size 145836 diff --git a/src/client/assets/room/furnitures/energy-drink/texture.afdesign b/src/client/assets/room/furnitures/energy-drink/texture.afdesign new file mode 100644 index 000000000..0cdabe2a0 --- /dev/null +++ b/src/client/assets/room/furnitures/energy-drink/texture.afdesign @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d866ba40bdf8d3003e5d3a8513380c1fdabd50e3e48133d9da75493152d4bf07 +size 824566 diff --git a/src/client/assets/room/furnitures/energy-drink/texture.png b/src/client/assets/room/furnitures/energy-drink/texture.png new file mode 100644 index 000000000..41956382f --- /dev/null +++ b/src/client/assets/room/furnitures/energy-drink/texture.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1276fa7989fce26b53c3e46856f4b7e5578b7b9ebce58e9b882c92b2901ba3c8 +size 127510 diff --git a/src/client/assets/room/furnitures/energy-drink/uv.png b/src/client/assets/room/furnitures/energy-drink/uv.png new file mode 100644 index 000000000..03789d28e --- /dev/null +++ b/src/client/assets/room/furnitures/energy-drink/uv.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e104f38826828dd785bd793da10faae58bafd98a96b0f4ae4a2ecf97063fd8be +size 22142 diff --git a/src/client/assets/room/furnitures/eraser/cover.png b/src/client/assets/room/furnitures/eraser/cover.png new file mode 100644 index 000000000..ec41b03ea --- /dev/null +++ b/src/client/assets/room/furnitures/eraser/cover.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c1df07561fce6169ae1c7eeece2a98f173f8c07dceeb9bcd29b42c8ddb4047e7 +size 8336 diff --git a/src/client/assets/room/furnitures/eraser/cover.psd b/src/client/assets/room/furnitures/eraser/cover.psd new file mode 100644 index 000000000..9e02d8714 --- /dev/null +++ b/src/client/assets/room/furnitures/eraser/cover.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12d9201023121b13d2b3a19530e8d1252f09a7a00676f644456f35d6d720174a +size 219123 diff --git a/src/client/assets/room/furnitures/eraser/eraser-uv.png b/src/client/assets/room/furnitures/eraser/eraser-uv.png new file mode 100644 index 000000000..6006360f1 --- /dev/null +++ b/src/client/assets/room/furnitures/eraser/eraser-uv.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ffd2d61abf5a8ccc3e8d11d66103f80c17cb755f0c9badddc88b4fa53e0b78a +size 11164 diff --git a/src/client/assets/room/furnitures/eraser/eraser.blend b/src/client/assets/room/furnitures/eraser/eraser.blend new file mode 100644 index 000000000..7f2cd84c3 --- /dev/null +++ b/src/client/assets/room/furnitures/eraser/eraser.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c68e2a5505488f81acd5fb852b59c0f5d8803870be279b3852351007df544e76 +size 527996 diff --git a/src/client/assets/room/furnitures/eraser/eraser.glb b/src/client/assets/room/furnitures/eraser/eraser.glb new file mode 100644 index 000000000..82787c52a --- /dev/null +++ b/src/client/assets/room/furnitures/eraser/eraser.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:61d06064718cc9e3c076dbd2b4d2945600074585716acda49c29cf51d8613dd3 +size 15748 diff --git a/src/client/assets/room/furnitures/facial-tissue/facial-tissue-uv.png b/src/client/assets/room/furnitures/facial-tissue/facial-tissue-uv.png new file mode 100644 index 000000000..d34d42ba0 --- /dev/null +++ b/src/client/assets/room/furnitures/facial-tissue/facial-tissue-uv.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce6e482349c98659b38b62bf565b47e1c0176990c8fc84920e2462edd8b52482 +size 4470 diff --git a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.blend b/src/client/assets/room/furnitures/facial-tissue/facial-tissue.blend new file mode 100644 index 000000000..8d1bb2dfe --- /dev/null +++ b/src/client/assets/room/furnitures/facial-tissue/facial-tissue.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b7b7737cff040c95291d6707569f8aa03a7aa5e52b0c15f0b8e1082d0346f7e7 +size 533220 diff --git a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.glb b/src/client/assets/room/furnitures/facial-tissue/facial-tissue.glb new file mode 100644 index 000000000..c76a1dae7 --- /dev/null +++ b/src/client/assets/room/furnitures/facial-tissue/facial-tissue.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e59f36a617f6b8f7bea5a1ae7e8830a58e2cc549796a6054190523a7211d89f0 +size 8332 diff --git a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.png b/src/client/assets/room/furnitures/facial-tissue/facial-tissue.png new file mode 100644 index 000000000..f635c627f --- /dev/null +++ b/src/client/assets/room/furnitures/facial-tissue/facial-tissue.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f8c82f59ac0bfca0bfb10945811182749e8f34aaaa86a89d58307645b161435 +size 688 diff --git a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.psd b/src/client/assets/room/furnitures/facial-tissue/facial-tissue.psd new file mode 100644 index 000000000..733fc38ee --- /dev/null +++ b/src/client/assets/room/furnitures/facial-tissue/facial-tissue.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c4786393a8c9236f8d7f37d59987827005663a4a474bd4956a1e29cb8ac26ab +size 111968 diff --git a/src/client/assets/room/furnitures/fan/fan.blend b/src/client/assets/room/furnitures/fan/fan.blend new file mode 100644 index 000000000..b1882b468 --- /dev/null +++ b/src/client/assets/room/furnitures/fan/fan.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23dc5ce38f127c0a840839ce8e47708e3ef1765242a28455fd883e6dbd081d66 +size 772732 diff --git a/src/client/assets/room/furnitures/fan/fan.glb b/src/client/assets/room/furnitures/fan/fan.glb new file mode 100644 index 000000000..e872ec6e3 --- /dev/null +++ b/src/client/assets/room/furnitures/fan/fan.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65593e078bbb6861788cade8525b170364243780e2abf522f190691b4c87c46c +size 51612 diff --git a/src/client/assets/room/furnitures/holo-display/holo-display.blend b/src/client/assets/room/furnitures/holo-display/holo-display.blend new file mode 100644 index 000000000..d68ee2163 --- /dev/null +++ b/src/client/assets/room/furnitures/holo-display/holo-display.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17aa9c7d7ce954bca59e408cd3b3b0f7b0d31de84fd1071e960951331cf3cdb7 +size 788456 diff --git a/src/client/assets/room/furnitures/holo-display/holo-display.glb b/src/client/assets/room/furnitures/holo-display/holo-display.glb new file mode 100644 index 000000000..5e1c5c736 --- /dev/null +++ b/src/client/assets/room/furnitures/holo-display/holo-display.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:722007c0bd4f708eed7b822f92d57657ebb6061f9309439b3021e0b51207fdc8 +size 148928 diff --git a/src/client/assets/room/furnitures/holo-display/ray-uv.png b/src/client/assets/room/furnitures/holo-display/ray-uv.png new file mode 100644 index 000000000..b1865bc00 --- /dev/null +++ b/src/client/assets/room/furnitures/holo-display/ray-uv.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f49fe38d1e4c100896e881144b78d36001376760b12943485448b21460f6dd5 +size 20901 diff --git a/src/client/assets/room/furnitures/holo-display/ray.png b/src/client/assets/room/furnitures/holo-display/ray.png new file mode 100644 index 000000000..b16aac8c4 --- /dev/null +++ b/src/client/assets/room/furnitures/holo-display/ray.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d567d13d3d2d061c74dbcc3ffbb8b332a671807e20839764c6a6d56326a7a609 +size 104293 diff --git a/src/client/assets/room/furnitures/keyboard/keyboard.blend b/src/client/assets/room/furnitures/keyboard/keyboard.blend new file mode 100644 index 000000000..4b869ead4 --- /dev/null +++ b/src/client/assets/room/furnitures/keyboard/keyboard.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b11fabed75497140328006c5c7c0be1f31e11222c6b0b488c75457ad31266b7 +size 1005588 diff --git a/src/client/assets/room/furnitures/keyboard/keyboard.glb b/src/client/assets/room/furnitures/keyboard/keyboard.glb new file mode 100644 index 000000000..4acc8175d --- /dev/null +++ b/src/client/assets/room/furnitures/keyboard/keyboard.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aee2c2a48cfe9cc328412d738722f0ce0cab9cc4d7dc4ebe31c526248849f269 +size 132360 diff --git a/src/client/assets/room/furnitures/low-table/low-table.blend b/src/client/assets/room/furnitures/low-table/low-table.blend new file mode 100644 index 000000000..2dd52b263 --- /dev/null +++ b/src/client/assets/room/furnitures/low-table/low-table.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7daed384e1c2e124f1c4f24a61b3de81e891a1831246fb9680418b9a4a4ff7b5 +size 497336 diff --git a/src/client/assets/room/furnitures/low-table/low-table.glb b/src/client/assets/room/furnitures/low-table/low-table.glb new file mode 100644 index 000000000..4f00633ca --- /dev/null +++ b/src/client/assets/room/furnitures/low-table/low-table.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a233469453c623733b34ec4812a8ce2212d90e5f80922d2b4361fdec6d1bb852 +size 2364 diff --git a/src/client/assets/room/furnitures/mat/mat.blend b/src/client/assets/room/furnitures/mat/mat.blend new file mode 100644 index 000000000..4071fee17 --- /dev/null +++ b/src/client/assets/room/furnitures/mat/mat.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e3e76888ad544ef6b08cefef5d3dbf0f197f847dd49ded0b116e3cab887390db +size 489304 diff --git a/src/client/assets/room/furnitures/mat/mat.glb b/src/client/assets/room/furnitures/mat/mat.glb new file mode 100644 index 000000000..f443fd812 --- /dev/null +++ b/src/client/assets/room/furnitures/mat/mat.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:191fc3f4da2323cce9148168e9e324f640a1143036a39b22905fa77ee98225c2 +size 1700 diff --git a/src/client/assets/room/furnitures/milk/milk-uv.png b/src/client/assets/room/furnitures/milk/milk-uv.png new file mode 100644 index 000000000..47bf99fc9 --- /dev/null +++ b/src/client/assets/room/furnitures/milk/milk-uv.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04c6709a2fb7a64c91746826a2ad32df37b48c6d9d1817abc8534f3154966475 +size 16577 diff --git a/src/client/assets/room/furnitures/milk/milk.blend b/src/client/assets/room/furnitures/milk/milk.blend new file mode 100644 index 000000000..09edab85d --- /dev/null +++ b/src/client/assets/room/furnitures/milk/milk.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6cd53f03bc3693a02f4e39687f208ac00dccb4bfbdbf322ad7bbae0e64bce340 +size 539836 diff --git a/src/client/assets/room/furnitures/milk/milk.glb b/src/client/assets/room/furnitures/milk/milk.glb new file mode 100644 index 000000000..e8b39ebf9 --- /dev/null +++ b/src/client/assets/room/furnitures/milk/milk.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3d012ad177ecb771bab7a9e746800ed09a31db9b6106632c4777a97544301a6 +size 8456 diff --git a/src/client/assets/room/furnitures/milk/milk.png b/src/client/assets/room/furnitures/milk/milk.png new file mode 100644 index 000000000..6bd085022 --- /dev/null +++ b/src/client/assets/room/furnitures/milk/milk.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dea0f1ffe01f47c17a5d37a17cd641bea9611a827128db8f5dfb1ab9648a4d89 +size 658 diff --git a/src/client/assets/room/furnitures/milk/milk.psd b/src/client/assets/room/furnitures/milk/milk.psd new file mode 100644 index 000000000..f606cd52c --- /dev/null +++ b/src/client/assets/room/furnitures/milk/milk.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e68dd2bcf0f4b0794b1acea8e38d8f38ff83c3c9c1ac68c3112845c3ed9cba9 +size 125415 diff --git a/src/client/assets/room/furnitures/monitor/monitor.blend b/src/client/assets/room/furnitures/monitor/monitor.blend new file mode 100644 index 000000000..08621e856 --- /dev/null +++ b/src/client/assets/room/furnitures/monitor/monitor.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9232f4ce34dc57607ae61aa186c7d825e17fe527ce9ac44237013524ce351804 +size 586820 diff --git a/src/client/assets/room/furnitures/monitor/monitor.glb b/src/client/assets/room/furnitures/monitor/monitor.glb new file mode 100644 index 000000000..6b7718935 --- /dev/null +++ b/src/client/assets/room/furnitures/monitor/monitor.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f2ea45916b49fd9ffdc09bc8a4d1e23b99e810e8224572947cd68b2fd9a49c9 +size 35300 diff --git a/src/client/assets/room/furnitures/monitor/monitor.psd b/src/client/assets/room/furnitures/monitor/monitor.psd new file mode 100644 index 000000000..4bc2c729c --- /dev/null +++ b/src/client/assets/room/furnitures/monitor/monitor.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d825d08c1f18906f3a16137a9fc7a25a057517a85971f9782363559cf121b5b0 +size 3692204 diff --git a/src/client/assets/room/furnitures/monitor/screen-uv.png b/src/client/assets/room/furnitures/monitor/screen-uv.png new file mode 100644 index 000000000..17b9ea333 --- /dev/null +++ b/src/client/assets/room/furnitures/monitor/screen-uv.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e46d7799e60df44f554abb551672a574051e1e59bea990245e4b7b25819b53f0 +size 1495 diff --git a/src/client/assets/room/furnitures/monitor/screen.jpg b/src/client/assets/room/furnitures/monitor/screen.jpg new file mode 100644 index 000000000..38312e831 --- /dev/null +++ b/src/client/assets/room/furnitures/monitor/screen.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1422820708bc1d10c78fc2982208851b01d75c534819f2a72fca7386c088672 +size 24842 diff --git a/src/client/assets/room/furnitures/moon/moon.blend b/src/client/assets/room/furnitures/moon/moon.blend new file mode 100644 index 000000000..d899afb66 --- /dev/null +++ b/src/client/assets/room/furnitures/moon/moon.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc9289bebf658662e17b537f4004894861de229a0ca2b81aa47388cc18885bc6 +size 725536 diff --git a/src/client/assets/room/furnitures/moon/moon.glb b/src/client/assets/room/furnitures/moon/moon.glb new file mode 100644 index 000000000..f675d0d27 --- /dev/null +++ b/src/client/assets/room/furnitures/moon/moon.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c8e31e99fc62a29b493749f6b94fa46c8284e76bd758f8324ad1d617843cb1f +size 122112 diff --git a/src/client/assets/room/furnitures/moon/moon.jpg b/src/client/assets/room/furnitures/moon/moon.jpg new file mode 100644 index 000000000..ad88e8280 --- /dev/null +++ b/src/client/assets/room/furnitures/moon/moon.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aee8e7be3e53fb80c75f44c1aed8293641d5a506dec9a0dcc7329bb0e1c72b55 +size 87151 diff --git a/src/client/assets/room/furnitures/mousepad/mousepad.blend b/src/client/assets/room/furnitures/mousepad/mousepad.blend new file mode 100644 index 000000000..036d13acd --- /dev/null +++ b/src/client/assets/room/furnitures/mousepad/mousepad.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4097bfccab88175370b49a6daa8cf54dcf205eeb15e4c1d44d194f7d80db4545 +size 495008 diff --git a/src/client/assets/room/furnitures/mousepad/mousepad.glb b/src/client/assets/room/furnitures/mousepad/mousepad.glb new file mode 100644 index 000000000..55dfd155f --- /dev/null +++ b/src/client/assets/room/furnitures/mousepad/mousepad.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d98174d1f2b2981d1c0c6b74e97caf9fc99fec996da05b8a804a32ebb8c46c7a +size 4360 diff --git a/src/client/assets/room/furnitures/pc/motherboard-uv.png b/src/client/assets/room/furnitures/pc/motherboard-uv.png new file mode 100644 index 000000000..dd390834b --- /dev/null +++ b/src/client/assets/room/furnitures/pc/motherboard-uv.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ecc74391bdbe47b7fea3ea04dca5d19a814b0b18ede6fbc429005945081ba96 +size 2920 diff --git a/src/client/assets/room/furnitures/pc/motherboard-uv.psd b/src/client/assets/room/furnitures/pc/motherboard-uv.psd new file mode 100644 index 000000000..5c713c38c --- /dev/null +++ b/src/client/assets/room/furnitures/pc/motherboard-uv.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f954199f4edec36aed779b0fc961d04689f11957e872af3ba6f5cefd5997735 +size 7131432 diff --git a/src/client/assets/room/furnitures/pc/motherboard.jpg b/src/client/assets/room/furnitures/pc/motherboard.jpg new file mode 100644 index 000000000..f36a5f09f --- /dev/null +++ b/src/client/assets/room/furnitures/pc/motherboard.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18025d82ce87b69521213214396640b416c30674c00118d4a460abc7801c32ce +size 64600 diff --git a/src/client/assets/room/furnitures/pc/pc.blend b/src/client/assets/room/furnitures/pc/pc.blend new file mode 100644 index 000000000..cfa3d417f --- /dev/null +++ b/src/client/assets/room/furnitures/pc/pc.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:881e55e5ea3865aee9c25431c71333ffc676ed21b6d64353762f459942fbcc29 +size 818152 diff --git a/src/client/assets/room/furnitures/pc/pc.glb b/src/client/assets/room/furnitures/pc/pc.glb new file mode 100644 index 000000000..1d24ac276 --- /dev/null +++ b/src/client/assets/room/furnitures/pc/pc.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:449583fc86a14ef45f944f521f0a451a4bb2f9fd13504d74c115b0270cae13a8 +size 103620 diff --git a/src/client/assets/room/furnitures/pencil/pencil.blend b/src/client/assets/room/furnitures/pencil/pencil.blend new file mode 100644 index 000000000..5830e254c --- /dev/null +++ b/src/client/assets/room/furnitures/pencil/pencil.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c398fb62ca47b5c3a28dc3e1b6be4be033103d47b89a50747f52c2c15b41098 +size 683032 diff --git a/src/client/assets/room/furnitures/pencil/pencil.glb b/src/client/assets/room/furnitures/pencil/pencil.glb new file mode 100644 index 000000000..f14504941 --- /dev/null +++ b/src/client/assets/room/furnitures/pencil/pencil.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e07e8d7fdc061604bcb94a4fbbd7350a0dbad5eff4805204133c5f0af432e0ca +size 7788 diff --git a/src/client/assets/room/furnitures/photoframe/photo-uv.png b/src/client/assets/room/furnitures/photoframe/photo-uv.png new file mode 100644 index 000000000..9cb8b5b50 --- /dev/null +++ b/src/client/assets/room/furnitures/photoframe/photo-uv.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f047514bb100e9c38a0b13f96dcbc6faf576b36d02ec620fb9719c875bb8a3ab +size 2639 diff --git a/src/client/assets/room/furnitures/photoframe/photo.jpg b/src/client/assets/room/furnitures/photoframe/photo.jpg new file mode 100644 index 000000000..1b58b1bdd --- /dev/null +++ b/src/client/assets/room/furnitures/photoframe/photo.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:977a6f693e554bc44f66b6a6c3500f763bc7fe3422766ade0d4ded5a548b3ece +size 30500 diff --git a/src/client/assets/room/furnitures/photoframe/photoframe.blend b/src/client/assets/room/furnitures/photoframe/photoframe.blend new file mode 100644 index 000000000..5e6b7e2bc --- /dev/null +++ b/src/client/assets/room/furnitures/photoframe/photoframe.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cfac50eea15c1856c1da46adbbe5e9553a8a791cb2b45bdf2085d11c6f98a719 +size 551416 diff --git a/src/client/assets/room/furnitures/photoframe/photoframe.glb b/src/client/assets/room/furnitures/photoframe/photoframe.glb new file mode 100644 index 000000000..0743635ff --- /dev/null +++ b/src/client/assets/room/furnitures/photoframe/photoframe.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3c8230e48a2d992e7c65d002bff6c354fb3ddd4abfbafda986e4da918d457f5 +size 37612 diff --git a/src/client/assets/room/furnitures/piano/piano.blend b/src/client/assets/room/furnitures/piano/piano.blend new file mode 100644 index 000000000..bfc08201c --- /dev/null +++ b/src/client/assets/room/furnitures/piano/piano.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:46118c3e67e8da35293804ada926f6e894b5d5e38f5bda147ccfa84c03a97ea9 +size 713228 diff --git a/src/client/assets/room/furnitures/piano/piano.glb b/src/client/assets/room/furnitures/piano/piano.glb new file mode 100644 index 000000000..da65c7c71 --- /dev/null +++ b/src/client/assets/room/furnitures/piano/piano.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3eaf2446b3c9feba2d42bc65d5c494dc8221d63b62641bfe17e44820cb97314a +size 73320 diff --git a/src/client/assets/room/furnitures/pinguin/pinguin.blend b/src/client/assets/room/furnitures/pinguin/pinguin.blend new file mode 100644 index 000000000..b558d9fbd --- /dev/null +++ b/src/client/assets/room/furnitures/pinguin/pinguin.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bfbb89a044ad8902b553b2935fce483b62b1e8e256484801fb02eb6a6a459fc0 +size 778976 diff --git a/src/client/assets/room/furnitures/pinguin/pinguin.glb b/src/client/assets/room/furnitures/pinguin/pinguin.glb new file mode 100644 index 000000000..4262fa35d --- /dev/null +++ b/src/client/assets/room/furnitures/pinguin/pinguin.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4faee287c94213d0a4fa3705298c4cedcb2325605ed92171862d9b0e867f4d74 +size 60172 diff --git a/src/client/assets/room/furnitures/plant/plant-soil-uv.png b/src/client/assets/room/furnitures/plant/plant-soil-uv.png new file mode 100644 index 000000000..745abeb1f --- /dev/null +++ b/src/client/assets/room/furnitures/plant/plant-soil-uv.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b89e7ebdd871531f0ea7288147e008fc6028ed8550e9efa27a33e01832c48f82 +size 4509 diff --git a/src/client/assets/room/furnitures/plant/plant-soil.png b/src/client/assets/room/furnitures/plant/plant-soil.png new file mode 100644 index 000000000..1f1c9cd12 --- /dev/null +++ b/src/client/assets/room/furnitures/plant/plant-soil.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0efcacf02545955138d6b77e93c1fe0f50a7ead27fbf33c5ca26d5a3135b03fd +size 10852 diff --git a/src/client/assets/room/furnitures/plant/plant-soil.psd b/src/client/assets/room/furnitures/plant/plant-soil.psd new file mode 100644 index 000000000..475223756 --- /dev/null +++ b/src/client/assets/room/furnitures/plant/plant-soil.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be4adb11ca27fca4e50c8e464d6f0355df3dfecd3dbf7b3b59c028d9bc6860c3 +size 390188 diff --git a/src/client/assets/room/furnitures/plant/plant.blend b/src/client/assets/room/furnitures/plant/plant.blend new file mode 100644 index 000000000..1194cbe66 --- /dev/null +++ b/src/client/assets/room/furnitures/plant/plant.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25ca98b542b8cfc603b44d457d09c121407e91839ae418386ac5c80b2bab572e +size 604488 diff --git a/src/client/assets/room/furnitures/plant/plant.glb b/src/client/assets/room/furnitures/plant/plant.glb new file mode 100644 index 000000000..668ced52d --- /dev/null +++ b/src/client/assets/room/furnitures/plant/plant.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e096bae7ddda7eabf6714785a09d9ac25c1096ce3dc292eb8877209504d4899b +size 27664 diff --git a/src/client/assets/room/furnitures/plant2/plant2.blend b/src/client/assets/room/furnitures/plant2/plant2.blend new file mode 100644 index 000000000..c1e480975 --- /dev/null +++ b/src/client/assets/room/furnitures/plant2/plant2.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23f6471d3adb31d2a74f70f353deeed037a7b22625d7a45ca99a6f1980024be9 +size 1060816 diff --git a/src/client/assets/room/furnitures/plant2/plant2.glb b/src/client/assets/room/furnitures/plant2/plant2.glb new file mode 100644 index 000000000..c994c7c8c --- /dev/null +++ b/src/client/assets/room/furnitures/plant2/plant2.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:03e9638fd2f24dca928e8dccab9528f32e085660a2734348018a5448ec8b70bc +size 133212 diff --git a/src/client/assets/room/furnitures/plant2/soil.png b/src/client/assets/room/furnitures/plant2/soil.png new file mode 100644 index 000000000..1f1c9cd12 --- /dev/null +++ b/src/client/assets/room/furnitures/plant2/soil.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0efcacf02545955138d6b77e93c1fe0f50a7ead27fbf33c5ca26d5a3135b03fd +size 10852 diff --git a/src/client/assets/room/furnitures/poster-h/poster-h.blend b/src/client/assets/room/furnitures/poster-h/poster-h.blend new file mode 100644 index 000000000..c7cf70009 --- /dev/null +++ b/src/client/assets/room/furnitures/poster-h/poster-h.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:039f7a2b65fb905c46c4736732362dbb6c64b7cb3617faf8c5ad9c913079ec89 +size 667604 diff --git a/src/client/assets/room/furnitures/poster-h/poster-h.glb b/src/client/assets/room/furnitures/poster-h/poster-h.glb new file mode 100644 index 000000000..934f87fe0 --- /dev/null +++ b/src/client/assets/room/furnitures/poster-h/poster-h.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:87308bdcb4e98c61a5e53460347fae2dc018decf50c6584ced794a8f192c2c1b +size 1280 diff --git a/src/client/assets/room/furnitures/poster-h/uv.png b/src/client/assets/room/furnitures/poster-h/uv.png new file mode 100644 index 000000000..b38de42e2 --- /dev/null +++ b/src/client/assets/room/furnitures/poster-h/uv.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f9ef234cd0f5e4931829f7f895c735b40d5c8056559a3368ce4c4d5fb11ce6ab +size 3786 diff --git a/src/client/assets/room/furnitures/poster-v/poster-v.blend b/src/client/assets/room/furnitures/poster-v/poster-v.blend new file mode 100644 index 000000000..a166ec7d1 --- /dev/null +++ b/src/client/assets/room/furnitures/poster-v/poster-v.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7cb8d48ff1603f0218e2af2cafdc7fbcca56b83e6d2ef1a39c385ccb3ec481f9 +size 650740 diff --git a/src/client/assets/room/furnitures/poster-v/poster-v.glb b/src/client/assets/room/furnitures/poster-v/poster-v.glb new file mode 100644 index 000000000..40a649b4b --- /dev/null +++ b/src/client/assets/room/furnitures/poster-v/poster-v.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b44189cfa637c6297aa554ffe05024f240456de820658140d7f5e1a3e92bd5f0 +size 1280 diff --git a/src/client/assets/room/furnitures/poster-v/uv.png b/src/client/assets/room/furnitures/poster-v/uv.png new file mode 100644 index 000000000..232797fa8 --- /dev/null +++ b/src/client/assets/room/furnitures/poster-v/uv.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b0be86931a37ba76d1ac5e6fcbcff823b68f7daeada6e86d1b9175e5e6713382 +size 3795 diff --git a/src/client/assets/room/furnitures/pudding/pudding.blend b/src/client/assets/room/furnitures/pudding/pudding.blend new file mode 100644 index 000000000..7158460ef --- /dev/null +++ b/src/client/assets/room/furnitures/pudding/pudding.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:741b69f79bebf9c3eef976db2ff58cbfc0d0928629d8fb92f929c1a16596b54d +size 694784 diff --git a/src/client/assets/room/furnitures/pudding/pudding.glb b/src/client/assets/room/furnitures/pudding/pudding.glb new file mode 100644 index 000000000..6a0ab36b5 --- /dev/null +++ b/src/client/assets/room/furnitures/pudding/pudding.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2256f5143f5dceebb3e18b04ecf2ff8664cfe0515a2f562adafce169305133d +size 10612 diff --git a/src/client/assets/room/furnitures/rubik-cube/rubik-cube.blend b/src/client/assets/room/furnitures/rubik-cube/rubik-cube.blend new file mode 100644 index 000000000..b0b3e0282 --- /dev/null +++ b/src/client/assets/room/furnitures/rubik-cube/rubik-cube.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0fe55c423b8757b54f75a21acc205de741cb145874fc8cb9faccd891a6262eea +size 745960 diff --git a/src/client/assets/room/furnitures/rubik-cube/rubik-cube.glb b/src/client/assets/room/furnitures/rubik-cube/rubik-cube.glb new file mode 100644 index 000000000..b7f35471f --- /dev/null +++ b/src/client/assets/room/furnitures/rubik-cube/rubik-cube.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:340684678592e28c95db89e413b3cab18d4ace5dc677acc8e7659a40c8b80ebd +size 67688 diff --git a/src/client/assets/room/furnitures/server/rack-uv.png b/src/client/assets/room/furnitures/server/rack-uv.png new file mode 100644 index 000000000..5b108dbe7 --- /dev/null +++ b/src/client/assets/room/furnitures/server/rack-uv.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15f330da365faa78eb88d35fd5c7c7dbbe64554dedf6a09c536da45264b00b2c +size 6705 diff --git a/src/client/assets/room/furnitures/server/rack.png b/src/client/assets/room/furnitures/server/rack.png new file mode 100644 index 000000000..0ed71b77e --- /dev/null +++ b/src/client/assets/room/furnitures/server/rack.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ef1386cd4c204d510ff0138dd31fc39c4cc58ed7da2b03f235383c33fd00604 +size 7046 diff --git a/src/client/assets/room/furnitures/server/server.blend b/src/client/assets/room/furnitures/server/server.blend new file mode 100644 index 000000000..63b2b8c5e --- /dev/null +++ b/src/client/assets/room/furnitures/server/server.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd9217f211f78447fbf82c7b431f94bbb6fb64996e8fe2abc40dbd8e5a28ad69 +size 684372 diff --git a/src/client/assets/room/furnitures/server/server.glb b/src/client/assets/room/furnitures/server/server.glb new file mode 100644 index 000000000..d142b162d --- /dev/null +++ b/src/client/assets/room/furnitures/server/server.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2847517cf2f45e0d60e05d346320e5147461632dd99bbfee4fbbdf461e722ad0 +size 149480 diff --git a/src/client/assets/room/furnitures/server/server.png b/src/client/assets/room/furnitures/server/server.png new file mode 100644 index 000000000..f3b9f954b --- /dev/null +++ b/src/client/assets/room/furnitures/server/server.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d0631505d68b6cef0acb3620931994c147e76a19f309b223f1d163b8ac24fa1 +size 116866 diff --git a/src/client/assets/room/furnitures/server/uv.png b/src/client/assets/room/furnitures/server/uv.png new file mode 100644 index 000000000..440d7f850 --- /dev/null +++ b/src/client/assets/room/furnitures/server/uv.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd723b7663b235aff7fd73527839af194de44b1e9f19203eac014bd3e68978c8 +size 4012 diff --git a/src/client/assets/room/furnitures/sofa/sofa.blend b/src/client/assets/room/furnitures/sofa/sofa.blend new file mode 100644 index 000000000..d6ce7a7a8 --- /dev/null +++ b/src/client/assets/room/furnitures/sofa/sofa.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b9d07ae7ca263c52232bf88ae917c2f49ed9f38a247175171e6e693d02e406e +size 711488 diff --git a/src/client/assets/room/furnitures/sofa/sofa.glb b/src/client/assets/room/furnitures/sofa/sofa.glb new file mode 100644 index 000000000..a25da2d85 --- /dev/null +++ b/src/client/assets/room/furnitures/sofa/sofa.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9908f4ff53f1496c2209b01b346db4577016b059d43d906a4affe9b114871dde +size 37656 diff --git a/src/client/assets/room/furnitures/spiral/spiral.blend b/src/client/assets/room/furnitures/spiral/spiral.blend new file mode 100644 index 000000000..6e38f7a7e --- /dev/null +++ b/src/client/assets/room/furnitures/spiral/spiral.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86eebb0e8f9234badf1756144f048995e790e16d54847b25018efa05a0eb410c +size 1241416 diff --git a/src/client/assets/room/furnitures/spiral/spiral.glb b/src/client/assets/room/furnitures/spiral/spiral.glb new file mode 100644 index 000000000..310d37443 --- /dev/null +++ b/src/client/assets/room/furnitures/spiral/spiral.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d2aff8f090a1ce393ccc37b9efbd9504cddc71d2e82453a3d5cf84d6c7ce851 +size 251788 diff --git a/src/client/assets/room/furnitures/tv/screen-uv.png b/src/client/assets/room/furnitures/tv/screen-uv.png new file mode 100644 index 000000000..0347b7184 --- /dev/null +++ b/src/client/assets/room/furnitures/tv/screen-uv.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c66f573bd8b55a230c011ff10413e4544025c74b72aa1c263477ebbe11f8df6 +size 3792 diff --git a/src/client/assets/room/furnitures/tv/tv.blend b/src/client/assets/room/furnitures/tv/tv.blend new file mode 100644 index 000000000..29042aed7 --- /dev/null +++ b/src/client/assets/room/furnitures/tv/tv.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:49a76fbe08f8cbe581d917d4e267ae35e37bc6ee43307ed39b394b334ecb6dc7 +size 587640 diff --git a/src/client/assets/room/furnitures/tv/tv.glb b/src/client/assets/room/furnitures/tv/tv.glb new file mode 100644 index 000000000..a82b9497c --- /dev/null +++ b/src/client/assets/room/furnitures/tv/tv.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba430e92df220721d8665977957963ffc5d2265094dc017623a6fc2c0dba3db6 +size 8580 diff --git a/src/client/assets/room/furnitures/wall-clock/wall-clock.blend b/src/client/assets/room/furnitures/wall-clock/wall-clock.blend new file mode 100644 index 000000000..297bca096 --- /dev/null +++ b/src/client/assets/room/furnitures/wall-clock/wall-clock.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c311d9471f14b26a35de4a068a6772c63439788a3826fea8d4672de7909d3d95 +size 574128 diff --git a/src/client/assets/room/furnitures/wall-clock/wall-clock.glb b/src/client/assets/room/furnitures/wall-clock/wall-clock.glb new file mode 100644 index 000000000..ab7eddea8 --- /dev/null +++ b/src/client/assets/room/furnitures/wall-clock/wall-clock.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d74cccebf9fee11716e379913bf92fdf0f7cb899fb4bdf146903da9c893a7f9a +size 47848 diff --git a/src/client/assets/room/rooms/default/default.blend b/src/client/assets/room/rooms/default/default.blend new file mode 100644 index 000000000..cdd716b0b --- /dev/null +++ b/src/client/assets/room/rooms/default/default.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:98e8f50c0f456faf7601e699a7865782381faba56c357e33a1a491f1e0c622ed +size 618364 diff --git a/src/client/assets/room/rooms/default/default.glb b/src/client/assets/room/rooms/default/default.glb new file mode 100644 index 000000000..7c4a6b945 --- /dev/null +++ b/src/client/assets/room/rooms/default/default.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:027d6c86e3cc4617adad8555ef94d7165ee0dbc4a38260e2bfbc107b8f2734b7 +size 12280 diff --git a/src/client/assets/room/rooms/washitsu/husuma-uv.png b/src/client/assets/room/rooms/washitsu/husuma-uv.png new file mode 100644 index 000000000..8a649a384 --- /dev/null +++ b/src/client/assets/room/rooms/washitsu/husuma-uv.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41e32ed334283982fbc93b086dcae1860dfbe3df0d7a702d0e82555eb8acd0f0 +size 4037 diff --git a/src/client/assets/room/rooms/washitsu/husuma.png b/src/client/assets/room/rooms/washitsu/husuma.png new file mode 100644 index 000000000..68d6f93c3 --- /dev/null +++ b/src/client/assets/room/rooms/washitsu/husuma.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:956b41d22c1820d184c51e2dcffa858a54038e48157ac1b108adc9160dd3e7fe +size 2539 diff --git a/src/client/assets/room/rooms/washitsu/tatami-single1600.png b/src/client/assets/room/rooms/washitsu/tatami-single1600.png new file mode 100644 index 000000000..cb97c12e1 --- /dev/null +++ b/src/client/assets/room/rooms/washitsu/tatami-single1600.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1f9d9007bfd97c844bd0aba622adb87d8654265554b6fdbb9e66b245fb978e5 +size 1173343 diff --git a/src/client/assets/room/rooms/washitsu/tatami-uv.png b/src/client/assets/room/rooms/washitsu/tatami-uv.png new file mode 100644 index 000000000..9c53ba99f --- /dev/null +++ b/src/client/assets/room/rooms/washitsu/tatami-uv.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17bea45d2e494d6158583beb5d9124e5af532028f729dfe14b79a9457b8a414b +size 4075 diff --git a/src/client/assets/room/rooms/washitsu/tatami.afdesign b/src/client/assets/room/rooms/washitsu/tatami.afdesign new file mode 100644 index 000000000..5ce6206e7 --- /dev/null +++ b/src/client/assets/room/rooms/washitsu/tatami.afdesign @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:288912fa868a162258a314b108beda8e85a6faebfa9103dfab9fb8a96e5ee71d +size 2501804 diff --git a/src/client/assets/room/rooms/washitsu/tatami.png b/src/client/assets/room/rooms/washitsu/tatami.png new file mode 100644 index 000000000..9528e72d3 --- /dev/null +++ b/src/client/assets/room/rooms/washitsu/tatami.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09f5b41cfb2322d135b58d9a034368a65a5af3fd39782706365a2470d01aa57e +size 313722 diff --git a/src/client/assets/room/rooms/washitsu/washitsu.blend b/src/client/assets/room/rooms/washitsu/washitsu.blend new file mode 100644 index 000000000..40e61285f --- /dev/null +++ b/src/client/assets/room/rooms/washitsu/washitsu.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:236a2bf548e309cd6eeb34efd91632a8c75c2019703c9ac634b3f66b45a74370 +size 664000 diff --git a/src/client/assets/room/rooms/washitsu/washitsu.glb b/src/client/assets/room/rooms/washitsu/washitsu.glb new file mode 100644 index 000000000..09d28db44 --- /dev/null +++ b/src/client/assets/room/rooms/washitsu/washitsu.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:148217d1fe7602645840f68dc834abc21ebaa2ad03ae3c9135776259ecd7ec95 +size 415180 diff --git a/src/client/pages/room/preview.vue b/src/client/pages/room/preview.vue new file mode 100644 index 000000000..22228cf8c --- /dev/null +++ b/src/client/pages/room/preview.vue @@ -0,0 +1,106 @@ + + + diff --git a/src/client/pages/room/room.vue b/src/client/pages/room/room.vue new file mode 100644 index 000000000..2dd221ddf --- /dev/null +++ b/src/client/pages/room/room.vue @@ -0,0 +1,296 @@ + + + + + diff --git a/src/client/router.ts b/src/client/router.ts index d826d6b49..e997d2db9 100644 --- a/src/client/router.ts +++ b/src/client/router.ts @@ -18,6 +18,7 @@ export const router = new VueRouter({ ]}, { path: '/@:user/pages/:page', component: page('page'), props: route => ({ pageName: route.params.page, username: route.params.user }) }, { path: '/@:user/pages/:pageName/view-source', component: page('page-editor/page-editor'), props: route => ({ initUser: route.params.user, initPageName: route.params.pageName }) }, + { path: '/@:acct/room', props: true, component: page('room/room') }, { path: '/announcements', component: page('announcements') }, { path: '/about', component: page('about') }, { path: '/about-misskey', component: page('about-misskey') }, diff --git a/src/client/scripts/room/furniture.ts b/src/client/scripts/room/furniture.ts new file mode 100644 index 000000000..7734e3266 --- /dev/null +++ b/src/client/scripts/room/furniture.ts @@ -0,0 +1,21 @@ +export type RoomInfo = { + roomType: string; + carpetColor: string; + furnitures: Furniture[]; +}; + +export type Furniture = { + id: string; // 同じ家具が複数ある場合にそれぞれを識別するためのIDであり、家具IDではない + type: string; // こっちが家具ID(chairとか) + position: { + x: number; + y: number; + z: number; + }; + rotation: { + x: number; + y: number; + z: number; + }; + props?: Record; +}; diff --git a/src/client/scripts/room/furnitures.json5 b/src/client/scripts/room/furnitures.json5 new file mode 100644 index 000000000..7c1a90a3f --- /dev/null +++ b/src/client/scripts/room/furnitures.json5 @@ -0,0 +1,397 @@ +// 家具メタデータ + +// 家具にはユーザーが設定できるプロパティを設定可能です: +// +// props: { +// : +// } +// +// proptype一覧: +// * image ... 画像選択ダイアログを出し、その画像のURLが格納されます +// * color ... 色選択コントロールを出し、選択された色が格納されます + +// 家具にカスタムテクスチャを適用できるようにするには、textureプロパティに以下の追加の情報を含めます: +// 便宜上そのUVのどの部分にカスタムテクスチャを貼り合わせるかのエリアをテクスチャエリアと呼びます。 +// UVは1024*1024だと仮定します。 +// +// : { +// prop: <プロパティ名>, +// uv: { +// x: <テクスチャエリアX座標>, +// y: <テクスチャエリアY座標>, +// width: <テクスチャエリアの幅>, +// height: <テクスチャエリアの高さ>, +// }, +// } +// +// には、カスタムテクスチャを適用したいメッシュ名を指定します +// <プロパティ名>には、カスタムテクスチャとして使用する画像を格納するプロパティ(前述)名を指定します + +// 家具にカスタムカラーを適用できるようにするには、colorプロパティに以下の追加の情報を含めます: +// +// : <プロパティ名> +// +// には、カスタムカラーを適用したいマテリアル名を指定します +// <プロパティ名>には、カスタムカラーとして使用する色を格納するプロパティ(前述)名を指定します + +[ + { + id: "milk", + place: "floor" + }, + { + id: "bed", + place: "floor" + }, + { + id: "low-table", + place: "floor", + props: { + color: 'color' + }, + color: { + Table: 'color' + } + }, + { + id: "desk", + place: "floor", + props: { + color: 'color' + }, + color: { + Board: 'color' + } + }, + { + id: "chair", + place: "floor", + props: { + color: 'color' + }, + color: { + Chair: 'color' + } + }, + { + id: "chair2", + place: "floor", + props: { + color1: 'color', + color2: 'color' + }, + color: { + Cushion: 'color1', + Leg: 'color2' + } + }, + { + id: "fan", + place: "wall" + }, + { + id: "pc", + place: "floor" + }, + { + id: "plant", + place: "floor" + }, + { + id: "plant2", + place: "floor" + }, + { + id: "eraser", + place: "floor" + }, + { + id: "pencil", + place: "floor" + }, + { + id: "pudding", + place: "floor" + }, + { + id: "cardboard-box", + place: "floor" + }, + { + id: "cardboard-box2", + place: "floor" + }, + { + id: "cardboard-box3", + place: "floor" + }, + { + id: "book", + place: "floor", + props: { + color: 'color' + }, + color: { + Cover: 'color' + } + }, + { + id: "book2", + place: "floor" + }, + { + id: "piano", + place: "floor" + }, + { + id: "facial-tissue", + place: "floor" + }, + { + id: "server", + place: "floor" + }, + { + id: "moon", + place: "floor" + }, + { + id: "corkboard", + place: "wall" + }, + { + id: "mousepad", + place: "floor", + props: { + color: 'color' + }, + color: { + Pad: 'color' + } + }, + { + id: "monitor", + place: "floor", + props: { + screen: 'image' + }, + texture: { + Screen: { + prop: 'screen', + uv: { + x: 0, + y: 434, + width: 1024, + height: 588, + }, + }, + }, + }, + { + id: "tv", + place: "floor", + props: { + screen: 'image' + }, + texture: { + Screen: { + prop: 'screen', + uv: { + x: 0, + y: 434, + width: 1024, + height: 588, + }, + }, + }, + }, + { + id: "keyboard", + place: "floor" + }, + { + id: "carpet-stripe", + place: "floor", + props: { + color1: 'color', + color2: 'color' + }, + color: { + CarpetAreaA: 'color1', + CarpetAreaB: 'color2' + }, + }, + { + id: "mat", + place: "floor", + props: { + color: 'color' + }, + color: { + Mat: 'color' + } + }, + { + id: "color-box", + place: "floor", + props: { + color: 'color' + }, + color: { + main: 'color' + } + }, + { + id: "wall-clock", + place: "wall" + }, + { + id: "cube", + place: "floor", + props: { + color: 'color' + }, + color: { + Cube: 'color' + } + }, + { + id: "photoframe", + place: "wall", + props: { + photo: 'image', + color: 'color' + }, + texture: { + Photo: { + prop: 'photo', + uv: { + x: 0, + y: 342, + width: 1024, + height: 683, + }, + }, + }, + color: { + Frame: 'color' + } + }, + { + id: "pinguin", + place: "floor", + props: { + body: 'color', + belly: 'color' + }, + color: { + Body: 'body', + Belly: 'belly', + } + }, + { + id: "rubik-cube", + place: "floor", + }, + { + id: "poster-h", + place: "wall", + props: { + picture: 'image' + }, + texture: { + Poster: { + prop: 'picture', + uv: { + x: 0, + y: 277, + width: 1024, + height: 745, + }, + }, + }, + }, + { + id: "poster-v", + place: "wall", + props: { + picture: 'image' + }, + texture: { + Poster: { + prop: 'picture', + uv: { + x: 0, + y: 0, + width: 745, + height: 1024, + }, + }, + }, + }, + { + id: "sofa", + place: "floor", + props: { + color: 'color' + }, + color: { + Sofa: 'color' + } + }, + { + id: "spiral", + place: "floor", + props: { + color: 'color' + }, + color: { + Step: 'color' + } + }, + { + id: "bin", + place: "floor", + props: { + color: 'color' + }, + color: { + Bin: 'color' + } + }, + { + id: "cup-noodle", + place: "floor" + }, + { + id: "holo-display", + place: "floor", + props: { + image: 'image' + }, + texture: { + Image_Front: { + prop: 'image', + uv: { + x: 0, + y: 0, + width: 1024, + height: 1024, + }, + }, + Image_Back: { + prop: 'image', + uv: { + x: 0, + y: 0, + width: 1024, + height: 1024, + }, + }, + }, + }, + { + id: 'energy-drink', + place: "floor", + } +] diff --git a/src/client/scripts/room/room.ts b/src/client/scripts/room/room.ts new file mode 100644 index 000000000..a45fb11e4 --- /dev/null +++ b/src/client/scripts/room/room.ts @@ -0,0 +1,776 @@ +import autobind from 'autobind-decorator'; +import { v4 as uuid } from 'uuid'; +import * as THREE from 'three'; +import { GLTFLoader, GLTF } from 'three/examples/jsm/loaders/GLTFLoader'; +import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls.js'; +import { EffectComposer } from 'three/examples/jsm/postprocessing/EffectComposer.js'; +import { RenderPass } from 'three/examples/jsm/postprocessing/RenderPass.js'; +import { ShaderPass } from 'three/examples/jsm/postprocessing/ShaderPass.js'; +import { BloomPass } from 'three/examples/jsm/postprocessing/BloomPass.js'; +import { FXAAShader } from 'three/examples/jsm/shaders/FXAAShader.js'; +import { TransformControls } from 'three/examples/jsm/controls/TransformControls.js'; +import { Furniture, RoomInfo } from './furniture'; +import { query as urlQuery } from '../../../prelude/url'; +const furnitureDefs = require('./furnitures.json5'); + +THREE.ImageUtils.crossOrigin = ''; + +type Options = { + graphicsQuality: Room['graphicsQuality']; + onChangeSelect: Room['onChangeSelect']; + useOrthographicCamera: boolean; +}; + +/** + * MisskeyRoom Core Engine + */ +export class Room { + private clock: THREE.Clock; + private scene: THREE.Scene; + private renderer: THREE.WebGLRenderer; + private camera: THREE.PerspectiveCamera | THREE.OrthographicCamera; + private controls: OrbitControls; + private composer: EffectComposer; + private mixers: THREE.AnimationMixer[] = []; + private furnitureControl: TransformControls; + private roomInfo: RoomInfo; + private graphicsQuality: 'cheep' | 'low' | 'medium' | 'high' | 'ultra'; + private roomObj: THREE.Object3D; + private objects: THREE.Object3D[] = []; + private selectedObject: THREE.Object3D = null; + private onChangeSelect: Function; + private isTransformMode = false; + private renderFrameRequestId: number; + + private get canvas(): HTMLCanvasElement { + return this.renderer.domElement; + } + + private get furnitures(): Furniture[] { + return this.roomInfo.furnitures; + } + + private set furnitures(furnitures: Furniture[]) { + this.roomInfo.furnitures = furnitures; + } + + private get enableShadow() { + return this.graphicsQuality != 'cheep'; + } + + private get usePostFXs() { + return this.graphicsQuality !== 'cheep' && this.graphicsQuality !== 'low'; + } + + private get shadowQuality() { + return ( + this.graphicsQuality === 'ultra' ? 16384 : + this.graphicsQuality === 'high' ? 8192 : + this.graphicsQuality === 'medium' ? 4096 : + this.graphicsQuality === 'low' ? 1024 : + 0); // cheep + } + + constructor(user, isMyRoom, roomInfo: RoomInfo, container: Element, options: Options) { + this.roomInfo = roomInfo; + this.graphicsQuality = options.graphicsQuality; + this.onChangeSelect = options.onChangeSelect; + + this.clock = new THREE.Clock(true); + + //#region Init a scene + this.scene = new THREE.Scene(); + + const width = container.clientWidth; + const height = container.clientHeight; + + //#region Init a renderer + this.renderer = new THREE.WebGLRenderer({ + antialias: false, + stencil: false, + alpha: false, + powerPreference: + this.graphicsQuality === 'ultra' ? 'high-performance' : + this.graphicsQuality === 'high' ? 'high-performance' : + this.graphicsQuality === 'medium' ? 'default' : + this.graphicsQuality === 'low' ? 'low-power' : + 'low-power' // cheep + }); + + this.renderer.setPixelRatio(window.devicePixelRatio); + this.renderer.setSize(width, height); + this.renderer.autoClear = false; + this.renderer.setClearColor(new THREE.Color(0x051f2d)); + this.renderer.shadowMap.enabled = this.enableShadow; + this.renderer.gammaOutput = true; + this.renderer.shadowMap.type = + this.graphicsQuality === 'ultra' ? THREE.PCFSoftShadowMap : + this.graphicsQuality === 'high' ? THREE.PCFSoftShadowMap : + this.graphicsQuality === 'medium' ? THREE.PCFShadowMap : + this.graphicsQuality === 'low' ? THREE.BasicShadowMap : + THREE.BasicShadowMap; // cheep + + container.insertBefore(this.canvas, container.firstChild); + //#endregion + + //#region Init a camera + this.camera = options.useOrthographicCamera + ? new THREE.OrthographicCamera( + width / - 2, width / 2, height / 2, height / - 2, -10, 10) + : new THREE.PerspectiveCamera(45, width / height); + + if (options.useOrthographicCamera) { + this.camera.position.x = 2; + this.camera.position.y = 2; + this.camera.position.z = 2; + this.camera.zoom = 100; + this.camera.updateProjectionMatrix(); + } else { + this.camera.position.x = 5; + this.camera.position.y = 2; + this.camera.position.z = 5; + } + + this.scene.add(this.camera); + //#endregion + + //#region AmbientLight + const ambientLight = new THREE.AmbientLight(0xffffff, 1); + this.scene.add(ambientLight); + //#endregion + + if (this.graphicsQuality !== 'cheep') { + //#region Room light + const roomLight = new THREE.SpotLight(0xffffff, 0.1); + + roomLight.position.set(0, 8, 0); + roomLight.castShadow = this.enableShadow; + roomLight.shadow.bias = -0.0001; + roomLight.shadow.mapSize.width = this.shadowQuality; + roomLight.shadow.mapSize.height = this.shadowQuality; + roomLight.shadow.camera.near = 0.1; + roomLight.shadow.camera.far = 9; + roomLight.shadow.camera.fov = 45; + + this.scene.add(roomLight); + //#endregion + } + + //#region Out light + const outLight1 = new THREE.SpotLight(0xffffff, 0.4); + outLight1.position.set(9, 3, -2); + outLight1.castShadow = this.enableShadow; + outLight1.shadow.bias = -0.001; // アクネ、アーチファクト対策 その代わりピーターパンが発生する可能性がある + outLight1.shadow.mapSize.width = this.shadowQuality; + outLight1.shadow.mapSize.height = this.shadowQuality; + outLight1.shadow.camera.near = 6; + outLight1.shadow.camera.far = 15; + outLight1.shadow.camera.fov = 45; + this.scene.add(outLight1); + + const outLight2 = new THREE.SpotLight(0xffffff, 0.2); + outLight2.position.set(-2, 3, 9); + outLight2.castShadow = false; + outLight2.shadow.bias = -0.001; // アクネ、アーチファクト対策 その代わりピーターパンが発生する可能性がある + outLight2.shadow.camera.near = 6; + outLight2.shadow.camera.far = 15; + outLight2.shadow.camera.fov = 45; + this.scene.add(outLight2); + //#endregion + + //#region Init a controller + this.controls = new OrbitControls(this.camera, this.canvas); + + this.controls.target.set(0, 1, 0); + this.controls.enableZoom = true; + this.controls.enablePan = isMyRoom; + this.controls.minPolarAngle = 0; + this.controls.maxPolarAngle = Math.PI / 2; + this.controls.minAzimuthAngle = 0; + this.controls.maxAzimuthAngle = Math.PI / 2; + this.controls.enableDamping = true; + this.controls.dampingFactor = 0.2; + //#endregion + + //#region POST FXs + if (!this.usePostFXs) { + this.composer = null; + } else { + const renderTarget = new THREE.WebGLRenderTarget(width, height, { + minFilter: THREE.LinearFilter, + magFilter: THREE.LinearFilter, + format: THREE.RGBFormat, + stencilBuffer: false, + }); + + const fxaa = new ShaderPass(FXAAShader); + fxaa.uniforms['resolution'].value = new THREE.Vector2(1 / width, 1 / height); + fxaa.renderToScreen = true; + + this.composer = new EffectComposer(this.renderer, renderTarget); + this.composer.addPass(new RenderPass(this.scene, this.camera)); + if (this.graphicsQuality === 'ultra') { + this.composer.addPass(new BloomPass(0.25, 30, 128.0, 512)); + } + this.composer.addPass(fxaa); + } + //#endregion + //#endregion + + //#region Label + //#region Avatar + const avatarUrl = `/proxy/?${urlQuery({ url: user.avatarUrl })}`; + + const textureLoader = new THREE.TextureLoader(); + textureLoader.crossOrigin = 'anonymous'; + + const iconTexture = textureLoader.load(avatarUrl); + iconTexture.wrapS = THREE.RepeatWrapping; + iconTexture.wrapT = THREE.RepeatWrapping; + iconTexture.anisotropy = 16; + + const avatarMaterial = new THREE.MeshBasicMaterial({ + map: iconTexture, + side: THREE.DoubleSide, + alphaTest: 0.5 + }); + + const iconGeometry = new THREE.PlaneGeometry(1, 1); + + const avatarObject = new THREE.Mesh(iconGeometry, avatarMaterial); + avatarObject.position.set(-3, 2.5, 2); + avatarObject.rotation.y = Math.PI / 2; + avatarObject.castShadow = false; + + this.scene.add(avatarObject); + //#endregion + + //#region Username + const name = user.username; + + new THREE.FontLoader().load('/assets/fonts/helvetiker_regular.typeface.json', font => { + const nameGeometry = new THREE.TextGeometry(name, { + size: 0.5, + height: 0, + curveSegments: 8, + font: font, + bevelThickness: 0, + bevelSize: 0, + bevelEnabled: false + }); + + const nameMaterial = new THREE.MeshLambertMaterial({ + color: 0xffffff + }); + + const nameObject = new THREE.Mesh(nameGeometry, nameMaterial); + nameObject.position.set(-3, 2.25, 1.25); + nameObject.rotation.y = Math.PI / 2; + nameObject.castShadow = false; + + this.scene.add(nameObject); + }); + //#endregion + //#endregion + + //#region Interaction + if (isMyRoom) { + this.furnitureControl = new TransformControls(this.camera, this.canvas); + this.scene.add(this.furnitureControl); + + // Hover highlight + this.canvas.onmousemove = this.onmousemove; + + // Click + this.canvas.onmousedown = this.onmousedown; + } + //#endregion + + //#region Init room + this.loadRoom(); + //#endregion + + //#region Load furnitures + for (const furniture of this.furnitures) { + this.loadFurniture(furniture).then(obj => { + this.scene.add(obj.scene); + this.objects.push(obj.scene); + }); + } + //#endregion + + // Start render + if (this.usePostFXs) { + this.renderWithPostFXs(); + } else { + this.renderWithoutPostFXs(); + } + } + + @autobind + private renderWithoutPostFXs() { + this.renderFrameRequestId = + window.requestAnimationFrame(this.renderWithoutPostFXs); + + // Update animations + const clock = this.clock.getDelta(); + for (const mixer of this.mixers) { + mixer.update(clock); + } + + this.controls.update(); + this.renderer.render(this.scene, this.camera); + } + + @autobind + private renderWithPostFXs() { + this.renderFrameRequestId = + window.requestAnimationFrame(this.renderWithPostFXs); + + // Update animations + const clock = this.clock.getDelta(); + for (const mixer of this.mixers) { + mixer.update(clock); + } + + this.controls.update(); + this.renderer.clear(); + this.composer.render(); + } + + @autobind + private loadRoom() { + const type = this.roomInfo.roomType; + new GLTFLoader().load(`/assets/room/rooms/${type}/${type}.glb`, gltf => { + gltf.scene.traverse(child => { + if (!(child instanceof THREE.Mesh)) return; + + child.receiveShadow = this.enableShadow; + + child.material = new THREE.MeshLambertMaterial({ + color: (child.material as THREE.MeshStandardMaterial).color, + map: (child.material as THREE.MeshStandardMaterial).map, + name: (child.material as THREE.MeshStandardMaterial).name, + }); + + // 異方性フィルタリング + if ((child.material as THREE.MeshLambertMaterial).map && this.graphicsQuality !== 'cheep') { + (child.material as THREE.MeshLambertMaterial).map.minFilter = THREE.LinearMipMapLinearFilter; + (child.material as THREE.MeshLambertMaterial).map.magFilter = THREE.LinearMipMapLinearFilter; + (child.material as THREE.MeshLambertMaterial).map.anisotropy = 8; + } + }); + + gltf.scene.position.set(0, 0, 0); + + this.scene.add(gltf.scene); + this.roomObj = gltf.scene; + if (this.roomInfo.roomType === 'default') { + this.applyCarpetColor(); + } + }); + } + + @autobind + private loadFurniture(furniture: Furniture) { + const def = furnitureDefs.find(d => d.id === furniture.type); + return new Promise((res, rej) => { + const loader = new GLTFLoader(); + loader.load(`/assets/room/furnitures/${furniture.type}/${furniture.type}.glb`, gltf => { + const model = gltf.scene; + + // Load animation + if (gltf.animations.length > 0) { + const mixer = new THREE.AnimationMixer(model); + this.mixers.push(mixer); + for (const clip of gltf.animations) { + mixer.clipAction(clip).play(); + } + } + + model.name = furniture.id; + model.position.x = furniture.position.x; + model.position.y = furniture.position.y; + model.position.z = furniture.position.z; + model.rotation.x = furniture.rotation.x; + model.rotation.y = furniture.rotation.y; + model.rotation.z = furniture.rotation.z; + + model.traverse(child => { + if (!(child instanceof THREE.Mesh)) return; + child.castShadow = this.enableShadow; + child.receiveShadow = this.enableShadow; + (child.material as THREE.MeshStandardMaterial).metalness = 0; + + // 異方性フィルタリング + if ((child.material as THREE.MeshStandardMaterial).map && this.graphicsQuality !== 'cheep') { + (child.material as THREE.MeshStandardMaterial).map.minFilter = THREE.LinearMipMapLinearFilter; + (child.material as THREE.MeshStandardMaterial).map.magFilter = THREE.LinearMipMapLinearFilter; + (child.material as THREE.MeshStandardMaterial).map.anisotropy = 8; + } + }); + + if (def.color) { // カスタムカラー + this.applyCustomColor(model); + } + + if (def.texture) { // カスタムテクスチャ + this.applyCustomTexture(model); + } + + res(gltf); + }, null, rej); + }); + } + + @autobind + private applyCarpetColor() { + this.roomObj.traverse(child => { + if (!(child instanceof THREE.Mesh)) return; + if (child.material && + (child.material as THREE.MeshStandardMaterial).name && + (child.material as THREE.MeshStandardMaterial).name === 'Carpet' + ) { + const colorHex = parseInt(this.roomInfo.carpetColor.substr(1), 16); + (child.material as THREE.MeshStandardMaterial).color.setHex(colorHex); + } + }); + } + + @autobind + private applyCustomColor(model: THREE.Object3D) { + const furniture = this.furnitures.find(furniture => furniture.id === model.name); + const def = furnitureDefs.find(d => d.id === furniture.type); + if (def.color == null) return; + model.traverse(child => { + if (!(child instanceof THREE.Mesh)) return; + for (const t of Object.keys(def.color)) { + if (!child.material || + !(child.material as THREE.MeshStandardMaterial).name || + (child.material as THREE.MeshStandardMaterial).name !== t + ) continue; + + const prop = def.color[t]; + const val = furniture.props ? furniture.props[prop] : undefined; + + if (val == null) continue; + + const colorHex = parseInt(val.substr(1), 16); + (child.material as THREE.MeshStandardMaterial).color.setHex(colorHex); + } + }); + } + + @autobind + private applyCustomTexture(model: THREE.Object3D) { + 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)) { + if (child.name !== t) continue; + + const prop = def.texture[t].prop; + const val = furniture.props ? furniture.props[prop] : undefined; + + if (val == null) continue; + + const canvas = document.createElement('canvas'); + canvas.height = 1024; + canvas.width = 1024; + + child.material = new THREE.MeshLambertMaterial({ + emissive: 0x111111, + side: THREE.DoubleSide, + alphaTest: 0.5, + }); + + const img = new Image(); + img.crossOrigin = 'anonymous'; + img.onload = () => { + const uvInfo = def.texture[t].uv; + + const ctx = canvas.getContext('2d'); + ctx.drawImage(img, + 0, 0, img.width, img.height, + uvInfo.x, uvInfo.y, uvInfo.width, uvInfo.height); + + const texture = new THREE.Texture(canvas); + texture.wrapS = THREE.RepeatWrapping; + texture.wrapT = THREE.RepeatWrapping; + texture.anisotropy = 16; + texture.flipY = false; + + (child.material as THREE.MeshLambertMaterial).map = texture; + (child.material as THREE.MeshLambertMaterial).needsUpdate = true; + (child.material as THREE.MeshLambertMaterial).map.needsUpdate = true; + }; + img.src = val; + } + }); + } + + @autobind + private onmousemove(ev: MouseEvent) { + if (this.isTransformMode) return; + + const rect = (ev.target as HTMLElement).getBoundingClientRect(); + const x = (((ev.clientX * window.devicePixelRatio) - rect.left) / this.canvas.width) * 2 - 1; + const y = -(((ev.clientY * window.devicePixelRatio) - rect.top) / this.canvas.height) * 2 + 1; + const pos = new THREE.Vector2(x, y); + + this.camera.updateMatrixWorld(); + + const raycaster = new THREE.Raycaster(); + raycaster.setFromCamera(pos, this.camera); + + const intersects = raycaster.intersectObjects(this.objects, true); + + for (const object of this.objects) { + if (this.isSelectedObject(object)) continue; + object.traverse(child => { + if (child instanceof THREE.Mesh) { + (child.material as THREE.MeshStandardMaterial).emissive.setHex(0x000000); + } + }); + } + + if (intersects.length > 0) { + const intersected = this.getRoot(intersects[0].object); + if (this.isSelectedObject(intersected)) return; + intersected.traverse(child => { + if (child instanceof THREE.Mesh) { + (child.material as THREE.MeshStandardMaterial).emissive.setHex(0x191919); + } + }); + } + } + + @autobind + private onmousedown(ev: MouseEvent) { + if (this.isTransformMode) return; + if (ev.target !== this.canvas || ev.button !== 0) return; + + const rect = (ev.target as HTMLElement).getBoundingClientRect(); + const x = (((ev.clientX * window.devicePixelRatio) - rect.left) / this.canvas.width) * 2 - 1; + const y = -(((ev.clientY * window.devicePixelRatio) - rect.top) / this.canvas.height) * 2 + 1; + const pos = new THREE.Vector2(x, y); + + this.camera.updateMatrixWorld(); + + const raycaster = new THREE.Raycaster(); + raycaster.setFromCamera(pos, this.camera); + + const intersects = raycaster.intersectObjects(this.objects, true); + + for (const object of this.objects) { + object.traverse(child => { + if (child instanceof THREE.Mesh) { + (child.material as THREE.MeshStandardMaterial).emissive.setHex(0x000000); + } + }); + } + + if (intersects.length > 0) { + const selectedObj = this.getRoot(intersects[0].object); + this.selectFurniture(selectedObj); + } else { + this.selectedObject = null; + this.onChangeSelect(null); + } + } + + @autobind + private getRoot(obj: THREE.Object3D): THREE.Object3D { + let found = false; + let x = obj.parent; + while (!found) { + if (x.parent.parent == null) { + found = true; + } else { + x = x.parent; + } + } + return x; + } + + @autobind + private isSelectedObject(obj: THREE.Object3D): boolean { + if (this.selectedObject == null) { + return false; + } else { + return obj.name === this.selectedObject.name; + } + } + + @autobind + private selectFurniture(obj: THREE.Object3D) { + this.selectedObject = obj; + this.onChangeSelect(obj); + obj.traverse(child => { + if (child instanceof THREE.Mesh) { + (child.material as THREE.MeshStandardMaterial).emissive.setHex(0xff0000); + } + }); + } + + /** + * 家具の移動/回転モードにします + * @param type 移動か回転か + */ + @autobind + public enterTransformMode(type: 'translate' | 'rotate') { + this.isTransformMode = true; + this.furnitureControl.setMode(type); + this.furnitureControl.attach(this.selectedObject); + this.controls.enableRotate = false; + } + + /** + * 家具の移動/回転モードを終了します + */ + @autobind + public exitTransformMode() { + this.isTransformMode = false; + this.furnitureControl.detach(); + this.controls.enableRotate = true; + } + + /** + * 家具プロパティを更新します + * @param key プロパティ名 + * @param value 値 + */ + @autobind + public updateProp(key: string, value: any) { + const furniture = this.furnitures.find(furniture => furniture.id === this.selectedObject.name); + if (furniture.props == null) furniture.props = {}; + furniture.props[key] = value; + this.applyCustomColor(this.selectedObject); + this.applyCustomTexture(this.selectedObject); + } + + /** + * 部屋に家具を追加します + * @param type 家具の種類 + */ + @autobind + public addFurniture(type: string) { + const furniture = { + id: uuid(), + type: type, + position: { + x: 0, + y: 0, + z: 0, + }, + rotation: { + x: 0, + y: 0, + z: 0, + }, + }; + + this.furnitures.push(furniture); + + this.loadFurniture(furniture).then(obj => { + this.scene.add(obj.scene); + this.objects.push(obj.scene); + }); + } + + /** + * 現在選択されている家具を部屋から削除します + */ + @autobind + public removeFurniture() { + this.exitTransformMode(); + const obj = this.selectedObject; + this.scene.remove(obj); + this.objects = this.objects.filter(object => object.name !== obj.name); + this.furnitures = this.furnitures.filter(furniture => furniture.id !== obj.name); + this.selectedObject = null; + this.onChangeSelect(null); + } + + /** + * 全ての家具を部屋から削除します + */ + @autobind + public removeAllFurnitures() { + this.exitTransformMode(); + for (const obj of this.objects) { + this.scene.remove(obj); + } + this.objects = []; + this.furnitures = []; + this.selectedObject = null; + this.onChangeSelect(null); + } + + /** + * 部屋の床の色を変更します + * @param color 色 + */ + @autobind + public updateCarpetColor(color: string) { + this.roomInfo.carpetColor = color; + this.applyCarpetColor(); + } + + /** + * 部屋の種類を変更します + * @param type 種類 + */ + @autobind + public changeRoomType(type: string) { + this.roomInfo.roomType = type; + this.scene.remove(this.roomObj); + this.loadRoom(); + } + + /** + * 部屋データを取得します + */ + @autobind + public getRoomInfo() { + for (const obj of this.objects) { + const furniture = this.furnitures.find(f => f.id === obj.name); + furniture.position.x = obj.position.x; + furniture.position.y = obj.position.y; + furniture.position.z = obj.position.z; + furniture.rotation.x = obj.rotation.x; + furniture.rotation.y = obj.rotation.y; + furniture.rotation.z = obj.rotation.z; + } + + return this.roomInfo; + } + + /** + * 選択されている家具を取得します + */ + @autobind + public getSelectedObject() { + return this.selectedObject; + } + + @autobind + public findFurnitureById(id: string) { + return this.furnitures.find(furniture => furniture.id === id); + } + + /** + * レンダリングを終了します + */ + @autobind + public destroy() { + // Stop render loop + window.cancelAnimationFrame(this.renderFrameRequestId); + + this.controls.dispose(); + this.scene.dispose(); + } +} diff --git a/src/client/store.ts b/src/client/store.ts index 23c800184..c1d7d3991 100644 --- a/src/client/store.ts +++ b/src/client/store.ts @@ -56,6 +56,8 @@ export const defaultDeviceSettings = { imageNewTab: false, showFixedPostForm: false, disablePagesScript: true, + roomGraphicsQuality: 'medium', + roomUseOrthographicCamera: true, sfxVolume: 0.3, sfxNote: 'syuilo/down', sfxNoteMy: 'syuilo/up', @@ -187,6 +189,12 @@ export default () => new Vuex.Store({ icon: faTerminal, to: '/scratchpad', }, + rooms: { + title: 'rooms', + icon: faDoorClosed, + get show() { return getters.isSignedIn; }, + get to() { return `/@${state.i.username}/room`; }, + }, }), },