Compare commits

..

1163 Commits

Author SHA1 Message Date
syuilo a716d5511a wip 2026-07-30 10:42:27 +09:00
syuilo cb62a1d4fe wip 2026-07-30 10:11:29 +09:00
syuilo 6ec6a5d523 Merge branch 'develop' into room 2026-07-30 09:38:45 +09:00
syuilo 3bbe40baec Update Firework.ts 2026-07-29 20:09:08 +09:00
syuilo 2d7e79f924 wip 2026-07-29 20:01:43 +09:00
syuilo b3c981d14a wip 2026-07-29 17:18:28 +09:00
かっこかり bcc3bc4fd7 fix(frontend): MkLightboxの動画の縦横比を事前に確定させるように (#17822)
* fix(frontend): MkLightboxの動画の縦横比を事前に確定させるように

* fix

* fix
2026-07-29 14:47:58 +09:00
syuilo 1b878998a0 wip 2026-07-29 14:20:58 +09:00
syuilo dc773a2709 wip 2026-07-29 12:48:57 +09:00
syuilo 9feab0b673 wip 2026-07-29 11:39:54 +09:00
syuilo c1d60fa5f5 up 2026-07-28 20:39:09 +09:00
syuilo d93aede642 wip 2026-07-28 19:45:15 +09:00
syuilo 3479b957e4 wip 2026-07-28 16:39:33 +09:00
syuilo 4682180c8b wip 2026-07-28 14:56:51 +09:00
syuilo 6dffa2f59a wip 2026-07-28 11:08:25 +09:00
syuilo 86762db14e wip 2026-07-28 10:47:40 +09:00
syuilo f53b50ee54 Update config.json 2026-07-27 21:55:29 +09:00
syuilo 58cb722bdf wip 2026-07-27 21:54:15 +09:00
syuilo ee2d16b237 Update lobby.ts 2026-07-27 20:44:13 +09:00
syuilo 319ddc674c wip 2026-07-27 20:07:24 +09:00
syuilo 9d4d04b6d2 Update lobby.ts 2026-07-27 16:18:46 +09:00
syuilo b9ca53785c wip 2026-07-27 16:00:11 +09:00
syuilo 83f3daccde Merge branch 'develop' into room 2026-07-27 12:58:26 +09:00
syuilo 6fac907867 Update babylonRuntime.ts 2026-07-03 15:48:54 +09:00
syuilo 887f219119 up 2026-07-03 15:42:05 +09:00
syuilo b1a1717fdc Merge branch 'develop' into room 2026-07-03 15:40:38 +09:00
syuilo 1903607659 thumbs 2026-06-17 16:55:13 +09:00
syuilo 7d750668c0 thumbs 2026-06-17 16:51:17 +09:00
syuilo db6708bfbd Merge branch 'develop' into room 2026-06-17 16:42:41 +09:00
syuilo bb06278e97 wip 2026-06-15 20:13:43 +09:00
syuilo 3fd8becdc5 typo 2026-06-15 18:51:26 +09:00
syuilo de94c15c8f typo 2026-06-15 18:50:05 +09:00
syuilo 68719db32f typo 2026-06-15 18:49:26 +09:00
syuilo 1e4539a168 typo 2026-06-15 18:48:21 +09:00
syuilo ef6c5dfc95 typo 2026-06-15 18:47:33 +09:00
syuilo 4fc9e38e0d typo 2026-06-15 18:46:54 +09:00
syuilo 60f60b6bac Merge branch 'develop' into room 2026-06-15 18:42:48 +09:00
syuilo a7a7b8bc69 Update babylonRuntime.ts 2026-06-15 17:42:36 +09:00
syuilo 253dd052f8 refactoe 2026-06-15 16:22:57 +09:00
syuilo c1eb67a4ce typo 2026-06-15 16:18:20 +09:00
syuilo a26d78d573 stickyPlaneId 2026-06-15 16:16:33 +09:00
syuilo 9e33507f01 wip 2026-06-14 20:10:00 +09:00
syuilo bde03b8259 wip 2026-06-14 17:21:05 +09:00
syuilo 5690d28d4e Update engine.ts 2026-06-14 17:04:17 +09:00
syuilo 64a4283c35 Update engine.ts 2026-06-14 15:31:05 +09:00
syuilo 9de48030fc Update engine.ts 2026-06-14 15:28:38 +09:00
syuilo 1dbf9f9f85 wip 2026-06-14 13:35:21 +09:00
syuilo 37c3145859 shadow 2026-06-13 20:34:04 +09:00
syuilo 600dae3d68 wip 2026-06-13 15:59:23 +09:00
syuilo ab9d6947ae 🎨 2026-06-13 12:31:35 +09:00
syuilo 56da1e5084 🎨 2026-06-13 11:35:24 +09:00
syuilo 63d314750f Update room.core.vue 2026-06-12 18:43:02 +09:00
syuilo 1e10b67476 herbarium 2026-06-12 17:42:11 +09:00
syuilo cf2139d515 wip 2026-06-12 13:39:41 +09:00
syuilo 3d2941bd8f wip 2026-06-12 12:30:39 +09:00
syuilo c06eef6b58 username label 2026-06-11 21:27:32 +09:00
syuilo fa7a8b1282 up 2026-06-11 20:13:42 +09:00
syuilo 319826fe76 Merge branch 'develop' into room 2026-06-11 20:12:32 +09:00
syuilo 54cfa4a13e Update README.md 2026-06-11 18:35:54 +09:00
syuilo e507d41640 Update lavaLamp.ts 2026-06-11 18:24:58 +09:00
syuilo d9cac0fa56 🎨 2026-06-11 14:47:22 +09:00
syuilo 2e51cde16e 🎨 2026-06-11 11:58:43 +09:00
syuilo 98ac383b44 🎨 2026-06-11 11:25:32 +09:00
syuilo e1290584f2 kakejiku 2026-06-10 20:51:41 +09:00
syuilo 923d95d078 locale 2026-06-10 18:59:13 +09:00
syuilo 47a5f0cdd9 image rotation 2026-06-10 18:50:20 +09:00
syuilo 961d611cd4 bolt 2026-06-10 15:50:47 +09:00
syuilo 2bc10ccc34 lavaLamp 2026-06-10 13:58:20 +09:00
syuilo 38dae938c0 Update haniwa.ts 2026-06-09 20:15:02 +09:00
syuilo 1f2b635920 clean up 2026-06-09 19:51:03 +09:00
syuilo 39c6baf6f2 room light 2026-06-09 18:50:46 +09:00
syuilo 79541bcbe3 downlight 2026-06-09 15:29:26 +09:00
syuilo ba66b5d609 wip 2026-06-09 14:09:10 +09:00
syuilo a2c96c29c7 wip 2026-06-09 12:06:50 +09:00
syuilo 60db0a6bbd wip 2026-06-09 11:40:35 +09:00
syuilo 07f17820b3 Update simple.ts 2026-06-08 21:50:06 +09:00
syuilo 66cd678cd3 wip 2026-06-08 21:35:29 +09:00
syuilo 1f604db203 wip 2026-06-08 15:45:27 +09:00
syuilo 06def2995b throttle 2026-06-08 11:45:59 +09:00
syuilo c9107e5d2b Update MkWorldMonoOptionsForm.vue 2026-06-08 11:41:16 +09:00
syuilo cbac208262 Update README.md 2026-06-08 10:37:44 +09:00
syuilo b7c7323b97 Update README.md 2026-06-08 10:28:59 +09:00
syuilo 602d034e94 cardboard-box 2026-06-08 10:24:23 +09:00
syuilo 22f78ab175 haniwa 2026-06-07 20:46:01 +09:00
syuilo d59afb5a29 ceilingFan 2026-06-07 18:31:01 +09:00
syuilo cc8e6a2e92 update ceiling-fan-light 2026-06-07 16:59:09 +09:00
syuilo 004ef368c2 update ceiling-fan-light 2026-06-07 16:47:04 +09:00
syuilo ac06c1700a Update babylonRuntime.ts
add RegisterAnimation and RegisterAnimatable
2026-06-07 11:24:43 +09:00
syuilo 2d0fb674d5 wip 2026-06-06 17:29:08 +09:00
syuilo 61b8b0aac3 .js 2026-06-06 17:17:15 +09:00
syuilo bd6e443cec Update haniwa.ts 2026-06-06 17:00:20 +09:00
syuilo 897199a807 .js 2026-06-06 16:45:49 +09:00
syuilo 1f64579516 wip 2026-06-06 16:34:16 +09:00
syuilo 84203630a1 wip 2026-06-05 20:48:20 +09:00
syuilo 561e0c3813 Update room.add-furniture-dialog.vue 2026-06-04 22:50:17 +09:00
syuilo 169d655717 Update room.add-furniture-dialog.vue 2026-06-04 22:27:30 +09:00
syuilo ade652dd3e wallClock 2026-06-04 20:22:09 +09:00
syuilo 138353c84d up 2026-06-04 16:53:02 +09:00
syuilo 4b30bfeb3c wip 2026-06-04 16:22:31 +09:00
syuilo aae2039df2 Update default.blend 2026-06-04 02:28:39 +09:00
syuilo 850e156687 🎨 2026-06-04 02:28:30 +09:00
syuilo 844196cfea wip 2026-06-03 22:07:04 +09:00
syuilo 1925840f3f Merge branch 'develop' into room 2026-06-03 21:54:33 +09:00
syuilo d5df006463 Update babylonRuntime.ts 2026-06-03 21:46:22 +09:00
syuilo 2593652510 Update babylonRuntime.ts 2026-06-03 21:38:52 +09:00
syuilo 2e22b34c40 Create haniwa.blend 2026-06-03 21:01:51 +09:00
syuilo 8d3c3284b5 wip 2026-06-03 19:15:08 +09:00
syuilo 7d7a125299 wip 2026-06-03 18:46:18 +09:00
syuilo aac51a171c wip 2026-06-03 17:12:08 +09:00
syuilo 908e0022e9 wip 2026-06-03 15:14:25 +09:00
syuilo b56a2a8bf7 wip 2026-06-03 14:50:32 +09:00
syuilo 61de0fb279 wip 2026-06-03 14:17:23 +09:00
syuilo b43ff3d820 wip 2026-06-03 14:06:41 +09:00
syuilo 23b2f4c7a0 Update env.ts 2026-06-03 13:53:56 +09:00
syuilo 827895b548 wip 2026-06-03 13:00:53 +09:00
syuilo 8b0dd1ea68 wip 2026-06-03 12:03:54 +09:00
syuilo ec3517ba58 wip 2026-06-03 09:55:12 +09:00
syuilo c24515044e Update babylonRuntime.ts 2026-06-03 08:48:33 +09:00
syuilo f55adc19d3 registerBabylonRuntime 2026-06-03 08:42:07 +09:00
syuilo 32af098cd9 pure 2026-06-02 21:41:11 +09:00
syuilo cfea88dce3 Update defineFurnitureUi.ts 2026-06-02 20:31:27 +09:00
syuilo 3a97e26f80 Update engine.ts 2026-06-02 18:50:58 +09:00
syuilo 7bcb1b1732 wip 2026-06-02 18:00:39 +09:00
syuilo 8684cf14cc wip 2026-06-02 17:43:20 +09:00
syuilo 686a847697 wip 2026-06-02 17:06:10 +09:00
syuilo 0294ef74e4 wip 2026-06-02 14:53:23 +09:00
syuilo 42af31fbbd Update room.core.vue 2026-06-02 14:47:20 +09:00
syuilo b9ea42531a wip 2026-06-02 14:39:15 +09:00
syuilo 39c4618a35 Merge branch 'develop' into room 2026-06-02 14:12:58 +09:00
syuilo b025ce0ae6 wip 2026-06-02 10:50:24 +09:00
syuilo 07e660df01 Update MkWorldAvatarEditDialog.vue 2026-06-01 20:28:21 +09:00
syuilo e07eed4a4b wip 2026-06-01 18:33:50 +09:00
syuilo 19ad95cfa6 Update room.core.vue 2026-06-01 13:13:56 +09:00
syuilo 8f5f595073 Update room.core.vue 2026-06-01 13:13:32 +09:00
syuilo 6a536d5c92 refactor 2026-06-01 13:12:39 +09:00
syuilo c1e6e6a871 wip 2026-06-01 13:05:35 +09:00
syuilo 039bce590f wip 2026-06-01 12:44:46 +09:00
syuilo 24dac68475 Update MkWorldAvatarManager.vue 2026-06-01 11:21:23 +09:00
syuilo 8217a3a42c wip 2026-06-01 11:08:50 +09:00
syuilo dbcb856638 wip 2026-06-01 11:07:05 +09:00
syuilo dbbb197816 wip 2026-06-01 10:58:13 +09:00
syuilo 40263b0af5 wip 2026-06-01 09:42:07 +09:00
syuilo b978df8990 wip 2026-06-01 09:26:07 +09:00
syuilo 3a0da02b50 wip 2026-06-01 09:17:24 +09:00
syuilo af7d1a763a wip 2026-06-01 09:15:58 +09:00
syuilo a7e16c09dd up 2026-05-31 20:07:47 +09:00
syuilo 351872f47b Update engine.ts 2026-05-31 18:57:23 +09:00
syuilo e3c6c3025a wip 2026-05-31 18:52:54 +09:00
syuilo 273bc59cdb Update room.core.vue 2026-05-31 18:49:24 +09:00
syuilo 7a3e27d653 Update PlayerContainer.ts 2026-05-31 18:39:57 +09:00
syuilo 6a8aacfb95 wip 2026-05-31 17:07:39 +09:00
syuilo 99659a89b4 Update room.core.vue 2026-05-31 16:56:40 +09:00
syuilo 4591b940c3 Update room.core.vue 2026-05-31 16:52:23 +09:00
syuilo f01e9aa2ac wip 2026-05-31 16:50:33 +09:00
syuilo bba1605801 Update WorldRoomMultiplayService.ts 2026-05-31 16:48:06 +09:00
syuilo 6d6dbb2584 Update PlayerContainer.ts 2026-05-31 16:47:07 +09:00
syuilo 51a08bbf34 Update room.core.vue 2026-05-31 16:17:27 +09:00
syuilo 7fa8bcc9fd wip 2026-05-31 16:09:58 +09:00
syuilo 9d5818f7b5 wip 2026-05-31 15:24:55 +09:00
syuilo bb028fda00 wip 2026-05-31 14:56:40 +09:00
syuilo 56ae76e994 Update OverlayPanel.vue 2026-05-31 14:39:20 +09:00
syuilo 69bc12201e wip 2026-05-31 14:35:15 +09:00
syuilo 313e730fbb Update room.core.vue 2026-05-31 14:24:24 +09:00
syuilo c14986b43d Update room.core.vue 2026-05-31 14:22:59 +09:00
syuilo 69c75fc464 Update room.core.vue 2026-05-31 13:39:47 +09:00
syuilo 1b13c945ff wip 2026-05-31 13:37:40 +09:00
syuilo 6e763d4daa Update OverlayPanel.vue 2026-05-31 13:28:12 +09:00
syuilo d1e5b04a10 Update OverlayPanel.vue 2026-05-31 13:27:32 +09:00
syuilo 7fec78b70e wip 2026-05-31 13:22:54 +09:00
syuilo c962cd33b3 wip 2026-05-31 12:47:24 +09:00
syuilo 814bf357ca wip 2026-05-31 11:30:32 +09:00
syuilo 222d914544 Update room.core.vue 2026-05-31 11:29:22 +09:00
syuilo b81b9e1da7 wip 2026-05-31 11:16:56 +09:00
syuilo 52cb23da63 wip 2026-05-31 10:09:25 +09:00
syuilo 6b4c2c9141 Update room.core.vue 2026-05-31 10:02:09 +09:00
syuilo 7af9069962 wip 2026-05-31 09:58:26 +09:00
syuilo 8f9be8c735 wip 2026-05-31 09:40:20 +09:00
syuilo cdbf5c843f wip 2026-05-31 09:26:19 +09:00
syuilo 27fff648b6 Update README.md 2026-05-30 21:17:27 +09:00
syuilo 5cdc5f53b4 Update MkWorldMonoOptionsForm.vue 2026-05-30 20:45:26 +09:00
syuilo c67e231ff5 wip 2026-05-30 19:18:43 +09:00
syuilo f564b7a29b object -> furniture 2026-05-30 19:14:45 +09:00
syuilo 1eea31aacd object -> furniture 2026-05-30 19:00:43 +09:00
syuilo 5da458ca54 Update engine.ts 2026-05-30 18:32:39 +09:00
syuilo c343ccbdff wip 2026-05-30 18:25:16 +09:00
syuilo f8a981a1fc wip 2026-05-30 18:20:04 +09:00
syuilo 72df3d29ce wip 2026-05-29 10:57:17 +09:00
syuilo 75454b8075 wip 2026-05-29 10:08:08 +09:00
syuilo 559846fd7c wip 2026-05-29 09:56:22 +09:00
syuilo 8c1fa69800 Update MkWorldAvatarEditDialog.vue 2026-05-29 09:44:11 +09:00
syuilo 810d437a2c Update MkWorldAvatarEditDialog.vue 2026-05-29 09:40:33 +09:00
syuilo 3fca2cb664 wip 2026-05-29 08:01:39 +09:00
syuilo e95552b264 wip 2026-05-29 07:42:48 +09:00
syuilo 781f6135fd wip 2026-05-29 07:39:52 +09:00
syuilo e90830c738 Update MkWorldAvatarEditDialog.vue 2026-05-28 21:02:26 +09:00
syuilo ab32ab6746 wip 2026-05-28 20:52:10 +09:00
syuilo 86c4f3072f wip 2026-05-28 18:27:44 +09:00
syuilo 8bb8b2fc97 wip 2026-05-28 17:50:04 +09:00
syuilo fad53328be wip 2026-05-28 17:42:54 +09:00
syuilo 0a6bfce548 wip 2026-05-28 17:32:45 +09:00
syuilo 5998b01ffc wip 2026-05-28 17:24:22 +09:00
syuilo 9a91170839 wip 2026-05-28 15:03:06 +09:00
syuilo a0aa64cd9f wip 2026-05-28 13:12:35 +09:00
syuilo 95864071a0 Update PlayerContainer.ts 2026-05-28 10:31:01 +09:00
syuilo ff9d997cec Update edit-world-avatar-dialog.vue 2026-05-28 10:16:33 +09:00
syuilo c6d0855a2e wip 2026-05-28 10:15:02 +09:00
syuilo 624b858758 wip 2026-05-28 09:56:40 +09:00
syuilo d722b8e9d7 wip 2026-05-28 09:40:02 +09:00
syuilo fd02ea906f wip 2026-05-28 09:24:03 +09:00
syuilo aed9a4a1b4 Update preferences.vue 2026-05-28 08:54:35 +09:00
syuilo ace51f7605 wip 2026-05-28 08:53:14 +09:00
syuilo c10e1c4b31 wip 2026-05-28 08:51:23 +09:00
syuilo 4c80e92522 wip 2026-05-28 08:04:50 +09:00
syuilo 71c3f921cc wip 2026-05-28 07:53:30 +09:00
syuilo 6bc9eb9d84 wip 2026-05-27 21:12:34 +09:00
syuilo fbf3c02392 wip 2026-05-27 21:00:05 +09:00
syuilo 0c8b1055d4 wip 2026-05-27 19:54:40 +09:00
syuilo 0e7b517554 wip 2026-05-27 19:18:55 +09:00
syuilo 5cefdd224b wip 2026-05-27 18:58:50 +09:00
syuilo 1a5a4c834f wip 2026-05-27 17:58:34 +09:00
syuilo 2df145c458 wip 2026-05-27 17:28:32 +09:00
syuilo 43958fc70d wip 2026-05-27 16:57:11 +09:00
syuilo 8f94b04edc Update WorldRoomService.ts 2026-05-27 10:11:03 +09:00
syuilo c7d07d0364 Update WorldRoomService.ts 2026-05-27 10:06:59 +09:00
syuilo 5d974e8242 wip 2026-05-27 09:56:17 +09:00
syuilo 807ade4c37 wip 2026-05-27 09:55:12 +09:00
syuilo 2efd52f400 wip 2026-05-26 15:00:14 +09:00
syuilo f0375aa420 wip 2026-05-26 14:42:19 +09:00
syuilo 04c2703ace wip 2026-05-26 10:51:07 +09:00
syuilo 65022ed342 wip 2026-05-26 10:44:40 +09:00
syuilo 0d025d99f2 Update ObjectContainer.ts 2026-05-26 10:43:20 +09:00
syuilo e68847e563 wip 2026-05-26 10:42:40 +09:00
syuilo 409e9f744c wip 2026-05-26 10:01:50 +09:00
syuilo 9f81a88466 wip 2026-05-26 09:59:11 +09:00
syuilo 564d2446cb wip 2026-05-26 09:48:29 +09:00
syuilo cb605a3978 wip 2026-05-26 09:45:40 +09:00
syuilo 4f89010aca wip 2026-05-26 09:44:05 +09:00
syuilo 8933ac119a wip 2026-05-26 09:38:58 +09:00
syuilo 982897f1b5 wip 2026-05-26 09:36:14 +09:00
syuilo dd69662603 wip 2026-05-26 09:34:55 +09:00
syuilo 9485b3fba9 wip 2026-05-26 09:30:06 +09:00
syuilo 245f673a78 wip 2026-05-26 09:29:48 +09:00
syuilo 71bb388b8b wip: separate package 2026-05-25 22:17:58 +09:00
syuilo 39f2614f9a Update steelRack.schema.ts 2026-05-25 20:27:33 +09:00
syuilo 46efad5b12 wip 2026-05-25 20:26:36 +09:00
syuilo fda845cb63 wip 2026-05-25 18:28:46 +09:00
syuilo cccc66bbbf Create object-schema-defs.ts 2026-05-25 16:28:47 +09:00
syuilo 32822d6d07 mi-objet 2026-05-25 16:25:13 +09:00
syuilo 7bca3ca179 wip 2026-05-25 16:24:07 +09:00
syuilo 6961f277b5 temporary del 2026-05-25 15:57:37 +09:00
syuilo eb33c8a93f wip 2026-05-25 15:51:51 +09:00
syuilo 43232d5baa wip 2026-05-25 15:07:47 +09:00
syuilo b8f67a3e69 wip 2026-05-25 15:07:22 +09:00
syuilo 748b571856 wip i18n separation 2026-05-25 14:58:28 +09:00
syuilo f0bf3cda75 wip i18n separation 2026-05-25 14:33:22 +09:00
syuilo bf28b303d7 clean 2026-05-25 14:01:13 +09:00
syuilo 1a064ea430 wip 2026-05-25 13:51:54 +09:00
syuilo 68431f62f1 Update icosahedron.blend 2026-05-25 13:49:13 +09:00
syuilo 2c8abf8239 icosahedron 2026-05-25 13:48:08 +09:00
syuilo 822b567742 wip 2026-05-25 13:21:14 +09:00
syuilo a89475e820 Update room.add-object-dialog.vue 2026-05-25 13:12:06 +09:00
syuilo 2d8c6ca585 Update room.object-customize-form.vue 2026-05-25 12:48:04 +09:00
syuilo fc6a840132 chair 2026-05-25 12:40:46 +09:00
syuilo 9a44c69177 wip 2026-05-25 12:33:17 +09:00
syuilo 0be946a10b Update ja-JP.yml 2026-05-25 12:17:54 +09:00
syuilo a201f72c8a wip 2026-05-25 12:13:16 +09:00
syuilo 83a4281a30 wip 2026-05-25 11:59:23 +09:00
syuilo 7546bf7dc2 wip 2026-05-25 10:53:47 +09:00
syuilo 2942234778 Update cardboardBox.ts 2026-05-25 10:31:37 +09:00
syuilo 540e20864c wip 2026-05-25 10:21:57 +09:00
syuilo 6ee6894184 Update woodRingsPendantLight.ts 2026-05-25 09:37:48 +09:00
syuilo 2a880164f8 Update woodRingsPendantLight.ts 2026-05-25 09:24:09 +09:00
syuilo c002752d65 Update woodRingsPendantLight.ts 2026-05-25 09:17:44 +09:00
syuilo 05e1a43a1c wip 2026-05-24 05:48:13 +09:00
syuilo ec79d6bee7 Update room.object-customize-form.vue 2026-05-24 05:25:29 +09:00
syuilo a3b6dc0899 wip 2026-05-24 05:09:52 +09:00
syuilo 2fffa94eb2 wip 2026-05-24 04:48:56 +09:00
syuilo 0fade25574 Update object.ts 2026-05-24 04:35:33 +09:00
syuilo aa4fa9c54e wip 2026-05-24 04:33:42 +09:00
syuilo fdba915288 Update object.ts 2026-05-23 20:24:07 +09:00
syuilo 773077470e Update engine.ts 2026-05-23 20:20:51 +09:00
syuilo 3eafdbe57a Update cardboardBox.ts 2026-05-23 20:10:42 +09:00
syuilo 8138fd2c34 Update cardboardBox.ts 2026-05-23 20:10:11 +09:00
syuilo ce72d10491 Update engine.ts 2026-05-23 19:43:36 +09:00
syuilo f8851c0f2e wip 2026-05-23 19:43:10 +09:00
syuilo d3a7dc0ea5 Update engine.ts 2026-05-23 18:15:39 +09:00
syuilo 32bdb77e97 Update room.core.vue 2026-05-23 18:14:21 +09:00
syuilo 8ac3c77ae1 Update object.ts 2026-05-23 18:09:36 +09:00
syuilo 8611d55ffc wip 2026-05-23 17:57:35 +09:00
syuilo 14b648faa6 wip 2026-05-23 17:48:39 +09:00
syuilo c6a755c0a7 wip 2026-05-23 16:53:37 +09:00
syuilo 1154bb5370 wip 2026-05-23 15:54:07 +09:00
syuilo 1701e993cf Update cardboardBox.ts 2026-05-23 13:38:52 +09:00
syuilo 99f998cf60 wip 2026-05-23 13:32:51 +09:00
syuilo 05a8dcf897 wip 2026-05-22 18:59:21 +09:00
syuilo 90ea7902eb Update engine.ts 2026-05-22 17:43:44 +09:00
syuilo 644c16aee6 Update engine.ts 2026-05-22 17:42:29 +09:00
syuilo ce5857b265 Update engine.ts 2026-05-22 17:32:20 +09:00
syuilo fbae160442 Update README.md 2026-05-22 11:15:35 +09:00
syuilo 2daad2223d Update engine.ts 2026-05-22 10:40:50 +09:00
syuilo 6cbae336d0 Update env.ts 2026-05-22 10:39:42 +09:00
syuilo 47f9f38a40 wip 2026-05-22 10:31:40 +09:00
syuilo 73d6764a0b wip 2026-05-21 21:23:05 +09:00
syuilo c85ee681bb Update engine.ts 2026-05-21 21:03:19 +09:00
syuilo 61d5a5620a Update issyoubin.ts 2026-05-21 18:38:04 +09:00
syuilo 2873768cd2 Update engine.ts 2026-05-21 18:08:15 +09:00
syuilo 4c957ecd9b wip 2026-05-21 17:29:37 +09:00
syuilo 8c61fc2be0 refactor 2026-05-21 16:52:44 +09:00
syuilo 57057f56f5 wip 2026-05-21 16:37:54 +09:00
syuilo 985dd72a7f Merge branch 'develop' into room 2026-05-21 16:15:27 +09:00
syuilo dfbe765baa ObjectContainer 2026-05-21 16:15:18 +09:00
syuilo 555fa80709 wip 2026-05-21 14:26:27 +09:00
syuilo 7546e7c800 wip 2026-05-21 14:17:03 +09:00
syuilo ce36de7e4f Update steelRack.ts 2026-05-21 14:09:00 +09:00
syuilo 1cb96731e6 Update steelRack.ts 2026-05-21 14:07:03 +09:00
syuilo 4bf0ba3716 semi-procedual steel-rack 2026-05-21 13:29:55 +09:00
syuilo d2e48b707b wip 2026-05-21 12:04:43 +09:00
syuilo 8e70550c84 wip 2026-05-21 11:52:47 +09:00
syuilo 199c0f533b wip 2026-05-21 10:46:15 +09:00
syuilo ad44cc3446 wip 2026-05-21 09:08:14 +09:00
syuilo 8f73c22df3 Update engine.ts 2026-05-20 19:54:23 +09:00
syuilo 20eb342eff wip 2026-05-20 19:09:41 +09:00
syuilo 5d17b557c1 wip 2026-05-20 15:21:02 +09:00
syuilo 43cb18b3e9 wip 2026-05-19 20:26:33 +09:00
syuilo 75dfcf48b6 Update electronicDisplayBoard.ts 2026-05-19 19:23:45 +09:00
syuilo 9e9ae54c26 Update package.json 2026-05-19 16:08:43 +09:00
syuilo e78694f11b up 2026-05-19 16:04:48 +09:00
syuilo 5397beb965 Merge branch 'develop' into room 2026-05-19 15:56:21 +09:00
syuilo 92bc50cb90 Merge branch 'develop' into room 2026-05-19 15:23:21 +09:00
syuilo 45d8b656cb Update EngineBase.ts 2026-05-19 13:41:08 +09:00
syuilo a5e0c594b2 Update engineControllerBase.ts 2026-05-19 13:15:40 +09:00
syuilo 646b0ca041 wip 2026-05-19 13:15:20 +09:00
syuilo de27cc92dc Update engine.ts 2026-05-18 13:27:48 +09:00
syuilo 09d5502eb6 Update utility.ts 2026-05-18 10:44:05 +09:00
syuilo dc6ac2529f Update utility.ts 2026-05-18 10:43:46 +09:00
syuilo a766609963 wip 2026-05-18 10:24:18 +09:00
syuilo e1aa62d2b7 Update engine.ts 2026-05-18 09:40:07 +09:00
syuilo c62d92d88f Update engine.ts 2026-05-18 07:51:14 +09:00
syuilo 1a456998bc Merge branch 'develop' into room 2026-05-18 07:21:45 +09:00
syuilo 14fe51c0a4 wip 2026-05-16 16:40:43 +09:00
syuilo f203ebe4d5 Update engineControllerBase.ts 2026-05-16 11:36:27 +09:00
syuilo de979d3a98 wip 2026-05-16 11:26:46 +09:00
syuilo 7c2e3adf25 wip 2026-05-16 11:15:27 +09:00
syuilo e24cf73a83 update text 2026-05-16 10:52:43 +09:00
syuilo d3eb3867bd handle lost event 2026-05-16 10:49:25 +09:00
syuilo fcfd3331dd miWorldRoomTemp 2026-05-16 09:05:19 +09:00
syuilo 5aa1f0d562 wip 2026-05-16 07:27:50 +09:00
syuilo 491510a11e refactor 2026-05-16 07:15:27 +09:00
syuilo e0382cdf86 duplicateSelectedObject 2026-05-16 07:12:11 +09:00
syuilo 9ae6a9f426 tweak anim 2026-05-16 07:00:19 +09:00
syuilo a8ca0cf9ed refactor 2026-05-16 07:00:00 +09:00
syuilo 45fc8994f0 Merge branch 'room' of https://github.com/misskey-dev/misskey into room 2026-05-16 06:56:40 +09:00
syuilo 85ae7c7efc Update engine.ts 2026-05-16 06:56:38 +09:00
syuilo 2867f03f50 Update engineControllerBase.ts 2026-05-15 22:03:01 +09:00
syuilo 1cd75fe5a8 wip 2026-05-15 19:59:41 +09:00
syuilo 7f2286f1fd Update room.core.vue 2026-05-15 19:45:17 +09:00
syuilo 840e2c3744 wip 2026-05-15 18:09:14 +09:00
syuilo af1dbd3a71 Update room.core.vue 2026-05-15 17:47:16 +09:00
syuilo 82cdaeb56e wip 2026-05-15 17:45:20 +09:00
syuilo ea732458ab Update room.core.vue 2026-05-15 17:23:42 +09:00
syuilo b6e92cdef9 Update engine.ts 2026-05-15 17:12:55 +09:00
syuilo 11b699a180 wip 2026-05-15 16:06:52 +09:00
syuilo e90a53a851 wip 2026-05-15 15:05:15 +09:00
syuilo 1469f890dd Update engine.ts 2026-05-15 14:40:37 +09:00
syuilo 6c82e0fef8 Update engine.ts 2026-05-15 14:34:26 +09:00
syuilo 6ee52259c4 lazy create putParticleSystem 2026-05-15 13:23:05 +09:00
syuilo 414b522d0a Update engine.ts 2026-05-15 13:15:54 +09:00
syuilo a95f3c9467 Update engine.ts 2026-05-15 13:06:15 +09:00
syuilo ecb2ae379e Update engine.ts 2026-05-15 12:56:39 +09:00
syuilo 2e34e6f454 wip 2026-05-15 12:52:54 +09:00
syuilo bee415625a Update WorldRoomService.ts 2026-05-15 09:45:52 +09:00
syuilo d0d3aef76c Merge branch 'develop' into room 2026-05-15 09:41:51 +09:00
syuilo 93a46ae2d6 Merge branch 'develop' into room 2026-05-15 09:39:21 +09:00
syuilo 8b5d006248 Update room.core.vue 2026-05-14 21:39:02 +09:00
syuilo bcc965a19c Update room.core.vue 2026-05-14 21:26:24 +09:00
syuilo 2c5ce5bfae Update room.core.vue 2026-05-14 21:25:55 +09:00
syuilo 170980a0a6 Update WorldRoomService.ts 2026-05-14 21:19:35 +09:00
syuilo 216fb56a4b wip 2026-05-14 21:08:50 +09:00
syuilo 8defcd9f9f wip 2026-05-14 19:35:50 +09:00
syuilo d38f04c97f wip 2026-05-14 19:08:36 +09:00
syuilo ecedd71192 Update engine.ts 2026-05-14 18:47:51 +09:00
syuilo b582895ac6 up 2026-05-14 17:45:40 +09:00
syuilo 267dc5fb64 Update object.ts 2026-05-14 17:20:11 +09:00
syuilo ab02a99a0e wip 2026-05-14 17:19:59 +09:00
syuilo 03481322a9 wip 2026-05-14 17:10:28 +09:00
syuilo fb130466ae wip 2026-05-14 15:41:12 +09:00
syuilo 43f20e44c3 Update room.add-object-dialog.vue 2026-05-14 15:04:37 +09:00
syuilo 2966d2a862 Merge branch 'develop' into room 2026-05-14 14:43:34 +09:00
syuilo 8f23991723 Update engineControllerBase.ts 2026-05-14 14:38:59 +09:00
syuilo bfdda83a6d wip 2026-05-14 14:38:00 +09:00
syuilo ddce5ff526 wip 2026-05-14 14:30:14 +09:00
syuilo 8dd62e57e2 Update object.ts 2026-05-14 14:27:45 +09:00
syuilo 0b17663eeb wip 2026-05-14 14:25:17 +09:00
syuilo 41c5e7242d add note 2026-05-14 12:44:52 +09:00
syuilo ef8f593de8 attachments 2026-05-14 12:43:30 +09:00
syuilo 410cc8ac50 Update engineControllerBase.ts 2026-05-13 21:13:26 +09:00
syuilo a905eeef03 Update engine.ts 2026-05-13 19:53:34 +09:00
syuilo ebb74eff92 Update room.add-object-dialog.vue 2026-05-13 19:44:03 +09:00
syuilo b69efeeb79 wip 2026-05-13 19:26:55 +09:00
syuilo 1a57b8177b Update room.add-object-dialog.vue 2026-05-13 18:36:09 +09:00
syuilo 0e300a9795 wip 2026-05-13 18:33:04 +09:00
syuilo 13d35f8124 fix 2026-05-13 18:23:48 +09:00
syuilo b53e4f6742 wip 2026-05-13 15:48:34 +09:00
syuilo 9d102c2a70 wip 2026-05-13 14:09:43 +09:00
syuilo 84f389aebd wip 2026-05-13 12:29:34 +09:00
syuilo 8072dbef8b wip 2026-05-13 10:30:42 +09:00
syuilo 8195f5257f support pinch/zoom 2026-05-12 20:23:20 +09:00
syuilo b8f8ac031c wip 2026-05-11 20:40:21 +09:00
syuilo 57f1adb402 wip 2026-05-11 15:45:16 +09:00
syuilo 48ce2e09ab Update utility.ts 2026-05-11 15:35:04 +09:00
syuilo dca5450340 wip 2026-05-11 15:28:46 +09:00
syuilo 202c9e8f25 wip 2026-05-11 15:07:44 +09:00
syuilo 8e1e69e60e Update engine.ts 2026-05-11 14:40:34 +09:00
syuilo f3d0edf546 wip: sr in edit mode 2026-05-11 13:35:32 +09:00
syuilo 08dfd23c19 Update engine.ts 2026-05-11 11:01:17 +09:00
syuilo b231357ae8 Update engine.ts 2026-05-11 10:30:40 +09:00
syuilo 102cf03213 tweak 2026-05-11 10:19:15 +09:00
syuilo d1da15128e wip 2026-05-11 09:50:27 +09:00
syuilo 0d96f418ab wip 2026-05-11 09:34:36 +09:00
syuilo b879f2f1e3 Update engine.ts 2026-05-09 16:36:59 +09:00
syuilo fb77eb4349 Update previewEngine.ts 2026-05-09 14:41:39 +09:00
syuilo 79ad7e274c Update previewEngine.ts 2026-05-09 14:29:04 +09:00
syuilo 4890673013 Update previewEngine.ts 2026-05-09 14:28:14 +09:00
syuilo 1f204f572f Update room.vue 2026-05-09 14:15:15 +09:00
syuilo 9976588025 Update room.add-object-dialog.vue 2026-05-09 14:13:49 +09:00
syuilo 414a28fb19 wip 2026-05-09 14:06:07 +09:00
syuilo 3605ffdafc wip 2026-05-09 13:52:45 +09:00
syuilo 179c9fc70a Update previewEngine.ts 2026-05-09 13:10:30 +09:00
syuilo f3a7f10319 wip 2026-05-09 13:03:57 +09:00
syuilo 17333fd7e5 Merge branch 'develop' into room 2026-05-08 18:26:18 +09:00
syuilo 14f4d2c228 wip 2026-05-08 18:23:16 +09:00
syuilo 18b4210eef Update room.add-object-dialog.vue 2026-05-08 18:10:59 +09:00
syuilo 54c2c4dd53 wip 2026-05-07 17:38:49 +09:00
syuilo 42da479026 Update tabletopLcdButtonsController.ts 2026-05-07 16:00:49 +09:00
syuilo adc487ef78 wip 2026-05-07 15:17:49 +09:00
syuilo b08b3a2500 Update curtain.blend 2026-05-07 14:56:14 +09:00
syuilo 4324b6def2 wip 2026-05-07 14:17:09 +09:00
syuilo 21fe0f5e67 wip 2026-05-07 12:56:18 +09:00
syuilo 3ede04c563 Merge branch 'develop' into room 2026-05-07 11:43:07 +09:00
syuilo b750d69065 Merge branch 'develop' into room 2026-05-07 11:33:46 +09:00
syuilo 0c4b36e2d1 wip 2026-05-07 10:56:26 +09:00
syuilo 5cb9474494 wip 2026-05-06 19:17:46 +09:00
syuilo 3be075d281 Update room.add-object-dialog.vue 2026-05-06 18:30:57 +09:00
syuilo d7c94fbf86 handheldGameConsole 2026-05-06 18:25:07 +09:00
syuilo c6d7aa7be8 Update room.add-object-dialog.vue 2026-05-06 14:31:55 +09:00
syuilo d56c6dfe57 wip 2026-05-06 14:24:38 +09:00
syuilo f9be5d8c47 wip 2026-05-06 11:49:16 +09:00
syuilo ac023668a7 Update engine.ts 2026-05-06 11:42:02 +09:00
syuilo 59c9b86842 Update engine.ts 2026-05-06 11:39:13 +09:00
syuilo c4adcde114 Update room.vue 2026-05-05 20:29:19 +09:00
syuilo db1b5e9ce9 wip 2026-05-05 20:29:10 +09:00
syuilo a1cb4b8304 Update README.md 2026-05-04 22:37:55 +09:00
syuilo fd04c5f2fc Update README.md 2026-05-04 22:36:57 +09:00
syuilo 7be7465703 wip 2026-05-04 21:41:21 +09:00
syuilo 626ae675bc wip 2026-05-04 21:30:43 +09:00
syuilo 2a1cd5c197 wip 2026-05-04 19:32:47 +09:00
syuilo a9dd5fd5bf wip 2026-05-04 16:41:50 +09:00
syuilo beb5d1dec5 wip 2026-05-04 16:25:11 +09:00
syuilo d451ce8c36 wip 2026-05-04 15:41:44 +09:00
syuilo f0f78a11cb Update woodRingsPendantLight.ts 2026-05-04 10:47:14 +09:00
syuilo 69dd2675fa Update env.ts 2026-05-04 10:05:25 +09:00
syuilo eb7691e3ba wip 2026-05-04 09:38:35 +09:00
syuilo db90e4ebc0 Update env.ts 2026-05-04 09:24:42 +09:00
syuilo 29491997ea wip 2026-05-04 09:22:29 +09:00
syuilo 015e6d1c81 wip 2026-05-04 09:14:58 +09:00
syuilo 49ee15dd9a Update room.vue 2026-05-03 21:35:19 +09:00
syuilo e6b5758d54 wip 2026-05-03 21:34:11 +09:00
syuilo 210368d597 wip 2026-05-03 20:49:03 +09:00
syuilo 203f29afb9 wip 2026-05-03 18:42:04 +09:00
syuilo fa0eac34c2 Update engine.ts 2026-05-03 17:06:17 +09:00
syuilo d4fa5cf7ca Update engine.ts 2026-05-03 17:02:36 +09:00
syuilo 479e9af17e Update engine.ts 2026-05-03 17:01:49 +09:00
syuilo f03af71dc0 wip 2026-05-03 16:54:11 +09:00
syuilo 6d94f00ecf Update env.ts 2026-05-03 16:21:57 +09:00
syuilo 9e848f3135 default -> simple 2026-05-03 16:20:53 +09:00
syuilo b16b158372 Update room.vue 2026-05-03 16:19:12 +09:00
syuilo 39525c66c2 heya -> env 2026-05-03 16:19:03 +09:00
syuilo d3dc9bc86c wip 2026-05-03 16:12:58 +09:00
syuilo 444d862eac wip 2026-05-03 16:00:57 +09:00
syuilo 74e9851511 wip 2026-05-03 15:45:33 +09:00
syuilo a8586fe224 Update wallMountSpotLight.ts 2026-05-03 14:15:08 +09:00
syuilo d132fdfc04 Update ductRailSpotLights.ts 2026-05-03 14:11:31 +09:00
syuilo 3ba902c2b6 Update ductRailSpotLights.ts 2026-05-03 14:02:59 +09:00
syuilo 50f7c74259 Update controller.ts 2026-05-03 12:17:55 +09:00
syuilo 9b7c908c68 Update room.vue 2026-05-03 12:13:33 +09:00
syuilo e7290c0486 rotation 2026-05-03 12:12:45 +09:00
syuilo db22eddd1e Update engine.ts 2026-05-03 11:51:35 +09:00
syuilo a8cea0622d Update room.object-customize-form.vue 2026-05-03 10:53:21 +09:00
syuilo 5bf1b5569f 🎨 2026-05-03 10:50:10 +09:00
syuilo d1cb2c5bc7 Update worker.ts 2026-05-03 10:00:01 +09:00
syuilo a49697042a refactor: use AbortController 2026-05-03 09:40:04 +09:00
syuilo 4656d93358 wip 2026-05-02 21:27:17 +09:00
syuilo 2e5a02a85a Update controller.ts 2026-05-02 20:12:38 +09:00
syuilo 8421ec75da Merge branch 'develop' into room 2026-05-02 12:41:38 +09:00
syuilo dcd2160294 Update ductRailSpotLights.ts 2026-05-01 20:37:47 +09:00
syuilo 3833469955 Update engine.ts 2026-05-01 20:32:50 +09:00
syuilo 0adfbc8d51 Update lavaLamp.ts 2026-05-01 19:46:44 +09:00
syuilo a931079896 Update lavaLamp.ts 2026-05-01 19:37:50 +09:00
syuilo 18c08f52f1 wip 2026-05-01 19:31:36 +09:00
syuilo 8975449538 Update engine.ts 2026-05-01 18:04:25 +09:00
syuilo 4e149a642d wip 2026-05-01 17:53:40 +09:00
syuilo 09d133242d Update engine.ts 2026-05-01 12:19:03 +09:00
syuilo a8db20259b fix wasdVec calculation 2026-05-01 12:04:05 +09:00
syuilo d1eda166de wip 2026-05-01 11:54:52 +09:00
syuilo 7df4b729e9 Update controller.ts 2026-05-01 11:36:30 +09:00
syuilo 3ed6148f6a wip 2026-05-01 10:02:39 +09:00
syuilo ebe5739ce3 recordPlayer 2026-05-01 09:58:13 +09:00
syuilo 9bc404a8f5 wip 2026-04-30 21:49:09 +09:00
syuilo 90ff3d79d1 Update electronicDisplayBoard.ts 2026-04-30 21:20:55 +09:00
syuilo 6fb49ab88d note 2026-04-30 20:55:21 +09:00
syuilo 722d09b1ae wip 2026-04-30 20:52:53 +09:00
syuilo 6d6ae6728c wip 2026-04-30 19:24:10 +09:00
syuilo ce2e74f3ca wip 2026-04-30 18:06:50 +09:00
syuilo b34e957c25 Update electronicDisplayBoard.ts 2026-04-30 17:38:34 +09:00
syuilo 157b4673fd Update tv.ts 2026-04-30 16:48:45 +09:00
syuilo ac1a19e95c Merge branch 'develop' into room 2026-04-30 16:44:38 +09:00
syuilo 5639324077 up 2026-04-30 16:44:20 +09:00
syuilo a471fe16fa wip 2026-04-30 16:34:07 +09:00
syuilo 6cf90fd714 wip 2026-04-30 16:01:11 +09:00
syuilo c7c785ad2a Update heya.ts 2026-04-30 14:05:58 +09:00
syuilo bde64b5b1f Update engine.ts 2026-04-30 13:53:28 +09:00
syuilo 30f7727e33 wip 2026-04-30 13:32:10 +09:00
syuilo 5d36da17fe wip 2026-04-30 12:16:35 +09:00
syuilo 7bcda08339 wip 2026-04-30 11:52:53 +09:00
syuilo a15575078f Update engine.ts 2026-04-30 11:22:05 +09:00
syuilo 56d813a184 Update engine.ts 2026-04-30 11:13:26 +09:00
syuilo 8f5c09daa1 wip 2026-04-30 09:17:22 +09:00
syuilo c2d5a33400 wip 2026-04-30 08:36:23 +09:00
syuilo 6f3f4e7ef1 wip 2026-04-30 08:32:55 +09:00
syuilo 49f21d7423 wip 2026-04-29 21:06:15 +09:00
syuilo 92a6086e21 Create wall-wood.png 2026-04-29 21:03:40 +09:00
syuilo 9d1c2d52d2 Update tabletopLcdButtonsController.ts 2026-04-29 20:57:59 +09:00
syuilo f97a6c6d55 wip 2026-04-29 20:16:23 +09:00
syuilo 0f69a284c6 wip 2026-04-29 20:07:34 +09:00
syuilo 1427d887dd wip 2026-04-29 20:00:56 +09:00
syuilo a4c9aff8a9 wip 2026-04-29 19:38:21 +09:00
syuilo 5db8ccec74 Update worker.ts 2026-04-29 17:34:02 +09:00
syuilo 70ebc0d32c clean 2026-04-29 17:17:42 +09:00
syuilo d885627350 refactor 2026-04-29 17:16:05 +09:00
syuilo 4a77db7866 refactor 2026-04-29 17:04:06 +09:00
syuilo e50d4fa8ab Update engine.ts 2026-04-29 16:58:11 +09:00
syuilo 27578f2688 wip 2026-04-29 15:23:00 +09:00
syuilo fc97ba41af Update README.md 2026-04-29 15:08:43 +09:00
syuilo a3610ae6c4 🎨 2026-04-29 15:05:04 +09:00
syuilo fc615daad3 Update engine.ts 2026-04-29 13:02:56 +09:00
syuilo 0321edb1ac Merge branch 'room' of https://github.com/misskey-dev/misskey into room 2026-04-29 13:02:31 +09:00
syuilo 8593737886 clean 2026-04-29 13:02:10 +09:00
syuilo 35ad1d758e wip 2026-04-29 12:59:46 +09:00
syuilo 110e5daa6f Update README.md 2026-04-29 12:19:26 +09:00
syuilo 5de191f01a wip 2026-04-29 11:41:14 +09:00
syuilo 80c2b1fa65 mhq 2026-04-29 11:01:42 +09:00
syuilo c8441da835 wip 2026-04-29 10:04:45 +09:00
syuilo fa2b1d6096 wip 2026-04-29 09:53:29 +09:00
syuilo 18a4da4ad7 wip 2026-04-29 09:49:04 +09:00
syuilo 52e9395fab wip 2026-04-29 09:40:12 +09:00
syuilo d05d7938a4 Update engine.ts 2026-04-28 21:12:05 +09:00
syuilo 7846e8efb8 Update engine.ts 2026-04-28 21:08:14 +09:00
syuilo e09f832fad wip 2026-04-28 17:53:48 +09:00
syuilo 515f6d9790 wip 2026-04-28 16:52:24 +09:00
syuilo 657159da45 wip 2026-04-28 16:25:43 +09:00
syuilo e88188cd6d wip 2026-04-28 16:22:08 +09:00
syuilo dcb834ed41 Update controller.ts 2026-04-28 16:11:27 +09:00
syuilo 5a7960d0a9 wip 2026-04-28 16:03:28 +09:00
syuilo 11e55d8fe8 wip 2026-04-28 15:54:41 +09:00
syuilo 836de1bb28 wip 2026-04-28 14:24:20 +09:00
syuilo 58e617af6d wip 2026-04-28 12:20:14 +09:00
syuilo f44d566933 wip@p 2026-04-28 11:10:57 +09:00
syuilo 72fbc4bc9c Update engine.ts 2026-04-28 09:00:10 +09:00
syuilo 746c16aecc Update engine.ts 2026-04-28 08:58:00 +09:00
syuilo 7bef2cd8e0 wip 2026-04-28 08:46:33 +09:00
syuilo aed73eb074 Update room.vue 2026-04-28 08:23:13 +09:00
syuilo a756ca6ffb 🎨 2026-04-28 07:59:23 +09:00
syuilo f19040888a wip 2026-04-27 20:57:30 +09:00
syuilo 634cdf5e1e wip 2026-04-27 19:05:03 +09:00
syuilo c09d445215 wip 2026-04-27 18:28:15 +09:00
syuilo 1d71c0c6dd wip 2026-04-27 17:13:25 +09:00
syuilo 130a43f39a wip 2026-04-27 17:02:43 +09:00
syuilo 9c25c44a8a wip 2026-04-27 16:58:01 +09:00
syuilo 76ce6c84c0 wip 2026-04-27 16:51:05 +09:00
syuilo 24caff71e1 Update engine.ts 2026-04-27 15:22:50 +09:00
syuilo 036b8ea320 wip 2026-04-27 14:46:57 +09:00
syuilo f98394fc60 Update engine.ts 2026-04-27 11:04:46 +09:00
syuilo f52ac6351d wip 2026-04-27 10:58:23 +09:00
syuilo eb1357026d Merge branch 'develop' into room 2026-04-27 10:35:14 +09:00
syuilo 1b5be37f9b Update room.vue 2026-04-27 10:23:56 +09:00
syuilo 42c659c580 Merge branch 'develop' into room 2026-04-27 10:19:37 +09:00
syuilo ec32cad19f Update room.vue 2026-04-27 10:05:02 +09:00
syuilo 0910c47612 Update room.vue 2026-04-27 09:14:36 +09:00
syuilo 88e7303779 wip 2026-04-27 09:02:49 +09:00
syuilo 3a5532211b wip 2026-04-27 08:36:41 +09:00
syuilo 5b945278f9 wip 2026-04-26 21:21:04 +09:00
syuilo 0db2e5a42f Update room.vue 2026-04-26 20:56:47 +09:00
syuilo 8e1c5673b8 Update room.vue 2026-04-26 20:51:27 +09:00
syuilo a763c396bd Update MkProgressBar.vue 2026-04-26 20:51:23 +09:00
syuilo f5dae1d4c8 wip 2026-04-26 18:45:33 +09:00
syuilo 17697ba6ec joystick 2026-04-26 17:08:51 +09:00
syuilo a77987ab28 Update engine.ts 2026-04-26 13:58:33 +09:00
syuilo 47d9e92776 Update engine.ts 2026-04-26 13:25:28 +09:00
syuilo af928ffe93 Update engine.ts 2026-04-26 12:17:43 +09:00
syuilo 4adca586ed wip 2026-04-26 12:11:15 +09:00
syuilo e703705d60 Update engine.ts 2026-04-26 11:33:30 +09:00
syuilo be434949a4 Update engine.ts 2026-04-26 11:26:23 +09:00
syuilo bbff43e9e6 Update room.vue 2026-04-26 11:22:46 +09:00
syuilo 5c28ee0536 Update engine.ts 2026-04-26 10:08:43 +09:00
syuilo 7e41d17c6a Update engine.ts 2026-04-26 10:05:00 +09:00
syuilo 1cd6d01fdd wip 2026-04-25 04:19:52 +09:00
syuilo 3263f4bcc0 Update tabletopLcdButtonsController.ts 2026-04-24 19:40:39 +09:00
syuilo 58feedb53d wip 2026-04-24 19:38:25 +09:00
syuilo e62c85a971 wip 2026-04-24 19:35:19 +09:00
syuilo 585d727297 wip 2026-04-24 19:04:37 +09:00
syuilo abd6c85b41 Update engine.ts 2026-04-24 18:10:43 +09:00
syuilo 9551a3d01a wip 2026-04-24 17:55:13 +09:00
syuilo d281a81200 Update engine.ts 2026-04-24 16:43:04 +09:00
syuilo 82741c2d61 Update engine.ts 2026-04-24 16:23:13 +09:00
syuilo b00880c21f wip 2026-04-24 15:42:58 +09:00
syuilo df5d5d23cc Update engine.ts 2026-04-24 13:51:25 +09:00
syuilo 35f6cac9f6 wip 2026-04-24 13:26:38 +09:00
syuilo 7ddcbf5e94 Update previewEngine.ts 2026-04-24 11:42:49 +09:00
syuilo 634bae3c49 wip 2026-04-24 11:36:35 +09:00
syuilo 0b50aa9d13 Update room.add-object-dialog.vue 2026-04-24 11:27:08 +09:00
syuilo e594ad9c6f Update room.add-object-dialog.vue 2026-04-24 11:19:49 +09:00
syuilo d105c707ec Update room.add-object-dialog.vue 2026-04-24 10:59:42 +09:00
syuilo 93f24c5b8f Update room.add-object-dialog.vue 2026-04-24 10:33:55 +09:00
syuilo 7c170a21e5 wip 2026-04-24 10:16:13 +09:00
syuilo 1de4440dbd ductRailSpotLights 2026-04-23 21:17:12 +09:00
syuilo e6ce36178c wip 2026-04-23 20:22:24 +09:00
syuilo 8a6e925297 wip 2026-04-23 20:18:46 +09:00
syuilo eeda7e7002 note 2026-04-23 18:11:54 +09:00
syuilo abfa67965e wip 2026-04-23 17:48:12 +09:00
syuilo 2c6560cc71 Update previewEngine.ts 2026-04-23 17:28:21 +09:00
syuilo 4984146f6e Update issyoubin.ts 2026-04-23 17:26:40 +09:00
syuilo c36dfc6643 wip 2026-04-23 17:17:09 +09:00
syuilo 9184f0d7b9 issyoubin wip 2026-04-23 16:54:59 +09:00
syuilo 4c659c3129 Update previewEngine.ts 2026-04-23 16:50:54 +09:00
syuilo 10926e5525 Update utility.ts 2026-04-23 15:37:26 +09:00
syuilo 8d3a5a6503 morph 2026-04-23 13:45:50 +09:00
syuilo 924c517bb5 Update randomBooks.ts 2026-04-23 12:31:44 +09:00
syuilo 54c339d89c Update randomBooks.ts 2026-04-23 12:23:34 +09:00
syuilo ce98d4244b Update tabletopDigitalClock.ts 2026-04-23 12:19:54 +09:00
syuilo 4e4b56699b wip 2026-04-23 11:57:53 +09:00
syuilo fab7667b0a 平積み 2026-04-23 09:59:15 +09:00
syuilo 942e32f4de 🎨 2026-04-23 08:19:00 +09:00
syuilo 3897b044fe Update previewEngine.ts 2026-04-22 22:39:42 +09:00
syuilo c47a0c33cf wip 2026-04-22 21:45:33 +09:00
syuilo 2b849685a1 Update engine.ts 2026-04-22 21:24:19 +09:00
syuilo bad29c7604 tableSalt 2026-04-22 21:07:33 +09:00
syuilo b7b24a2140 Update books.ts 2026-04-22 19:45:21 +09:00
syuilo 20d9a03bb3 wip 2026-04-22 19:10:18 +09:00
syuilo 09d58a3ecf wip 2026-04-22 18:33:17 +09:00
syuilo 94e8050455 wallMountSpotLight 2026-04-22 17:28:15 +09:00
syuilo 2f039ce2e9 Update controller.ts 2026-04-22 16:04:38 +09:00
syuilo 61fd35bc97 wip 2026-04-22 16:02:24 +09:00
syuilo 2d36ccf1b2 wip 2026-04-22 14:12:11 +09:00
syuilo 174221fdc4 Update engine.ts 2026-04-22 13:56:38 +09:00
syuilo 08a0f03a45 Update engine.ts 2026-04-22 12:12:58 +09:00
syuilo de795a48e8 Update engine.ts 2026-04-22 12:10:50 +09:00
syuilo af8a0bdf12 Update engine.ts 2026-04-22 11:54:24 +09:00
syuilo b734ab3419 Update engine.ts 2026-04-22 11:33:08 +09:00
syuilo 595e66c423 Update engine.ts 2026-04-22 11:26:53 +09:00
syuilo 7b0e839661 up 2026-04-22 09:36:40 +09:00
syuilo 6f79420fdc 🎨 2026-04-22 09:31:40 +09:00
syuilo b41bad4188 tabletop-lcd-buttons-controller 2026-04-22 09:16:31 +09:00
syuilo 2f34f1c6f1 🎨 2026-04-21 19:42:55 +09:00
syuilo 7b80da7737 🎨 2026-04-21 17:18:46 +09:00
syuilo e65e3b4569 Update previewEngine.ts 2026-04-21 17:09:39 +09:00
syuilo 0ef489513a 🎨 2026-04-21 17:01:32 +09:00
syuilo a92cae8e09 Merge branch 'develop' into room 2026-04-21 16:38:16 +09:00
syuilo 2619509d69 wip 2026-04-21 16:35:13 +09:00
syuilo da8945dc23 stormGlass 2026-04-21 16:30:42 +09:00
syuilo 64995bebc5 glassCylinderPotPlant 2026-04-21 15:54:05 +09:00
syuilo c2dde53c1c gizmo 2026-04-21 15:08:11 +09:00
syuilo efaf7bdd95 side grid snap 2026-04-21 14:28:27 +09:00
syuilo 3dcbfc0168 wall snap 2026-04-21 14:16:37 +09:00
syuilo e96e88b1ce fix scale 2026-04-21 13:33:43 +09:00
syuilo 493a2eb50c Update engine.ts 2026-04-21 13:23:13 +09:00
syuilo fc4d769e1e grid 2026-04-21 12:36:44 +09:00
syuilo 0f0bc9b54f fix scale 2026-04-21 12:18:20 +09:00
syuilo ead90471c4 note 2026-04-21 12:08:01 +09:00
syuilo 461e083454 fix scale 2026-04-21 12:02:58 +09:00
syuilo 79fe0fbd05 make WORLD_SCALE 1 2026-04-21 11:55:53 +09:00
syuilo db9d0090b7 clean up 2026-04-21 11:47:58 +09:00
syuilo 1f81960640 wip 2026-04-21 11:46:48 +09:00
syuilo 5d389732d9 Update randomBooks.ts 2026-04-21 11:27:56 +09:00
syuilo b300f9620c Update woodRingsPendantLight.ts 2026-04-21 11:24:43 +09:00
syuilo ddafd9e517 Update engine.ts 2026-04-21 11:23:18 +09:00
syuilo 2b9f593e03 Update engine.ts 2026-04-21 11:19:48 +09:00
syuilo 5f3f3d715a 9.3.3 2026-04-21 11:08:42 +09:00
syuilo de62fa3b59 Update engine.ts 2026-04-21 09:47:49 +09:00
syuilo 32cba5b979 note 2026-04-21 09:46:12 +09:00
syuilo ab90824b9c wip 2026-04-21 09:44:23 +09:00
syuilo ebec026508 Update engine.ts 2026-04-21 09:12:00 +09:00
syuilo 8ddb2cbe75 Update engine.ts 2026-04-21 09:09:25 +09:00
syuilo 97439d7718 Update engine.ts 2026-04-21 08:53:18 +09:00
syuilo 60a2cd9306 Update engine.ts 2026-04-21 08:52:31 +09:00
syuilo 62be4a258e fix 2026-04-21 07:53:24 +09:00
syuilo ae4a174de5 Merge branch 'develop' into room 2026-04-21 06:13:42 +09:00
syuilo 1e15503000 up 2026-04-21 06:13:17 +09:00
syuilo 61ac82d297 Update petBottle.ts 2026-04-20 21:39:23 +09:00
syuilo f18b3467d9 🎨 2026-04-20 21:37:20 +09:00
syuilo dec440b6cc wip 2026-04-20 21:25:31 +09:00
syuilo 26ac4f7732 note 2026-04-20 20:52:24 +09:00
syuilo b7b3c07a96 Update engine.ts 2026-04-20 20:50:52 +09:00
syuilo 2040827615 wip 2026-04-20 20:47:31 +09:00
syuilo 2b456fec47 wip 2026-04-20 20:21:42 +09:00
syuilo b21ad59db3 wip 2026-04-20 20:19:18 +09:00
syuilo f04799a4f5 wip 2026-04-20 20:07:49 +09:00
syuilo 28dec6b0a3 clean up 2026-04-20 20:01:25 +09:00
syuilo 714bff0835 Update room.add-object-dialog.vue 2026-04-20 20:00:41 +09:00
syuilo 772608ae99 wip 2026-04-20 19:13:29 +09:00
syuilo fe3b3704ba 🎨 2026-04-20 18:10:43 +09:00
syuilo d6caef7ee7 Update heya.ts 2026-04-20 16:29:28 +09:00
syuilo 83a15f74ef boxWallShelf 2026-04-20 16:07:35 +09:00
syuilo 27addb49cf wip 2026-04-20 14:38:12 +09:00
syuilo 6aa741f8d4 wip 2026-04-20 14:32:46 +09:00
syuilo e224bdf5e4 Update previewEngine.ts 2026-04-20 12:41:11 +09:00
syuilo 9fe2044f53 Update previewEngine.ts 2026-04-20 12:33:25 +09:00
syuilo b1aef2d308 Update previewEngine.ts 2026-04-20 12:29:08 +09:00
syuilo 79a063f692 wip 2026-04-20 12:17:57 +09:00
syuilo c3c36b06c2 Update previewEngine.ts 2026-04-20 11:36:39 +09:00
syuilo 358f0c0a6f Update engine.ts 2026-04-20 09:58:18 +09:00
syuilo 6041db87e8 wip 2026-04-20 09:46:10 +09:00
syuilo ff4af812b5 wip 2026-04-20 09:14:22 +09:00
syuilo c2428ca3cc fix 2026-04-19 20:23:07 +09:00
syuilo e402057d3b timer 2026-04-19 20:15:51 +09:00
syuilo 3811de2283 Update utility.ts 2026-04-19 20:07:05 +09:00
syuilo 421d466921 speakerStand 2026-04-19 17:36:24 +09:00
syuilo a211d0df51 wip 2026-04-19 17:11:59 +09:00
syuilo c0690c9b80 wip 2026-04-19 16:46:55 +09:00
syuilo 8b9164a8c3 wip 2026-04-19 16:38:42 +09:00
syuilo 5df01bae9a wip 2026-04-19 13:37:43 +09:00
syuilo f8e093466d fixes 2026-04-19 13:32:08 +09:00
syuilo 664ca528fe wip 2026-04-19 13:21:21 +09:00
syuilo aaab1e7260 wip 2026-04-19 09:52:02 +09:00
syuilo a85f05ca29 wip 2026-04-18 20:58:52 +09:00
syuilo 3253d30073 wip 2026-04-18 20:30:53 +09:00
syuilo 02d365e27b wip 2026-04-18 20:07:50 +09:00
syuilo a4be9b2078 wip 2026-04-18 18:08:37 +09:00
syuilo 47cd092380 wip 2026-04-18 15:08:36 +09:00
syuilo d1555d5423 Update engine.ts 2026-04-18 14:08:35 +09:00
syuilo acd9b94b49 wip 2026-04-18 14:07:14 +09:00
syuilo 4b135bccd8 wip 2026-04-18 11:54:03 +09:00
syuilo 109fdd2ff3 Merge branch 'develop' into room 2026-04-18 08:17:59 +09:00
syuilo aa5275137e wip 2026-04-18 08:13:37 +09:00
syuilo 669286c1d8 wip 2026-04-17 20:42:02 +09:00
syuilo 623b4f087f wip 2026-04-17 17:53:11 +09:00
syuilo 02c6e1b876 fix 2026-04-17 15:39:12 +09:00
syuilo 6cca5706f7 wip 2026-04-17 15:31:56 +09:00
syuilo ebdf627b19 update directory structure 2026-04-17 10:16:05 +09:00
syuilo ae463cde5e wip 2026-04-17 10:03:33 +09:00
syuilo 6350890e9f Update engine.ts 2026-04-16 19:04:13 +09:00
syuilo 77fc803612 Update engine.ts 2026-04-16 18:52:47 +09:00
syuilo e87752a07c clean up 2026-04-16 18:06:59 +09:00
syuilo a7c8a3d6d1 Update engine.ts 2026-04-16 17:34:35 +09:00
syuilo 2175a3a18f Update engine.ts 2026-04-16 17:20:49 +09:00
syuilo 3d48146b92 Update engine.ts 2026-04-16 15:40:48 +09:00
syuilo 4f9aded205 Update engine.ts 2026-04-16 15:27:23 +09:00
syuilo e634fb1456 wip 2026-04-16 14:50:10 +09:00
syuilo 2b0d0d4533 Merge branch 'develop' into room 2026-04-16 14:34:24 +09:00
syuilo 4ac9da7f1f Merge branch 'develop' into room 2026-04-16 12:47:24 +09:00
syuilo 08e0ecf99b Update engine.ts 2026-04-16 11:01:32 +09:00
syuilo 007a2481ef Update ceilingFanLight.ts 2026-04-16 10:58:12 +09:00
syuilo 61eea5799b 🎨 2026-04-16 10:57:58 +09:00
syuilo 1fe9117944 miObjet 2026-04-16 10:41:24 +09:00
syuilo 4a16a71fa2 note 2026-04-16 09:53:49 +09:00
syuilo 85701fcb6d Update README.md 2026-04-16 09:50:06 +09:00
syuilo cd918817d9 Update README.md 2026-04-16 09:48:02 +09:00
syuilo 24c0504cb0 🎨 2026-04-16 08:05:39 +09:00
syuilo 750a48df62 todo 2026-04-16 08:00:48 +09:00
syuilo ead79ab275 wip 2026-04-16 07:59:33 +09:00
syuilo 124079f80a wip 2026-04-15 21:44:26 +09:00
syuilo ac2c6b93ce 🎨 2026-04-15 19:48:52 +09:00
syuilo b0d4ab371b wip 2026-04-15 19:08:08 +09:00
syuilo a3c3f7ba91 clean uv 2026-04-15 18:57:37 +09:00
syuilo 12e1b86b53 note 2026-04-15 18:43:22 +09:00
syuilo 7fd9ac1cc8 wip 2026-04-15 18:30:13 +09:00
syuilo da8a7abcde setRenderingAutoClearDepthStencil 2026-04-15 18:24:15 +09:00
syuilo 6275196101 progress 2026-04-15 18:10:42 +09:00
syuilo 7eb8723082 Update engine.ts 2026-04-15 17:48:49 +09:00
syuilo d730c26fcc Update engine.ts 2026-04-15 17:44:33 +09:00
syuilo 56c2e1c989 Update engine.ts 2026-04-15 16:50:12 +09:00
syuilo 77acce78dd wip 2026-04-15 16:31:32 +09:00
syuilo db5f64b097 wip 2026-04-15 16:18:15 +09:00
syuilo ddfd9f46f3 Update engine.ts 2026-04-15 13:11:47 +09:00
syuilo 4254268f8d TransformNode 2026-04-15 12:14:27 +09:00
syuilo 5104bafe95 hasCollisions 2026-04-15 11:54:38 +09:00
syuilo c426f95bee wip 2026-04-15 11:36:26 +09:00
syuilo c9ae842258 optimize collisions 2026-04-15 11:18:20 +09:00
syuilo 6a7e05d00a Update room.vue 2026-04-15 10:45:50 +09:00
syuilo af5bdb4296 cm 2026-04-15 09:23:11 +09:00
syuilo cf46a4af1e scale intensity 2026-04-15 09:17:11 +09:00
syuilo 83daf43f49 scale intensity 2026-04-15 09:01:59 +09:00
syuilo 3db0b8a1fd cm 2026-04-15 08:51:47 +09:00
syuilo cf9349f29c controller 2026-04-14 21:30:07 +09:00
syuilo 7e0b5ff8be fps 2026-04-14 15:50:06 +09:00
syuilo 28030ea3fa Update engine.ts 2026-04-14 12:53:29 +09:00
syuilo 357aeff407 Update dj-player.glb 2026-04-14 12:45:05 +09:00
syuilo 2f80442b99 🎨 2026-04-14 12:40:33 +09:00
syuilo 3bad686c71 Update engine.ts 2026-04-14 12:26:15 +09:00
syuilo 240c055b45 collision 2026-04-14 10:43:40 +09:00
syuilo 02eb8cfe1c Update room.vue 2026-04-14 08:03:15 +09:00
syuilo 87e2a046b7 🎨 2026-04-14 05:43:42 +09:00
syuilo 4ce42a02c1 newtonsCradle 2026-04-14 04:56:55 +09:00
syuilo f61b2504cc Update engine.ts 2026-04-14 04:26:22 +09:00
syuilo 1b119c49a1 update 2026-04-14 04:15:17 +09:00
syuilo 0ae3eb0721 Update engine.ts 2026-04-14 03:26:34 +09:00
syuilo 205d2c3343 wip 2026-04-13 21:42:12 +09:00
syuilo b6e269d140 fix 2026-04-13 21:10:09 +09:00
syuilo b9335bc314 🎨 2026-04-13 20:21:09 +09:00
syuilo ae92f75345 fix 2026-04-13 18:39:09 +09:00
syuilo 2ff307fe42 Update ironFrameTable.ts 2026-04-13 18:18:26 +09:00
syuilo 60bdd30681 Update tabletopIronFrameStand.ts 2026-04-13 18:11:41 +09:00
syuilo c877210828 ironFrameTable 2026-04-13 18:08:39 +09:00
syuilo e85d1c6139 tabletopIronFrameStand 2026-04-13 17:29:07 +09:00
syuilo 2094e82a30 desk 2026-04-13 16:41:21 +09:00
syuilo f86c5fb3b2 Update engine.ts 2026-04-13 15:30:31 +09:00
syuilo 6b95d07930 woodRingsPendantLight 2026-04-13 13:14:46 +09:00
syuilo 886f64055d wallGlassPictureFrame 2026-04-13 11:58:08 +09:00
syuilo 4740c76128 wip 2026-04-13 11:18:53 +09:00
syuilo baad4ae929 variable iron-frame-shelf 2026-04-13 11:11:14 +09:00
syuilo e989c4b1a5 cuboid 2026-04-13 10:12:24 +09:00
syuilo 8f133d3fed wip 2026-04-13 09:58:02 +09:00
syuilo f26ebef565 pizza 2026-04-12 21:38:39 +09:00
syuilo 7f46bd4928 rename 2026-04-12 21:30:47 +09:00
syuilo abe22da9ed Update ironWoodShelf.ts 2026-04-12 21:28:17 +09:00
syuilo ebc9a60237 ironWoodShelf 2026-04-12 21:22:04 +09:00
syuilo 272c267ea0 Update engine.ts 2026-04-12 19:58:40 +09:00
syuilo 21e6ac6678 🎨 2026-04-12 18:57:46 +09:00
syuilo 2685e254f1 twistedCubeObjet 2026-04-12 17:56:01 +09:00
syuilo 7d5c2052eb Update tabletopGlassPictureFrame.ts 2026-04-12 16:43:19 +09:00
syuilo e8d43032cc wip 2026-04-12 16:41:48 +09:00
syuilo 4ad5234325 tabletopGlassPictureFrame 2026-04-12 15:40:03 +09:00
syuilo 6582087b2f 🎨 2026-04-12 14:30:59 +09:00
syuilo dc689a8c22 🎨 2026-04-12 11:29:39 +09:00
syuilo fa8bdf55be sprayer 2026-04-12 11:29:30 +09:00
syuilo 87828dc0ad fix 2026-04-11 19:37:21 +09:00
syuilo 9fe161ec7c wip 2026-04-11 18:28:31 +09:00
syuilo 938dc5ce40 wip 2026-04-11 15:35:01 +09:00
syuilo 5049857e81 Update randomBooks.ts 2026-04-11 14:19:22 +09:00
syuilo 58cf1414fc Update texture.png 2026-04-11 13:19:04 +09:00
syuilo 6563eb9b8f Update randomBooks.ts 2026-04-11 13:15:07 +09:00
syuilo 69ac19d018 wip 2026-04-11 13:03:11 +09:00
syuilo eeae06014a Update randomBooks.ts 2026-04-11 11:35:33 +09:00
syuilo d808d20f8e wip 2026-04-11 11:19:22 +09:00
syuilo d775fa6360 wip 2026-04-11 05:54:20 +09:00
syuilo 5f4914e6dc Update engine.ts 2026-04-11 05:14:21 +09:00
syuilo 8427685f7b Update engine.ts 2026-04-11 05:08:42 +09:00
syuilo 7dd05a3d60 anim 2026-04-11 05:07:41 +09:00
syuilo 55747bdb99 Merge branch 'room' of https://github.com/misskey-dev/misskey into room 2026-04-11 05:05:40 +09:00
syuilo 909c0ae156 Update engine.ts 2026-04-11 05:05:30 +09:00
syuilo 4c0b78a1ac add put anim 2026-04-11 05:04:58 +09:00
syuilo 62a9795685 note 2026-04-10 20:38:56 +09:00
syuilo 04ff23c44f dj 2026-04-10 19:55:13 +09:00
syuilo ed119dfeb8 Update engine.ts 2026-04-10 16:10:22 +09:00
syuilo c341ad21db used-tissue 2026-04-10 15:00:26 +09:00
syuilo 11119ab046 book 2026-04-10 14:35:17 +09:00
syuilo dc59fd4edb icosahedron 2026-04-10 12:53:51 +09:00
syuilo 887f548985 wallMirror 2026-04-10 11:41:07 +09:00
syuilo a627b58e85 wallCanvas 2026-04-10 11:06:39 +09:00
syuilo 57fbebaea5 Update engine.ts 2026-04-10 09:59:49 +09:00
syuilo 6386ebe18e wip 2026-04-10 09:46:18 +09:00
syuilo 60bf7c6b1f wip 2026-04-09 22:16:33 +09:00
syuilo 6fe0e97ac6 🍮 2026-04-09 15:43:45 +09:00
syuilo bf72fb0d9a Merge branch 'develop' into room 2026-04-09 14:31:26 +09:00
syuilo 85af12d35a Update engine.ts 2026-04-09 11:29:20 +09:00
syuilo 7970fed6e1 Update engine.ts 2026-04-09 11:23:46 +09:00
syuilo 03c0b48e1e Update engine.ts 2026-04-09 11:16:43 +09:00
syuilo 45c851bb5b wip 2026-04-09 08:57:31 +09:00
syuilo 9b3424c5d3 wip 2026-04-08 22:21:42 +09:00
syuilo 9d9b47daca wip 2026-04-08 20:47:02 +09:00
syuilo 1d8f03e199 wip 2026-04-08 20:34:35 +09:00
syuilo 5e1c0d1064 wip 2026-04-08 18:40:20 +09:00
syuilo a6b7150371 Update engine.ts 2026-04-08 18:08:06 +09:00
syuilo 7701bca55b wip 2026-04-08 16:59:32 +09:00
syuilo 547da71743 refactor 2026-04-08 15:34:42 +09:00
syuilo 25ed41ba64 refactor 2026-04-08 15:24:17 +09:00
syuilo 5e4d128f68 refactor 2026-04-08 15:12:46 +09:00
syuilo 8ec7da0cf4 wip 2026-04-08 14:38:43 +09:00
syuilo 970efb3440 wip 2026-04-08 13:20:09 +09:00
syuilo 58acbac7ef wip 2026-04-08 12:49:32 +09:00
syuilo 5736b43149 wip 2026-04-08 12:40:40 +09:00
syuilo 682c5417cb wip 2026-04-08 12:31:34 +09:00
syuilo 127600a5d4 Update engine.ts 2026-04-08 10:48:44 +09:00
syuilo 61386f699e Update engine.ts 2026-04-08 10:29:16 +09:00
syuilo 3283ec410a Update engine.ts 2026-04-08 10:19:18 +09:00
syuilo 6fd8c8c908 note 2026-04-08 10:16:27 +09:00
syuilo 5b6fa78748 Update engine.ts 2026-04-08 10:06:44 +09:00
syuilo 64fd4b7c0a wip 2026-04-08 10:06:36 +09:00
syuilo 3356cf36d3 note 2026-04-07 21:44:58 +09:00
syuilo e2e4e83e6f note 2026-04-07 21:40:10 +09:00
syuilo 8030e4f3fa note 2026-04-07 21:37:13 +09:00
syuilo a00d80e30c add note 2026-04-07 21:32:37 +09:00
syuilo 82373f24d9 Update engine.ts 2026-04-07 20:16:59 +09:00
syuilo fb0c089a16 wip 2026-04-07 19:18:55 +09:00
syuilo c04c6502be wip 2026-04-07 19:00:25 +09:00
syuilo 6b4310c91d Update engine.ts 2026-04-07 17:11:07 +09:00
syuilo 662de635aa Update woodRingFloorLamp.ts 2026-04-07 17:02:38 +09:00
syuilo af8d14a139 Update engine.ts 2026-04-07 15:45:36 +09:00
syuilo afd731797e wip 2026-04-07 15:43:06 +09:00
syuilo d51d1191c5 apply scale 2026-04-07 09:03:55 +09:00
syuilo f4a060b9a8 Update woodRingFloorLamp.ts 2026-04-06 21:41:28 +09:00
syuilo f6677aa02c wip 2026-04-06 21:28:16 +09:00
syuilo 0d966d8ded wip 2026-04-06 21:14:50 +09:00
syuilo a54a8a10ad Update engine.ts 2026-04-06 15:35:21 +09:00
syuilo 602c8d8be1 Update engine.ts 2026-04-06 14:14:24 +09:00
syuilo bdbbe83421 Update engine.ts 2026-04-06 13:39:36 +09:00
syuilo 50575a272c Update engine.ts 2026-04-06 13:17:47 +09:00
syuilo 3b80a96412 Update engine.ts 2026-04-06 12:55:39 +09:00
syuilo fa979f1fed Update engine.ts 2026-04-06 11:40:53 +09:00
syuilo 38bf5fc0bf 🎨 2026-04-06 08:56:38 +09:00
syuilo 78911b24de wip 2026-04-05 19:54:52 +09:00
syuilo 83b5305671 Update engine.ts 2026-04-05 17:18:58 +09:00
syuilo 07d57b0edd wip 2026-04-05 17:15:19 +09:00
syuilo bd0e6f3268 wip 2026-04-05 15:57:47 +09:00
syuilo 0c808aa23d add note 2026-04-05 15:36:44 +09:00
syuilo 68eebb9d76 wip 2026-04-05 15:31:12 +09:00
syuilo b318cff137 Update engine.ts 2026-04-05 14:49:14 +09:00
syuilo 614e8a7254 Update engine.ts 2026-04-05 13:12:23 +09:00
syuilo 93f62f6054 pc 2026-04-05 13:07:30 +09:00
syuilo ca49618fdb Update engine.ts 2026-04-04 21:54:26 +09:00
syuilo fdd360f490 Update engine.ts 2026-04-04 21:25:13 +09:00
syuilo df5df25c80 wip 2026-04-04 20:55:48 +09:00
syuilo c454b8922b wip 2026-04-04 20:23:24 +09:00
syuilo ba4d495b42 Update engine.ts 2026-04-04 19:19:33 +09:00
syuilo 4ed1d56f03 Update ceilingFanLight.ts 2026-04-04 18:14:45 +09:00
syuilo 49823f9ec3 Update engine.ts 2026-04-04 17:18:55 +09:00
syuilo 85dea8b49d wip 2026-04-04 17:09:20 +09:00
syuilo f2be8a2169 Update engine.ts 2026-04-04 16:57:52 +09:00
syuilo 7121cd1ea9 Update engine.ts 2026-04-04 16:43:32 +09:00
syuilo e79532e50a add note 2026-04-04 16:20:24 +09:00
syuilo 17f97bab7b wip 2026-04-04 16:01:20 +09:00
syuilo f13ada97a7 Update books.ts 2026-04-04 14:55:01 +09:00
syuilo 0db754bdd6 Update engine.ts 2026-04-04 13:47:17 +09:00
syuilo 74dfbb7a74 Update engine.ts 2026-04-04 12:55:05 +09:00
syuilo 2a583509ab Update engine.ts 2026-04-04 12:42:27 +09:00
syuilo 4813ea5afc wip 2026-04-03 20:51:40 +09:00
syuilo 65b6821d4f Update engine.ts 2026-04-03 20:46:22 +09:00
syuilo 8a165321b7 Update engine.ts 2026-04-03 19:52:04 +09:00
syuilo b89fc36cd0 Update engine.ts 2026-04-03 19:49:15 +09:00
syuilo f5ebbbca50 Update engine.ts 2026-04-03 19:23:47 +09:00
syuilo 81414a18d3 wip 2026-04-03 19:16:24 +09:00
syuilo 6bf4feaef5 Update engine.ts 2026-04-03 18:55:50 +09:00
syuilo 4efe4fb519 wip 2026-04-03 18:00:05 +09:00
syuilo 3873eb0cd7 wip 2026-04-03 17:21:21 +09:00
syuilo df092dd120 wip 2026-04-03 16:13:42 +09:00
syuilo 654c2c5b05 Update blind.ts 2026-04-03 14:07:44 +09:00
syuilo f367bc37f8 wip 2026-04-03 13:45:43 +09:00
syuilo e8d8242c09 wip 2026-04-03 12:42:35 +09:00
syuilo 2ecaccedab Update laptopPc.ts 2026-04-03 11:26:15 +09:00
syuilo 4a7614f903 wip 2026-04-03 11:25:25 +09:00
syuilo d3da77c307 wip 2026-04-03 11:18:23 +09:00
syuilo 1c610ce825 Update engine.ts 2026-04-03 10:23:55 +09:00
syuilo d5a5b04468 wip 2026-04-03 10:13:43 +09:00
syuilo b91409f5c6 wip 2026-04-02 21:30:37 +09:00
syuilo 74c67b843e Update engine.ts 2026-04-02 17:51:10 +09:00
syuilo 913e35442c wip 2026-04-02 17:06:09 +09:00
syuilo 7a939dc5b3 Update engine.ts 2026-04-02 14:45:42 +09:00
syuilo 71179b8b24 Update engine.ts 2026-04-02 14:35:00 +09:00
syuilo c5a9c08814 wip 2026-04-02 14:31:20 +09:00
syuilo ea8df304c9 wip 2026-04-02 14:15:52 +09:00
syuilo a01bbf828d Merge branch 'develop' into room 2026-04-02 12:53:16 +09:00
syuilo d2807e974c Update utility.ts 2026-03-31 20:47:42 +09:00
syuilo d6f41f9c51 Update engine.ts 2026-03-31 20:47:16 +09:00
syuilo b2f2e9e75d wip 2026-03-27 19:03:11 +09:00
syuilo ee55a0a6cc Update engine.ts 2026-03-27 18:44:12 +09:00
syuilo df184c8fdf Update engine.ts 2026-03-27 15:48:53 +09:00
syuilo 4dd3bfc208 wip 2026-03-27 15:12:30 +09:00
syuilo c677dd6566 ✌️ 2026-03-27 14:46:53 +09:00
syuilo de53f475c5 Merge branch 'room' of https://github.com/misskey-dev/misskey into room 2026-03-27 14:20:02 +09:00
syuilo b2eed6b82a wip 2026-03-27 14:19:59 +09:00
syuilo 6eefe6899c Update engine.ts 2026-03-27 13:47:46 +09:00
syuilo 8619d0156e wip 2026-03-27 10:55:33 +09:00
syuilo 9bc0d7b361 wip 2026-03-26 22:20:34 +09:00
syuilo 9ffd8d777e Update engine.ts 2026-03-26 22:13:06 +09:00
syuilo c558f93a0e wip 2026-03-26 21:56:05 +09:00
syuilo 5458ee016d Update engine.ts 2026-03-26 21:13:29 +09:00
syuilo 5886260e0b wip 2026-03-26 21:09:24 +09:00
syuilo 42c7a483a4 wip 2026-03-26 20:27:10 +09:00
syuilo 7f5858a66f wip 2026-03-26 20:26:27 +09:00
syuilo 4965429069 wip 2026-03-26 19:13:45 +09:00
syuilo 58ec8af8cd wip 2026-03-26 14:34:22 +09:00
syuilo 1af8584aca Merge branch 'develop' into room 2026-03-26 14:19:36 +09:00
syuilo 564098a631 Merge branch 'develop' into room 2026-03-22 18:14:44 +09:00
syuilo 6fceb31c44 Update package.json 2026-03-15 16:38:41 +09:00
syuilo 2a1a27f8c7 Merge branch 'develop' into room 2026-03-15 16:38:33 +09:00
syuilo 0e5c8496ce wip 2026-03-07 20:42:43 +09:00
syuilo 7ff95b8f8a wip 2026-03-06 14:09:32 +09:00
syuilo 295c91c245 wip 2026-03-05 16:55:03 +09:00
syuilo 7322697707 Update engine.ts 2026-03-05 12:05:44 +09:00
syuilo ed4e3a51fd wip 2026-03-05 12:00:14 +09:00
syuilo bdc34305be wip 2026-03-05 11:54:25 +09:00
syuilo 354504b534 wip 2026-03-04 18:01:00 +09:00
syuilo f311105b54 wip 2026-03-04 14:22:40 +09:00
syuilo 2984b0000b wip 2026-03-04 13:00:10 +09:00
syuilo 98aadf8dcc wip 2026-03-04 12:20:11 +09:00
syuilo 1d3ddd279b Update pictureFrame.ts 2026-03-04 11:58:54 +09:00
syuilo 349ee141bb wip 2026-03-04 11:57:40 +09:00
syuilo 9070159db7 wip 2026-03-04 11:52:19 +09:00
syuilo 0a4b81b0cc Update pictureFrame.ts 2026-03-04 11:35:46 +09:00
syuilo 2de50f893f wip 2026-03-04 11:33:18 +09:00
syuilo 0157dd6b41 wip 2026-03-04 09:59:06 +09:00
syuilo 208c300460 refactor 2026-03-03 21:22:56 +09:00
syuilo 46791a3bf2 wip 2026-03-03 21:09:59 +09:00
syuilo 16b54e9615 wip 2026-03-03 21:01:31 +09:00
syuilo 78b689f41c wip 2026-03-03 20:27:26 +09:00
syuilo 7b04d5d434 Update engine.ts 2026-03-03 19:30:50 +09:00
syuilo c22345e3e0 wip 2026-03-03 19:10:13 +09:00
syuilo a90c179998 wip 2026-03-03 18:29:53 +09:00
syuilo 8eebeab692 Update poster.ts 2026-03-03 16:48:21 +09:00
syuilo 66e0eeedfb Update poster.ts 2026-03-03 16:34:05 +09:00
syuilo 3874f7abe9 Update poster.ts 2026-03-03 16:33:57 +09:00
syuilo 98f74b0c7a wip 2026-03-03 16:09:51 +09:00
syuilo dbffa5520c wip 2026-03-03 15:51:58 +09:00
syuilo e336cbad62 Update pictureFrame.ts 2026-03-03 14:56:42 +09:00
syuilo 2fab946b7a Update pictureFrame.ts 2026-03-03 14:52:16 +09:00
syuilo 239df4694c Update pictureFrame.ts 2026-03-03 13:43:31 +09:00
syuilo 1c9a324f3a Update engine.ts 2026-03-03 13:26:57 +09:00
syuilo dbdb7ec324 Update pictureFrame.ts 2026-03-03 13:01:57 +09:00
syuilo d43b3be6f0 wip 2026-03-03 12:46:55 +09:00
syuilo 34b46baaea wip 2026-03-03 12:34:52 +09:00
syuilo dc8dda3aac wip 2026-03-03 10:47:36 +09:00
syuilo 1b2717e256 wip 2026-03-02 21:14:25 +09:00
syuilo 9d723aaaa6 wip 2026-03-02 19:18:27 +09:00
syuilo 78bfcd71af wip 2026-03-02 19:05:35 +09:00
syuilo 5175a1e193 wip 2026-03-02 18:08:53 +09:00
syuilo 2438447ad3 wip 2026-03-02 15:26:50 +09:00
syuilo 01385575fd wip 2026-03-02 13:00:43 +09:00
syuilo 3f0c4b0577 wip 2026-03-02 10:46:16 +09:00
syuilo 36438e85d1 wip 2026-03-01 21:57:53 +09:00
syuilo 545009078a wip 2026-03-01 21:36:12 +09:00
syuilo 5910ec68e3 wip 2026-02-27 21:57:43 +09:00
syuilo 3e7166bd2c wip 2026-02-27 15:01:36 +09:00
syuilo dbfd1a751c wip 2026-02-27 13:56:29 +09:00
syuilo dda26f7f48 wip 2026-02-26 21:11:35 +09:00
syuilo 54b30d1138 wip 2026-02-26 15:57:27 +09:00
syuilo d8dc66781f wip 2026-02-26 15:48:59 +09:00
syuilo 4d37ada54d wip 2026-02-26 14:24:58 +09:00
syuilo a8456a45ab wip 2026-02-25 19:15:26 +09:00
syuilo 08667b4d35 wip 2026-02-25 19:05:50 +09:00
syuilo 03f20814c9 wip 2026-02-25 16:50:57 +09:00
syuilo 2672ae4463 Merge branch 'develop' into room 2026-02-24 17:58:15 +09:00
syuilo de4c1b3b66 wip 2026-02-22 21:25:36 +09:00
syuilo ec82773ff7 wip 2026-02-22 18:23:32 +09:00
syuilo cdb8d86fbf wip 2026-02-22 14:24:57 +09:00
syuilo 20dc48f221 wip 2026-02-22 13:55:08 +09:00
syuilo 0729e209c5 wip 2026-02-22 13:25:23 +09:00
syuilo c5eaf0f7af wip 2026-02-22 09:08:50 +09:00
syuilo dcae3ccaaa wip 2026-02-21 21:44:56 +09:00
syuilo fcc36759f7 Update tabletopDigitalClock.ts 2026-02-21 20:45:44 +09:00
syuilo 689c24c776 wip 2026-02-21 20:37:27 +09:00
syuilo 055121d698 Update engine.ts 2026-02-21 18:17:43 +09:00
syuilo 402dd538bf wip 2026-02-21 18:09:37 +09:00
syuilo 8bdf773a2b wip 2026-02-21 15:18:31 +09:00
syuilo 460f79d5cf wip 2026-02-20 21:02:28 +09:00
syuilo 998f85b260 wip 2026-02-20 17:56:29 +09:00
syuilo a0356d8d4d wip 2026-02-20 16:59:40 +09:00
syuilo d68655f5c2 wip 2026-02-20 16:43:12 +09:00
syuilo bba7076eca wip 2026-02-20 16:33:35 +09:00
syuilo aae03a914d wip 2026-02-20 13:15:34 +09:00
syuilo cdc9b47b78 wip 2026-02-20 11:39:42 +09:00
syuilo 41d40f53cf wip 2026-02-19 21:46:53 +09:00
syuilo 17a3bdb5eb wip 2026-02-19 21:38:44 +09:00
syuilo dadc5295fa wip 2026-02-19 19:44:08 +09:00
syuilo 679c75006a Update room.vue 2026-02-19 19:35:19 +09:00
syuilo cd9612e664 wip 2026-02-19 19:21:18 +09:00
syuilo d01b3036d6 wip 2026-02-19 19:09:00 +09:00
syuilo 376bb328df wip 2026-02-19 19:05:26 +09:00
syuilo 6a08231591 wip 2026-02-19 17:23:33 +09:00
syuilo 411c4ef3ae wip 2026-02-17 20:40:18 +09:00
syuilo 6f32e09db5 wip 2026-02-17 20:06:58 +09:00
syuilo 86f6498ddd wip 2026-02-17 16:45:54 +09:00
syuilo 5619cbb0da wip 2026-02-17 16:27:47 +09:00
syuilo 9475e6151f wip 2026-02-17 16:00:31 +09:00
syuilo af560802b3 wip 2026-02-17 13:46:58 +09:00
syuilo 3375220aee wip 2026-02-17 13:34:40 +09:00
syuilo ce7af6a308 wip 2026-02-17 13:27:25 +09:00
syuilo d446e00964 wip 2026-02-17 13:11:06 +09:00
syuilo 90fa65c96e wip 2026-02-17 12:09:07 +09:00
syuilo 3717962757 wip 2026-02-17 11:56:52 +09:00
syuilo 8bd2003a38 wip 2026-02-17 08:46:51 +09:00
syuilo 07909ab228 wip 2026-02-17 08:21:42 +09:00
syuilo 503a02ac42 Update engine.ts 2026-02-17 07:47:37 +09:00
syuilo 8a0ba3a18a Update engine.ts 2026-02-17 07:34:12 +09:00
syuilo 7b7767942f wip 2026-02-17 07:17:27 +09:00
syuilo 8c28c7c253 Update engine.ts 2026-02-16 21:11:13 +09:00
syuilo 0d8a6e8136 Update engine.ts 2026-02-16 21:06:39 +09:00
syuilo 6a4a09c8cf wip 2026-02-16 21:04:32 +09:00
syuilo 06adb3e045 wip 2026-02-16 20:51:48 +09:00
syuilo c12f330432 wip 2026-02-16 18:25:58 +09:00
syuilo a45611171a wip 2026-02-16 16:21:48 +09:00
syuilo f58de15d45 wip 2026-02-16 15:14:37 +09:00
syuilo aa6c9be133 Update engine.ts 2026-02-16 13:57:51 +09:00
syuilo 2841f67166 Update engine.ts 2026-02-16 12:23:06 +09:00
syuilo b1bb07542a Update engine.ts 2026-02-16 12:14:54 +09:00
syuilo eb0544e083 Update engine.ts 2026-02-16 11:14:53 +09:00
syuilo d490891acc Merge branch 'room' of https://github.com/misskey-dev/misskey into room 2026-02-16 10:27:15 +09:00
syuilo 4da92509cb wip 2026-02-16 10:27:13 +09:00
syuilo f85223c064 Update engine.ts 2026-02-15 23:39:50 +09:00
syuilo 0397fccdb3 wip 2026-02-15 22:42:09 +09:00
syuilo c93758b554 wip 2026-02-15 22:23:31 +09:00
syuilo be67e75ef9 wip 2026-02-15 20:43:25 +09:00
syuilo d8d4b230b0 wip 2026-02-15 19:42:31 +09:00
syuilo 0996c2d9b2 wip 2026-02-15 18:33:46 +09:00
syuilo 0bcc5a3695 wip 2026-02-15 16:12:53 +09:00
syuilo e70743bf40 wip 2026-02-15 15:46:09 +09:00
syuilo 9ecb3d6a5a wip 2026-02-15 14:14:44 +09:00
syuilo 9f0fbb8531 wip 2026-02-15 11:02:21 +09:00
syuilo 52a1b30503 Update engine.ts 2026-02-14 21:48:01 +09:00
syuilo 1dec481a7e wip 2026-02-14 21:43:02 +09:00
syuilo ad48f43524 wip 2026-02-14 20:32:59 +09:00
syuilo 7efa04d561 wip 2026-02-14 10:46:32 +09:00
syuilo bf7f771760 wip 2026-02-13 20:37:41 +09:00
syuilo 3acf6db835 wip 2026-02-13 18:44:10 +09:00
syuilo aafcffd1ad wip 2026-02-13 17:23:02 +09:00
syuilo 82f68f1e93 Update engine.ts 2026-02-13 16:44:47 +09:00
syuilo 3a02ae8b28 Update engine.ts 2026-02-13 15:24:07 +09:00
syuilo 3022313fac wip 2026-02-13 14:37:01 +09:00
syuilo 22d5c27ca7 wip 2026-02-13 14:29:55 +09:00
syuilo 8665923337 wip 2026-02-13 14:10:02 +09:00
syuilo efd101d0a0 wip 2026-02-13 12:17:16 +09:00
syuilo 36f17a156f wip 2026-02-13 10:43:00 +09:00
syuilo 2e84d2864c Update engine.ts 2026-02-12 21:19:35 +09:00
syuilo 909f78b33c wip 2026-02-12 21:16:47 +09:00
syuilo cb6c790d6c wip 2026-02-12 21:06:48 +09:00
syuilo b790608f52 wip 2026-02-12 20:45:18 +09:00
syuilo 13e3bdc90b wip 2026-02-12 19:16:37 +09:00
syuilo 2a1a03ef9d wip 2026-02-12 15:55:13 +09:00
syuilo fb25331661 wip 2026-02-12 14:38:05 +09:00
syuilo 51d2b0d6a5 wip 2026-02-12 10:55:57 +09:00
syuilo de1a3e3765 wip 2026-02-12 10:49:29 +09:00
syuilo 68d28eb4ac wip 2026-02-11 19:35:00 +09:00
syuilo ad150f4718 wi0p 2026-02-11 17:00:10 +09:00
syuilo 91e3249b23 wip 2026-02-11 15:55:47 +09:00
syuilo 24a7131b0b wip 2026-02-11 15:37:16 +09:00
syuilo a0e318b43f wip 2026-02-11 14:51:51 +09:00
syuilo e41e700f2d wip 2026-02-11 11:20:49 +09:00
syuilo 6c64e75412 Update engine.ts 2026-02-11 10:44:47 +09:00
syuilo 0c5c0ce67e wip 2026-02-11 10:29:46 +09:00
syuilo 6ac091096b wip 2026-02-11 09:50:12 +09:00
syuilo b05010bdc4 wip 2026-02-10 20:35:20 +09:00
syuilo d033704f12 wip 2026-02-10 18:53:48 +09:00
syuilo 367119a5a2 wip 2026-02-10 17:30:19 +09:00
syuilo d15c971125 wip 2026-02-10 16:47:43 +09:00
syuilo 4d532199b4 wip 2026-02-10 16:27:28 +09:00
syuilo cd15906c29 wip 2026-02-10 14:33:02 +09:00
syuilo 4ee5c73bca Update engine.ts 2026-02-10 11:43:16 +09:00
syuilo cb1d9c38df Update engine.ts 2026-02-10 11:40:25 +09:00
syuilo bce3411cef refactor 2026-02-10 11:01:41 +09:00
syuilo a721a94902 Update engine.ts 2026-02-10 10:56:24 +09:00
syuilo 3173290abb wip 2026-02-10 10:47:22 +09:00
syuilo 491b40ed80 wip 2026-02-10 09:59:54 +09:00
syuilo ab1362264a Update room.vue 2026-02-09 20:43:21 +09:00
syuilo 09993a8ac8 wip 2026-02-09 20:35:22 +09:00
syuilo 8619367ac0 wip 2026-02-09 20:26:44 +09:00
syuilo 148c853000 wip 2026-02-09 18:02:17 +09:00
syuilo 14efbe6584 wip 2026-02-09 15:39:12 +09:00
syuilo 9f054bb97b Update engine.ts 2026-02-09 15:35:39 +09:00
syuilo 6f07445185 wip 2026-02-09 14:58:45 +09:00
syuilo 80b5c6cd35 Update engine.ts 2026-02-09 12:09:40 +09:00
syuilo 7ab225662c wip 2026-02-09 11:57:55 +09:00
syuilo 85dc9c738b Update engine.ts 2026-02-09 11:06:54 +09:00
syuilo a09bf963f4 wip 2026-02-09 10:52:41 +09:00
syuilo 242fd56aec Update engine.ts 2026-02-08 22:23:38 +09:00
syuilo a42fdee480 wip 2026-02-08 21:53:33 +09:00
1096 changed files with 32971 additions and 26 deletions
+6
View File
@@ -16,6 +16,8 @@ on:
- packages/misskey-js/**
- packages/misskey-bubble-game/**
- packages/misskey-reversi/**
- packages/misskey-world/**
- packages/frontend-misskey-world-engine/**
- packages/shared/eslint.config.js
- scripts/check-dts*.mjs
- .github/workflows/lint.yml
@@ -32,6 +34,8 @@ on:
- packages/misskey-js/**
- packages/misskey-bubble-game/**
- packages/misskey-reversi/**
- packages/misskey-world/**
- packages/frontend-misskey-world-engine/**
- packages/shared/eslint.config.js
- scripts/check-dts*.mjs
- .github/workflows/lint.yml
@@ -69,6 +73,8 @@ jobs:
- misskey-js
- misskey-bubble-game
- misskey-reversi
- misskey-world
- frontend-misskey-world-engine
env:
eslint-cache-version: v1
eslint-cache-path: ${{ github.workspace }}/node_modules/.cache/eslint-${{ matrix.workspace }}
+10
View File
@@ -30,6 +30,8 @@ COPY --link ["packages/sw/package.json", "./packages/sw/"]
COPY --link ["packages/misskey-js/package.json", "./packages/misskey-js/"]
COPY --link ["packages/misskey-reversi/package.json", "./packages/misskey-reversi/"]
COPY --link ["packages/misskey-bubble-game/package.json", "./packages/misskey-bubble-game/"]
COPY --link ["packages/misskey-world/package.json", "./packages/misskey-world/"]
COPY --link ["packages/frontend-misskey-world-engine/package.json", "./packages/frontend-misskey-world-engine/"]
ARG NODE_ENV=production
@@ -61,6 +63,8 @@ COPY --link ["packages/backend/package.json", "./packages/backend/"]
COPY --link ["packages/misskey-js/package.json", "./packages/misskey-js/"]
COPY --link ["packages/misskey-reversi/package.json", "./packages/misskey-reversi/"]
COPY --link ["packages/misskey-bubble-game/package.json", "./packages/misskey-bubble-game/"]
COPY --link ["packages/misskey-world/package.json", "./packages/misskey-world/"]
COPY --link ["packages/frontend-misskey-world-engine/package.json", "./packages/frontend-misskey-world-engine/"]
ARG NODE_ENV=production
@@ -99,12 +103,18 @@ COPY --chown=misskey:misskey --from=target-builder /misskey/packages/backend/nod
COPY --chown=misskey:misskey --from=target-builder /misskey/packages/misskey-js/node_modules ./packages/misskey-js/node_modules
COPY --chown=misskey:misskey --from=target-builder /misskey/packages/misskey-reversi/node_modules ./packages/misskey-reversi/node_modules
COPY --chown=misskey:misskey --from=target-builder /misskey/packages/misskey-bubble-game/node_modules ./packages/misskey-bubble-game/node_modules
COPY --chown=misskey:misskey --from=target-builder /misskey/packages/misskey-world/node_modules ./packages/misskey-world/node_modules
COPY --chown=misskey:misskey --from=target-builder /misskey/packages/frontend-misskey-world-engine/node_modules ./packages/frontend-misskey-world-engine/node_modules
COPY --chown=misskey:misskey --from=native-builder /misskey/built ./built
COPY --chown=misskey:misskey --from=native-builder /misskey/packages/misskey-js/built ./packages/misskey-js/built
COPY --chown=misskey:misskey --from=native-builder /misskey/packages/misskey-reversi/built ./packages/misskey-reversi/built
COPY --chown=misskey:misskey --from=native-builder /misskey/packages/misskey-bubble-game/built ./packages/misskey-bubble-game/built
COPY --chown=misskey:misskey --from=native-builder /misskey/packages/backend/built ./packages/backend/built
COPY --chown=misskey:misskey --from=native-builder /misskey/packages/i18n/built ./packages/i18n/built
COPY --chown=misskey:misskey --from=target-builder /misskey/packages/misskey-world/built ./packages/misskey-world/built
COPY --chown=misskey:misskey --from=target-builder /misskey/packages/frontend-misskey-world-engine/built ./packages/frontend-misskey-world-engine/built
COPY --chown=misskey:misskey . ./
ENV LD_PRELOAD=/usr/local/lib/libjemalloc.so
+475
View File
@@ -1414,6 +1414,8 @@ viewRenotedChannel: "リノート先のチャンネルを見る"
previewingTheme: "テーマのプレビュー中"
previewingThemeRestore: "元に戻す"
accessToken: "アクセストークン"
choose: "選択"
rotate: "回転"
chooseEmojiPalette: "絵文字パレットを選択"
addToEmojiPalette: "絵文字パレットに追加"
emojiPaletteAlreadyAddedConfirm: "この絵文字はすでにこの絵文字パレットに含まれています。追加しなおしますか?"
@@ -3580,3 +3582,476 @@ _qr:
scanFile: "端末の画像をスキャン"
raw: "テキスト"
mfm: "MFM"
worldAvatar: "Worldアバター"
worldAvatar_description: "MisskeyWorld / MisskeyRoomsで使用可能な3Dアバターを作成できます。"
_miWorld:
separateRenderingThread: "描画を別スレッドに分離"
separateRenderingThread_description: "有効にするとパフォーマンスが向上します。不安定になる場合は無効すると改善する可能性があります。"
graphicsQuality: "グラフィックの品質"
graphicsSettings: "グラフィック設定"
frameRateLimitation: "フレームレート制限"
higherValuePerformanceNote: "高くすると体験が向上しますが、消費電力が増加するなどパフォーマンスに影響を与えます。"
resolution: "解像度"
fov: "視野角"
failedToInitialize: "初期化に失敗しました"
crushed_description: "描画が継続できなくなりました。デバイスのリソース不足の可能性が考えられます。"
antialiasing: "アンチエイリアス"
avatar: "アバター"
advancedCustomize: "高度なアレンジ"
attachAccessory: "アクセサリーをつける"
takeScreenShot: "スクリーンショット"
onlineMenu: "オンラインメニュー"
connectToOnline: "オンラインに接続"
disconnectToOnline: "オンラインから切断"
character: "キャラクター"
sit: "座る"
lyingDown: "寝そべる"
standUp: "立ち上がる"
showUsernameOnAvatar: "アバターにユーザー名を表示"
show2dAvatarOnAvatar: "アバターにユーザーアイコンを表示"
_avatars:
_default:
body: "ボディ"
eyes: "目"
mouth: "口"
_avatarAccessories:
mug: "マグカップ"
_mug:
bodyMat: "コップの素材"
liquidMat: "液体の素材"
mikan: "みかん"
bolt: "ボルト"
_bolt:
mat: "素材"
_miRoom:
snapToGrid: "グリッドにスナップ"
gridScale: "グリッドサイズ"
thereAreUnsavedChanges: "未保存の変更があります"
revertAllChangesConfirmation: "全ての変更を取り消し、部屋を最後に保存した状態まで戻しますか?"
yourDeviceNotSupported_title: "MisskeyRoomを起動できません"
yourDeviceNotSupported_description: "お使いのデバイスがMisskeyRoomをサポートしていないか、デバイスのリソース不足などにより一時的に利用できなくなっています。\nMisskeyRoomを動作させるには、WebGPUをサポートするデバイス・ブラウザが必要です。"
imageFit: "画像のはめ込み"
imageFit_cover: "覆う"
imageFit_contain: "収める"
imageFit_stretch: "伸縮"
material_metallic: "光沢"
material_roughness: "粗さ"
light_brightness: "明るさ"
advancedCustomize: "高度なアレンジ"
enterEditMode: "エディットモードを始める"
exitEditMode: "エディットモードを終了"
installFurniture: "家具を設置"
roomCustomize: "部屋のカスタマイズ"
changeRoomName: "ルーム名を編集"
roomInfo: "ルーム情報"
duplicate: "複製"
grab: "掴む"
furnitureCustomize: "家具のアレンジ"
uninstallFurniture: "しまう"
furnituresCount: "家具の数"
attachedFilesCount: "添付ファイル数"
_furniturePlacement:
top: "上面設置"
bottom: "下面設置"
side: "側面設置"
_furnitures:
haniwa: "はにわ"
_haniwa:
bodyMat: "本体の素材"
insideColor: "中身の色"
woodRingFloorLamp: "リングシェードフロアランプ"
_woodRingFloorLamp:
shadeMat: "シェードの素材"
bodyMat: "本体の素材"
light: "照明"
a4Case: "A4ケース"
_a4Case:
mat: "素材"
aircon: "エアコン"
allInOnePc: "一体型PC"
_allInOnePc:
bezelMat: "ベゼルの素材"
bodyMat: "本体の素材"
image: "画面の画像"
image_desktop: "デスクトップ"
screenBrightness: "画面の明るさ"
aquarium: "水槽"
aromaReedDiffuser: "アロマリードディフューザー"
_aromaReedDiffuser:
bottleMat: "ボトルの素材"
oilMat: "オイルの素材"
banknote: "紙幣"
beamLamp: "ビームランプ"
bed: "ベッド"
_bed:
frameMat: "フレームの素材"
blind: "ブラインド"
_blind:
angle: "羽根の回転角度"
blades: "羽根の枚数"
open: "開閉状態"
book: "本"
_book:
height: "高さ"
thickness: "厚み"
variation: "バリエーション"
width: "幅"
books: "本の束"
_books:
variation: "バリエーション"
boxWallShelf: "ボックス型ウォールシェルフ"
_boxWallShelf:
bodyMat: "本体の素材"
height: "高さ"
width: "幅"
withBack: "背板"
cactusS: "サボテン S"
_cactusS:
potMat: "鉢の素材"
cardboardBox: "段ボール箱"
_cardboardBox:
variation: "種類"
variation_aizon: "Aizon"
variation_default: "デフォルト"
variation_mikan: "みかん"
ceilingFanLight: "シーリングファンライト"
_ceilingFanLight:
shadeMat: "シェードの素材"
bodyMat: "本体の素材"
ceilingFan: "シーリングファン"
_ceilingFan:
shadeMat: "シェードの素材"
bodyMat: "本体の素材"
chair: "椅子"
_chair:
primaryMat: "メインの素材"
secondaryMat: "サブの素材"
frameMat: "フレームの素材"
clippedPicture: "留められた写真"
_clippedPicture:
height: "高さ"
image: "画像"
width: "幅"
coffeeCup: "コーヒーカップ"
colorBox: "カラーボックス"
_colorBox:
mat: "素材"
cuboid: "直方体"
_cuboid:
mat: "素材"
x: "X"
y: "Y"
z: "Z"
cupNoodle: "インスタントラーメン"
curtain: "カーテン"
custardPudding: "プリン"
descriptionPlate: "説明が書かれたプレート"
desk: "デスク"
_desk:
boardMat: "天板の素材"
depth: "奥行き"
frameMat: "フレームの素材"
width: "幅"
desktopPc: "デスクトップPC"
_desktopPc:
bodyMat: "本体の素材"
coverMat: "カバーの素材"
inner1Mat: "内部素材1"
inner2Mat: "内部素材2"
inner3Mat: "内部素材3"
ledColor: "LEDの色"
djMixer: "DJミキサー"
djPlayer: "DJプレーヤー"
_djPlayer:
image: "画像"
"image:waveform": "波形"
screenBrightness: "画面の明るさ"
ductRailSpotLights: "スポットライト付きダクトレール"
_ductRailSpotLights:
angleH: "水平角度"
angleV: "垂直角度"
bodyMat: "本体の素材"
light: "照明"
ductTape: "ガムテープ"
herbarium: "ハーバリウム"
electronicDisplayBoard: "電光掲示板"
_electronicDisplayBoard:
frameMat: "フレームの素材"
ledBrightness: "LEDの明るさ"
ledColor: "LEDの色"
text: "テキスト"
emptyBento: "空の弁当容器"
energyDrink: "エナジードリンク"
envelope: "封筒"
facialTissue: "ティッシュ"
glassCylinderPotPlant: "ガラスシリンダーの鉢植えと植物"
handheldGameConsole: "携帯ゲーム機"
_handheldGameConsole:
bodyMat: "本体の素材"
image: "画像"
screenBrightness: "画面の明るさ"
hangingDuctRail: "吊り下げダクトレール"
_hangingDuctRail:
bodyMat: "本体の素材"
height: "高さ"
width: "幅"
hangingTShirt: "吊り下げTシャツ"
icosahedron: "正二十面体のオブジェ"
_icosahedron:
mat: "素材"
ironFrameTable: "アイアンフレームテーブル"
_ironFrameTable:
boardMat: "天板の素材"
depth: "奥行き"
frameMat: "フレームの素材"
height: "高さ"
width: "幅"
issyoubin: "一升瓶"
_issyoubin:
variation: "種類"
keyboard: "キーボード"
_keyboard:
bodyMat: "本体の素材"
keyMat: "キーの素材"
laptopPc: "ノートPC"
_laptopPc:
bezelMat: "ベゼルの素材"
bodyMat: "本体の素材"
image: "画像"
openAngle: "開き具合"
screenBrightness: "画面の明るさ"
largeMousepad: "大きいマウスパッド"
_largeMousepad:
image: "画像"
lavaLamp: "ラバランプ"
_lavaLamp:
bodyMat: "本体の素材"
glassMat: "ガラスの素材"
lavaColor: "オイルの色"
lightColor: "ランプの色"
letterCase: "レターケース"
lowPartitionBar: "低いパーティションバー"
_lowPartitionBar:
bodyMat: "本体の素材"
width: "幅"
miObjet: "Miオブジェ"
miPlate: "Miプレート"
miPlateDisplayed: "飾られたMiプレート"
milk: "牛乳"
mixer: "ミキサー"
monitor: "モニター"
_monitor:
bodyMat: "本体の素材"
image: "画像"
screenBrightness: "画面の明るさ"
monitorSpeaker: "モニタースピーカー"
_monitorSpeaker:
mat: "素材"
monstera: "モンステラ"
_monstera:
potMat: "鉢の素材"
mug: "マグカップ"
_mug:
bodyMat: "コップの素材"
liquidMat: "液体の素材"
newtonsCradle: "ニュートンクレードル"
_newtonsCradle:
frameMat: "フレームの素材"
openedCardboardBox: "開いた段ボール箱"
pachira: "パキラ"
_pachira:
potMat: "鉢の素材"
petBottle: "ペットボトル"
_petBottle:
empty: "空"
variation: "種類"
variation_greenTea: "緑茶"
variation_mineralWater: "ミネラルウォーター"
withCap: "キャップ"
withLabel: "ラベル"
piano: "ピアノ"
_piano:
bodyMat: "本体の素材"
pictureFrame: "シンプルな額縁"
_pictureFrame:
depth: "厚さ"
frameMat: "フレームの素材"
frameThickness: "フレームの幅"
height: "高さ"
image: "画像"
matHThickness: "マットの横幅"
matVThickness: "マットの縦幅"
width: "幅"
withCover: "カバーあり"
pizza: "ピザ"
plant: "植物"
plant2: "植物 2"
poster: "ポスター"
_poster:
height: "高さ"
image: "画像"
width: "幅"
powerStrip: "電源タップ"
radiometer: "ラジオメーター"
randomBooks: "雑多な本"
_randomBooks:
count: "数"
seed: "シード"
stackVertically: "平積み"
variation: "バリエーション"
variation_mix: "いろいろ"
variation_mixPlain: "いろいろ(無地)"
recordPlayer: "レコードプレーヤー"
rolledUpPoster: "丸めたポスター"
roundRug: "円形のラグ"
router: "ルーター"
siphon: "サイフォン"
snakeplant: "サンセベリア"
_snakeplant:
potMat: "鉢の素材"
sofa: "ソファ"
_sofa:
bodyMat: "本体の素材"
speaker: "スピーカー"
_speaker:
innerMat: "内側の素材"
outerMat: "外側の素材"
speakerStand: "スピーカースタンド"
_speakerStand:
bodyMat: "本体の素材"
height: "高さ"
spotLight: "スポットライト"
_spotLight:
angleH: "横方向の角度"
angleV: "縦方向の角度"
bodyMat: "本体の素材"
light: "照明"
downlight: "ダウンライト"
_downlight:
bodyMat: "本体の素材"
light: "照明"
sprayer: "霧吹き"
stanchionPole: "スタンションポール"
_stanchionPole:
bodyMat: "本体の素材"
ropeMat: "ロープの素材"
steelRack: "スチールラック"
_steelRack:
height: "高さ"
numberOfShelfs: "シェルフの数"
poleMat: "ポールの素材"
shelfPositionOf: "シェルフの位置"
shelfMat: "シェルフの素材"
widthAndDepthVariation: "W x D"
stormGlass: "ストームグラス"
tableSalt: "食卓塩"
tabletopCalendar: "卓上カレンダー"
tabletopDigitalClock: "卓上デジタル時計"
_tabletopDigitalClock:
bodyMat: "本体の素材"
lcdColor: "LCDの色"
tabletopFlag: "卓上旗"
_tabletopFlag:
image: "画像"
tabletopGlassPictureFrame: "卓上ガラス製フォトフレーム"
_tabletopGlassPictureFrame:
height: "高さ"
image: "画像"
width: "幅"
tabletopIronFrameStand: "卓上アイアンフレームスタンド"
_tabletopIronFrameStand:
boardMat: "板の素材"
depth: "奥行き"
frameMat: "フレームの素材"
height: "高さ"
width: "幅"
tabletopLcdButtonsController: "LCDボタン付き卓上コントローラー"
_tabletopLcdButtonsController:
bodyMat: "本体の素材"
image: "画像"
screenBrightness: "画面の明るさ"
tabletopPictureFrame: "卓上フォトフレーム"
_tabletopPictureFrame:
depth: "厚さ"
frameMat: "フレームの素材"
frameThickness: "フレームの幅"
height: "高さ"
image: "画像"
matHThickness: "マットの横幅"
matVThickness: "マットの縦幅"
width: "幅"
tapestry: "タペストリー"
_tapestry:
height: "高さ"
image: "画像"
width: "幅"
tetrapod: "波消ブロックの置物"
tv: "テレビ"
_tv:
bodyMat: "本体の素材"
screenBrightness: "画面の明るさ"
twistedCubeObjet: "ねじれた立方体のオブジェ"
usedTissue: "使用済みティッシュ"
wallCanvas: "壁掛けキャンバス"
_wallCanvas:
height: "高さ"
image: "画像"
width: "幅"
wallClock: "壁掛け時計"
_wallClock:
frameMat: "フレームの素材"
faceMat: "文字盤の素材"
handsMat: "針の素材"
wallGlassPictureFrame: "ガラスの壁掛けフォトフレーム"
_wallGlassPictureFrame:
height: "高さ"
image: "画像"
width: "幅"
wallMirror: "壁掛けミラー"
_wallMirror:
frameMat: "フレームの素材"
frameThickness: "フレームの厚み"
height: "高さ"
width: "幅"
wallMountSpotLight: "ウォールマウントスポットライト"
_wallMountSpotLight:
angleH: "横方向の角度"
angleV: "縦方向の角度"
bodyMat: "本体の素材"
light: "照明"
wallShelf: "ウォールシェルフ"
_wallShelf:
boardMat: "板の素材"
boardStyle: "板のスタイル"
"boardStyle:color": "単色"
"boardStyle:wood": "木目"
style: "スタイル"
wireBasket: "ワイヤーバスケット"
_wireBasket:
bodyMat: "本体の素材"
wireNet: "ワイヤーネット"
_wireNet:
bodyMat: "本体の素材"
woodRingsPendantLight: "リングペンダントライト"
_woodRingsPendantLight:
bodyMat: "本体の素材"
length: "長さ"
light: "照明"
shadeMat: "シェードの素材"
woodSoundAbsorbingPanel: "木製吸音パネル"
ironFrameShelf: "アイアンフレームシェルフ"
_ironFrameShelf:
boardMat: "板の素材"
frameMat: "フレームの素材"
height: "段数"
width: "幅"
kakejiku: "掛軸"
_kakejiku:
image: "画像"
"image:kitsuaishinsei": "喫藍心整"
+2
View File
@@ -20,6 +20,8 @@
"packages/misskey-js/generator",
"packages/misskey-reversi",
"packages/misskey-bubble-game",
"packages/misskey-world",
"packages/frontend-misskey-world-engine",
"packages-private/*"
],
"private": true,
@@ -0,0 +1,28 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
export class WorldRoom1778744540138 {
name = 'WorldRoom1778744540138'
/**
* @param {QueryRunner} queryRunner
*/
async up(queryRunner) {
await queryRunner.query(`CREATE TABLE "world_room" ("id" character varying(32) NOT NULL, "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL, "name" character varying(256) NOT NULL, "description" character varying(1024) NOT NULL, "userId" character varying(32) NOT NULL, "likedCount" integer NOT NULL DEFAULT '0', "visibility" character varying(128) NOT NULL DEFAULT 'public', "def" jsonb NOT NULL DEFAULT '{}', CONSTRAINT "PK_40cfacaf35b0b54bb2281c89767" PRIMARY KEY ("id"))`);
await queryRunner.query(`CREATE INDEX "IDX_88289375952050da4a7752a366" ON "world_room" ("updatedAt") `);
await queryRunner.query(`CREATE INDEX "IDX_f803a5efb4125c5fd8a414285e" ON "world_room" ("userId") `);
await queryRunner.query(`ALTER TABLE "world_room" ADD CONSTRAINT "FK_f803a5efb4125c5fd8a414285ed" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
}
/**
* @param {QueryRunner} queryRunner
*/
async down(queryRunner) {
await queryRunner.query(`ALTER TABLE "world_room" DROP CONSTRAINT "FK_f803a5efb4125c5fd8a414285ed"`);
await queryRunner.query(`DROP INDEX "public"."IDX_f803a5efb4125c5fd8a414285e"`);
await queryRunner.query(`DROP INDEX "public"."IDX_88289375952050da4a7752a366"`);
await queryRunner.query(`DROP TABLE "world_room"`);
}
}
@@ -0,0 +1,30 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
export class WorldAvatar1779921322355 {
name = 'WorldAvatar1779921322355'
/**
* @param {QueryRunner} queryRunner
*/
async up(queryRunner) {
await queryRunner.query(`CREATE TABLE "world_avatar" ("id" character varying(32) NOT NULL, "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL, "name" character varying(256) NOT NULL, "userId" character varying(32) NOT NULL, "def" jsonb NOT NULL DEFAULT '{}', "active" boolean NOT NULL DEFAULT false, CONSTRAINT "PK_e7a27262285cc2c27114871f866" PRIMARY KEY ("id"))`);
await queryRunner.query(`CREATE INDEX "IDX_0f1d0bdfaca455cc2f13defabe" ON "world_avatar" ("updatedAt") `);
await queryRunner.query(`CREATE INDEX "IDX_4eba43c8e2540a92e99dd7f5a9" ON "world_avatar" ("userId") `);
await queryRunner.query(`ALTER TABLE "world_room" ADD "accessCount" integer NOT NULL DEFAULT '0'`);
await queryRunner.query(`ALTER TABLE "world_avatar" ADD CONSTRAINT "FK_4eba43c8e2540a92e99dd7f5a9a" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
}
/**
* @param {QueryRunner} queryRunner
*/
async down(queryRunner) {
await queryRunner.query(`ALTER TABLE "world_avatar" DROP CONSTRAINT "FK_4eba43c8e2540a92e99dd7f5a9a"`);
await queryRunner.query(`ALTER TABLE "world_room" DROP COLUMN "accessCount"`);
await queryRunner.query(`DROP INDEX "public"."IDX_4eba43c8e2540a92e99dd7f5a9"`);
await queryRunner.query(`DROP INDEX "public"."IDX_0f1d0bdfaca455cc2f13defabe"`);
await queryRunner.query(`DROP TABLE "world_avatar"`);
}
}
+30
View File
@@ -154,6 +154,11 @@ import { ApQuestionService } from './activitypub/models/ApQuestionService.js';
import { QueueModule } from './QueueModule.js';
import { QueueService } from './QueueService.js';
import { LoggerService } from './LoggerService.js';
import { WorldRoomService } from './WorldRoomService.js';
import { WorldRoomEntityService } from './entities/WorldRoomEntityService.js';
import { WorldRoomMultiplayService } from './WorldRoomMultiplayService.js';
import { WorldAvatarService } from './WorldAvatarService.js';
import { WorldAvatarEntityService } from './entities/WorldAvatarEntityService.js';
import { TelemetryService } from './telemetry/TelemetryService.js';
import type { Provider } from '@nestjs/common';
@@ -231,6 +236,9 @@ const $ChatService: Provider = { provide: 'ChatService', useExisting: ChatServic
const $RegistryApiService: Provider = { provide: 'RegistryApiService', useExisting: RegistryApiService };
const $ReversiService: Provider = { provide: 'ReversiService', useExisting: ReversiService };
const $PageService: Provider = { provide: 'PageService', useExisting: PageService };
const $WorldRoomService: Provider = { provide: 'WorldRoomService', useExisting: WorldRoomService };
const $WorldRoomMultiplayService: Provider = { provide: 'WorldRoomMultiplayService', useExisting: WorldRoomMultiplayService };
const $WorldAvatarService: Provider = { provide: 'WorldAvatarService', useExisting: WorldAvatarService };
const $ChartLoggerService: Provider = { provide: 'ChartLoggerService', useExisting: ChartLoggerService };
const $FederationChart: Provider = { provide: 'FederationChart', useExisting: FederationChart };
@@ -286,6 +294,8 @@ const $RoleEntityService: Provider = { provide: 'RoleEntityService', useExisting
const $ReversiGameEntityService: Provider = { provide: 'ReversiGameEntityService', useExisting: ReversiGameEntityService };
const $MetaEntityService: Provider = { provide: 'MetaEntityService', useExisting: MetaEntityService };
const $SystemWebhookEntityService: Provider = { provide: 'SystemWebhookEntityService', useExisting: SystemWebhookEntityService };
const $WorldRoomEntityService: Provider = { provide: 'WorldRoomEntityService', useExisting: WorldRoomEntityService };
const $WorldAvatarEntityService: Provider = { provide: 'WorldAvatarEntityService', useExisting: WorldAvatarEntityService };
const $ApAudienceService: Provider = { provide: 'ApAudienceService', useExisting: ApAudienceService };
const $ApDbResolverService: Provider = { provide: 'ApDbResolverService', useExisting: ApDbResolverService };
@@ -384,6 +394,9 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
RegistryApiService,
ReversiService,
PageService,
WorldRoomService,
WorldRoomMultiplayService,
WorldAvatarService,
ChartLoggerService,
FederationChart,
@@ -439,6 +452,8 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
ReversiGameEntityService,
MetaEntityService,
SystemWebhookEntityService,
WorldRoomEntityService,
WorldAvatarEntityService,
ApAudienceService,
ApDbResolverService,
@@ -535,6 +550,9 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
$RegistryApiService,
$ReversiService,
$PageService,
$WorldRoomService,
$WorldRoomMultiplayService,
$WorldAvatarService,
$ChartLoggerService,
$FederationChart,
@@ -590,6 +608,8 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
$ReversiGameEntityService,
$MetaEntityService,
$SystemWebhookEntityService,
$WorldRoomEntityService,
$WorldAvatarEntityService,
$ApAudienceService,
$ApDbResolverService,
@@ -686,6 +706,9 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
RegistryApiService,
ReversiService,
PageService,
WorldRoomService,
WorldRoomMultiplayService,
WorldAvatarService,
FederationChart,
NotesChart,
@@ -740,6 +763,8 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
ReversiGameEntityService,
MetaEntityService,
SystemWebhookEntityService,
WorldRoomEntityService,
WorldAvatarEntityService,
ApAudienceService,
ApDbResolverService,
@@ -835,6 +860,9 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
$RegistryApiService,
$ReversiService,
$PageService,
$WorldRoomService,
$WorldRoomMultiplayService,
$WorldAvatarService,
$FederationChart,
$NotesChart,
@@ -889,6 +917,8 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
$ReversiGameEntityService,
$MetaEntityService,
$SystemWebhookEntityService,
$WorldRoomEntityService,
$WorldAvatarEntityService,
$ApAudienceService,
$ApDbResolverService,
@@ -173,6 +173,16 @@ export interface ChatEventTypes {
};
}
export interface WorldRoomEventTypes {
enter: {
user: Packed<'UserLite'>;
avatar: Packed<'WorldAvatarLite'>['def'] | null;
};
left: {
userId: MiUser['id'];
};
}
export interface ReversiEventTypes {
matched: {
game: Packed<'ReversiGameDetailed'>;
@@ -315,6 +325,10 @@ export type GlobalEvents = {
name: `chatRoomStream:${MiChatRoom['id']}`;
payload: EventTypesToEventPayload<ChatEventTypes>;
};
worldRoom: {
name: `worldRoomStream:${string}`;
payload: EventTypesToEventPayload<WorldRoomEventTypes>;
};
reversi: {
name: `reversiStream:${MiUser['id']}`;
payload: EventTypesToEventPayload<ReversiEventTypes>;
@@ -435,4 +449,9 @@ export class GlobalEventService {
public publishReversiGameStream<K extends keyof ReversiGameEventTypes>(gameId: MiReversiGame['id'], type: K, value?: ReversiGameEventTypes[K]): void {
this.publish(`reversiGameStream:${gameId}`, type, typeof value === 'undefined' ? null : value);
}
@bindThis
public publishWorldRoomStream<K extends keyof WorldRoomEventTypes>(roomId: string, type: K, value?: WorldRoomEventTypes[K]): void {
this.publish(`worldRoomStream:${roomId}`, type, typeof value === 'undefined' ? null : value);
}
}
@@ -0,0 +1,148 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { Inject, Injectable } from '@nestjs/common';
import { DataSource, In, Not } from 'typeorm';
import { DI } from '@/di-symbols.js';
import {
MiDriveFile,
MiWorldAvatar,
} from '@/models/_.js';
import type { DriveFilesRepository, WorldAvatarsRepository } from '@/models/_.js';
import { bindThis } from '@/decorators.js';
import { RoleService } from '@/core/RoleService.js';
import { IdService } from '@/core/IdService.js';
import type { MiUser } from '@/models/User.js';
import { IdentifiableError } from '@/misc/identifiable-error.js';
import { ModerationLogService } from '@/core/ModerationLogService.js';
import { QueryService } from '@/core/QueryService.js';
@Injectable()
export class WorldAvatarService {
constructor(
@Inject(DI.db)
private db: DataSource,
@Inject(DI.worldAvatarsRepository)
private worldAvatarsRepository: WorldAvatarsRepository,
private roleService: RoleService,
private moderationLogService: ModerationLogService,
private queryService: QueryService,
private idService: IdService,
) {
}
public defaultAvatar = {
type: 'default',
body: {
color: [0.8, 0.8, 0.8],
roughness: 1,
metallic: 0,
},
eyes: {
type: 'a',
color: [0, 0, 0],
},
mouth: {
type: 'a',
color: [0, 0, 0],
},
accessories: [],
} satisfies MiWorldAvatar['def'];
@bindThis
public async validateDef(
me: MiUser,
def: MiWorldAvatar['def'],
): Promise<boolean> {
// TODO
return true;
}
@bindThis
public async findMyAvatarById(userId: MiUser['id'], avatarId: MiWorldAvatar['id']) {
return this.worldAvatarsRepository.findOneBy({ id: avatarId, userId: userId });
}
@bindThis
public async findAvatarById(avatarId: MiWorldAvatar['id']) {
return this.worldAvatarsRepository.findOne({ where: { id: avatarId }, relations: { user: true } });
}
@bindThis
public async getMyAvatarsWithPagination(userId: MiUser['id'], limit: number, sinceId?: MiWorldAvatar['id'] | null, untilId?: MiWorldAvatar['id'] | null) {
const query = this.queryService.makePaginationQuery(this.worldAvatarsRepository.createQueryBuilder('avatar'), sinceId, untilId)
.andWhere('avatar.userId = :userId', { userId });
const avatars = await query.take(limit).getMany();
return avatars;
}
@bindThis
public async create(
me: MiUser,
body: Partial<MiWorldAvatar>,
): Promise<MiWorldAvatar> {
const currentAvatarsCount = await this.worldAvatarsRepository.countBy({ userId: me.id });
// TODO: limit by role policy
const avatar = await this.worldAvatarsRepository.insertOne(new MiWorldAvatar({
id: this.idService.gen(),
updatedAt: new Date(),
name: body.name,
def: body.def,
userId: me.id,
active: currentAvatarsCount === 0,
}));
return avatar;
}
@bindThis
public async update(
avatar: MiWorldAvatar,
body: Partial<MiWorldAvatar>,
): Promise<void> {
body.updatedAt = new Date();
const updated = await this.worldAvatarsRepository.createQueryBuilder().update()
.set(body)
.where('id = :id', { id: avatar.id })
.returning('*')
.execute()
.then((response) => {
return response.raw[0];
});
if (body.active) {
await this.worldAvatarsRepository.createQueryBuilder().update()
.set({ active: false })
.where('userId = :userId', { userId: avatar.userId })
.andWhere('id != :id', { id: avatar.id })
.execute();
}
return updated;
}
@bindThis
public async delete(avatar: MiWorldAvatar, deleter?: MiUser): Promise<void> {
await this.worldAvatarsRepository.delete(avatar.id);
}
@bindThis
public async getActiveAvatarOfUser(userId: MiUser['id']) {
return this.worldAvatarsRepository.findOneBy({ userId, active: true });
}
@bindThis
public async getActiveAvatarOfUsers(userIds: MiUser['id'][]): Promise<MiWorldAvatar[]> {
if (userIds.length === 0) return [];
return this.worldAvatarsRepository.findBy({ userId: In(userIds), active: true });
}
}
@@ -0,0 +1,153 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { Inject, Injectable } from '@nestjs/common';
import { DataSource, In, Not } from 'typeorm';
import * as Redis from 'ioredis';
import { DI } from '@/di-symbols.js';
import {
MiWorldRoom,
} from '@/models/_.js';
import type { MiWorldAvatar, WorldRoomsRepository } from '@/models/_.js';
import { bindThis } from '@/decorators.js';
import { RoleService } from '@/core/RoleService.js';
import { IdService } from '@/core/IdService.js';
import type { MiUser } from '@/models/User.js';
import { IdentifiableError } from '@/misc/identifiable-error.js';
import { QueryService } from '@/core/QueryService.js';
import { GlobalEventService } from '@/core/GlobalEventService.js';
import { UserEntityService } from '@/core/entities/UserEntityService.js';
import type { Packed } from '@/misc/json-schema.js';
import { WorldAvatarService } from '@/core/WorldAvatarService.js';
import { WorldAvatarEntityService } from '@/core/entities/WorldAvatarEntityService.js';
type PlayerState = {
position: [number, number, number],
rotation: [number, number, number],
sit?: string; // id
};
@Injectable()
export class WorldRoomMultiplayService {
constructor(
@Inject(DI.db)
private db: DataSource,
@Inject(DI.redis)
private redisClient: Redis.Redis,
@Inject(DI.worldRoomsRepository)
private worldRoomsRepository: WorldRoomsRepository,
private roleService: RoleService,
private queryService: QueryService,
private idService: IdService,
private globalEventService: GlobalEventService,
private userEntityService: UserEntityService,
private worldAvatarService: WorldAvatarService,
private worldAvatarEntityService: WorldAvatarEntityService,
) {
}
@bindThis
public async enter(userId: MiUser['id'], roomId: MiWorldRoom['id']) {
console.log('enter', { userId, roomId });
// TODO: atomicにやる
const currentPlayers = await this.redisClient.hlen(`worldRoom:${roomId}:players`);
if (currentPlayers < 10) {
const redisPipeline = this.redisClient.pipeline();
redisPipeline.hset(`worldRoom:${roomId}:players`, userId, 1);
redisPipeline.hexpire(`worldRoom:${roomId}:players`, 30, 'FIELDS', 1, userId);
await redisPipeline.exec();
} else {
throw new Error('Room is full.');
}
// TODO: 既に入っていたらスキップ
const avatar = await this.worldAvatarService.getActiveAvatarOfUser(userId);
this.globalEventService.publishWorldRoomStream(roomId, 'enter', {
user: await this.userEntityService.pack(userId),
avatar: avatar?.def,
});
}
@bindThis
public async heartbeat(userId: MiUser['id'], roomId: MiWorldRoom['id']) {
const exists = await this.redisClient.hexists(`worldRoom:${roomId}:players`, userId);
if (exists) {
const redisPipeline = this.redisClient.pipeline();
redisPipeline.hexpire(`worldRoom:${roomId}:players`, 30, 'FIELDS', 1, userId);
redisPipeline.hexpire(`worldRoom:${roomId}:playerStates`, 30, 'FIELDS', 1, userId);
await redisPipeline.exec();
} else {
throw new Error('Not in room.');
}
}
@bindThis
public async left(userId: MiUser['id'], roomId: MiWorldRoom['id']) {
console.log('left', { userId, roomId });
const redisPipeline = this.redisClient.pipeline();
redisPipeline.hdel(`worldRoom:${roomId}:players`, userId);
redisPipeline.hdel(`worldRoom:${roomId}:playerStates`, userId);
await redisPipeline.exec();
this.globalEventService.publishWorldRoomStream(roomId, 'left', {
userId,
});
}
@bindThis
public async updatePlayerState(userId: MiUser['id'], roomId: MiWorldRoom['id'], state: PlayerState) {
const redisPipeline = this.redisClient.pipeline();
redisPipeline.hset(`worldRoom:${roomId}:playerStates`, userId, JSON.stringify(state));
redisPipeline.hexpire(`worldRoom:${roomId}:playerStates`, 30, 'FIELDS', 1, userId);
await redisPipeline.exec();
}
@bindThis
public async getPlayerStates(roomId: MiWorldRoom['id']): Promise<Record<string, PlayerState>> {
const entries = await this.redisClient.hgetall(`worldRoom:${roomId}:playerStates`);
return Object.fromEntries(Object.entries(entries).map(([userId, state]) => [userId, JSON.parse(state) as PlayerState]));
}
@bindThis
public getPlayerStatesAndHeatbeat(userId: MiUser['id'], roomId: MiWorldRoom['id']): Promise<Record<string, PlayerState>> {
// TODO: atomicにやる
this.heartbeat(userId, roomId);
return this.getPlayerStates(roomId);
}
@bindThis
public packPlayerProfile(user: Packed<'UserLite'>, avatar: Packed<'WorldAvatarLite'>['def'] | null) {
return {
user: {
name: user.name,
username: user.username,
avatarUrl: user.avatarUrl,
},
avatar: avatar ?? this.worldAvatarService.defaultAvatar,
};
}
@bindThis
public async getPlayerProfiles(roomId: MiWorldRoom['id'], userId?: MiUser['id']): Promise<Record<string, any>> {
let playerIds = await this.redisClient.hkeys(`worldRoom:${roomId}:players`);
playerIds = playerIds.filter(id => id !== userId);
const packedUsers = await this.userEntityService.packMany(playerIds);
const avatars = await this.worldAvatarService.getActiveAvatarOfUsers(playerIds);
const profiles: Record<string, any> = {};
for (const playerId of playerIds) {
const packedUser = packedUsers.find(u => u.id === playerId);
if (packedUser == null) continue;
profiles[playerId] = this.packPlayerProfile(packedUser, avatars.find(a => a.userId === playerId)?.def ?? null);
}
return profiles;
}
}
@@ -0,0 +1,176 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { Inject, Injectable } from '@nestjs/common';
import { DataSource, In, Not } from 'typeorm';
import { DI } from '@/di-symbols.js';
import {
MiDriveFile,
MiWorldRoom,
} from '@/models/_.js';
import type { DriveFilesRepository, WorldRoomsRepository } from '@/models/_.js';
import { bindThis } from '@/decorators.js';
import { RoleService } from '@/core/RoleService.js';
import { IdService } from '@/core/IdService.js';
import type { MiUser } from '@/models/User.js';
import { IdentifiableError } from '@/misc/identifiable-error.js';
import { ModerationLogService } from '@/core/ModerationLogService.js';
import { QueryService } from '@/core/QueryService.js';
const driveFileReferencingOptions = {
clippedPicture: ['image'],
tapestry: ['image'],
poster: ['image'],
pictureFrame: ['image'],
tabletopPictureFrame: ['image'],
tabletopGlassPictureFrame: ['image'],
wallCanvas: ['image'],
wallGlassPictureFrame: ['image'],
tabletopFlag: ['image'],
tabletopLcdButtonsController: ['image'],
djPlayer: ['image'],
monitor: ['image'],
allInOnePc: ['image'],
laptopPc: ['image'],
handheldGameConsole: ['image'],
largeMousepad: ['image'],
kakejiku: ['image'],
} as Record<string, string[]>;
@Injectable()
export class WorldRoomService {
constructor(
@Inject(DI.db)
private db: DataSource,
@Inject(DI.worldRoomsRepository)
private worldRoomsRepository: WorldRoomsRepository,
@Inject(DI.driveFilesRepository)
private driveFilesRepository: DriveFilesRepository,
private roleService: RoleService,
private moderationLogService: ModerationLogService,
private queryService: QueryService,
private idService: IdService,
) {
}
@bindThis
public async validateDef(
me: MiUser,
def: MiWorldRoom['def'],
): Promise<boolean> {
// TODO: スキーマ検証(関係ないプロパティを入れたり不正な値を入れたりできないように)
// そのためにはJSON SchemaでRoomState/各objectのoptionsを定義する必要がある
const objectsLimit = 100; // TODO: ref role policy
if (def.installedFurnitures.length > objectsLimit) {
return false;
}
const attachedFilesLimit = 30; // TODO: ref role policy
const attachedFileIds = this.collectReferencedDriveFileIds(def);
if (attachedFileIds.size > attachedFilesLimit) {
return false;
}
const attachedFiles = attachedFileIds.size === 0 ? [] : await this.driveFilesRepository.findBy({ id: In([...attachedFileIds]), userId: me.id });
for (const file of attachedFiles) {
if (!file.type.startsWith('image/')) {
return false;
}
if (file.size > 5 * 1024 * 1024) {
return false;
}
if (Math.max(file.properties.width ?? 0, file.properties.height ?? 0) > 2048) {
return false;
}
}
return true;
}
@bindThis
public async findMyRoomById(userId: MiUser['id'], roomId: MiWorldRoom['id']) {
return this.worldRoomsRepository.findOneBy({ id: roomId, userId: userId });
}
@bindThis
public async findRoomById(roomId: MiWorldRoom['id']) {
return this.worldRoomsRepository.findOne({ where: { id: roomId }, relations: { user: true } });
}
@bindThis
public async getRoomsOfUserWithPagination(userId: MiUser['id'], self: boolean, limit: number, sinceId?: MiWorldRoom['id'] | null, untilId?: MiWorldRoom['id'] | null) {
const query = this.queryService.makePaginationQuery(this.worldRoomsRepository.createQueryBuilder('room'), sinceId, untilId)
.andWhere('room.userId = :userId', { userId });
if (!self) {
query.andWhere('room.visibility = :visibility', { visibility: 'public' });
}
const rooms = await query.take(limit).getMany();
return rooms;
}
@bindThis
public async create(
me: MiUser,
body: Partial<MiWorldRoom>,
): Promise<MiWorldRoom> {
const room = await this.worldRoomsRepository.insertOne(new MiWorldRoom({
id: this.idService.gen(),
updatedAt: new Date(),
name: body.name,
description: body.description,
def: body.def,
userId: me.id,
visibility: body.visibility,
}));
return room;
}
@bindThis
public async update(
room: MiWorldRoom,
body: Partial<MiWorldRoom>,
): Promise<void> {
body.updatedAt = new Date();
return this.worldRoomsRepository.createQueryBuilder().update()
.set(body)
.where('id = :id', { id: room.id })
.returning('*')
.execute()
.then((response) => {
return response.raw[0];
});
}
@bindThis
public async delete(room: MiWorldRoom, deleter?: MiUser): Promise<void> {
await this.worldRoomsRepository.delete(room.id);
}
@bindThis
public collectReferencedDriveFileIds(roomState: MiWorldRoom['def']): Set<MiDriveFile['id']> {
const fileIds = new Set<MiDriveFile['id']>();
const installedFurnitures = roomState.installedFurnitures ?? roomState.installedObjects; // 後方互換性のため
for (const o of installedFurnitures) {
const def = driveFileReferencingOptions[o.type];
if (def == null) continue;
for (const key of def) {
const optionValue = o.options[key];
if (optionValue != null && optionValue.driveFileId != null && optionValue.driveFileId !== '') {
fileIds.add(optionValue.driveFileId);
}
}
}
return fileIds;
}
}
@@ -0,0 +1,93 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { DriveFilesRepository, MiWorldAvatar, WorldAvatarsRepository } from '@/models/_.js';
import { awaitAll } from '@/misc/prelude/await-all.js';
import type { Packed } from '@/misc/json-schema.js';
import type { } from '@/models/Blocking.js';
import type { MiUser } from '@/models/User.js';
import type { MiDriveFile } from '@/models/DriveFile.js';
import { bindThis } from '@/decorators.js';
import { IdService } from '@/core/IdService.js';
import { WorldAvatarService } from '@/core/WorldAvatarService.js';
import { UserEntityService } from './UserEntityService.js';
import { DriveFileEntityService } from './DriveFileEntityService.js';
import { In } from 'typeorm';
@Injectable()
export class WorldAvatarEntityService {
constructor(
@Inject(DI.worldAvatarsRepository)
private worldAvatarsRepository: WorldAvatarsRepository,
private worldAvatarService: WorldAvatarService,
private userEntityService: UserEntityService,
private idService: IdService,
) {
}
@bindThis
public async packLite(
src: MiWorldAvatar['id'] | MiWorldAvatar,
me?: { id: MiUser['id'] } | null | undefined,
hint?: {
packedUser?: Packed<'UserLite'>
},
): Promise<Packed<'WorldAvatarLite'>> {
const meId = me ? me.id : null;
const avatar = typeof src === 'object' ? src : await this.worldAvatarsRepository.findOneByOrFail({ id: src });
return await awaitAll({
id: avatar.id,
def: avatar.def,
});
}
@bindThis
public async packDetailed(
src: MiWorldAvatar['id'] | MiWorldAvatar,
me?: { id: MiUser['id'] } | null | undefined,
hint?: {
packedUser?: Packed<'UserLite'>
},
): Promise<Packed<'WorldAvatarDetailed'>> {
const meId = me ? me.id : null;
const avatar = typeof src === 'object' ? src : await this.worldAvatarsRepository.findOneByOrFail({ id: src });
return await awaitAll({
id: avatar.id,
createdAt: this.idService.parse(avatar.id).date.toISOString(),
updatedAt: avatar.updatedAt.toISOString(),
name: avatar.name,
def: avatar.def,
active: avatar.active,
});
}
@bindThis
public async packLiteMany(
avatars: MiWorldAvatar[],
me?: { id: MiUser['id'] } | null | undefined,
) {
const _users = avatars.map(({ user, userId }) => user ?? userId);
const _userMap = await this.userEntityService.packMany(_users, me)
.then(users => new Map(users.map(u => [u.id, u])));
return Promise.all(avatars.map(avatar => this.packLite(avatar, me, { packedUser: _userMap.get(avatar.userId) })));
}
@bindThis
public async packDetailedMany(
avatars: MiWorldAvatar[],
me?: { id: MiUser['id'] } | null | undefined,
) {
const _users = avatars.map(({ user, userId }) => user ?? userId);
const _userMap = await this.userEntityService.packMany(_users, me)
.then(users => new Map(users.map(u => [u.id, u])));
return Promise.all(avatars.map(avatar => this.packDetailed(avatar, me, { packedUser: _userMap.get(avatar.userId) })));
}
}
@@ -0,0 +1,97 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { DriveFilesRepository, MiWorldRoom, WorldRoomsRepository } from '@/models/_.js';
import { awaitAll } from '@/misc/prelude/await-all.js';
import type { Packed } from '@/misc/json-schema.js';
import type { } from '@/models/Blocking.js';
import type { MiUser } from '@/models/User.js';
import type { MiDriveFile } from '@/models/DriveFile.js';
import { bindThis } from '@/decorators.js';
import { IdService } from '@/core/IdService.js';
import { WorldRoomService } from '@/core/WorldRoomService.js';
import { UserEntityService } from './UserEntityService.js';
import { DriveFileEntityService } from './DriveFileEntityService.js';
import { In } from 'typeorm';
@Injectable()
export class WorldRoomEntityService {
constructor(
@Inject(DI.worldRoomsRepository)
private worldRoomsRepository: WorldRoomsRepository,
@Inject(DI.driveFilesRepository)
private driveFilesRepository: DriveFilesRepository,
private worldRoomService: WorldRoomService,
private userEntityService: UserEntityService,
private driveFileEntityService: DriveFileEntityService,
private idService: IdService,
) {
}
@bindThis
public async packLite(
src: MiWorldRoom['id'] | MiWorldRoom,
me?: { id: MiUser['id'] } | null | undefined,
hint?: {
packedUser?: Packed<'UserLite'>
},
): Promise<Packed<'WorldRoomLite'>> {
const meId = me ? me.id : null;
const room = typeof src === 'object' ? src : await this.worldRoomsRepository.findOneByOrFail({ id: src });
return await awaitAll({
id: room.id,
createdAt: this.idService.parse(room.id).date.toISOString(),
updatedAt: room.updatedAt.toISOString(),
userId: room.userId,
user: hint?.packedUser ?? this.userEntityService.pack(room.user ?? room.userId, me),
name: room.name,
description: room.description,
});
}
@bindThis
public async packDetailed(
src: MiWorldRoom['id'] | MiWorldRoom,
me?: { id: MiUser['id'] } | null | undefined,
hint?: {
packedUser?: Packed<'UserLite'>
},
): Promise<Packed<'WorldRoomDetailed'>> {
const meId = me ? me.id : null;
const room = typeof src === 'object' ? src : await this.worldRoomsRepository.findOneByOrFail({ id: src });
const attachedFileIds = this.worldRoomService.collectReferencedDriveFileIds(room.def);
const attachedFiles = attachedFileIds.size === 0 ? [] : await this.driveFilesRepository.findBy({ id: In([...attachedFileIds]), userId: room.userId });
return await awaitAll({
id: room.id,
createdAt: this.idService.parse(room.id).date.toISOString(),
updatedAt: room.updatedAt.toISOString(),
userId: room.userId,
user: hint?.packedUser ?? this.userEntityService.pack(room.user ?? room.userId, me),
name: room.name,
description: room.description,
def: room.def,
attachedFiles: this.driveFileEntityService.packMany(attachedFiles),
});
}
@bindThis
public async packLiteMany(
rooms: MiWorldRoom[],
me?: { id: MiUser['id'] } | null | undefined,
) {
const _users = rooms.map(({ user, userId }) => user ?? userId);
const _userMap = await this.userEntityService.packMany(_users, me)
.then(users => new Map(users.map(u => [u.id, u])));
return Promise.all(rooms.map(room => this.packLite(room, me, { packedUser: _userMap.get(room.userId) })));
}
}
+2
View File
@@ -91,5 +91,7 @@ export const DI = {
bubbleGameRecordsRepository: Symbol('bubbleGameRecordsRepository'),
reversiGamesRepository: Symbol('reversiGamesRepository'),
noteDraftsRepository: Symbol('noteDraftsRepository'),
worldRoomsRepository: Symbol('worldRoomsRepository'),
worldAvatarsRepository: Symbol('worldAvatarsRepository'),
//#endregion
};
+6
View File
@@ -75,6 +75,8 @@ import { packedChatRoomInvitationSchema } from '@/models/json-schema/chat-room-i
import { packedChatRoomMembershipSchema } from '@/models/json-schema/chat-room-membership.js';
import { packedAchievementNameSchema, packedAchievementSchema } from '@/models/json-schema/achievement.js';
import { packedNoteDraftSchema } from '@/models/json-schema/note-draft.js';
import { packedWorldRoomDetailedSchema, packedWorldRoomLiteSchema } from '@/models/json-schema/world-room.js';
import { packedWorldAvatarDetailedSchema, packedWorldAvatarLiteSchema } from '@/models/json-schema/world-avatar.js';
export const refs = {
UserLite: packedUserLiteSchema,
@@ -147,6 +149,10 @@ export const refs = {
ChatRoom: packedChatRoomSchema,
ChatRoomInvitation: packedChatRoomInvitationSchema,
ChatRoomMembership: packedChatRoomMembershipSchema,
WorldRoomLite: packedWorldRoomLiteSchema,
WorldRoomDetailed: packedWorldRoomDetailedSchema,
WorldAvatarLite: packedWorldAvatarLiteSchema,
WorldAvatarDetailed: packedWorldAvatarDetailedSchema,
};
export type Packed<x extends keyof typeof refs> = SchemaType<typeof refs[x]>;
@@ -84,6 +84,8 @@ import {
MiChatRoomMembership,
MiChatRoomInvitation,
MiChatApproval,
MiWorldRoom,
MiWorldAvatar,
} from './_.js';
import type { Provider } from '@nestjs/common';
import type { DataSource } from 'typeorm';
@@ -544,6 +546,18 @@ const $reversiGamesRepository: Provider = {
inject: [DI.db],
};
const $worldRoomsRepository: Provider = {
provide: DI.worldRoomsRepository,
useFactory: (db: DataSource) => db.getRepository(MiWorldRoom).extend(miRepository as MiRepository<MiWorldRoom>),
inject: [DI.db],
};
const $worldAvatarsRepository: Provider = {
provide: DI.worldAvatarsRepository,
useFactory: (db: DataSource) => db.getRepository(MiWorldAvatar).extend(miRepository as MiRepository<MiWorldAvatar>),
inject: [DI.db],
};
@Module({
imports: [],
providers: [
@@ -623,6 +637,8 @@ const $reversiGamesRepository: Provider = {
$chatApprovalsRepository,
$bubbleGameRecordsRepository,
$reversiGamesRepository,
$worldRoomsRepository,
$worldAvatarsRepository,
],
exports: [
$usersRepository,
@@ -701,6 +717,8 @@ const $reversiGamesRepository: Provider = {
$chatApprovalsRepository,
$bubbleGameRecordsRepository,
$reversiGamesRepository,
$worldRoomsRepository,
$worldAvatarsRepository,
],
})
export class RepositoryModule {
@@ -0,0 +1,54 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { Entity, Index, JoinColumn, Column, PrimaryColumn, ManyToOne } from 'typeorm';
import { id } from './util/id.js';
import { MiUser } from './User.js';
@Entity('world_avatar')
export class MiWorldAvatar {
@PrimaryColumn(id())
public id: string;
@Index()
@Column('timestamp with time zone', {
})
public updatedAt: Date;
@Column('varchar', {
length: 256,
})
public name: string;
@Index()
@Column({
...id(),
})
public userId: MiUser['id'];
@ManyToOne(() => MiUser, {
onDelete: 'CASCADE',
})
@JoinColumn()
public user: MiUser | null;
@Column('boolean', {
default: false,
})
public active: boolean;
@Column('jsonb', {
default: {},
})
public def: Record<string, any>;
constructor(data: Partial<MiWorldAvatar>) {
if (data == null) return;
for (const [k, v] of Object.entries(data)) {
(this as any)[k] = v;
}
}
}
+72
View File
@@ -0,0 +1,72 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { Entity, Index, JoinColumn, Column, PrimaryColumn, ManyToOne } from 'typeorm';
import { id } from './util/id.js';
import { MiUser } from './User.js';
export const worldRoomVisibility = ['public', 'private'] as const;
export type WorldRoomVisibility = typeof worldRoomVisibility[number];
@Entity('world_room')
export class MiWorldRoom {
@PrimaryColumn(id())
public id: string;
@Index()
@Column('timestamp with time zone', {
})
public updatedAt: Date;
@Column('varchar', {
length: 256,
})
public name: string;
@Column('varchar', {
length: 1024,
})
public description: string;
@Index()
@Column({
...id(),
})
public userId: MiUser['id'];
@ManyToOne(() => MiUser, {
onDelete: 'CASCADE',
})
@JoinColumn()
public user: MiUser | null;
@Column('integer', {
default: 0,
})
public likedCount: number;
@Column('integer', {
default: 0,
})
public accessCount: number;
@Column('varchar', {
length: 128, default: 'public',
})
public visibility: WorldRoomVisibility;
@Column('jsonb', {
default: {},
})
public def: Record<string, any>;
constructor(data: Partial<MiWorldRoom>) {
if (data == null) return;
for (const [k, v] of Object.entries(data)) {
(this as any)[k] = v;
}
}
}
+7 -1
View File
@@ -23,7 +23,7 @@ import { MiBubbleGameRecord } from '@/models/BubbleGameRecord.js';
import { MiChannel } from '@/models/Channel.js';
import { MiChannelFavorite } from '@/models/ChannelFavorite.js';
import { MiChannelFollowing } from '@/models/ChannelFollowing.js';
import { MiChannelMuting } from "@/models/ChannelMuting.js";
import { MiChannelMuting } from '@/models/ChannelMuting.js';
import { MiChatApproval } from '@/models/ChatApproval.js';
import { MiChatMessage } from '@/models/ChatMessage.js';
import { MiChatRoom } from '@/models/ChatRoom.js';
@@ -84,6 +84,8 @@ import { MiUserProfile } from '@/models/UserProfile.js';
import { MiUserPublickey } from '@/models/UserPublickey.js';
import { MiUserSecurityKey } from '@/models/UserSecurityKey.js';
import { MiWebhook } from '@/models/Webhook.js';
import { MiWorldRoom } from '@/models/WorldRoom.js';
import { MiWorldAvatar } from '@/models/WorldAvatar.js';
import type { QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity.js';
export interface MiRepository<T extends ObjectLiteral> {
@@ -173,6 +175,8 @@ export {
MiChatApproval,
MiBubbleGameRecord,
MiReversiGame,
MiWorldRoom,
MiWorldAvatar,
};
export type AbuseUserReportsRepository = Repository<MiAbuseUserReport> & MiRepository<MiAbuseUserReport>;
@@ -253,3 +257,5 @@ export type ChatRoomInvitationsRepository = Repository<MiChatRoomInvitation> & M
export type ChatApprovalsRepository = Repository<MiChatApproval> & MiRepository<MiChatApproval>;
export type BubbleGameRecordsRepository = Repository<MiBubbleGameRecord> & MiRepository<MiBubbleGameRecord>;
export type ReversiGamesRepository = Repository<MiReversiGame> & MiRepository<MiReversiGame>;
export type WorldRoomsRepository = Repository<MiWorldRoom> & MiRepository<MiWorldRoom>;
export type WorldAvatarsRepository = Repository<MiWorldAvatar> & MiRepository<MiWorldAvatar>;
@@ -0,0 +1,52 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
export const packedWorldAvatarLiteSchema = {
type: 'object',
properties: {
id: {
type: 'string',
optional: false, nullable: false,
format: 'id',
},
def: {
type: 'object',
optional: false, nullable: false,
},
},
} as const;
export const packedWorldAvatarDetailedSchema = {
type: 'object',
properties: {
id: {
type: 'string',
optional: false, nullable: false,
format: 'id',
},
createdAt: {
type: 'string',
optional: false, nullable: false,
format: 'date-time',
},
updatedAt: {
type: 'string',
optional: false, nullable: false,
format: 'date-time',
},
name: {
type: 'string',
optional: false, nullable: false,
},
def: {
type: 'object',
optional: false, nullable: false,
},
active: {
type: 'boolean',
optional: false, nullable: false,
},
},
} as const;
@@ -0,0 +1,95 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
export const packedWorldRoomLiteSchema = {
type: 'object',
properties: {
id: {
type: 'string',
optional: false, nullable: false,
format: 'id',
},
createdAt: {
type: 'string',
optional: false, nullable: false,
format: 'date-time',
},
updatedAt: {
type: 'string',
optional: false, nullable: false,
format: 'date-time',
},
userId: {
type: 'string',
optional: false, nullable: false,
format: 'id',
},
user: {
type: 'object',
ref: 'UserLite',
optional: false, nullable: false,
},
name: {
type: 'string',
optional: false, nullable: false,
},
description: {
type: 'string',
optional: false, nullable: false,
},
},
} as const;
export const packedWorldRoomDetailedSchema = {
type: 'object',
properties: {
id: {
type: 'string',
optional: false, nullable: false,
format: 'id',
},
createdAt: {
type: 'string',
optional: false, nullable: false,
format: 'date-time',
},
updatedAt: {
type: 'string',
optional: false, nullable: false,
format: 'date-time',
},
userId: {
type: 'string',
optional: false, nullable: false,
format: 'id',
},
user: {
type: 'object',
ref: 'UserLite',
optional: false, nullable: false,
},
name: {
type: 'string',
optional: false, nullable: false,
},
description: {
type: 'string',
optional: false, nullable: false,
},
def: {
type: 'object',
optional: false, nullable: false,
},
attachedFiles: {
type: 'array',
optional: false, nullable: false,
items: {
type: 'object',
optional: false, nullable: false,
ref: 'DriveFile',
},
},
},
} as const;
+4
View File
@@ -87,6 +87,8 @@ import { MiBubbleGameRecord } from '@/models/BubbleGameRecord.js';
import { MiReversiGame } from '@/models/ReversiGame.js';
import { MiChatApproval } from '@/models/ChatApproval.js';
import { MiSystemAccount } from '@/models/SystemAccount.js';
import { MiWorldRoom } from '@/models/WorldRoom.js';
import { MiWorldAvatar } from '@/models/WorldAvatar.js';
pg.types.setTypeParser(20, Number);
@@ -254,6 +256,8 @@ export const entities = [
MiChatApproval,
MiBubbleGameRecord,
MiReversiGame,
MiWorldRoom,
MiWorldAvatar,
...charts,
];
+3 -1
View File
@@ -6,6 +6,7 @@
import { Module } from '@nestjs/common';
import { EndpointsModule } from '@/server/api/EndpointsModule.js';
import { CoreModule } from '@/core/CoreModule.js';
import MainStreamConnection from '@/server/api/stream/Connection.js';
import { ApiCallService } from './api/ApiCallService.js';
import { FileServerService } from './FileServerService.js';
import { HealthServerService } from './HealthServerService.js';
@@ -30,7 +31,6 @@ import { UrlPreviewService } from './web/UrlPreviewService.js';
import { ClientLoggerService } from './web/ClientLoggerService.js';
import { OAuth2ProviderService } from './oauth/OAuth2ProviderService.js';
import MainStreamConnection from '@/server/api/stream/Connection.js';
import { MainChannel } from './api/stream/channels/main.js';
import { AdminChannel } from './api/stream/channels/admin.js';
import { AntennaChannel } from './api/stream/channels/antenna.js';
@@ -49,6 +49,7 @@ import { ChatUserChannel } from './api/stream/channels/chat-user.js';
import { ChatRoomChannel } from './api/stream/channels/chat-room.js';
import { ReversiChannel } from './api/stream/channels/reversi.js';
import { ReversiGameChannel } from './api/stream/channels/reversi-game.js';
import { WorldRoomChannel } from './api/stream/channels/world-room.js';
import { NoteStreamingHidingService } from './api/stream/NoteStreamingHidingService.js';
import { SigninWithPasskeyApiService } from './api/SigninWithPasskeyApiService.js';
@@ -99,6 +100,7 @@ import { SigninWithPasskeyApiService } from './api/SigninWithPasskeyApiService.j
QueueStatsChannel,
ServerStatsChannel,
UserListChannel,
WorldRoomChannel,
NoteStreamingHidingService,
OpenApiServerService,
OAuth2ProviderService,
@@ -447,4 +447,14 @@ export * as 'chat/rooms/invitations/inbox' from './endpoints/chat/rooms/invitati
export * as 'chat/rooms/invitations/outbox' from './endpoints/chat/rooms/invitations/outbox.js';
export * as 'chat/history' from './endpoints/chat/history.js';
export * as 'chat/read-all' from './endpoints/chat/read-all.js';
export * as 'world/rooms/create' from './endpoints/world/rooms/create.js';
export * as 'world/rooms/update' from './endpoints/world/rooms/update.js';
export * as 'world/rooms/delete' from './endpoints/world/rooms/delete.js';
export * as 'world/rooms/list-by-user' from './endpoints/world/rooms/list-by-user.js';
export * as 'world/rooms/show' from './endpoints/world/rooms/show.js';
export * as 'world/avatars/create' from './endpoints/world/avatars/create.js';
export * as 'world/avatars/update' from './endpoints/world/avatars/update.js';
export * as 'world/avatars/delete' from './endpoints/world/avatars/delete.js';
export * as 'world/avatars/list' from './endpoints/world/avatars/list.js';
export * as 'world/avatars/show' from './endpoints/world/avatars/show.js';
export * as 'v2/admin/emoji/list' from './endpoints/v2/admin/emoji/list.js';
@@ -0,0 +1,63 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { Inject, Injectable } from '@nestjs/common';
import ms from 'ms';
import { Endpoint } from '@/server/api/endpoint-base.js';
import { DI } from '@/di-symbols.js';
import { ApiError } from '@/server/api/error.js';
import { WorldAvatarService } from '@/core/WorldAvatarService.js';
import { WorldAvatarEntityService } from '@/core/entities/WorldAvatarEntityService.js';
export const meta = {
tags: ['worldAvatar'],
requireCredential: true,
prohibitMoved: true,
kind: 'write:worldAvatar',
limit: {
duration: ms('1day'),
max: 10,
},
res: {
type: 'object',
optional: false, nullable: false,
ref: 'WorldAvatarDetailed',
},
errors: {
},
} as const;
export const paramDef = {
type: 'object',
properties: {
name: { type: 'string', maxLength: 256 },
def: { type: 'object', additionalProperties: true },
},
required: ['name', 'def'],
} as const;
@Injectable()
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
constructor(
private worldAvatarService: WorldAvatarService,
private worldAvatarEntityService: WorldAvatarEntityService,
) {
super(meta, paramDef, async (ps, me) => {
// TODO: validate avatar
const avatar = await this.worldAvatarService.create(me, {
name: ps.name,
def: ps.def,
});
return await this.worldAvatarEntityService.packDetailed(avatar);
});
}
}
@@ -0,0 +1,50 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { Inject, Injectable } from '@nestjs/common';
import { Endpoint } from '@/server/api/endpoint-base.js';
import { DI } from '@/di-symbols.js';
import { WorldAvatarService } from '@/core/WorldAvatarService.js';
import { ApiError } from '@/server/api/error.js';
export const meta = {
tags: ['worldAvatar'],
requireCredential: true,
kind: 'write:worldAvatar',
errors: {
noSuchAvatar: {
message: 'No such avatar.',
code: 'NO_SUCH_ROOM',
id: 'd4e3753d-97bf-4a19-ab8e-21080fbc0f4c',
},
},
} as const;
export const paramDef = {
type: 'object',
properties: {
avatarId: { type: 'string', format: 'misskey:id' },
},
required: ['avatarId'],
} as const;
@Injectable()
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
constructor(
private worldAvatarService: WorldAvatarService,
) {
super(meta, paramDef, async (ps, me) => {
const avatar = await this.worldAvatarService.findMyAvatarById(me.id, ps.avatarId);
if (avatar == null) {
throw new ApiError(meta.errors.noSuchAvatar);
}
await this.worldAvatarService.delete(avatar, me);
});
}
}
@@ -0,0 +1,62 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { Inject, Injectable } from '@nestjs/common';
import { Endpoint } from '@/server/api/endpoint-base.js';
import { DI } from '@/di-symbols.js';
import { WorldAvatarService } from '@/core/WorldAvatarService.js';
import { WorldAvatarEntityService } from '@/core/entities/WorldAvatarEntityService.js';
import { ApiError } from '@/server/api/error.js';
import { IdService } from '@/core/IdService.js';
export const meta = {
tags: ['worldAvatar'],
requireCredential: true,
kind: 'read:worldAvatar',
res: {
type: 'array',
optional: false, nullable: false,
items: {
type: 'object',
optional: false, nullable: false,
ref: 'WorldAvatarDetailed',
},
},
errors: {
},
} as const;
export const paramDef = {
type: 'object',
properties: {
limit: { type: 'integer', minimum: 1, maximum: 100, default: 30 },
sinceId: { type: 'string', format: 'misskey:id' },
untilId: { type: 'string', format: 'misskey:id' },
sinceDate: { type: 'integer' },
untilDate: { type: 'integer' },
},
required: [],
} as const;
@Injectable()
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
constructor(
private worldAvatarEntityService: WorldAvatarEntityService,
private worldAvatarService: WorldAvatarService,
private idService: IdService,
) {
super(meta, paramDef, async (ps, me) => {
const untilId = ps.untilId ?? (ps.untilDate ? this.idService.gen(ps.untilDate!) : null);
const sinceId = ps.sinceId ?? (ps.sinceDate ? this.idService.gen(ps.sinceDate!) : null);
const avatars = await this.worldAvatarService.getMyAvatarsWithPagination(me.id, ps.limit, sinceId, untilId);
return this.worldAvatarEntityService.packDetailedMany(avatars, me);
});
}
}
@@ -0,0 +1,62 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { Inject, Injectable } from '@nestjs/common';
import { Endpoint } from '@/server/api/endpoint-base.js';
import { DI } from '@/di-symbols.js';
import { WorldAvatarService } from '@/core/WorldAvatarService.js';
import { ApiError } from '@/server/api/error.js';
import { WorldAvatarEntityService } from '@/core/entities/WorldAvatarEntityService.js';
export const meta = {
tags: ['worldAvatar'],
requireCredential: true,
kind: 'read:worldAvatar',
res: {
type: 'object',
optional: false, nullable: false,
ref: 'WorldAvatarDetailed',
},
errors: {
noSuchAvatar: {
message: 'No such avatar.',
code: 'NO_SUCH_ROOM',
id: '857ae02f-8759-4d20-9adb-6e95fffe4fd8',
},
},
} as const;
export const paramDef = {
type: 'object',
properties: {
avatarId: { type: 'string', format: 'misskey:id' },
},
required: ['avatarId'],
} as const;
@Injectable()
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
constructor(
private worldAvatarService: WorldAvatarService,
private worldAvatarEntityService: WorldAvatarEntityService,
) {
super(meta, paramDef, async (ps, me) => {
const avatar = await this.worldAvatarService.findAvatarById(ps.avatarId);
if (avatar == null) {
throw new ApiError(meta.errors.noSuchAvatar);
}
if (avatar.userId !== me.id) {
throw new ApiError(meta.errors.noSuchAvatar);
}
return this.worldAvatarEntityService.packDetailed(avatar, me);
});
}
}
@@ -0,0 +1,62 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { Inject, Injectable } from '@nestjs/common';
import { Endpoint } from '@/server/api/endpoint-base.js';
import { DI } from '@/di-symbols.js';
import { WorldAvatarService } from '@/core/WorldAvatarService.js';
import { ApiError } from '@/server/api/error.js';
export const meta = {
tags: ['worldAvatar'],
requireCredential: true,
kind: 'write:worldAvatar',
res: {
},
errors: {
noSuchAvatar: {
message: 'No such avatar.',
code: 'NO_SUCH_ROOM',
id: 'fcdb0f92-bda6-47f9-bd05-343e0e020933',
},
},
} as const;
export const paramDef = {
type: 'object',
properties: {
avatarId: { type: 'string', format: 'misskey:id' },
name: { type: 'string', maxLength: 256 },
def: { type: 'object', additionalProperties: true },
active: { type: 'boolean' },
},
required: ['avatarId'],
} as const;
@Injectable()
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
constructor(
private worldAvatarService: WorldAvatarService,
) {
super(meta, paramDef, async (ps, me) => {
const avatar = await this.worldAvatarService.findMyAvatarById(me.id, ps.avatarId);
if (avatar == null) {
throw new ApiError(meta.errors.noSuchAvatar);
}
// TODO: validate avatar
await this.worldAvatarService.update(avatar, {
name: ps.name,
def: ps.def,
active: ps.active,
});
});
}
}
@@ -0,0 +1,67 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { Inject, Injectable } from '@nestjs/common';
import ms from 'ms';
import { Endpoint } from '@/server/api/endpoint-base.js';
import { DI } from '@/di-symbols.js';
import { ApiError } from '@/server/api/error.js';
import { WorldRoomService } from '@/core/WorldRoomService.js';
import { WorldRoomEntityService } from '@/core/entities/WorldRoomEntityService.js';
export const meta = {
tags: ['worldRoom'],
requireCredential: true,
prohibitMoved: true,
kind: 'write:worldRoom',
limit: {
duration: ms('1day'),
max: 10,
},
res: {
type: 'object',
optional: false, nullable: false,
ref: 'WorldRoomDetailed',
},
errors: {
},
} as const;
export const paramDef = {
type: 'object',
properties: {
name: { type: 'string', maxLength: 256 },
description: { type: 'string', maxLength: 1024 },
visibility: { type: 'string', enum: ['public', 'private'] },
def: { type: 'object', additionalProperties: true },
},
required: ['name', 'visibility', 'def'],
} as const;
@Injectable()
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
constructor(
private worldRoomService: WorldRoomService,
private worldRoomEntityService: WorldRoomEntityService,
) {
super(meta, paramDef, async (ps, me) => {
// TODO: validate room
const room = await this.worldRoomService.create(me, {
name: ps.name,
description: ps.description ?? '',
visibility: ps.visibility,
def: ps.def,
});
return await this.worldRoomEntityService.packDetailed(room);
});
}
}
@@ -0,0 +1,50 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { Inject, Injectable } from '@nestjs/common';
import { Endpoint } from '@/server/api/endpoint-base.js';
import { DI } from '@/di-symbols.js';
import { WorldRoomService } from '@/core/WorldRoomService.js';
import { ApiError } from '@/server/api/error.js';
export const meta = {
tags: ['worldRoom'],
requireCredential: true,
kind: 'write:worldRoom',
errors: {
noSuchRoom: {
message: 'No such room.',
code: 'NO_SUCH_ROOM',
id: 'd4e3753d-97bf-4a19-ab8e-21080fbc0f4c',
},
},
} as const;
export const paramDef = {
type: 'object',
properties: {
roomId: { type: 'string', format: 'misskey:id' },
},
required: ['roomId'],
} as const;
@Injectable()
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
constructor(
private worldRoomService: WorldRoomService,
) {
super(meta, paramDef, async (ps, me) => {
const room = await this.worldRoomService.findMyRoomById(me.id, ps.roomId);
if (room == null) {
throw new ApiError(meta.errors.noSuchRoom);
}
await this.worldRoomService.delete(room, me);
});
}
}
@@ -0,0 +1,63 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { Inject, Injectable } from '@nestjs/common';
import { Endpoint } from '@/server/api/endpoint-base.js';
import { DI } from '@/di-symbols.js';
import { WorldRoomService } from '@/core/WorldRoomService.js';
import { WorldRoomEntityService } from '@/core/entities/WorldRoomEntityService.js';
import { ApiError } from '@/server/api/error.js';
import { IdService } from '@/core/IdService.js';
export const meta = {
tags: ['worldRoom'],
requireCredential: true,
kind: 'read:worldRoom',
res: {
type: 'array',
optional: false, nullable: false,
items: {
type: 'object',
optional: false, nullable: false,
ref: 'WorldRoomLite',
},
},
errors: {
},
} as const;
export const paramDef = {
type: 'object',
properties: {
userId: { type: 'string', format: 'misskey:id' },
limit: { type: 'integer', minimum: 1, maximum: 100, default: 30 },
sinceId: { type: 'string', format: 'misskey:id' },
untilId: { type: 'string', format: 'misskey:id' },
sinceDate: { type: 'integer' },
untilDate: { type: 'integer' },
},
required: ['userId'],
} as const;
@Injectable()
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
constructor(
private worldRoomEntityService: WorldRoomEntityService,
private worldRoomService: WorldRoomService,
private idService: IdService,
) {
super(meta, paramDef, async (ps, me) => {
const untilId = ps.untilId ?? (ps.untilDate ? this.idService.gen(ps.untilDate!) : null);
const sinceId = ps.sinceId ?? (ps.sinceDate ? this.idService.gen(ps.sinceDate!) : null);
const rooms = await this.worldRoomService.getRoomsOfUserWithPagination(ps.userId, ps.userId === me.id, ps.limit, sinceId, untilId);
return this.worldRoomEntityService.packLiteMany(rooms, me);
});
}
}
@@ -0,0 +1,62 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { Inject, Injectable } from '@nestjs/common';
import { Endpoint } from '@/server/api/endpoint-base.js';
import { DI } from '@/di-symbols.js';
import { WorldRoomService } from '@/core/WorldRoomService.js';
import { ApiError } from '@/server/api/error.js';
import { WorldRoomEntityService } from '@/core/entities/WorldRoomEntityService.js';
export const meta = {
tags: ['worldRoom'],
requireCredential: true,
kind: 'read:worldRoom',
res: {
type: 'object',
optional: false, nullable: false,
ref: 'WorldRoomDetailed',
},
errors: {
noSuchRoom: {
message: 'No such room.',
code: 'NO_SUCH_ROOM',
id: '857ae02f-8759-4d20-9adb-6e95fffe4fd8',
},
},
} as const;
export const paramDef = {
type: 'object',
properties: {
roomId: { type: 'string', format: 'misskey:id' },
},
required: ['roomId'],
} as const;
@Injectable()
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
constructor(
private worldRoomService: WorldRoomService,
private worldRoomEntityService: WorldRoomEntityService,
) {
super(meta, paramDef, async (ps, me) => {
const room = await this.worldRoomService.findRoomById(ps.roomId);
if (room == null) {
throw new ApiError(meta.errors.noSuchRoom);
}
if (room.userId !== me.id && room.visibility === 'private') {
throw new ApiError(meta.errors.noSuchRoom);
}
return this.worldRoomEntityService.packDetailed(room, me);
});
}
}
@@ -0,0 +1,64 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { Inject, Injectable } from '@nestjs/common';
import { Endpoint } from '@/server/api/endpoint-base.js';
import { DI } from '@/di-symbols.js';
import { WorldRoomService } from '@/core/WorldRoomService.js';
import { ApiError } from '@/server/api/error.js';
export const meta = {
tags: ['worldRoom'],
requireCredential: true,
kind: 'write:worldRoom',
res: {
},
errors: {
noSuchRoom: {
message: 'No such room.',
code: 'NO_SUCH_ROOM',
id: 'fcdb0f92-bda6-47f9-bd05-343e0e020933',
},
},
} as const;
export const paramDef = {
type: 'object',
properties: {
roomId: { type: 'string', format: 'misskey:id' },
name: { type: 'string', maxLength: 256 },
description: { type: 'string', maxLength: 1024 },
visibility: { type: 'string', enum: ['public', 'private'] },
def: { type: 'object', additionalProperties: true },
},
required: ['roomId'],
} as const;
@Injectable()
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
constructor(
private worldRoomService: WorldRoomService,
) {
super(meta, paramDef, async (ps, me) => {
const room = await this.worldRoomService.findMyRoomById(me.id, ps.roomId);
if (room == null) {
throw new ApiError(meta.errors.noSuchRoom);
}
// TODO: validate room
await this.worldRoomService.update(room, {
name: ps.name,
description: ps.description,
visibility: ps.visibility,
def: ps.def,
});
});
}
}
@@ -35,6 +35,7 @@ import { ChatUserChannel } from '@/server/api/stream/channels/chat-user.js';
import { ChatRoomChannel } from '@/server/api/stream/channels/chat-room.js';
import { ReversiChannel } from '@/server/api/stream/channels/reversi.js';
import { ReversiGameChannel } from '@/server/api/stream/channels/reversi-game.js';
import { WorldRoomChannel } from '@/server/api/stream/channels/world-room.js';
import type { ChannelRequest } from './channel.js';
import type { ChannelConstructor } from './channel.js';
import type Channel from './channel.js';
@@ -338,6 +339,7 @@ export default class Connection {
case 'chatRoom': return ChatRoomChannel;
case 'reversi': return ReversiChannel;
case 'reversiGame': return ReversiGameChannel;
case 'worldRoom': return WorldRoomChannel;
default:
throw new Error(`no such channel: ${name}`);
@@ -0,0 +1,115 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { Inject, Injectable, Scope } from '@nestjs/common';
import { REQUEST } from '@nestjs/core';
import { DI } from '@/di-symbols.js';
import { bindThis } from '@/decorators.js';
import type { GlobalEvents } from '@/core/GlobalEventService.js';
import type { JsonObject } from '@/misc/json-value.js';
import { WorldRoomService } from '@/core/WorldRoomService.js';
import { WorldRoomMultiplayService } from '@/core/WorldRoomMultiplayService.js';
import Channel, { type ChannelRequest } from '../channel.js';
@Injectable({ scope: Scope.TRANSIENT })
export class WorldRoomChannel extends Channel {
public readonly chName = 'worldRoom';
public static shouldShare = false;
public static requireCredential = true as const;
public static kind = 'read:worldRoom';
private roomId: string;
private intervalId: NodeJS.Timeout;
private isEntered = false;
constructor(
@Inject(REQUEST)
request: ChannelRequest,
private worldRoomService: WorldRoomService,
private worldRoomMultiplayService: WorldRoomMultiplayService,
) {
super(request);
}
@bindThis
public async init(params: JsonObject): Promise<boolean> {
if (typeof params.roomId !== 'string') return false;
if (!this.user) return false;
this.roomId = params.roomId;
const room = await this.worldRoomService.findRoomById(this.roomId);
if (room == null) return false;
try {
await this.enter();
} catch (err) {
return false;
}
this.subscriber.on(`worldRoomStream:${this.roomId}`, this.onEvent);
return true;
}
@bindThis
private async enter() {
if (this.isEntered) return;
await this.worldRoomMultiplayService.enter(this.user!.id, this.roomId);
this.isEntered = true;
this.send('entered', {
playerProfiles: await this.worldRoomMultiplayService.getPlayerProfiles(this.roomId, this.user!.id),
});
this.intervalId = setInterval(async () => {
const states = await this.worldRoomMultiplayService.getPlayerStatesAndHeatbeat(this.user!.id, this.roomId);
delete states[this.user!.id];
this.send('sync', states);
}, 100);
}
@bindThis
private async onEvent(data: GlobalEvents['worldRoom']['payload']) {
switch (data.type) {
case 'enter': {
if (data.body.user.id === this.user!.id) return; // 自分の入室は無視
this.send('playerEntered', {
id: data.body.user.id,
profile: this.worldRoomMultiplayService.packPlayerProfile(data.body.user, data.body.avatar),
});
break;
}
case 'left': {
if (data.body.userId === this.user!.id) return; // 自分の退室は無視
this.send('playerLeft', {
id: data.body.userId,
});
break;
}
}
}
@bindThis
public onMessage(type: string, body: any) {
switch (type) {
case 'update':
if (this.roomId && this.isEntered) {
this.worldRoomMultiplayService.updatePlayerState(this.user!.id, this.roomId, body);
}
break;
}
}
@bindThis
public dispose() {
this.subscriber.off(`worldRoomStream:${this.roomId}`, this.onEvent);
clearInterval(this.intervalId);
this.worldRoomMultiplayService.left(this.user!.id, this.roomId);
}
}
@@ -0,0 +1,5 @@
# frontend用Misskey Worldエンジン
エンジンはWeb Worker内で動作し、ほぼすべてのMisskey Webの機能は使えないため、意図しないそれらへの参照/依存が原理的に発生しないように別パッケージとする
ただしヘッドレス動作することは(今のところ)意図していない
@@ -0,0 +1,28 @@
import tsParser from '@typescript-eslint/parser';
import sharedConfig from '../shared/eslint.config.js';
// eslint-disable-next-line import/no-default-export
export default [
...sharedConfig,
{
ignores: [
'**/node_modules',
'built',
'coverage',
'jest.config.ts',
'test',
'test-d',
],
},
{
files: ['**/*.ts', '**/*.tsx'],
languageOptions: {
parserOptions: {
parser: tsParser,
project: ['./tsconfig.json'],
sourceType: 'module',
tsconfigRootDir: import.meta.dirname,
},
},
},
];
@@ -0,0 +1,34 @@
{
"type": "module",
"name": "frontend-misskey-world-engine",
"private": true,
"scripts": {
"eslint": "eslint './**/*.{js,jsx,ts,tsx}'",
"typecheck": "tsgo --noEmit",
"lint": "pnpm typecheck && pnpm eslint"
},
"devDependencies": {
"@types/seedrandom": "3.0.8",
"@typescript-eslint/eslint-plugin": "8.59.2",
"@typescript-eslint/parser": "8.59.2",
"esbuild": "0.28.0",
"execa": "9.6.1",
"nodemon": "3.1.14",
"throttle-debounce": "5.0.2",
"@types/tinycolor2": "1.4.6"
},
"files": [
"built"
],
"dependencies": {
"@babylonjs/core": "9.18.0",
"@babylonjs/inspector": "9.18.0",
"@babylonjs/loaders": "9.18.0",
"@babylonjs/materials": "9.18.0",
"@types/throttle-debounce": "5.0.2",
"eventemitter3": "5.0.4",
"seedrandom": "3.0.5",
"tinycolor2": "1.6.0",
"hls.js": "1.6.16"
}
}
@@ -0,0 +1,127 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import EventEmitter from 'eventemitter3';
const IN_WEB_WORKER = typeof window === 'undefined';
export type EngineBaseEvents = {
'loadingProgress': (ctx: { progress: number }) => void;
'contextlost': (ctx: { reason: string; message: string; }) => void;
};
export abstract class EngineBase<EVs extends EngineBaseEvents> extends EventEmitter<{
'ev': (ctx: { type: keyof EVs; ctx: Parameters<EVs[keyof EVs]>[0] }) => void;
}> {
declare _eventTypes?: EVs;
protected engine: BABYLON.WebGPUEngine;
public scene: BABYLON.Scene;
abstract sr: BABYLON.SnapshotRenderingHelper;
protected fps: number | null = null;
protected disposed = false;
public inputs: EventEmitter<{
'click': (event: { x: number; y: number; }) => void;
'keydown': (event: { code: string; shiftKey: boolean; }) => void;
'keyup': (event: { code: string; shiftKey: boolean; }) => void;
'wheel': (event: { deltaY: number; }) => void;
'zoom': (event: { delta: number; }) => void;
'pointer': (event: { x: number; y: number; }) => void;
}> = new EventEmitter();
constructor(options: {
engine: BABYLON.WebGPUEngine;
fps: number | null;
}) {
super();
this.fps = options.fps;
this.engine = options.engine;
// doNotHandleContextLostがtrueだとそもそも呼ばれない
//babylonEngine.onContextLostObservable.add(() => {
// os.alert({
// type: 'error',
// title: i18n.ts.somethingHappened,
// text: i18n.ts._miWorld.crushed_description,
// });
//});
this.engine._device.lost.then((info) => { // TODO: babylonEngineの内部プロパティに依存しない方法をforumで聞く
this.ev('contextlost', { reason: info.reason, message: info.message }); // transferableじゃないデータが含まれている可能性も考慮してinfoそのままは送らない
});
this.scene = new BABYLON.Scene(this.engine);
}
private currentRafId: number | null = null;
protected startRenderLoop() {
if (this.fps == null) {
this.engine.runRenderLoop(() => {
this.scene.render();
});
} else {
let then = 0;
const interval = 1000 / this.fps;
const renderLoop = (timeStamp: number) => {
if (this.disposed) return;
// workerで実行される可能性がある
this.currentRafId = requestAnimationFrame(renderLoop);
const delta = timeStamp - then;
if (delta <= interval) return;
then = timeStamp - (delta % interval);
this.engine.beginFrame();
this.scene.render();
this.engine.endFrame();
};
// workerで実行される可能性がある
this.currentRafId = requestAnimationFrame(renderLoop);
}
}
public pauseRender() { // TODO: srと同じく参照カウント方式にした方が便利そう
this.engine.stopRenderLoop();
if (this.currentRafId != null) {
// workerで実行される可能性がある
cancelAnimationFrame(this.currentRafId);
this.currentRafId = null;
}
}
public resumeRender() {
this.startRenderLoop();
}
public abstract init(): Promise<void>;
protected ev<K extends keyof EVs>(type: K, ctx: Parameters<EVs[K]>[0]) {
this.emit('ev', { type, ctx });
}
public async takeScreenshot() {
return await BABYLON.Tools.CreateScreenshotAsync(this.engine, this.scene.activeCamera!, { precision: 1 });
}
public abstract resize(): void;
public destroy() {
this.engine.stopRenderLoop();
if (this.currentRafId != null) {
// workerで実行される可能性がある
cancelAnimationFrame(this.currentRafId);
this.currentRafId = null;
}
this.engine.dispose();
this.scene.dispose();
this.disposed = true;
}
}
@@ -0,0 +1,127 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js';
import { randomRange, Timer } from './utility.js';
import type { EngineBase } from './EngineBase.js';
export class Firework {
private engine: EngineBase<any>;
private timer: Timer = new Timer();
constructor(engine: EngineBase<any>) {
this.engine = engine;
}
public launch(options: {
position: [number, number, number];
}) {
this.engine.sr.disableSnapshotRendering();
const texture = new BABYLON.Texture(`/client-assets/world/other/firework/flare-${Math.round(randomRange(1, 8))}.png`, this.engine.scene);
//const emitter = new BABYLON.TransformNode('emitter', this.engine.scene);
const emitter = BABYLON.MeshBuilder.CreateBox('emitter', { size: cm(10) }, this.engine.scene);
emitter.position = new BABYLON.Vector3(options.position[0], options.position[1], options.position[2]);
const ps = new BABYLON.ParticleSystem('', 32, this.engine.scene);
ps.particleTexture = texture;
ps.emitter = emitter;
ps.minEmitPower = cm(100);
ps.maxEmitPower = cm(500);
ps.minLifeTime = 0.5;
ps.maxLifeTime = 1;
ps.minSize = cm(3);
ps.maxSize = cm(30);
//ps.direction1 = new BABYLON.Vector3(0, 1, 0);
//ps.direction2 = new BABYLON.Vector3(0, 1, 0);
ps.emitRate = 20;
ps.blendMode = BABYLON.ParticleSystem.BLENDMODE_ADD;
//ps.color1 = new BABYLON.Color4(1, 1, 1, 0.3);
//ps.color2 = new BABYLON.Color4(1, 1, 1, 0.2);
ps.colorDead = new BABYLON.Color4(1, 1, 1, 0);
ps.start();
this.engine.sr.fixParticleSystem(ps);
const launchAnim = new BABYLON.Animation(
'',
'position',
60,
BABYLON.Animation.ANIMATIONTYPE_VECTOR3,
BABYLON.Animation.ANIMATIONLOOPMODE_CONSTANT,
);
launchAnim.setKeys([
{ frame: 0, value: new BABYLON.Vector3(options.position[0], options.position[1], options.position[2]) },
{ frame: 60, value: new BABYLON.Vector3(options.position[0], options.position[1] + cm(randomRange(1000, 4000)), options.position[2]) },
]);
emitter.animations.push(launchAnim);
const animating = Promise.withResolvers<void>();
this.engine.scene.beginAnimation(emitter, 0, 60, false, 1, () => { animating.resolve(); });
animating.promise.then(() => {
ps.stop();
this.explode({
position: [emitter.position.x, emitter.position.y, emitter.position.z],
texture,
callback: () => { // explode途中でSRの状態を切り替えるとパーティクルが消える現象があるため、explodeが終了してから片づける
this.engine.sr.disableSnapshotRendering();
ps.dispose();
emitter.dispose();
this.engine.sr.enableSnapshotRendering();
},
});
});
this.engine.sr.enableSnapshotRendering();
}
public explode(options: {
position: [number, number, number];
texture: BABYLON.Texture;
callback: () => void;
}) {
this.engine.sr.disableSnapshotRendering();
const ps = new BABYLON.ParticleSystem('', 128, this.engine.scene);
ps.particleTexture = options.texture;
ps.emitter = new BABYLON.Vector3(options.position[0], options.position[1], options.position[2]);
ps.minEmitPower = cm(3700);
ps.maxEmitPower = cm(4000);
ps.minLifeTime = 0.8;
ps.maxLifeTime = 1;
ps.addDragGradient(0, 0.1);
ps.addDragGradient(1, 0.8);
ps.gravity = new BABYLON.Vector3(0, -50, 0).scale(WORLD_SCALE);
ps.minSize = cm(20);
ps.maxSize = cm(40);
const sphereEmitter = ps.createSphereEmitter(cm(1));
//ps.direction1 = new BABYLON.Vector3(0, 1, 0);
//ps.direction2 = new BABYLON.Vector3(0, 1, 0);
ps.manualEmitCount = 100;
ps.blendMode = BABYLON.ParticleSystem.BLENDMODE_MULTIPLYADD;
ps.color1 = new BABYLON.Color4(1, 1, 1, 1);
ps.color2 = new BABYLON.Color4(1, 1, 1, 1);
ps.colorDead = new BABYLON.Color4(1, 1, 1, 0);
ps.start();
this.engine.sr.fixParticleSystem(ps);
this.timer.setTimeout(() => {
this.engine.sr.disableSnapshotRendering();
ps.dispose();
this.engine.sr.enableSnapshotRendering();
options.callback();
}, 2000);
this.engine.sr.enableSnapshotRendering();
}
public dispose() {
this.timer.dispose();
}
}
@@ -0,0 +1,335 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js';
import { AccessoryContainer } from './avatars/AccessoryContainer.js';
import { getAccessoryDef } from './avatars/accessory-defs.js';
import { createTextMesh, Timer } from './utility.js';
import type { WorldAvatar } from 'misskey-world/src/types.js';
export type PlayerProfile = {
user: {
name: string;
username: string;
avatarUrl: string;
} | null;
avatar: WorldAvatar;
};
export type PlayerState = {
position: [number, number, number],
rotation: [number, number, number],
sit?: string; // id
};
const DEFAULT_FACE_PARTS_EYES = {
'_none_': null,
'a': '/client-assets/world/avatars/eyes-a.png',
'b': '/client-assets/world/avatars/eyes-b.png',
'c': '/client-assets/world/avatars/eyes-c.png',
'd': '/client-assets/world/avatars/eyes-d.png',
'e': '/client-assets/world/avatars/eyes-e.png',
'f': '/client-assets/world/avatars/eyes-f.png',
'g': '/client-assets/world/avatars/eyes-g.png',
};
const DEFAULT_FACE_PARTS_MOUTH = {
'_none_': null,
'a': '/client-assets/world/avatars/mouth-a.png',
'b': '/client-assets/world/avatars/mouth-b.png',
'c': '/client-assets/world/avatars/mouth-c.png',
'd': '/client-assets/world/avatars/mouth-d.png',
'e': '/client-assets/world/avatars/mouth-e.png',
'f': '/client-assets/world/avatars/mouth-f.png',
'g': '/client-assets/world/avatars/mouth-g.png',
'h': '/client-assets/world/avatars/mouth-h.png',
'i': '/client-assets/world/avatars/mouth-i.png',
};
let usernameLabelMaterial: BABYLON.StandardMaterial | null = null;
export class PlayerContainer {
public id: string;
private profile: PlayerProfile;
public root: BABYLON.TransformNode;
private subRootContainerForAnim: BABYLON.TransformNode;
private subRoot: BABYLON.TransformNode;
private modelRoot: BABYLON.TransformNode | null = null;
private sr: BABYLON.SnapshotRenderingHelper;
private scene: BABYLON.Scene;
public registerMeshes: (meshes: BABYLON.Mesh[]) => void = () => {};
private animationObserver: BABYLON.Observer<BABYLON.Scene> | null = null;
private accessoryContainers: AccessoryContainer[] = [];
private timer: Timer = new Timer();
private showUsername: boolean;
private show2dAvatar: boolean;
private usernameLabelMesh: BABYLON.Mesh | null = null;
private twodAvatarMesh: BABYLON.Mesh | null = null;
constructor(params: { id: string; profile: PlayerProfile; state: PlayerState | null; sr: BABYLON.SnapshotRenderingHelper; scene: BABYLON.Scene; showUsername: boolean; show2dAvatar: boolean; }) {
this.id = params.id;
this.profile = params.profile;
this.sr = params.sr;
this.scene = params.scene;
this.root = new BABYLON.TransformNode(`player:${this.id}`, params.scene);
this.root.rotationQuaternion = null;
this.subRootContainerForAnim = new BABYLON.TransformNode(`player:${this.id}:subRootContainerForAnim`, params.scene);
this.subRootContainerForAnim.parent = this.root;
this.subRoot = new BABYLON.TransformNode(`player:${this.id}:subRoot`, params.scene);
this.subRoot.parent = this.subRootContainerForAnim;
this.showUsername = params.showUsername;
this.show2dAvatar = params.show2dAvatar;
this.applyInfoMesh();
if (params.state) this.applyState(params.state, true);
}
public async loadAvatar() {
const filePath = '/client-assets/world/avatars/default.glb';
const loaderResult = await BABYLON.LoadAssetContainerAsync(filePath, this.scene);
// babylonによって自動で追加される右手系変換用ノード
const modelRootMesh = loaderResult.meshes[0] as BABYLON.Mesh;
// meshじゃなくtransform nodeにしてパフォーマンス向上
this.modelRoot = new BABYLON.TransformNode('__root__', this.scene);
this.modelRoot.parent = this.subRoot;
this.modelRoot.scaling.x = -1;
this.modelRoot.scaling = this.modelRoot.scaling.scale(WORLD_SCALE);// cmをmに
for (const m of modelRootMesh.getChildren()) {
if (m.parent === modelRootMesh) {
m.parent = this.modelRoot;
}
}
modelRootMesh.dispose();
const eyesBlinkTexture = new BABYLON.Texture('/client-assets/world/avatars/eyes-blink.png', this.scene, false, false);
eyesBlinkTexture.hasAlpha = true;
let eyesTex: BABYLON.Texture | null = null;
if (this.profile.avatar.eyes.type in DEFAULT_FACE_PARTS_EYES) {
const eyesTexPath = DEFAULT_FACE_PARTS_EYES[this.profile.avatar.eyes.type];
if (eyesTexPath) {
eyesTex = new BABYLON.Texture(eyesTexPath, this.scene, false, false);
eyesTex.hasAlpha = true;
}
}
let mouthTex: BABYLON.Texture | null = null;
if (this.profile.avatar.mouth.type in DEFAULT_FACE_PARTS_MOUTH) {
const mouthTexPath = DEFAULT_FACE_PARTS_MOUTH[this.profile.avatar.mouth.type];
if (mouthTexPath) {
mouthTex = new BABYLON.Texture(mouthTexPath, this.scene, false, false);
mouthTex.hasAlpha = true;
}
}
for (const mesh of this.modelRoot.getChildMeshes()) {
if (mesh.name.includes('__BODY__')) {
mesh.material.albedoColor = new BABYLON.Color3(this.profile.avatar.body.color[0], this.profile.avatar.body.color[1], this.profile.avatar.body.color[2]);
}
if (mesh.name.includes('__EYES__')) {
const mat = new BABYLON.PBRMaterial('', this.scene);
mat.albedoColor = new BABYLON.Color3(this.profile.avatar.eyes.color[0], this.profile.avatar.eyes.color[1], this.profile.avatar.eyes.color[2]);
mat.albedoTexture = eyesTex;
mat.roughness = 1;
mat.metallic = 0;
mesh.material = mat;
// TODO: SRを無効にせずに表現する方法を考える
const blink = () => {
if (mesh.isDisposed()) return;
this.sr.disableSnapshotRendering();
mat.albedoTexture = eyesBlinkTexture;
this.sr.enableSnapshotRendering();
this.timer.setTimeout(() => {
this.sr.disableSnapshotRendering();
mat.albedoTexture = eyesTex;
this.sr.enableSnapshotRendering();
this.timer.setTimeout(() => {
blink();
}, Math.random() * 10000);
}, 100);
};
this.timer.setTimeout(() => {
blink();
}, Math.random() * 10000);
}
if (mesh.name.includes('__MOUTH__')) {
if (mouthTex != null) {
const mat = new BABYLON.PBRMaterial('', this.scene);
mat.albedoColor = new BABYLON.Color3(this.profile.avatar.mouth.color[0], this.profile.avatar.mouth.color[1], this.profile.avatar.mouth.color[2]);
mat.albedoTexture = mouthTex;
mat.roughness = 1;
mat.metallic = 0;
mesh.material = mat;
} else {
mesh.isVisible = false;
}
}
}
this.registerMeshes(this.modelRoot.getChildMeshes());
this.accessoryContainers = await Promise.all(this.profile.avatar.accessories.map(ac => this.loadAccessory({
type: ac.type,
id: ac.id,
position: new BABYLON.Vector3(0, cm(19), 0),
rotation: new BABYLON.Vector3(0, 0, 0),
options: ac.options,
})));
const anim = new BABYLON.Animation('', 'position.y', 60, BABYLON.Animation.ANIMATIONTYPE_FLOAT, BABYLON.Animation.ANIMATIONLOOPMODE_CYCLE);
anim.setKeys([
{ frame: 0, value: cm(0) },
{ frame: 30, value: cm(-2) },
{ frame: 60, value: cm(0) },
{ frame: 90, value: cm(2) },
{ frame: 120, value: cm(0) },
]);
this.subRootContainerForAnim.animations = [anim];
this.animationObserver = this.scene.onAfterAnimationsObservable.add(() => {
this.sr.updateMesh(this.subRootContainerForAnim.getChildMeshes(), false);
});
this.scene.beginAnimation(this.subRootContainerForAnim, 0, 120, true);
}
private async loadAccessory(args: {
type: string;
id: string;
position: BABYLON.Vector3;
rotation: BABYLON.Vector3;
options: Record<string, unknown>;
}) {
const def = getAccessoryDef(args.type);
const container = new AccessoryContainer({
id: args.id,
type: args.type,
position: args.position.clone(),
rotation: args.rotation.clone(),
options: args.options,
sr: this.sr,
getIsSrReady: () => true,
lightContainer: this.lightContainer,
graphicsQuality: this.graphicsQuality,
scene: this.scene,
});
container.registerMeshes = (meshes) => {
this.registerMeshes(meshes);
};
await container.load();
container.root.parent = this.subRoot;
return container;
}
private applyInfoMesh() {
if (this.showUsername ) {
if (this.usernameLabelMesh == null) {
if (usernameLabelMaterial == null) {
const usernameLabelTex = new BABYLON.Texture('/client-assets/world/chars-black.png', this.scene, false, false);
usernameLabelMaterial = new BABYLON.StandardMaterial('usernameLabelMaterial', this.scene);
usernameLabelMaterial.roughness = 1;
usernameLabelMaterial.diffuseColor = new BABYLON.Color3(1, 1, 1);
usernameLabelMaterial.diffuseTexture = usernameLabelTex;
usernameLabelMaterial.emissiveColor = new BABYLON.Color3(1, 1, 1);
usernameLabelMaterial.emissiveTexture = usernameLabelTex;
usernameLabelMaterial.disableLighting = true;
}
this.usernameLabelMesh = createTextMesh(this.profile.user?.username ?? '(anonymous)', {
size: cm(5),
material: usernameLabelMaterial,
});
this.usernameLabelMesh.parent = this.subRoot;
this.usernameLabelMesh.position.y = cm(40);
this.usernameLabelMesh.billboardMode = BABYLON.Mesh.BILLBOARDMODE_ALL;
this.scene.addMesh(this.usernameLabelMesh);
}
} else {
if (this.usernameLabelMesh != null) {
this.usernameLabelMesh.dispose();
this.scene.removeMesh(this.usernameLabelMesh);
this.usernameLabelMesh = null;
}
}
if (this.show2dAvatar && this.profile.user?.avatarUrl != null) {
if (this.twodAvatarMesh == null) {
const twodAvatarTex = new BABYLON.Texture(this.profile.user.avatarUrl, this.scene, false, true);
const twodAvatarMat = new BABYLON.StandardMaterial('twodAvatarMat', this.scene);
twodAvatarMat.roughness = 1;
twodAvatarMat.diffuseColor = new BABYLON.Color3(0.5, 0.5, 0.5);
twodAvatarMat.diffuseTexture = twodAvatarTex;
twodAvatarMat.emissiveColor = new BABYLON.Color3(0.5, 0.5, 0.5);
twodAvatarMat.emissiveTexture = twodAvatarTex;
twodAvatarMat.disableLighting = true;
twodAvatarMat.backFaceCulling = false;
this.twodAvatarMesh = BABYLON.MeshBuilder.CreatePlane('twodAvatar', { size: cm(10) }, this.scene);
this.twodAvatarMesh.material = twodAvatarMat;
this.twodAvatarMesh.parent = this.subRoot;
this.twodAvatarMesh.position.y = cm(40) + cm(7.5);
this.twodAvatarMesh.billboardMode = BABYLON.Mesh.BILLBOARDMODE_ALL;
this.scene.addMesh(this.twodAvatarMesh);
}
} else {
if (this.twodAvatarMesh != null) {
this.twodAvatarMesh.dispose(false, true);
this.scene.removeMesh(this.twodAvatarMesh);
this.twodAvatarMesh = null;
}
}
}
public updateUserInfoDisplayOptions(options: { showUsername: boolean; show2dAvatar: boolean; }) {
this.showUsername = options.showUsername;
this.show2dAvatar = options.show2dAvatar;
this.applyInfoMesh();
}
public applyState(state: PlayerState, forInit = false) {
this.root.position.set(...state.position);
this.subRoot.rotation.set(...state.rotation);
if (!forInit) {
const meshes = this.root.getChildMeshes();
if (meshes.length > 0) this.sr.updateMesh(meshes);
}
}
public destroy() {
this.timer.dispose();
if (this.animationObserver != null) {
this.scene.onAfterAnimationsObservable.remove(this.animationObserver);
}
for (const ac of this.accessoryContainers) {
ac.destroy();
}
this.accessoryContainers = [];
if (this.usernameLabelMesh != null) {
this.usernameLabelMesh.dispose();
this.scene.removeMesh(this.usernameLabelMesh);
this.usernameLabelMesh = null;
}
if (this.twodAvatarMesh != null) {
this.twodAvatarMesh.dispose(false, true);
this.scene.removeMesh(this.twodAvatarMesh);
this.twodAvatarMesh = null;
}
this.root.dispose();
}
}
@@ -0,0 +1,208 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { registerBuiltInLoaders } from '@babylonjs/loaders/dynamic.js';
import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js';
import { ArcRotateCameraManualInput, getMeshesBoundingBox, GRAPHICS_QUALITY } from './utility.js';
import { PlayerContainer, type PlayerProfile } from './PlayerContainer.js';
import { EngineBase } from './EngineBase.js';
import { deepClone } from './clone.js';
import type { WorldAvatar } from 'misskey-world/src/types.js';
export class AvatarPreviewEngine extends EngineBase<{ // PlayerPreviewEngineに改名した方がいいかもしれない
'loadingProgress': (ctx: { progress: number }) => void;
'contextlost': (ctx: { reason: string; message: string; }) => void;
}> {
private sr: BABYLON.SnapshotRenderingHelper;
private shadowGenerator: BABYLON.ShadowGenerator;
private camera: BABYLON.ArcRotateCamera;
private avatarOptions: WorldAvatar | null = null;
private playerContainer: PlayerContainer | null = null;
private envMapIndoor: BABYLON.CubeTexture;
private roomLight: BABYLON.SpotLight;
private pipeline: BABYLON.DefaultRenderingPipeline;
private graphicsQuality: number;
private profile: PlayerProfile;
constructor(profile: PlayerProfile, options: {
engine: BABYLON.WebGPUEngine;
graphicsQuality: number;
fps: number | null;
}) {
super({
engine: options.engine,
fps: options.fps,
});
registerBuiltInLoaders();
this.graphicsQuality = options.graphicsQuality;
this.profile = deepClone(profile);
this.scene.autoClear = false;
this.scene.skipPointerMovePicking = true;
this.scene.skipFrustumClipping = true; // snapshot renderingでは全てのメッシュがアクティブになっている必要があるため
this.scene.clearColor = new BABYLON.Color4(0.01, 0.01, 0.01, 1);
this.sr = new BABYLON.SnapshotRenderingHelper(this.scene);
this.camera = new BABYLON.ArcRotateCamera('camera', Math.PI / 2, Math.PI / 2.5, cm(300), new BABYLON.Vector3(0, cm(90), 0), this.scene);
this.camera.minZ = cm(1);
this.camera.maxZ = cm(100000);
this.camera.fov = 0.5;
this.camera.lowerRadiusLimit = cm(50);
this.camera.upperRadiusLimit = cm(1000);
this.camera.inputs.clear();
this.camera.inputs.add(new ArcRotateCameraManualInput(this.scene, {
rotationSensitivity: 0.0005,
}));
this.envMapIndoor = BABYLON.CubeTexture.CreateFromPrefilteredData('/client-assets/room/indoor.env', this.scene);
this.envMapIndoor.boundingBoxSize = new BABYLON.Vector3(cm(500), cm(500), cm(500));
this.envMapIndoor.level = 0.6;
this.roomLight = new BABYLON.SpotLight('roomLight', new BABYLON.Vector3(cm(50), cm(249), cm(50)), new BABYLON.Vector3(0, -1, 0), 16, 8, this.scene);
this.roomLight.diffuse = new BABYLON.Color3(1.0, 0.9, 0.8);
this.roomLight.shadowMinZ = cm(10);
this.roomLight.shadowMaxZ = cm(500);
this.roomLight.radius = cm(30);
this.roomLight.intensity = 15 * WORLD_SCALE * WORLD_SCALE;
this.shadowGenerator = new BABYLON.ShadowGenerator(2048, this.roomLight);
this.shadowGenerator.forceBackFacesOnly = true;
this.shadowGenerator.bias = 0.0001;
this.shadowGenerator.usePercentageCloserFiltering = true;
this.shadowGenerator.filteringQuality = BABYLON.ShadowGenerator.QUALITY_HIGH;
this.shadowGenerator.getShadowMap().refreshRate = 60;
const gl = new BABYLON.GlowLayer('glow', this.scene, {
blurKernelSize: 64,
});
gl.intensity = 0.5;
this.scene.setRenderingAutoClearDepthStencil(gl.renderingGroupId, false);
this.sr.updateMeshesForEffectLayer(gl);
this.pipeline = new BABYLON.DefaultRenderingPipeline('default', true, this.scene);
this.pipeline.samples = 4;
if (this.graphicsQuality >= GRAPHICS_QUALITY.HIGH) {
this.pipeline.bloomEnabled = true;
this.pipeline.bloomThreshold = 0.95;
this.pipeline.bloomWeight = 0.1;
this.pipeline.bloomKernel = 256;
this.pipeline.bloomScale = 2;
}
this.pipeline.sharpenEnabled = true;
this.pipeline.sharpen.edgeAmount = 0.5;
}
public async init() {
this.startRenderLoop();
await this.scene.whenReadyAsync();
this.sr.enableSnapshotRendering();
this.inputs.on('wheel', (ev) => {
this.camera.fov += ev.deltaY * 0.0005;
this.camera.fov = Math.max(0.25, Math.min(0.5, this.camera.fov));
});
this.inputs.on('zoom', (ev) => {
this.camera.fov += -ev.delta * 0.0015;
this.camera.fov = Math.max(0.25, Math.min(0.5, this.camera.fov));
});
this.inputs.on('pointer', (ev) => {
(this.camera.inputs.attached.manual as ArcRotateCameraManualInput).setRotationVector({ x: ev.x, y: ev.y });
});
await this.load();
}
private async load() {
this.sr.disableSnapshotRendering();
this.playerContainer = new PlayerContainer({
id: '',
profile: this.profile,
state: {
position: [0, 0, 0],
rotation: [0, 0, 0],
},
sr: this.sr,
scene: this.scene,
showUsername: false,
show2dAvatar: false,
});
this.playerContainer.registerMeshes = (meshes) => {
for (const mesh of meshes) {
mesh.receiveShadows = true;
this.shadowGenerator.addShadowCaster(mesh);
if (mesh.material) {
if (mesh.material instanceof BABYLON.MultiMaterial) {
for (const subMat of mesh.material.subMaterials) {
(subMat as BABYLON.PBRMaterial).reflectionTexture = this.envMapIndoor;
(subMat as BABYLON.PBRMaterial).useGLTFLightFalloff = true; // Clustered Lightingではphysical falloffを持つマテリアルはアーチファクトが発生する https://doc.babylonjs.com/features/featuresDeepDive/lights/clusteredLighting/#materials-with-a-physical-falloff-may-cause-artefacts
(subMat as BABYLON.PBRMaterial).anisotropy.isEnabled = false; // なんかきれいにレンダリングされないため
}
} else {
(mesh.material as BABYLON.PBRMaterial).reflectionTexture = this.envMapIndoor;
(mesh.material as BABYLON.PBRMaterial).useGLTFLightFalloff = true; // Clustered Lightingではphysical falloffを持つマテリアルはアーチファクトが発生する https://doc.babylonjs.com/features/featuresDeepDive/lights/clusteredLighting/#materials-with-a-physical-falloff-may-cause-artefacts
(mesh.material as BABYLON.PBRMaterial).anisotropy.isEnabled = false; // なんかきれいにレンダリングされないため
}
}
if (!this.scene.meshes.includes(mesh)) this.scene.addMesh(mesh);
}
};
await this.playerContainer.loadAvatar();
const boundingInfo = getMeshesBoundingBox(this.playerContainer.root.getChildMeshes().filter(m => m.isEnabled() && m.isVisible), true);
this.camera.setTarget(new BABYLON.Vector3(0, boundingInfo.centerWorld.y, 0));
// zoom to fit
const size = boundingInfo.extendSize;
const distance = Math.max(size.x, size.y, size.z) * 2;
this.camera.radius = distance * 5;
this.sr.enableSnapshotRendering();
}
public clearPlayer() {
this.sr.disableSnapshotRendering();
if (this.playerContainer != null) {
this.playerContainer.destroy();
this.playerContainer = null;
}
this.sr.enableSnapshotRendering();
}
public async updateAvatar(value: WorldAvatar) {
this.profile.avatar = value;
this.clearPlayer();
await this.load();
}
public resize() {
// 一旦snapshot renderingを無効にしておかないとエラーが出る(babylonのバグ?)
// ~~...が、一旦無効にしたらしたで複数のマテリアルがそれぞれ入れ替わる(?)という謎の現象が発生するためコメントアウトしとく(エラー出てもレンダリングが止まったりするわけでもないし)~~
// ↑追記: engine.resizeした後に一瞬待つことで回避できることが判明
this.sr.disableSnapshotRendering();
this.engine.resize(true);
// workerで実行される可能性がある
setTimeout(() => {
this.sr.enableSnapshotRendering();
}, 1);
}
public destroy() {
super.destroy();
this.playerContainer?.destroy();
}
}
@@ -0,0 +1,29 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { AvatarPreviewEngine } from './avatarPreviewEngine.js';
import { registerBabylonRuntime } from './babylonRuntime.js';
import type { PlayerProfile } from './PlayerContainer.js';
registerBabylonRuntime();
export async function createAvatarPreviewEngine(params: {
canvas: HTMLCanvasElement; options: { graphicsQuality: number; resolution: number; fps: number | null }; profile: PlayerProfile;
}) {
const babylonEngine = new BABYLON.WebGPUEngine(params.canvas, { doNotHandleContextLost: true, powerPreference: 'low-power', antialias: true });
babylonEngine.compatibilityMode = false;
babylonEngine.enableOfflineSupport = false;
await babylonEngine.initAsync();
if (params.options.resolution === 2) babylonEngine.setHardwareScalingLevel(0.5);
if (params.options.resolution === 0.5) babylonEngine.setHardwareScalingLevel(2);
const engine = new AvatarPreviewEngine(params.profile, {
engine: babylonEngine,
...params.options,
});
return engine;
}
@@ -0,0 +1,110 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { AvatarPreviewEngine } from './avatarPreviewEngine.js';
import { registerBabylonRuntime } from './babylonRuntime.js';
import type { PlayerProfile } from './PlayerContainer.js';
registerBabylonRuntime();
let engine: AvatarPreviewEngine | null = null;
let canvas: OffscreenCanvas | null = null;
// TODO: 他のWorkerと実装を共通化
onmessage = async (event) => {
//console.log('Worker received message:', event.data);
switch (event.data?.type) {
case 'init': {
const profile = event.data.profile as PlayerProfile;
canvas = event.data.canvas as OffscreenCanvas;
const babylonEngine = new BABYLON.WebGPUEngine(canvas, { doNotHandleContextLost: true, powerPreference: 'low-power', antialias: true });
babylonEngine.compatibilityMode = false;
babylonEngine.enableOfflineSupport = false;
await babylonEngine.initAsync();
if (event.data.options.resolution === 2) babylonEngine.setHardwareScalingLevel(0.5);
if (event.data.options.resolution === 0.5) babylonEngine.setHardwareScalingLevel(2);
engine = new AvatarPreviewEngine(profile, {
engine: babylonEngine,
...event.data.options,
});
engine.on('ev', ({ type, ctx }) => {
self.postMessage({ type: 'ev', ev: { type, ctx } });
});
await engine.init();
self.postMessage({ type: 'inited' });
break;
}
case 'resize': {
canvas.width = event.data.width;
canvas.height = event.data.height;
if (engine != null) engine.resize();
break;
}
case 'input:keydown': {
if (engine == null) break;
engine.inputs.emit('keydown', event.data.ev);
break;
}
case 'input:keyup': {
if (engine == null) break;
engine.inputs.emit('keyup', event.data.ev);
break;
}
case 'input:click': {
if (engine == null) break;
engine.inputs.emit('click', event.data.ev);
break;
}
case 'input:wheel': {
if (engine == null) break;
engine.inputs.emit('wheel', event.data.ev);
break;
}
case 'input:zoom': {
if (engine == null) break;
engine.inputs.emit('zoom', event.data.ev);
break;
}
case 'input:pointer': {
if (engine == null) break;
engine.inputs.emit('pointer', event.data.ev);
break;
}
case 'call': {
if (engine == null) {
console.error('Failed to call: Engine is not initialized yet!!!');
break;
}
const res = engine[event.data.fn](...(event.data.args ?? []));
if (event.data.needReturnValue) {
if (res instanceof Promise) {
res.then((r) => {
self.postMessage({ type: 'return', id: event.data.id, value: r });
});
} else {
self.postMessage({ type: 'return', id: event.data.id, value: res });
}
}
break;
}
case 'set': {
if (engine == null) {
console.error('Failed to set: Engine is not initialized yet!!!');
break;
}
engine[event.data.key] = event.data.value;
break;
}
default: {
console.warn('Unrecognized message type:', event.data?.type);
}
}
};
@@ -0,0 +1,142 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { camelToKebab, WORLD_SCALE } from 'misskey-world/src/utility.js';
import { ModelExplorer, scaleMorph, Timer } from '../utility.js';
import { convertRawOptions, type ConvertedOptions, type RawOptions } from '../mono.js';
import { getAccessoryDef } from './accessory-defs.js';
import type { AvatarAccessoryInstance } from './accessory.js';
export class AccessoryContainer {
public id: string;
public type: string;
private options: ConvertedOptions;
public root: BABYLON.TransformNode;
private subRoot: BABYLON.TransformNode | null = null;
public instance: AvatarAccessoryInstance | null = null;
public model: ModelExplorer | null = null;
private scene: BABYLON.Scene;
public registerMeshes: (meshes: BABYLON.Mesh[]) => void = () => {};
private sr: BABYLON.SnapshotRenderingHelper;
private getIsSrReady: () => boolean;
private lightContainer: BABYLON.ClusteredLightContainer;
private graphicsQuality: number;
private timer: Timer = new Timer();
constructor(args: {
id: string;
type: string;
options: RawOptions;
position: BABYLON.Vector3;
rotation: BABYLON.Vector3;
sr: BABYLON.SnapshotRenderingHelper;
getIsSrReady: () => boolean;
lightContainer: BABYLON.ClusteredLightContainer;
scene: BABYLON.Scene;
graphicsQuality: number;
}) {
this.id = args.id;
this.type = args.type;
const def = getAccessoryDef(this.type);
this.options = convertRawOptions(def.options.schema, args.options, { files: [] });
this.sr = args.sr;
this.getIsSrReady = args.getIsSrReady;
this.lightContainer = args.lightContainer;
this.scene = args.scene;
this.graphicsQuality = args.graphicsQuality;
this.root = new BABYLON.TransformNode(`accessory_${args.id}_${args.type}`, this.scene);
this.root.position = args.position;
this.root.rotation = args.rotation;
}
public async load() {
const def = getAccessoryDef(this.type);
const filePath = def.path != null ? `/client-assets/world/objects/${def.path(this.options)}.glb` : `/client-assets/world/objects/${camelToKebab(this.type)}/${camelToKebab(this.type)}.glb`;
const loaderResult = await BABYLON.LoadAssetContainerAsync(filePath, this.scene);
// babylonによって自動で追加される右手系変換用ノード
const subRootMesh = loaderResult.meshes[0] as BABYLON.Mesh;
// meshじゃなくtransform nodeにしてパフォーマンス向上
this.subRoot = new BABYLON.TransformNode('__root__', this.scene);
this.subRoot.parent = this.root;
this.subRoot.scaling.x = -1;
this.subRoot.scaling = this.subRoot.scaling.scale(WORLD_SCALE);// cmをmに
for (const m of subRootMesh.getChildren()) {
if (m.parent === subRootMesh) {
m.parent = this.subRoot;
}
}
subRootMesh.dispose();
this.registerMeshes(this.subRoot.getChildMeshes());
this.model = new ModelExplorer(this.subRoot);
this.instance = await def.createInstance({
scene: this.scene,
sr: {
updateMesh: (mesh) => {
if (!this.getIsSrReady()) return;
this.sr.updateMesh(mesh);
},
reset: () => {
if (!this.getIsSrReady()) return;
this.sr.disableSnapshotRendering();
this.sr.enableSnapshotRendering();
},
fixParticleSystem: (ps) => this.sr.fixParticleSystem(ps),
},
lc: this.lightContainer,
root: this.root,
options: this.options,
model: this.model!,
timer: this.timer,
graphicsQuality: this.graphicsQuality,
reloadModel: () => {
this.reload();
},
});
}
public async reload() {
this.timer.dispose();
this.instance?.dispose?.();
this.instance = null;
this.model = null;
this.subRoot?.dispose();
this.root.removeChild(this.subRoot);
this.scene.removeTransformNode(this.subRoot);
this.timer = new Timer();
await this.load();
this.sr.disableSnapshotRendering();
this.sr.enableSnapshotRendering();
}
public optionsUpdated(options: Record<string, unknown>, key: string, value: any) {
if (this.instance == null) return;
this.options[key] = options[key]; // 参照を切れさせないようにプロパティ個別にmutate
this.sr.disableSnapshotRendering();
this.instance.onOptionsUpdated?.([key, this.options[key]]);
this.sr.enableSnapshotRendering();
}
public destroy() {
this.sr.disableSnapshotRendering();
this.timer.dispose();
this.instance?.dispose?.();
this.subRoot.dispose();
this.root.dispose();
this.scene.removeTransformNode(this.root);
this.sr.enableSnapshotRendering();
}
}
@@ -0,0 +1,32 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { bolt_schema } from 'misskey-world/src/avatars/accessories/bolt.schema.js';
import { defineAccessory } from '../accessory.js';
export const bolt = defineAccessory(bolt_schema, {
createInstance: ({ model, options }) => {
const material = model.findMaterial('__X_BOLT__');
const applyMat = () => {
material.albedoColor = new BABYLON.Color3(options.mat.color[0], options.mat.color[1], options.mat.color[2]);
material.roughness = options.mat.roughness;
material.metallic = options.mat.metallic;
};
applyMat();
return {
onOptionsUpdated: ([k, v]) => {
switch (k) {
case 'mat': applyMat(); break;
}
},
dispose: () => {
},
};
},
});
@@ -0,0 +1,17 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { mikan_schema } from 'misskey-world/src/avatars/accessories/mikan.schema.js';
import { defineAccessory } from '../accessory.js';
export const mikan = defineAccessory(mikan_schema, {
createInstance: ({ scene, root, sr }) => {
return {
dispose: () => {
},
};
},
});
@@ -0,0 +1,71 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { cm } from 'misskey-world/src/utility.js';
import { mug_schema } from 'misskey-world/src/avatars/accessories/mug.schema.js';
import { defineAccessory } from '../accessory.js';
export const mug = defineAccessory(mug_schema, {
createInstance: ({ options, scene, root, sr, model }) => {
const emitter = new BABYLON.TransformNode('emitter', scene);
emitter.parent = root;
emitter.position = new BABYLON.Vector3(0, cm(5), 0);
const ps = new BABYLON.ParticleSystem('steamParticleSystem', 8, scene);
ps.particleTexture = new BABYLON.Texture('/client-assets/world/objects/mug/steam.png');
ps.emitter = emitter;
ps.minEmitBox = new BABYLON.Vector3(cm(-1), 0, cm(-1));
ps.maxEmitBox = new BABYLON.Vector3(cm(1), 0, cm(1));
ps.minEmitPower = cm(10);
ps.maxEmitPower = cm(12);
ps.minLifeTime = 2;
ps.maxLifeTime = 3;
ps.addSizeGradient(0, cm(10), cm(12));
ps.addSizeGradient(1, cm(18), cm(20));
ps.direction1 = new BABYLON.Vector3(-0.3, 1, 0.3);
ps.direction2 = new BABYLON.Vector3(0.3, 1, -0.3);
ps.emitRate = 0.5;
ps.blendMode = BABYLON.ParticleSystem.BLENDMODE_ADD;
ps.color1 = new BABYLON.Color4(1, 1, 1, 0.3);
ps.color2 = new BABYLON.Color4(1, 1, 1, 0.2);
ps.colorDead = new BABYLON.Color4(1, 1, 1, 0);
ps.preWarmCycles = Math.random() * 1000;
ps.start();
sr.fixParticleSystem(ps);
const bodyMaterial = model.findMaterial('__X_MUG__');
const applyBodyMat = () => {
bodyMaterial.albedoColor = new BABYLON.Color3(options.bodyMat.color[0], options.bodyMat.color[1], options.bodyMat.color[2]);
bodyMaterial.roughness = options.bodyMat.roughness;
bodyMaterial.metallic = options.bodyMat.metallic;
};
applyBodyMat();
const liquidMaterial = model.findMaterial('__X_LIQUID__');
const applyLiquidMat = () => {
liquidMaterial.albedoColor = new BABYLON.Color3(options.liquidMat.color[0], options.liquidMat.color[1], options.liquidMat.color[2]);
liquidMaterial.roughness = options.liquidMat.roughness;
liquidMaterial.metallic = options.liquidMat.metallic;
};
applyLiquidMat();
return {
onOptionsUpdated: ([k, v]) => {
switch (k) {
case 'bodyMat': applyBodyMat(); break;
case 'liquidMat': applyLiquidMat(); break;
}
},
dispose: () => {
ps.stop();
emitter.dispose();
},
};
},
});
@@ -0,0 +1,23 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { mug } from './accessories/mug.js';
import { mikan } from './accessories/mikan.js';
import { bolt } from './accessories/bolt.js';
import type { AvatarAccessoryDef } from './accessory.js';
export const AVATAR_ACCESSORY_DEFS = [
mug,
mikan,
bolt,
] as AvatarAccessoryDef[];
export function getAccessoryDef(type: string): AvatarAccessoryDef {
const def = AVATAR_ACCESSORY_DEFS.find(x => x.id === type) as AvatarAccessoryDef | undefined;
if (def == null) {
throw new Error(`Unrecognized accessory type: ${type}`);
}
return def;
}
@@ -0,0 +1,46 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { ModelExplorer, type Timer } from '../utility.js';
import type { AccessorySchemaDef } from 'misskey-world/src/avatars/accessory.js';
import type { OptionsSchema } from 'misskey-world/src/mono.js';
import type { ConvertedOptions, GetConvertedOptionsSchemaValues } from '../mono.js';
export type AvatarAccessoryInstance<Options = any> = {
onOptionsUpdated?: <K extends keyof Options, V extends Options[K]>(kv: [K, V]) => void;
dispose: () => void;
};
export type SnapshotRenderingHelperWrapper = {
updateMesh: (meshes: BABYLON.Mesh[]) => void;
reset: () => void;
fixParticleSystem: (ps: BABYLON.ParticleSystem) => void;
};
export type AvatarAccessoryDef<Schema extends AccessorySchemaDef = AccessorySchemaDef> = Schema & {
path?: (options: string extends keyof Schema['options']['schema'] ? ConvertedOptions : Readonly<GetConvertedOptionsSchemaValues<Schema['options']['schema']>>) => string;
createInstance: (args: {
scene: BABYLON.Scene;
// TODO: snapshot renderingの関心を隠蔽した方が綺麗かもしれない
// 例えばmaterialUpdatedというメソッドを用意して内部的にresetを呼ぶなど
sr: SnapshotRenderingHelperWrapper;
lc: BABYLON.ClusteredLightContainer | null;
root: BABYLON.TransformNode;
options: string extends keyof Schema['options']['schema'] ? ConvertedOptions : Readonly<GetConvertedOptionsSchemaValues<Schema['options']['schema']>>;
model: ModelExplorer;
timer: Timer;
graphicsQuality: number;
reloadModel: () => void;
}) => AvatarAccessoryInstance<string extends keyof Schema['options']['schema'] ? ConvertedOptions : GetConvertedOptionsSchemaValues<Schema['options']['schema']>> | Promise<AvatarAccessoryInstance<Schema['options']['schema'] extends undefined ? ConvertedOptions : GetConvertedOptionsSchemaValues<Schema['options']['schema']>>>; // TODO: createInstanceをasyncにするのではなく、別にreadyみたいなものを返させる
};
export function defineAccessorySchema<const OpSc extends OptionsSchema>(def: AccessorySchemaDef<OpSc>): AccessorySchemaDef<OpSc> {
return def;
}
export function defineAccessory<const Schema extends AccessorySchemaDef<any>>(schema: Schema, def: Pick<AvatarAccessoryDef<Schema>, 'path' | 'createInstance'>): AvatarAccessoryDef<Schema> {
return { ...schema, ...def };
}
@@ -0,0 +1,37 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
export function registerBabylonRuntime(): void {
BABYLON.RegisterStandardEngineExtensions();
BABYLON.RegisterStandardWebGPUEngineExtensions();
BABYLON.RegisterAbstractEngineAlpha();
BABYLON.RegisterAbstractEngineTexture();
BABYLON.RegisterAbstractEngineCubeTexture();
BABYLON.RegisterAbstractEngineQuery();
BABYLON.RegisterAbstractEngineTextureSelector();
BABYLON.RegisterAbstractEngineTimeQuery();
BABYLON.RegisterAbstractEngineViews();
BABYLON.RegisterEnginesWebGPUExtensionsEngineRawTexture();
BABYLON.RegisterEnginesWebGPUExtensionsEngineReadTexture();
BABYLON.RegisterEnginesWebGPUExtensionsEngineCubeTexture();
BABYLON.RegisterEnginesWebGPUExtensionsEngineRenderTargetCube();
BABYLON.RegisterEnginesWebGPUExtensionsEngineQuery();
BABYLON.RegisterEnginesWebGPUExtensionsEngineDynamicTexture();
BABYLON.RegisterEnginesWebGPUExtensionsEngineVideoTexture();
BABYLON.RegisterBufferAlign();
BABYLON.RegisterCubeTexture();
BABYLON.RegisterStandardMaterial();
BABYLON.RegisterRay();
BABYLON.RegisterAnimation();
BABYLON.RegisterAnimatable();
BABYLON.RegisterCollisionCoordinator();
BABYLON.RegisterInstancedMesh();
BABYLON.RegisterPostProcessRenderPipelineManagerSceneComponent(
BABYLON.PostProcessRenderPipelineManager,
);
BABYLON.RegisterAbstractEngineLoadingScreen();
}
@@ -0,0 +1,25 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
// structredCloneが遅いため
// SEE: http://var.blog.jp/archives/86038606.html
// あと、Vue RefをIndexedDBに保存しようとしてstructredCloneを使ったらエラーになった
// https://github.com/misskey-dev/misskey/pull/8098#issuecomment-1114144045
export type Cloneable = string | number | boolean | null | undefined | { [key: string]: Cloneable } | { [key: number]: Cloneable } | { [key: symbol]: Cloneable } | Cloneable[];
export function deepClone<T extends Cloneable>(x: T): T {
if (typeof x === 'object') {
if (x === null) return x;
if (Array.isArray(x)) return x.map(deepClone) as T;
const obj = {} as Record<string | number | symbol, Cloneable>;
for (const [k, v] of Object.entries(x)) {
obj[k] = v === undefined ? undefined : deepClone(v);
}
return obj as T;
} else {
return x;
}
}
@@ -0,0 +1,259 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { registerBuiltInLoaders } from '@babylonjs/loaders/dynamic.js';
import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js';
import { FreeCameraManualInput, GRAPHICS_QUALITY, Timer } from './utility.js';
import { TIME_MAP } from './utility.js';
import { EngineBase } from './EngineBase.js';
import { LobbyEnvManager } from './envs/lobby.js';
import type { PlayerContainer, PlayerProfile, PlayerState } from './PlayerContainer.js';
import type { WorldEnvManager } from './env.js';
const IN_WEB_WORKER = typeof window === 'undefined';
export class WorldEngine extends EngineBase<{
'changeMyPlayerState': (ctx: PlayerState) => void;
'playerPointed': (ctx: { playerId: string; }) => void;
'playSfxUrl': (ctx: {
url: string;
options: {
volume: number;
playbackRate: number;
};
}) => void;
'loadingProgress': (ctx: { progress: number }) => void;
'contextlost': (ctx: { reason: string; message: string; }) => void;
}> {
public camera: BABYLON.UniversalCamera;
private time: 0 | 1 | 2 = 0; // 0: 昼, 1: 夕, 2: 夜
private envMap: BABYLON.CubeTexture;
public lightContainer: BABYLON.ClusteredLightContainer;
public sr: BABYLON.SnapshotRenderingHelper;
public gl: BABYLON.GlowLayer | null = null;
public timer: Timer = new Timer();
public isSitting = false;
private cameraHeight = cm(130);
private fov: number;
private useGlow: boolean;
public graphicsQuality: number;
private playerProfiles: Record<string, PlayerProfile> = {};
private playerContainers: PlayerContainer[] = [];
private showUsernameOnAvatar: boolean;
private show2dAvatarOnAvatar: boolean;
private envManager: WorldEnvManager | null = null;
private inited = false;
private isGodMode = false;
constructor(options: {
engine: BABYLON.WebGPUEngine;
graphicsQuality: number;
fps: number | null;
antialias: boolean;
fov: number;
useVirtualJoystick?: boolean;
showUsernameOnAvatar: boolean;
show2dAvatarOnAvatar: boolean;
}) {
super({
engine: options.engine,
fps: options.fps,
});
this.graphicsQuality = options.graphicsQuality;
this.useGlow = this.graphicsQuality >= GRAPHICS_QUALITY.MEDIUM;
this.fov = options.fov;
this.showUsernameOnAvatar = options.showUsernameOnAvatar;
this.show2dAvatarOnAvatar = options.show2dAvatarOnAvatar;
registerBuiltInLoaders();
this.scene.autoClear = false;
//this.scene.autoClearDepthAndStencil = false;
this.scene.skipPointerMovePicking = true;
this.scene.skipFrustumClipping = true; // snapshot renderingでは全てのメッシュがアクティブになっている必要があるため
this.scene.gravity = new BABYLON.Vector3(0, -0.1, 0).scale(WORLD_SCALE);
this.scene.collisionsEnabled = true;
this.sr = new BABYLON.SnapshotRenderingHelper(this.scene);
this.time = TIME_MAP[new Date().getHours() as keyof typeof TIME_MAP];
//this.time = TIME_MAP[12 as keyof typeof TIME_MAP];
this.scene.ambientColor = new BABYLON.Color3(0.9, 0.9, 0.9);
this.envMap = BABYLON.CubeTexture.CreateFromPrefilteredData(this.time === 2 ? '/client-assets/room/outdoor-night.env' : '/client-assets/room/outdoor-day.env', this.scene);
//this.envMap.level = 1;
this.envMap.level = 0;
this.camera = new BABYLON.FreeCamera('camera', new BABYLON.Vector3(0, this.cameraHeight, cm(0)), this.scene);
this.camera.minZ = cm(1);
this.camera.maxZ = cm(1000);
this.camera.fov = this.fov;
this.camera.ellipsoid = new BABYLON.Vector3(cm(15), cm(65), cm(15));
if (!this.isGodMode) {
this.camera.checkCollisions = true;
this.camera.applyGravity = true;
this.camera.needMoveForGravity = true;
}
this.camera.inputs.clear();
if (options.useVirtualJoystick) {
this.camera.inputs.add(new FreeCameraManualInput(this.scene, {
moveSensitivity: 0.02 * WORLD_SCALE,
rotationSensitivity: 0.0007,
isGodMode: this.isGodMode,
}));
this.camera.inertia = 0.75;
} else {
this.camera.inputs.add(new FreeCameraManualInput(this.scene, {
moveSensitivity: 0.003 * WORLD_SCALE,
rotationSensitivity: 0.0003,
isGodMode: this.isGodMode,
}));
}
this.scene.activeCamera = this.camera;
this.lightContainer = new BABYLON.ClusteredLightContainer('clustered', [], this.scene);
this.lightContainer.maxRange = cm(1000);
this.lightContainer.verticalTiles = 32;
this.lightContainer.horizontalTiles = 32;
this.lightContainer.depthSlices = 32;
if (this.useGlow) {
this.gl = new BABYLON.GlowLayer('glow', this.scene, {
//mainTextureFixedSize: 512,
blurKernelSize: 64,
});
this.gl.intensity = 0.5;
this.scene.setRenderingAutoClearDepthStencil(this.gl.renderingGroupId, false);
this.sr.updateMeshesForEffectLayer(this.gl);
}
}
public async init() {
await this.loadEnv();
this.startRenderLoop();
await this.scene.whenReadyAsync();
// 必ずシーンが少なくとも1フレームレンダリングがされてから呼ばれるように注意すること。そうしないとタイミングによってはエンジンがクラッシュする
this.sr.enableSnapshotRendering();
this.inputs.on('wheel', (ev) => {
if (this.scene.activeCamera === this.camera) {
this.camera.fov += ev.deltaY * 0.001;
this.camera.fov = Math.max(0.25, Math.min(this.fov, this.camera.fov));
}
});
this.inputs.on('zoom', (ev) => {
if (this.scene.activeCamera === this.camera) {
this.camera.fov += -ev.delta * 0.003;
this.camera.fov = Math.max(0.25, Math.min(this.fov, this.camera.fov));
}
});
this.inputs.on('click', (ev) => {
// TODO: GPUPickerを使いたいが、なぜか一部のメッシュが反応しない
const pickingInfo = this.scene.pick(ev.x, ev.y,
(m) => m.name.includes('__PICK__') || m.metadata?.isPlayer || (m.isVisible && m.isEnabled() && m.metadata?.furnitureId != null && this.furnitureContainers.has(m.metadata.furnitureId)));
if (pickingInfo.pickedMesh != null) {
const playerId = pickingInfo.pickedMesh.metadata.playerId;
if (playerId != null && this.playerContainers.some(c => c.id === playerId)) {
const c = this.playerContainers.find(c => c.id === playerId)!;
this.look(c.root.position);
this.ev('playerPointed', { playerId });
return;
}
}
});
this.inputs.on('pointer', (ev) => {
if (this.scene.activeCamera === this.camera) {
(this.camera.inputs.attached.manual as FreeCameraManualInput).setRotationVector({ x: ev.x, y: ev.y });
}
});
this.timer.setInterval(() => {
const camera = this.scene.activeCamera!;
const myPos = camera.globalPosition;
const myRotation = camera.absoluteRotation.toEulerAngles();
this.ev('changeMyPlayerState', {
position: [myPos.x, myPos.y, myPos.z],
rotation: [myRotation.x, myRotation.y, myRotation.z],
});
}, 100);
this.inited = true;
}
private async loadEnv() {
const envManager = new LobbyEnvManager(this);
await envManager.load();
envManager.setTime(this.time);
for (const mat of this.scene.materials) {
mat.unfreeze();
if (mat instanceof BABYLON.MultiMaterial) {
for (const subMat of mat.subMaterials) {
if (subMat.metadata?.useEnvMap) subMat.reflectionTexture = envManager.envMapIndoor;
}
} else {
if (mat.metadata?.useEnvMap) mat.reflectionTexture = envManager.envMapIndoor;
}
}
this.envManager = envManager;
this.camera.maxZ = this.envManager.maxCameraZ;
}
public cameraMove(vector: { x: number; y: number; }, dash: boolean) {
(this.camera.inputs.attached.manual as FreeCameraManualInput).setMoveVector(dash ? { x: vector.x * 3, y: vector.y * 3 } : vector);
}
public cameraJoystickMove(vector: { x: number; y: number; }) {
(this.camera.inputs.attached.manual as FreeCameraManualInput).setMoveVector(vector);
}
private playSfxUrl(url: string, options: { volume: number; playbackRate: number }) {
this.emit('playSfxUrl', { url, options });
}
public clearPlayers() {
this.sr.disableSnapshotRendering();
for (const playerContainer of this.playerContainers) {
playerContainer.destroy();
}
this.sr.enableSnapshotRendering();
this.playerContainers = [];
}
public updateAvatarDisplayOptions(options: { showUsername: boolean; show2dAvatar: boolean }) {
this.showUsernameOnAvatar = options.showUsername;
this.show2dAvatarOnAvatar = options.show2dAvatar;
this.sr.disableSnapshotRendering();
for (const playerContainer of this.playerContainers) {
playerContainer.updateUserInfoDisplayOptions(options);
}
this.sr.enableSnapshotRendering();
}
public resize() {
this.engine.resize(true);
}
public destroy() {
super.destroy();
this.timer.dispose();
this.envManager.dispose();
}
}
@@ -0,0 +1,109 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js';
import { findMaterial, GRAPHICS_QUALITY } from './utility.js';
import type { WorldEngine } from './engine.js';
export abstract class WorldEnvManager {
protected engine: WorldEngine;
public abstract envMapIndoor: BABYLON.CubeTexture | null;
public abstract maxCameraZ: number;
private shadowGenerators: BABYLON.ShadowGenerator[] = [];
constructor(engine: WorldEngine) {
this.engine = engine;
}
abstract load(): Promise<void>;
abstract setTime(time: number): void;
protected registerShadowGenerator(shadowGenerator: BABYLON.ShadowGenerator) {
this.shadowGenerators.push(shadowGenerator);
const shadowMap = shadowGenerator.getShadowMap()!;
shadowMap.refreshRate = BABYLON.RenderTargetTexture.REFRESHRATE_RENDER_ONCE;
// https://forum.babylonjs.com/t/is-it-intentional-that-the-shadow-map-refresh-rate-is-ignored-under-fast-snapshot-rendering/63523
const objectRenderer = shadowMap._objectRenderer;
const originalShouldRender = objectRenderer.shouldRender.bind(objectRenderer);
objectRenderer.shouldRender = function () {
if (this._engine.snapshotRendering) {
return this.refreshRate !== BABYLON.RenderTargetTexture.REFRESHRATE_RENDER_ONCE;
}
return originalShouldRender();
};
}
public addShadowCaster(mesh: BABYLON.AbstractMesh) {
for (const shadowGen of this.shadowGenerators) {
shadowGen.addShadowCaster(mesh);
}
}
public removeShadowCaster(mesh: BABYLON.AbstractMesh) {
for (const shadowGen of this.shadowGenerators) {
shadowGen.removeShadowCaster(mesh);
}
}
public async renderShadow() {
this.engine.sr.disableSnapshotRendering();
for (const shadowGen of this.shadowGenerators) {
const shadowMap = shadowGen.getShadowMap()!;
shadowMap.refreshRate = 1;
}
await new Promise(resolve => setTimeout(resolve, 1));
for (const shadowGen of this.shadowGenerators) {
const shadowMap = shadowGen.getShadowMap()!;
shadowMap.refreshRate = BABYLON.RenderTargetTexture.REFRESHRATE_RENDER_ONCE;
}
this.engine.sr.enableSnapshotRendering();
}
protected registerMeshes(meshes: BABYLON.AbstractMesh[]) {
for (const mesh of meshes) {
if (!this.engine.scene.meshes.includes(mesh)) this.engine.scene.addMesh(mesh);
if (['__COLLISION__'].some(name => mesh.name.includes(name))) {
mesh.isPickable = false;
mesh.receiveShadows = false;
mesh.isVisible = false;
mesh.checkCollisions = false;
if (mesh.name.includes('__COLLISION__')) {
mesh.checkCollisions = true;
}
continue;
}
mesh.isPickable = false;
mesh.checkCollisions = false;
if (mesh.material != null) {
(mesh.material as BABYLON.PBRMaterial).useGLTFLightFalloff = true; // Clustered Lightingではphysical falloffを持つマテリアルはアーチファクトが発生する https://doc.babylonjs.com/features/featuresDeepDive/lights/clusteredLighting/#materials-with-a-physical-falloff-may-cause-artefacts
if (mesh.material instanceof BABYLON.MultiMaterial) {
for (const subMat of mesh.material.subMaterials) {
subMat.reflectionTexture = this.envMapIndoor;
}
} else if (mesh.material instanceof BABYLON.PBRMaterial) {
mesh.material.reflectionTexture = this.envMapIndoor;
}
}
}
}
public dispose() {
for (const shadowGen of this.shadowGenerators) {
shadowGen.dispose();
}
}
}
@@ -0,0 +1,564 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js';
import tinycolor from 'tinycolor2';
import Hls from 'hls.js';
import { findMaterial, GRAPHICS_QUALITY, Timer } from '../utility.js';
import { WorldEnvManager } from '../env.js';
import { RecyvlingTextGrid, createPlaneUvMapper, randomRange } from '../utility.js';
import { Firework } from '../Firework.js';
import { getTimezoneOffsetLabel, timezones } from '../timezones.js';
import type { WorldEngine } from '../engine.js';
export class LobbyEnvManager extends WorldEnvManager {
private loaderResult: BABYLON.ISceneLoaderAsyncResult | null = null;
private meshes: BABYLON.Mesh[] = [];
private skybox: BABYLON.Mesh | null = null;
private skyboxMat: BABYLON.StandardMaterial | null = null;
private sunLight: BABYLON.DirectionalLight | null = null;
public envMapIndoor: BABYLON.CubeTexture | null = null;
public maxCameraZ = cm(100000);
private textMaterial: BABYLON.StandardMaterial | null = null;
private textBwMaterial: BABYLON.StandardMaterial | null = null;
private translucentTextMaterial: BABYLON.StandardMaterial | null = null;
private timer: Timer = new Timer();
private tz = timezones.find((tz) => tz.abbrev === 'JST')!;
constructor(engine: WorldEngine) {
super(engine);
}
public async load() {
this.engine.camera.position = new BABYLON.Vector3(cm(0), cm(250), cm(3000));
this.skybox = BABYLON.MeshBuilder.CreateBox('skybox', { size: cm(50000) }, this.engine.scene);
this.skyboxMat = new BABYLON.StandardMaterial('skyboxMat', this.engine.scene);
this.skyboxMat.backFaceCulling = false;
this.skyboxMat.disableLighting = true;
this.skybox.material = this.skyboxMat;
this.skybox.infiniteDistance = true;
if (this.engine.gl != null) this.engine.gl.addExcludedMesh(this.skybox);
const ambientLight1 = new BABYLON.HemisphericLight('ambientLight1', new BABYLON.Vector3(0, 1, 0), this.engine.scene);
ambientLight1.diffuse = new BABYLON.Color3(1.0, 0.9, 0.8);
ambientLight1.intensity = 1;
const ambientLight2 = new BABYLON.HemisphericLight('ambientLight2', new BABYLON.Vector3(0, -1, 0), this.engine.scene);
ambientLight2.diffuse = new BABYLON.Color3(0.8, 0.9, 1.0);
ambientLight2.intensity = 1;
//ambientLight.intensity = 0;
this.sunLight = new BABYLON.DirectionalLight('sunLight', new BABYLON.Vector3(0, -1, 0), this.engine.scene);
this.sunLight.position = new BABYLON.Vector3(cm(0), cm(10000), cm(0));
this.sunLight.shadowMinZ = cm(1000);
this.sunLight.shadowMaxZ = cm(2000);
this.loaderResult = await BABYLON.ImportMeshAsync('/client-assets/world/envs/lobby/lobby.glb', this.engine.scene);
//this.envMapIndoor = BABYLON.CubeTexture.CreateFromPrefilteredData('/client-assets/room/indoor.env', this.engine.scene);
//this.envMapIndoor.boundingBoxSize = new BABYLON.Vector3(cm(500), cm(500), cm(500));
this.meshes = this.loaderResult.meshes;
this.meshes[0].scaling = this.meshes[0].scaling.scale(WORLD_SCALE);
this.meshes[0].rotationQuaternion = null;
this.meshes[0].rotation = new BABYLON.Vector3(0, 0, 0);
this.meshes[0].bakeCurrentTransformIntoVertices();
for (const mesh of this.meshes) {
if (['__COLLISION__'].some(name => mesh.name.includes(name))) continue;
mesh.receiveShadows = true;
this.addShadowCaster(mesh);
}
this.textMaterial = new BABYLON.StandardMaterial('textMaterial', this.engine.scene);
this.textMaterial.diffuseTexture = new BABYLON.Texture('/client-assets/world/envs/lobby/chars-black.png', this.engine.scene, false, false);
this.textMaterial.diffuseTexture.hasAlpha = true;
this.textMaterial.disableLighting = true;
this.textMaterial.transparencyMode = BABYLON.Material.MATERIAL_ALPHABLEND;
this.textMaterial.useAlphaFromDiffuseTexture = true;
this.textMaterial.freeze();
this.textBwMaterial = new BABYLON.StandardMaterial('textBwMaterial', this.engine.scene);
this.textBwMaterial.emissiveTexture = new BABYLON.Texture('/client-assets/world/envs/lobby/chars-bw.png', this.engine.scene, false, false);
this.textBwMaterial.disableLighting = true;
this.textBwMaterial.freeze();
this.translucentTextMaterial = this.textMaterial.clone('translucentTextMaterial');
this.translucentTextMaterial.alpha = 0.25;
{
const objet = this.meshes.find(m => m.name.includes('__OBJET__'));
objet.rotation = objet.rotationQuaternion.toEulerAngles();
objet.rotationQuaternion = null;
const anim = new BABYLON.Animation('', 'rotation.y', 60, BABYLON.Animation.ANIMATIONTYPE_FLOAT, BABYLON.Animation.ANIMATIONLOOPMODE_CYCLE);
anim.setKeys([
{ frame: 0, value: 0 },
{ frame: 5000, value: -(Math.PI * 2) },
]);
objet.animations = [anim];
this.engine.scene.beginAnimation(objet, 0, 5000, true);
this.engine.scene.onAfterAnimationsObservable.add(() => {
this.engine.sr.updateMesh([objet, ...objet.getChildMeshes()], false);
});
}
{
const ring = this.meshes.find(m => m.name.includes('__LED_RING__'));
ring.rotation = ring.rotationQuaternion.toEulerAngles();
ring.rotationQuaternion = null;
const anim = new BABYLON.Animation('', 'rotation.y', 60, BABYLON.Animation.ANIMATIONTYPE_FLOAT, BABYLON.Animation.ANIMATIONLOOPMODE_CYCLE);
anim.setKeys([
{ frame: 0, value: 0 },
{ frame: 5000, value: -(Math.PI * 2) },
]);
ring.animations = [anim];
this.engine.scene.beginAnimation(ring, 0, 5000, true);
this.engine.scene.onAfterAnimationsObservable.add(() => {
this.engine.sr.updateMesh([ring, ...ring.getChildMeshes()], false);
});
}
{
const messageRingRoot = new BABYLON.TransformNode('', this.engine.scene);
const messageRing = this.meshes.find(m => m.name.includes('__MESSAGE_RING_OUTER_1__'));
messageRing.parent = messageRingRoot;
messageRing.rotation = messageRing.rotationQuaternion.toEulerAngles();
messageRing.rotationQuaternion = null;
const text = new RecyvlingTextGrid(messageRing, 256, {
meshFlipped: true,
material: this.textBwMaterial,
});
text.write('Wellcome to Misskey World!');
//messageRingRoot.rotation.x = Math.PI / 4;
const anim = new BABYLON.Animation('', 'rotation.y', 60, BABYLON.Animation.ANIMATIONTYPE_FLOAT, BABYLON.Animation.ANIMATIONLOOPMODE_CYCLE);
anim.setKeys([
{ frame: 0, value: 0 },
{ frame: 10000, value: -(Math.PI * 2) },
]);
messageRing.animations = [anim];
this.engine.scene.beginAnimation(messageRing, 0, 10000, true);
this.engine.scene.onAfterAnimationsObservable.add(() => {
this.engine.sr.updateMesh([messageRing, ...messageRing.getChildMeshes()], false);
});
const texts = [
'Wellcome to Misskey World!',
'Enjoy your stay!',
'Feel free to look around!',
'This is a virtual space for Misskey users!',
//'You can chat, play games, and more!',
//'Check out the bulletin board for announcements',
'Have a nice day with Misskey!',
'MAINTENANCE will begin at 9:00 A.M.',
];
let currentTextIndex = 1;
this.timer.setInterval(() => {
const textToShow = texts[currentTextIndex];
currentTextIndex = (currentTextIndex + 1) % texts.length;
text.writeWithAnimation(textToShow);
}, 10000);
}
{
const messageRingRoot = new BABYLON.TransformNode('', this.engine.scene);
const messageRing = this.meshes.find(m => m.name.includes('__MESSAGE_RING_OUTER_2__'));
messageRing.parent = messageRingRoot;
messageRing.rotation = messageRing.rotationQuaternion.toEulerAngles();
messageRing.rotationQuaternion = null;
const text = new RecyvlingTextGrid(messageRing, 256, {
meshFlipped: true,
material: this.translucentTextMaterial,
repeatSeparator: ' ',
});
messageRingRoot.rotation.x = Math.PI / 2;
const anim = new BABYLON.Animation('', 'rotation.y', 60, BABYLON.Animation.ANIMATIONTYPE_FLOAT, BABYLON.Animation.ANIMATIONLOOPMODE_CYCLE);
anim.setKeys([
{ frame: 0, value: 0 },
{ frame: 10000, value: -(Math.PI * 2) },
]);
messageRing.animations = [anim];
this.engine.scene.beginAnimation(messageRing, 0, 10000, true);
this.engine.scene.onAfterAnimationsObservable.add(() => {
this.engine.sr.updateMesh([messageRing, ...messageRing.getChildMeshes()], false);
});
this.timer.setInterval(() => {
text.write(Date.now().toString());
}, 10);
}
{
const messageRingRoot = new BABYLON.TransformNode('', this.engine.scene);
const messageRing = this.meshes.find(m => m.name.includes('__MESSAGE_RING_INNER_1__'));
messageRing.parent = messageRingRoot;
messageRing.rotation = messageRing.rotationQuaternion.toEulerAngles();
messageRing.rotationQuaternion = null;
const text = new RecyvlingTextGrid(messageRing, 64, {
material: this.textMaterial,
repeatSeparator: ' ',
});
//messageRingRoot.rotation.x = Math.PI / 4;
const anim = new BABYLON.Animation('', 'rotation.y', 60, BABYLON.Animation.ANIMATIONTYPE_FLOAT, BABYLON.Animation.ANIMATIONLOOPMODE_CYCLE);
anim.setKeys([
{ frame: 0, value: 0 },
{ frame: 10000, value: (Math.PI * 2) },
]);
messageRing.animations = [anim];
this.engine.scene.beginAnimation(messageRing, 0, 10000, true);
this.engine.scene.onAfterAnimationsObservable.add(() => {
this.engine.sr.updateMesh([messageRing, ...messageRing.getChildMeshes()], false);
});
this.timer.setInterval(() => {
const now = this.getCurrentTime();
const hours = now.getHours().toString().padStart(2, '0');
const minutes = now.getMinutes().toString().padStart(2, '0');
const seconds = now.getSeconds().toString().padStart(2, '0');
text.write(`${hours}:${minutes}:${seconds} ${getTimezoneOffsetLabel(this.tz.offset)}`);
}, 1000);
}
{
const messageRingRoot = new BABYLON.TransformNode('', this.engine.scene);
const messageRing = this.meshes.find(m => m.name.includes('__MESSAGE_RING_INNER_2__'));
messageRing.parent = messageRingRoot;
messageRing.rotation = messageRing.rotationQuaternion.toEulerAngles();
messageRing.rotationQuaternion = null;
const text = new RecyvlingTextGrid(messageRing, 64, {
material: this.textMaterial,
repeatSeparator: ' ',
});
//messageRingRoot.rotation.x = Math.PI / 4;
const anim = new BABYLON.Animation('', 'rotation.y', 60, BABYLON.Animation.ANIMATIONTYPE_FLOAT, BABYLON.Animation.ANIMATIONLOOPMODE_CYCLE);
anim.setKeys([
{ frame: 0, value: 0 },
{ frame: 10000, value: -(Math.PI * 2) },
]);
messageRing.animations = [anim];
this.engine.scene.beginAnimation(messageRing, 0, 10000, true);
this.engine.scene.onAfterAnimationsObservable.add(() => {
this.engine.sr.updateMesh([messageRing, ...messageRing.getChildMeshes()], false);
});
this.timer.setInterval(() => {
const now = this.getCurrentTime();
const years = now.getFullYear().toString();
const months = (now.getMonth() + 1).toString().padStart(2, '0');
const days = now.getDate().toString().padStart(2, '0');
const dayOfWeek = now.getDay();
const dayOfWeekStr = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'][dayOfWeek];
text.write(`${this.tz.abbrev} ${years}/${months}/${days} ${dayOfWeekStr.toUpperCase()}`);
}, 1000);
}
const spheres = [] as BABYLON.Mesh[];
for (let i = 0; i < 16; i++) {
const sphereRoot = new BABYLON.TransformNode('', this.engine.scene);
sphereRoot.position = new BABYLON.Vector3(cm(0), cm(1000 + (100 * i)), cm(0));
const rotation = Math.random() * Math.PI * 2;
const sphere = BABYLON.MeshBuilder.CreateSphere('', { diameter: cm(randomRange(50, 300)), segments: 16 }, this.engine.scene);
sphere.parent = sphereRoot;
sphere.position = new BABYLON.Vector3(cm(0), cm(0), cm(randomRange(2000, 7000)));
spheres.push(sphere);
const mat = new BABYLON.PBRMaterial('', this.engine.scene);
const color = tinycolor({ h: Math.random() * 360, s: 1, l: 0.5 }).toRgb();
mat.emissiveColor = new BABYLON.Color3(color.r / 255, color.g / 255, color.b / 255);
mat.disableLighting = true;
this.engine.gl?.addExcludedMesh(sphere);
sphere.material = mat;
const speed = randomRange(5000, 30000);
const anim = new BABYLON.Animation('', 'rotation.y', 60, BABYLON.Animation.ANIMATIONTYPE_FLOAT, BABYLON.Animation.ANIMATIONLOOPMODE_CYCLE);
anim.setKeys([
{ frame: 0, value: rotation },
{ frame: speed, value: Math.random() < 0.5 ? rotation + (Math.PI * 2) : rotation - (Math.PI * 2) },
]);
sphereRoot.animations = [anim];
this.engine.scene.beginAnimation(sphereRoot, 0, speed, true);
}
for (let i = 0; i < 64; i++) {
const sphereRoot = new BABYLON.TransformNode('', this.engine.scene);
sphereRoot.position = new BABYLON.Vector3(cm(0), cm(randomRange(-5000, 5000)), cm(0));
const rotation = Math.random() * Math.PI * 2;
const sphere = BABYLON.MeshBuilder.CreateSphere('', { diameter: cm(randomRange(500, 3000)), segments: 16 }, this.engine.scene);
sphere.parent = sphereRoot;
sphere.position = new BABYLON.Vector3(cm(0), cm(0), cm(randomRange(10000, 15000)));
spheres.push(sphere);
const mat = new BABYLON.PBRMaterial('', this.engine.scene);
const color = tinycolor({ h: Math.random() * 360, s: randomRange(0, 1), l: randomRange(0.75, 1) }).toRgb();
mat.emissiveColor = new BABYLON.Color3(color.r / 255, color.g / 255, color.b / 255);
mat.disableLighting = true;
this.engine.gl?.addExcludedMesh(sphere);
sphere.material = mat;
const speed = randomRange(10000, 100000);
const anim = new BABYLON.Animation('', 'rotation.y', 60, BABYLON.Animation.ANIMATIONTYPE_FLOAT, BABYLON.Animation.ANIMATIONLOOPMODE_CYCLE);
anim.setKeys([
{ frame: 0, value: rotation },
{ frame: speed, value: Math.random() < 0.5 ? rotation + (Math.PI * 2) : rotation - (Math.PI * 2) },
]);
sphereRoot.animations = [anim];
this.engine.scene.beginAnimation(sphereRoot, 0, speed, true);
}
this.engine.scene.onAfterAnimationsObservable.add(() => {
this.engine.sr.updateMesh(spheres, false);
});
const adsCountCol = 4;
const adsCountRow = 2;
const adRoots = [] as BABYLON.TransformNode[];
for (let j = 0; j < adsCountRow; j++) {
for (let i = 0; i < adsCountCol; i++) {
const adRoot = new BABYLON.TransformNode(`ad_${j}_${i}_root`, this.engine.scene);
adRoot.position = new BABYLON.Vector3(cm(0), cm(500 + (1000 * j)), cm(0));
const rotation = (i / adsCountCol) * Math.PI * 2;
const adMesh = BABYLON.MeshBuilder.CreatePlane(`ad_${j}_${i}`, { width: cm(1000), height: cm(700) }, this.engine.scene);
adMesh.parent = adRoot;
adMesh.position = new BABYLON.Vector3(cm(0), cm(0), cm(7500));
const tex = new BABYLON.Texture('http://syu-win.local:3000/files/e67bd2ec-a217-4c17-a222-596dcdbd0e57', this.engine.scene);
const adMat = new BABYLON.StandardMaterial(`ad_${j}_${i}_mat`, this.engine.scene);
adMat.emissiveTexture = tex;
adMat.disableLighting = true;
adMesh.material = adMat;
const anim = new BABYLON.Animation('', 'rotation.y', 60, BABYLON.Animation.ANIMATIONTYPE_FLOAT, BABYLON.Animation.ANIMATIONLOOPMODE_CYCLE);
anim.setKeys([
{ frame: 0, value: rotation },
{ frame: 15000, value: j % 2 === 0 ? rotation + (Math.PI * 2) : rotation - (Math.PI * 2) },
]);
adRoot.animations = [anim];
this.engine.scene.beginAnimation(adRoot, 0, 15000, true);
adRoots.push(adRoot);
}
}
this.engine.scene.onAfterAnimationsObservable.add(() => {
this.engine.sr.updateMesh(adRoots.flatMap(adRoot => [...adRoot.getChildMeshes()]), false);
});
const worldRingH = this.meshes.find(m => m.name.includes('__WORLD_RING_H__'));
const worldRingM = this.meshes.find(m => m.name.includes('__WORLD_RING_M__'));
worldRingH.material.reflectionTexture = null;
worldRingM.material.reflectionTexture = null;
worldRingH.rotation = worldRingH.rotationQuaternion.toEulerAngles();
worldRingM.rotation = worldRingM.rotationQuaternion.toEulerAngles();
worldRingH.rotationQuaternion = null;
worldRingM.rotationQuaternion = null;
const _1h = 1000 * 60 * 60;
const _12h = _1h * 12;
const _7days = _1h * 24 * 7;
const _30days = _1h * 24 * 30;
this.timer.setInterval(() => {
const time = Date.now();
worldRingH.rotation.x = ((time % _12h) / _12h) * Math.PI * 2;
worldRingM.rotation.y = -(((time % _1h) / _1h) * Math.PI);
this.engine.sr.updateMesh([worldRingH, ...worldRingH.getChildMeshes(), worldRingM, ...worldRingM.getChildMeshes()], false);
}, 100);
const dome = this.meshes.find(m => m.name.includes('__DOME__'));
dome.infiniteDistance = true;
const domeTexture = new BABYLON.CustomProceduralTexture('texture', '/client-assets/world/envs/lobby/shaders/bg', 4096, this.engine.scene);
domeTexture.hasAlpha = true;
domeTexture.wrapU = BABYLON.Texture.MIRROR_ADDRESSMODE;
domeTexture.wrapV = BABYLON.Texture.MIRROR_ADDRESSMODE;
dome.material = new BABYLON.StandardMaterial('sphereMat', this.engine.scene);
(dome.material as BABYLON.StandardMaterial).diffuseTexture = domeTexture;
(dome.material as BABYLON.StandardMaterial).emissiveColor = new BABYLON.Color3(1, 1, 1);
(dome.material as BABYLON.StandardMaterial).disableLighting = true;
(dome.material as BABYLON.StandardMaterial).useAlphaFromDiffuseTexture = true;
//this.engine.gl!.addExcludedMesh(dome);
const screenMeshes = this.meshes.filter(m => m.name.includes('__SCREEN__'));
const screenMaterial = screenMeshes[0].material as BABYLON.PBRMaterial;
const videoEl = document.createElement('video');
videoEl.crossOrigin = 'anonymous';
//videoEl.src = 'http://syu-win.local:3000/files/931c02c3-6238-4c29-9371-06bab78950bb';
const hls = new Hls();
hls.loadSource('https://tvs.misskey.io/official/hq-beta/ts:abr.m3u8');
hls.attachMedia(videoEl);
this.timer.setTimeout(() => {
const tex = new BABYLON.VideoTexture('', videoEl, this.engine.scene, true, true);
tex.level = 0.5;
tex.video.loop = true;
tex.video.volume = 0.25;
tex.video.muted = true;
screenMaterial.albedoColor = new BABYLON.Color3(0, 0, 0);
screenMaterial.emissiveTexture = tex;
screenMaterial.emissiveColor = new BABYLON.Color3(1, 1, 1);
tex.onLoadObservable.addOnce(() => {
tex.video.play();
for (const mesh of screenMeshes) {
if (mesh instanceof BABYLON.InstancedMesh) continue;
//normalizeUvToSquare(mesh);
const updateUv = createPlaneUvMapper(mesh);
if (tex == null) return;
const srcAspect = tex.getSize().width / tex.getSize().height;
const targetAspect = 16 / 9;
updateUv(srcAspect, targetAspect, 'cover', 0);
}
});
}, 3000);
const hourHands = this.meshes.filter(m => m.name.includes('__CLOCK_HAND_H__'));
const minuteHands = this.meshes.filter(m => m.name.includes('__CLOCK_HAND_M__'));
this.timer.setInterval(() => {
const now = this.getCurrentTime();
const hours = now.getHours() % 12;
const minutes = now.getMinutes();
const hAngle = -(hours / 12) * Math.PI * 2 - (minutes / 60) * (Math.PI * 2 / 12);
const mAngle = -(minutes / 60) * Math.PI * 2;
for (const hourHand of hourHands) hourHand.rotation = new BABYLON.Vector3(0, 0, hAngle);
for (const minuteHand of minuteHands) minuteHand.rotation = new BABYLON.Vector3(0, 0, mAngle);
this.engine.sr.updateMesh([...hourHands, ...minuteHands], false);
}, 1000);
//const emitter = new BABYLON.TransformNode('emitter', this.engine.scene);
//emitter.position = new BABYLON.Vector3(0, cm(-1000), 0);
//const ps = new BABYLON.ParticleSystem('', 128, this.engine.scene);
//ps.particleTexture = new BABYLON.Texture('/client-assets/world/envs/lobby/bubble.png');
//ps.emitter = emitter;
//ps.isLocal = true;
//ps.minEmitBox = new BABYLON.Vector3(cm(-1000), 0, cm(-1000));
//ps.maxEmitBox = new BABYLON.Vector3(cm(1000), 0, cm(1000));
//ps.minEmitPower = cm(100);
//ps.maxEmitPower = cm(500);
//ps.minLifeTime = 30;
//ps.maxLifeTime = 30;
//ps.minSize = cm(30);
//ps.maxSize = cm(300);
//ps.direction1 = new BABYLON.Vector3(0, 1, 0);
//ps.direction2 = new BABYLON.Vector3(0, 1, 0);
//ps.emitRate = 1.5;
//ps.blendMode = BABYLON.ParticleSystem.BLENDMODE_ADD;
//ps.color1 = new BABYLON.Color4(1, 1, 1, 0.3);
//ps.color2 = new BABYLON.Color4(1, 1, 1, 0.2);
//ps.colorDead = new BABYLON.Color4(1, 1, 1, 0);
//ps.preWarmCycles = Math.random() * 1000;
//ps.start();
//this.engine.sr.fixParticleSystem(ps);
const firework = new Firework(this.engine);
this.timer.setInterval(() => {
firework.launch({
position: [randomRange(cm(-2000), cm(2000)), cm(randomRange(1000, 3000)), randomRange(cm(-2000), cm(2000))],
});
}, 1000);
this.registerMeshes(this.meshes);
}
public setTime(time: number) {
if (this.skyboxMat == null) return;
if (time === 0) {
this.skyboxMat.emissiveColor = new BABYLON.Color3(0.7, 0.9, 1.0);
} else if (time === 1) {
this.skyboxMat.emissiveColor = new BABYLON.Color3(0.8, 0.5, 0.3);
} else {
this.skyboxMat.emissiveColor = new BABYLON.Color3(0.05, 0.05, 0.2);
}
if (this.sunLight != null) {
this.sunLight.diffuse = time === 0 ? new BABYLON.Color3(1.0, 0.9, 0.8) : time === 1 ? new BABYLON.Color3(1.0, 0.8, 0.6) : new BABYLON.Color3(0.6, 0.8, 1.0);
this.sunLight.intensity = time === 0 ? 3 : time === 1 ? 1 : 0.25;
}
}
private getCurrentTime() {
const now = new Date();
now.setMinutes(now.getMinutes() + now.getTimezoneOffset() + this.tz.offset);
return now;
}
public dispose() {
this.timer.dispose();
for (const m of this.meshes) {
m.dispose(false, true);
}
this.skybox?.dispose();
this.skyboxMat?.dispose();
this.envMapIndoor?.dispose();
this.sunLight?.dispose();
if (this.loaderResult != null) {
for (const m of this.loaderResult.meshes) {
m.dispose(false, true);
}
for (const t of this.loaderResult.transformNodes) {
t.dispose(false, true);
}
}
super.dispose();
}
}
class MessageRing {
constructor(mesh: BABYLON.Mesh, scene: BABYLON.Scene, options: { material: BABYLON.StandardMaterial; repeatSeparator: string; }) {
const messageRingRoot = new BABYLON.TransformNode('', this.engine.scene);
const messageRing = this.meshes.find(m => m.name.includes('__MESSAGE_RING_INNER_1__'));
messageRing.parent = messageRingRoot;
messageRing.rotation = messageRing.rotationQuaternion.toEulerAngles();
messageRing.rotationQuaternion = null;
const text = new RecyvlingTextGrid(messageRing, 64, {
material: this.textMaterial,
repeatSeparator: ' ',
});
//messageRingRoot.rotation.x = Math.PI / 4;
const anim = new BABYLON.Animation('', 'rotation.y', 60, BABYLON.Animation.ANIMATIONTYPE_FLOAT, BABYLON.Animation.ANIMATIONLOOPMODE_CYCLE);
anim.setKeys([
{ frame: 0, value: 0 },
{ frame: 10000, value: (Math.PI * 2) },
]);
messageRing.animations = [anim];
this.engine.scene.beginAnimation(messageRing, 0, 10000, true);
this.timer.setInterval(() => {
const now = new Date();
const hours = now.getHours().toString().padStart(2, '0');
const minutes = now.getMinutes().toString().padStart(2, '0');
const seconds = now.getSeconds().toString().padStart(2, '0');
text.write(`${hours}:${minutes}:${seconds}`);
}, 1000);
}
}
@@ -0,0 +1,25 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
// ランダムな文字列が生成できればなんでも良い(時系列でソートできるなら尚良)が、とりあえずaidの実装を拝借
const TIME2000 = 946684800000;
let counter = Math.floor(Math.random() * 10000);
function getTime(time: number): string {
time = time - TIME2000;
if (time < 0) time = 0;
return time.toString(36).padStart(8, '0');
}
function getNoise(): string {
return counter.toString(36).padStart(2, '0').slice(-2);
}
export function genId(): string {
counter++;
return getTime(Date.now()) + getNoise();
}
@@ -0,0 +1,52 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import type { OptionsSchema, NumberOptionSchema, BooleanOptionSchema, StringOptionSchema, ColorOptionSchema, MaterialOptionSchema, LightOptionSchema, EnumOptionSchema, RangeOptionSchema, ImageOptionSchema, SeedOptionSchema } from 'misskey-world/src/mono.js';
export type RawOptions = Record<string, unknown> & {
readonly __brand: unique symbol;
};
export type ConvertedOptions = Record<string, unknown> & {
readonly __brand: unique symbol;
};
type RawImageValue<Presets extends string = string> = { type: Presets | null | '_custom_'; driveFileId?: string | null; fit?: 'cover' | 'contain' | 'stretch'; rotation?: 0 | 1 | 2 | 3; };
type ConvertedImageValue<Presets extends string = string> = { type: Presets | null | '_custom_'; custom?: { url: string; } | null; fit?: 'cover' | 'contain' | 'stretch'; rotation?: 0 | 1 | 2 | 3; };
export type GetConvertedOptionsSchemaValues<T extends OptionsSchema> = {
[K in keyof T]:
T[K] extends NumberOptionSchema ? number :
T[K] extends BooleanOptionSchema ? boolean :
T[K] extends StringOptionSchema ? string :
T[K] extends ColorOptionSchema ? [number, number, number] :
T[K] extends MaterialOptionSchema ? { color: [number, number, number]; metallic: number; roughness: number; } :
T[K] extends LightOptionSchema ? { color: [number, number, number]; brightness: number; } :
T[K] extends EnumOptionSchema ? T[K]['enum'][number]['value'] :
T[K] extends RangeOptionSchema ? number :
T[K] extends ImageOptionSchema ? ConvertedImageValue<T[K]['presets'][number]['value']> :
T[K] extends SeedOptionSchema ? number :
never;
};
export function convertRawOptions<OpSc extends OptionsSchema>(schema: OpSc, raw: RawOptions, attachments: { files: { id: string; url: string; }[] }): ConvertedOptions {
const converted = {} as ConvertedOptions;
for (const record of Object.entries(schema)) {
const k = record[0];
const v = raw[k];
if (record[1].type === 'image') {
const _v = v as unknown as RawImageValue;
const file = _v.type === '_custom_' ? attachments.files.find(f => f.id === _v.driveFileId) : null;
if (file != null && file.url.startsWith('http://syu-win.local:3000/')) { // debug
file.url = file.url.replace('http://syu-win.local:3000/', 'https://local-mi.syuilo.dev/');
}
converted[k] = { type: _v.type, custom: file != null ? { url: file.url } : null, fit: _v.fit, rotation: _v.rotation } satisfies ConvertedImageValue;
} else {
converted[k] = v;
}
}
return converted;
}
@@ -0,0 +1,38 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { registerBabylonRuntime } from './babylonRuntime.js';
import { WorldEngine } from './engine.js';
registerBabylonRuntime();
export async function createWorldEngine(params: {
canvas: HTMLCanvasElement;
options: {
antialias: boolean;
resolution: number;
fov: number;
graphicsQuality: number;
fps: number | null;
useVirtualJoystick?: boolean;
showUsernameOnAvatar: boolean;
show2dAvatarOnAvatar: boolean;
};
}) {
const babylonEngine = new BABYLON.WebGPUEngine(params.canvas, { doNotHandleContextLost: true, powerPreference: 'high-performance', antialias: params.options.antialias });
babylonEngine.compatibilityMode = false;
babylonEngine.enableOfflineSupport = false;
await babylonEngine.initAsync();
if (params.options.resolution === 2) babylonEngine.setHardwareScalingLevel(0.5);
if (params.options.resolution === 0.5) babylonEngine.setHardwareScalingLevel(2);
const engine = new WorldEngine({
engine: babylonEngine,
...params.options,
});
return engine;
}
@@ -0,0 +1,280 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { camelToKebab, WORLD_SCALE } from 'misskey-world/src/utility.js';
import { scaleMorph, Timer } from '../utility.js';
import { convertRawOptions, type ConvertedOptions, type RawOptions } from '../mono.js';
import { getFurnitureDef } from './furniture-defs.js';
import { ModelManager, SYSTEM_MESH_NAMES } from './utility.js';
import type { RoomFurnitureInstance } from './furniture.js';
import type { RoomAttachments } from 'misskey-world/src/room/type.js';
function mergeMeshes(meshes: BABYLON.Mesh[], root: BABYLON.Mesh, hasTexture: boolean) {
const excludeMeshes = root.getChildMeshes().filter(m => SYSTEM_MESH_NAMES.some(s => m.name.includes(s)));
const childMeshes = root.getChildMeshes().filter(m => !excludeMeshes.some(x => x === m) && m.isVisible && !m.isDisposed());
const toMerge = [] as BABYLON.Mesh[];
for (const mesh of childMeshes) {
if (mesh instanceof BABYLON.InstancedMesh) {
continue;
}
if (mesh.hasInstances) continue;
if (mesh instanceof BABYLON.Mesh) {
toMerge.push(mesh);
}
}
if (toMerge.length <= 1) { // マージ対象が一つしかない状態でマージするのは単純に無駄なのと、babylonのバグが知らないけどなぜか法線が反転する
return null;
}
for (const mesh of toMerge) {
if (hasTexture) {
if (mesh.getVerticesData(BABYLON.VertexBuffer.UVKind) == null) {
const vertexCount = mesh.getTotalVertices();
const uvs = new Array(vertexCount * 2).fill(0);
mesh.setVerticesData(BABYLON.VertexBuffer.UVKind, uvs, false, 2);
}
if (mesh.getVerticesData(BABYLON.VertexBuffer.UV2Kind) == null) {
const vertexCount = mesh.getTotalVertices();
const uvs = new Array(vertexCount * 2).fill(0);
mesh.setVerticesData(BABYLON.VertexBuffer.UV2Kind, uvs, false, 2);
}
}
}
const merged = BABYLON.Mesh.MergeMeshes(toMerge, true, false, undefined, false, true);
return merged;
}
export class FurnitureContainer {
public id: string;
public type: string;
private options: ConvertedOptions;
public root: BABYLON.TransformNode;
private subRoot: BABYLON.TransformNode | null = null;
public instance: RoomFurnitureInstance | null = null;
public model: ModelManager | null = null;
private scene: BABYLON.Scene;
public registerMeshes: (meshes: BABYLON.Mesh[]) => void = () => {};
private sr: BABYLON.SnapshotRenderingHelper;
private getIsSrReady: () => boolean;
private lightContainer: BABYLON.ClusteredLightContainer;
private graphicsQuality: number;
private timer: Timer = new Timer();
private sitChair: () => void = () => {};
public boundingBox: {
min: BABYLON.Vector3;
max: BABYLON.Vector3;
} | null = null;
constructor(args: {
id: string;
type: string;
options: RawOptions;
roomAttachments: RoomAttachments;
position: BABYLON.Vector3;
rotation: BABYLON.Vector3;
sr: BABYLON.SnapshotRenderingHelper;
getIsSrReady: () => boolean;
lightContainer: BABYLON.ClusteredLightContainer;
scene: BABYLON.Scene;
graphicsQuality: number;
sitChair?: () => void;
}) {
this.id = args.id;
this.type = args.type;
const def = getFurnitureDef(this.type);
this.options = convertRawOptions(def.options.schema, args.options, args.roomAttachments);
this.sr = args.sr;
this.getIsSrReady = args.getIsSrReady;
this.lightContainer = args.lightContainer;
this.scene = args.scene;
this.graphicsQuality = args.graphicsQuality;
this.root = new BABYLON.TransformNode(`furniture_${args.id}_${args.type}`, this.scene);
this.root.position = args.position;
this.root.rotation = args.rotation;
if (args.sitChair != null) this.sitChair = args.sitChair;
}
public async load() {
const def = getFurnitureDef(this.type);
const filePath = def.path != null ? `/client-assets/world/objects/${def.path(this.options)}.glb` : `/client-assets/world/objects/${camelToKebab(this.type)}/${camelToKebab(this.type)}.glb`;
const loaderResult = await BABYLON.LoadAssetContainerAsync(filePath, this.scene);
// babylonによって自動で追加される右手系変換用ノード
const subRootMesh = loaderResult.meshes[0] as BABYLON.Mesh;
// 不要なUVを掃除
if (!def.hasTexture) {
for (const m of loaderResult.meshes) {
if (m.geometry != null) {
m.geometry.removeVerticesData(BABYLON.VertexBuffer.UVKind);
m.geometry.removeVerticesData(BABYLON.VertexBuffer.UV2Kind);
m.geometry.removeVerticesData(BABYLON.VertexBuffer.UV3Kind);
m.geometry.removeVerticesData(BABYLON.VertexBuffer.UV4Kind);
m.geometry.removeVerticesData(BABYLON.VertexBuffer.UV5Kind);
m.geometry.removeVerticesData(BABYLON.VertexBuffer.UV6Kind);
}
}
}
if (def.canPreMeshesMerging) {
const merged = mergeMeshes(loaderResult.meshes, subRootMesh, def.hasTexture);
if (merged != null) {
merged.setParent(subRootMesh);
merged.name = 'preMerged';
merged.material.freeze();
if (merged.material instanceof BABYLON.MultiMaterial) {
for (const subMat of merged.material.subMaterials) {
subMat.freeze();
}
}
// TODO: 再帰的にする
for (const m of loaderResult.transformNodes) {
if (m.getChildren().length === 0) {
m.dispose();
}
}
}
}
// meshじゃなくtransform nodeにしてパフォーマンス向上
this.subRoot = new BABYLON.TransformNode('__root__', this.scene);
this.subRoot.parent = this.root;
this.subRoot.scaling.x = -1;
this.subRoot.scaling = this.subRoot.scaling.scale(WORLD_SCALE);// cmをmに
for (const m of subRootMesh.getChildren()) {
if (m.parent === subRootMesh) {
m.parent = this.subRoot;
}
}
subRootMesh.dispose();
this.registerMeshes(this.subRoot.getChildMeshes());
this.model = new ModelManager(this.subRoot, loaderResult.meshes.filter(m => !m.isDisposed() && m.name !== '__root__'), def.hasTexture, (meshes) => {
this.registerMeshes(meshes);
});
this.instance = await def.createInstance({
scene: this.scene,
sr: {
updateMesh: (mesh) => {
if (!this.getIsSrReady()) return;
this.sr.updateMesh(mesh);
},
reset: () => {
if (!this.getIsSrReady()) return;
this.sr.disableSnapshotRendering();
this.sr.enableSnapshotRendering();
},
fixParticleSystem: (ps) => this.sr.fixParticleSystem(ps),
},
lc: this.lightContainer,
root: this.root,
options: this.options,
model: this.model!,
id: this.id,
timer: this.timer,
graphicsQuality: this.graphicsQuality,
reloadModel: () => {
this.reload();
},
sitChair: () => {
this.sitChair();
},
stickyMarkerMeshUpdated: (mesh) => {
// TODO
//// stickyな子の位置を更新
//if (mesh.name.includes('__TOP__')) {
// mesh.unfreezeWorldMatrix();
// mesh.computeWorldMatrix(true);
// const updateChildStickyObjectPosition = (furnitureId: string) => {
// const stickyFurnitureIds = Array.from(this.roomState.installedFurnitures.filter(o => o.sticky === furnitureId)).map(o => o.id);
// for (const soid of stickyFurnitureIds) {
// const soMesh = this.objectEntities.get(soid)!.rootMesh;
// soMesh.unfreezeWorldMatrix();
// for (const m of soMesh.getChildMeshes()) {
// m.unfreezeWorldMatrix();
// }
// console.log(mesh.getAbsolutePosition().y);
// soMesh.position.y = mesh.getAbsolutePosition().y;
// updateChildStickyObjectPosition(soid);
// }
// };
// updateChildStickyObjectPosition(args.id);
//}
},
});
this.instance.onInited?.();
this.calcBoundingBox();
}
public calcBoundingBox() {
// TODO: モーフ最大適用後のサイズが取得されてしまうのを直す
this.boundingBox = this.subRoot.getHierarchyBoundingVectors(true);
}
public interact(iid: string | null = null) {
if (this.instance == null) return;
if (iid == null) {
if (this.instance.primaryInteraction != null) {
this.instance.interactions[this.instance.primaryInteraction].fn();
}
} else {
this.instance.interactions[iid].fn();
}
}
public async reload() {
this.timer.dispose();
this.instance?.dispose?.();
this.instance = null;
this.model = null;
this.subRoot?.dispose();
this.root.removeChild(this.subRoot);
this.scene.removeTransformNode(this.subRoot);
this.timer = new Timer();
await this.load();
this.sr.disableSnapshotRendering();
this.sr.enableSnapshotRendering();
}
public optionsUpdated(options: RawOptions, key: string, value: any, roomAttachments: RoomAttachments) {
if (this.instance == null) return;
const def = getFurnitureDef(this.type);
const convertedOptions = convertRawOptions(def.options.schema, options, roomAttachments);
this.options[key] = convertedOptions[key]; // 参照を切れさせないようにプロパティ個別にmutate
this.sr.disableSnapshotRendering();
this.instance.onOptionsUpdated?.([key, this.options[key]]);
this.sr.enableSnapshotRendering();
}
public destroy() {
this.sr.disableSnapshotRendering();
this.timer.dispose();
this.instance?.dispose?.();
this.subRoot.dispose();
this.root.dispose();
this.scene.removeTransformNode(this.root);
this.sr.enableSnapshotRendering();
}
}
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,121 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { SYSTEM_HEYA_MESH_NAMES } from './utility.js';
import type { RoomEngine } from './engine.js';
export abstract class RoomEnvManager<T = any> {
protected engine: RoomEngine;
public abstract envMapIndoor: BABYLON.CubeTexture | null;
public abstract maxCameraZ: number;
private shadowGenerators: BABYLON.ShadowGenerator[] = [];
protected isRoomLightOn = true;
constructor(engine: RoomEngine) {
this.engine = engine;
}
abstract load(options: T): Promise<void>;
abstract applyOptions(options: T): void;
abstract setTime(time: number): void;
abstract applyRoomLight(): void;
public turnOnRoomLight() {
this.isRoomLightOn = true;
this.applyRoomLight();
}
public turnOffRoomLight() {
this.isRoomLightOn = false;
this.applyRoomLight();
}
protected registerShadowGenerator(shadowGenerator: BABYLON.ShadowGenerator) {
this.shadowGenerators.push(shadowGenerator);
const shadowMap = shadowGenerator.getShadowMap()!;
shadowMap.refreshRate = BABYLON.RenderTargetTexture.REFRESHRATE_RENDER_ONCE;
// https://forum.babylonjs.com/t/is-it-intentional-that-the-shadow-map-refresh-rate-is-ignored-under-fast-snapshot-rendering/63523
const objectRenderer = shadowMap._objectRenderer;
const originalShouldRender = objectRenderer.shouldRender.bind(objectRenderer);
objectRenderer.shouldRender = function () {
if (this._engine.snapshotRendering) {
return this.refreshRate !== BABYLON.RenderTargetTexture.REFRESHRATE_RENDER_ONCE;
}
return originalShouldRender();
};
}
public addShadowCaster(mesh: BABYLON.AbstractMesh) {
for (const shadowGen of this.shadowGenerators) {
shadowGen.addShadowCaster(mesh);
}
}
public removeShadowCaster(mesh: BABYLON.AbstractMesh) {
for (const shadowGen of this.shadowGenerators) {
shadowGen.removeShadowCaster(mesh);
}
}
public async renderShadow() {
this.engine.sr.disableSnapshotRendering();
for (const shadowGen of this.shadowGenerators) {
const shadowMap = shadowGen.getShadowMap()!;
shadowMap.refreshRate = 1;
}
await new Promise(resolve => setTimeout(resolve, 1));
for (const shadowGen of this.shadowGenerators) {
const shadowMap = shadowGen.getShadowMap()!;
shadowMap.refreshRate = BABYLON.RenderTargetTexture.REFRESHRATE_RENDER_ONCE;
}
this.engine.sr.enableSnapshotRendering();
}
protected registerMeshes(meshes: BABYLON.AbstractMesh[]) {
for (const mesh of meshes) {
if (!this.engine.scene.meshes.includes(mesh)) this.engine.scene.addMesh(mesh);
if (SYSTEM_HEYA_MESH_NAMES.some(name => mesh.name.includes(name))) {
mesh.isPickable = false;
mesh.receiveShadows = false;
mesh.isVisible = false;
mesh.checkCollisions = false;
if (mesh.name.includes('__COLLISION__')) {
mesh.checkCollisions = true;
}
continue;
}
mesh.isPickable = false;
mesh.checkCollisions = false;
if (mesh.material != null) {
(mesh.material as BABYLON.PBRMaterial).useGLTFLightFalloff = true; // Clustered Lightingではphysical falloffを持つマテリアルはアーチファクトが発生する https://doc.babylonjs.com/features/featuresDeepDive/lights/clusteredLighting/#materials-with-a-physical-falloff-may-cause-artefacts
if (mesh.material instanceof BABYLON.MultiMaterial) {
for (const subMat of mesh.material.subMaterials) {
subMat.reflectionTexture = this.envMapIndoor;
}
} else if (mesh.material instanceof BABYLON.PBRMaterial) {
mesh.material.reflectionTexture = this.envMapIndoor;
}
}
}
}
public dispose() {
for (const shadowGen of this.shadowGenerators) {
shadowGen.dispose();
}
}
}
@@ -0,0 +1,343 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js';
import { findMaterial, GRAPHICS_QUALITY } from '../../utility.js';
import { SYSTEM_HEYA_MESH_NAMES } from '../utility.js';
import { RoomEnvManager } from '../env.js';
import type { RoomEngine } from '../engine.js';
import type { CustomMadoriEnvOptions } from 'misskey-world/src/room/env.js';
export class CustomMadoriEnvManager extends RoomEnvManager<CustomMadoriEnvOptions> {
private loaderResult: BABYLON.ISceneLoaderAsyncResult | null = null;
private meshes: BABYLON.Mesh[] = [];
private rootNode: BABYLON.TransformNode;
private unitRootNodes: (BABYLON.TransformNode | null)[] = [];
private floorRootNode: BABYLON.TransformNode | null = null;
private wallRootNode: BABYLON.TransformNode | null = null;
private floorMaterials: Record<string, BABYLON.PBRMaterial> = {};
private wallMaterials: Record<string, BABYLON.PBRMaterial> = {};
private wallBeamMaterials: Record<string, BABYLON.PBRMaterial> = {};
private pillarMaterials: Record<string, BABYLON.PBRMaterial> = {};
private ceilingMaterials: Record<string, BABYLON.PBRMaterial> = {};
private beamMesh: BABYLON.Mesh | null = null;
private baseboardMesh: BABYLON.Mesh | null = null;
private wallARootNode: BABYLON.TransformNode | null = null;
private wallBRootNode: BABYLON.TransformNode | null = null;
private skybox: BABYLON.Mesh | null = null;
private skyboxMat: BABYLON.StandardMaterial | null = null;
private roomLight: BABYLON.DirectionalLight | null = null;
public envMapIndoor: BABYLON.CubeTexture | null = null;
public maxCameraZ = cm(3000);
constructor(engine: RoomEngine) {
super(engine);
this.rootNode = new BABYLON.TransformNode('customMadoriRoot', this.engine.scene);
//this.rootNode.scaling = new BABYLON.Vector3(WORLD_SCALE, WORLD_SCALE, WORLD_SCALE);
}
public async load(options: CustomMadoriEnvOptions) {
this.skybox = BABYLON.MeshBuilder.CreateBox('skybox', { size: cm(3000) }, this.engine.scene);
this.skyboxMat = new BABYLON.StandardMaterial('skyboxMat', this.engine.scene);
this.skyboxMat.backFaceCulling = false;
this.skyboxMat.disableLighting = true;
this.skybox.material = this.skyboxMat;
this.skybox.infiniteDistance = true;
this.roomLight = new BABYLON.DirectionalLight('env:RoomLight', new BABYLON.Vector3(0, -1, 0), this.engine.scene);
this.roomLight.position = new BABYLON.Vector3(0, cm(300), 0);
this.roomLight.shadowMinZ = cm(10);
this.roomLight.shadowMaxZ = cm(500);
this.roomLight.radius = cm(30);
this.applyRoomLight();
if (this.engine.graphicsQuality >= GRAPHICS_QUALITY.MEDIUM) {
const shadowGeneratorForRoomLight = new BABYLON.ShadowGenerator(this.engine.graphicsQuality <= GRAPHICS_QUALITY.MEDIUM ? 1024 : 2048, this.roomLight);
shadowGeneratorForRoomLight.forceBackFacesOnly = true;
shadowGeneratorForRoomLight.bias = 0.0005;
shadowGeneratorForRoomLight.usePercentageCloserFiltering = true;
shadowGeneratorForRoomLight.filteringQuality = BABYLON.ShadowGenerator.QUALITY_HIGH;
//shadowGeneratorForRoomLight.useContactHardeningShadow = true;
//shadowGeneratorForRoomLight.contactHardeningLightSizeUVRatio = 0.01;
this.registerShadowGenerator(shadowGeneratorForRoomLight);
}
for (const materialDef of options.flooringMaterials) {
const mat = new BABYLON.PBRMaterial(`flooring_${materialDef.id}`, this.engine.scene);
mat.albedoColor = new BABYLON.Color3(...materialDef.color);
mat.metallic = 0;
mat.roughness = 1;
const texPath = materialDef.texture === 'wood' ? '/client-assets/room/textures/flooring-wood.png'
: materialDef.texture === 'concrete' ? '/client-assets/room/textures/concrete3.png'
: null;
if (texPath != null) {
const tex = new BABYLON.Texture(texPath, this.engine.scene, false, false);
mat.albedoTexture = tex;
}
//mat.freeze();
this.floorMaterials[materialDef.id] = mat;
}
for (const materialDef of options.wallMaterials) {
const mat = new BABYLON.PBRMaterial(`wall_${materialDef.id}`, this.engine.scene);
mat.albedoColor = new BABYLON.Color3(...materialDef.color);
mat.metallic = 0;
mat.roughness = 1;
const texPath = materialDef.texture === 'wood' ? '/client-assets/room/textures/wall-wood2.png'
: materialDef.texture === 'concrete' ? '/client-assets/room/textures/concrete1.png'
: null;
if (texPath != null) {
const tex = new BABYLON.Texture(texPath, this.engine.scene, false, false);
mat.albedoTexture = tex;
}
//mat.freeze();
this.wallMaterials[materialDef.id] = mat;
}
for (const materialDef of options.ceilingMaterials) {
const mat = new BABYLON.PBRMaterial(`ceiling_${materialDef.id}`, this.engine.scene);
mat.albedoColor = new BABYLON.Color3(...materialDef.color);
mat.metallic = 0;
mat.roughness = 1;
const texPath = materialDef.texture === 'wood' ? '/client-assets/room/textures/ceiling-wood.png'
: materialDef.texture === 'concrete' ? '/client-assets/room/textures/concrete3.png'
: null;
if (texPath != null) {
const tex = new BABYLON.Texture(texPath, this.engine.scene, false, false);
mat.albedoTexture = tex;
}
//mat.freeze();
this.ceilingMaterials[materialDef.id] = mat;
}
this.loaderResult = await BABYLON.LoadAssetContainerAsync('/client-assets/room/envs/custom-madori/units.glb', this.engine.scene);
this.envMapIndoor = BABYLON.CubeTexture.CreateFromPrefilteredData('/client-assets/room/indoor.env', this.engine.scene);
this.envMapIndoor.boundingBoxSize = new BABYLON.Vector3(cm(2000), cm(500), cm(2000));
this.meshes = this.loaderResult.meshes.filter(m => m instanceof BABYLON.Mesh);
this.meshes[0].rotationQuaternion = null;
this.meshes[0].rotation = new BABYLON.Vector3(0, 0, 0);
for (const m of this.meshes[0].getChildren()) {
if (m.parent === this.meshes[0]) {
m.parent = this.rootNode;
}
}
// instanced mesh を通常の mesh に変換 (そうしないとマテリアルが共有される)
for (const mesh of this.loaderResult.meshes) {
if (mesh instanceof BABYLON.InstancedMesh) {
const realizedMesh = mesh.sourceMesh.clone(mesh.name, null, true);
realizedMesh.position = mesh.position.clone();
if (mesh.rotationQuaternion) {
realizedMesh.rotationQuaternion = mesh.rotationQuaternion.clone();
} else {
realizedMesh.rotation = mesh.rotation.clone();
}
realizedMesh.scaling = mesh.scaling.clone();
realizedMesh.parent = mesh.parent;
mesh.dispose();
this.engine.scene.removeMesh(mesh);
this.meshes.push(realizedMesh);
}
}
this.floorRootNode = this.loaderResult.transformNodes.find(t => t.name.includes('__FLOOR__'))!;
this.wallRootNode = this.loaderResult.transformNodes.find(t => t.name.includes('__WALL__'))!;
this.beamMesh = this.loaderResult.meshes.find(m => m.name.includes('__BEAM__')) as BABYLON.Mesh;
this.baseboardMesh = this.loaderResult.meshes.find(m => m.name.includes('__BASEBOARD__')) as BABYLON.Mesh;
this.wallARootNode = this.loaderResult.transformNodes.find(t => t.name.includes('__WALL_A__'))!;
this.wallBRootNode = this.loaderResult.transformNodes.find(t => t.name.includes('__WALL_B__'))!;
const baseboardMaterial = findMaterial(this.rootNode, '__BASEBOARD__');
//baseboardMaterial.metadata.disableEnvMap = true;
for (const mesh of this.meshes) {
if (SYSTEM_HEYA_MESH_NAMES.some(name => mesh.name.includes(name))) continue;
mesh.receiveShadows = true;
}
await this.applyOptions(options);
}
private createUnit(options: CustomMadoriEnvOptions, x: number, z: number) {
function indexToPos(index: number): [number, number] {
const z = Math.floor(index / options.dimension[0]);
const x = index % options.dimension[0];
return [x, z];
}
function posToIndex(x: number, z: number): number {
if (x < 0 || z < 0 || x >= options.dimension[0] || z >= options.dimension[1]) return -1;
return x + (options.dimension[0] * z);
}
const unitDef = options.units[posToIndex(x, z)];
if (unitDef == null) return;
const unitZPositiveDef = options.units[posToIndex(x, z + 1)];
const unitZNegativeDef = options.units[posToIndex(x, z - 1)];
const unitXPositiveDef = options.units[posToIndex(x + 1, z)];
const unitXNegativeDef = options.units[posToIndex(x - 1, z)];
const shiftedX = x - (options.dimension[0] / 2) + 0.5;
const unitRoot = new BABYLON.TransformNode(`unit_${x}_${z}`, this.engine.scene);
unitRoot.parent = this.rootNode;
unitRoot.position = new BABYLON.Vector3(cm(100) * shiftedX, 0, cm(100) * z);
const defaultFlooringMaterial = this.floorMaterials[options.flooringMaterials[0].id];
const unitFloorRootNode = this.floorRootNode.clone(`unit_${x}_${z}_floor`, unitRoot)!;
unitFloorRootNode.scaling = new BABYLON.Vector3(-WORLD_SCALE, WORLD_SCALE, WORLD_SCALE);
const flooringMesh = unitFloorRootNode.getChildMeshes().find(m => m.name.includes('__FLOOR__'));
flooringMesh.material = unitDef.flooring?.material != null && this.floorMaterials[unitDef.flooring.material] != null ? this.floorMaterials[unitDef.flooring.material] : defaultFlooringMaterial;
const defaultCeilingMaterial = this.ceilingMaterials[options.ceilingMaterials[0].id];
const ceilingMesh = unitFloorRootNode.getChildMeshes().find(m => m.name.includes('__CEILING__'));
ceilingMesh.material = unitDef.ceiling?.material != null && this.ceilingMaterials[unitDef.ceiling.material] != null ? this.ceilingMaterials[unitDef.ceiling.material] : defaultCeilingMaterial;
const defaultWallMaterial = this.wallMaterials[options.wallMaterials[0].id];
const createWall = (dir: 'zPositive' | 'zNegative' | 'xPositive' | 'xNegative') => {
const wallDef = unitDef.walls?.[dir] ?? {};
const wallRootNode = this.wallRootNode.clone(`unit_${x}_${z}_wall_${dir}`, unitRoot)!;
wallRootNode.scaling = new BABYLON.Vector3(-WORLD_SCALE, WORLD_SCALE, WORLD_SCALE);
switch (dir) {
case 'zPositive':
wallRootNode.rotation = new BABYLON.Vector3(0, Math.PI, 0);
wallRootNode.position = new BABYLON.Vector3(0, 0, cm(50));
break;
case 'zNegative':
wallRootNode.position = new BABYLON.Vector3(0, 0, cm(-50));
break;
case 'xPositive':
wallRootNode.rotation = new BABYLON.Vector3(0, -Math.PI / 2, 0);
wallRootNode.position = new BABYLON.Vector3(cm(50), 0, 0);
break;
case 'xNegative':
wallRootNode.rotation = new BABYLON.Vector3(0, Math.PI / 2, 0);
wallRootNode.position = new BABYLON.Vector3(cm(-50), 0, 0);
break;
}
const beamMesh = wallRootNode.getChildMeshes().find(m => m.name.includes('__BEAM__'));
beamMesh.isVisible = wallDef.withBeam === true;
const baseboardMesh = wallRootNode.getChildMeshes().find(m => m.name.includes('__BASEBOARD__'));
baseboardMesh.isVisible = wallDef.withBaseboard === true;
switch (wallDef.type) {
case 'window': {
const wallNode = this.wallBRootNode.clone('', wallRootNode)!;
const wallMesh = wallNode.getChildMeshes().find(m => m.name.includes('__WALL__'))!;
wallMesh.material = wallDef.material != null && this.wallMaterials[wallDef.material] != null ? this.wallMaterials[wallDef.material] : defaultWallMaterial;
break;
}
case 'door': {
//wallMeshOriginal = this.wallAMesh;
break;
}
default: {
const wallNode = this.wallARootNode.clone('', wallRootNode)!;
const wallMesh = wallNode.getChildMeshes().find(m => m.name.includes('__WALL__'))!;
wallMesh.material = wallDef.material != null && this.wallMaterials[wallDef.material] != null ? this.wallMaterials[wallDef.material] : defaultWallMaterial;
break;
}
}
};
if (unitZPositiveDef == null) createWall('zPositive');
if (unitZNegativeDef == null) createWall('zNegative');
if (unitXPositiveDef == null) createWall('xPositive');
if (unitXNegativeDef == null) createWall('xNegative');
for (const mesh of unitRoot.getChildMeshes()) {
this.meshes.push(mesh);
}
this.registerMeshes(unitRoot.getChildMeshes());
return unitRoot;
}
public setTime(time: number) {
if (this.skyboxMat == null) return;
if (time === 0) {
this.skyboxMat.emissiveColor = new BABYLON.Color3(0.7, 0.9, 1.0);
} else if (time === 1) {
this.skyboxMat.emissiveColor = new BABYLON.Color3(0.8, 0.5, 0.3);
} else {
this.skyboxMat.emissiveColor = new BABYLON.Color3(0.05, 0.05, 0.2);
}
if (this.sunLight != null) {
this.sunLight.diffuse = time === 0 ? new BABYLON.Color3(1.0, 0.9, 0.8) : time === 1 ? new BABYLON.Color3(1.0, 0.8, 0.6) : new BABYLON.Color3(0.6, 0.8, 1.0);
this.sunLight.intensity = time === 0 ? 3 : time === 1 ? 1 : 0.25;
}
}
public applyRoomLight(): void {
if (this.roomLight == null) return;
this.roomLight.diffuse = new BABYLON.Color3(...this.engine.roomState.light.color);
this.roomLight.intensity = 0.0005 * WORLD_SCALE * WORLD_SCALE * this.engine.roomState.light.brightness * (this.isRoomLightOn ? 1 : 0);
if (this.envMapIndoor != null) this.envMapIndoor.level = 0.025 + (0.575 * this.engine.roomState.light.brightness * (this.isRoomLightOn ? 1 : 0));
for (const m of this.engine.scene.materials) {
if (m.metadata?.disableEnvMap) {
m.ambientColor = this.isRoomLightOn ? new BABYLON.Color3(0.5, 0.5, 0.5) : new BABYLON.Color3(0.025, 0.025, 0.025);
}
}
}
public applyOptions(options: CustomMadoriEnvOptions) {
// TODO: 返り値をpromiseにしてちゃんとテクスチャが読み終わってからresolveする
for (const n of this.unitRootNodes) {
if (n != null) n.dispose();
}
this.unitRootNodes = [];
for (let z = 0; z < options.dimension[1]; z++) {
for (let x = 0; x < options.dimension[0]; x++) {
const node = this.createUnit(options, x, z);
this.unitRootNodes.push(node);
}
}
}
public dispose() {
for (const m of this.meshes) {
m.dispose(false, true);
}
this.skybox?.dispose();
this.skyboxMat?.dispose();
this.envMapIndoor?.dispose();
this.roomLight?.dispose();
this.sunLight?.dispose();
if (this.loaderResult != null) {
for (const m of this.loaderResult.meshes) {
m.dispose(false, true);
}
for (const t of this.loaderResult.transformNodes) {
t.dispose(false, true);
}
}
super.dispose();
}
}
@@ -0,0 +1,160 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js';
import { findMaterial, GRAPHICS_QUALITY } from '../../utility.js';
import { SYSTEM_HEYA_MESH_NAMES } from '../utility.js';
import { RoomEnvManager } from '../env.js';
import type { RoomEngine } from '../engine.js';
import type { JapaneseEnvOptions } from 'misskey-world/src/room/env.js';
export class JapaneseEnvManager extends RoomEnvManager<JapaneseEnvOptions> {
private loaderResult: BABYLON.ISceneLoaderAsyncResult | null = null;
private meshes: BABYLON.Mesh[] = [];
private skybox: BABYLON.Mesh | null = null;
private skyboxMat: BABYLON.StandardMaterial | null = null;
private roomLight: BABYLON.SpotLight | null = null;
private sunLight: BABYLON.DirectionalLight | null = null;
public envMapIndoor: BABYLON.CubeTexture | null = null;
public maxCameraZ = cm(1000);
constructor(engine: RoomEngine) {
super(engine);
}
public async load(options: JapaneseEnvOptions) {
this.skybox = BABYLON.MeshBuilder.CreateBox('skybox', { size: cm(1000) }, this.engine.scene);
this.skyboxMat = new BABYLON.StandardMaterial('skyboxMat', this.engine.scene);
this.skyboxMat.backFaceCulling = false;
this.skyboxMat.disableLighting = true;
this.skybox.material = this.skyboxMat;
this.skybox.infiniteDistance = true;
this.roomLight = new BABYLON.SpotLight('env:RoomLight', new BABYLON.Vector3(0, cm(249), 0), new BABYLON.Vector3(0, -1, 0), 16, 8, this.engine.scene);
this.roomLight.shadowMinZ = cm(10);
this.roomLight.shadowMaxZ = cm(300);
this.roomLight.radius = cm(30);
this.applyRoomLight();
if (this.engine.graphicsQuality >= GRAPHICS_QUALITY.MEDIUM) {
const shadowGeneratorForRoomLight = new BABYLON.ShadowGenerator(this.engine.graphicsQuality <= GRAPHICS_QUALITY.MEDIUM ? 1024 : 2048, this.roomLight);
shadowGeneratorForRoomLight.forceBackFacesOnly = true;
shadowGeneratorForRoomLight.bias = 0.0005;
shadowGeneratorForRoomLight.usePercentageCloserFiltering = true;
shadowGeneratorForRoomLight.filteringQuality = BABYLON.ShadowGenerator.QUALITY_HIGH;
//shadowGeneratorForRoomLight.useContactHardeningShadow = true;
//shadowGeneratorForRoomLight.contactHardeningLightSizeUVRatio = 0.01;
this.registerShadowGenerator(shadowGeneratorForRoomLight);
}
if (this.engine.graphicsQuality >= GRAPHICS_QUALITY.MEDIUM) {
this.sunLight = new BABYLON.DirectionalLight('env:SunLight', new BABYLON.Vector3(0.2, -1, -1), this.engine.scene);
this.sunLight.position = new BABYLON.Vector3(cm(-20), cm(1000), cm(1000));
this.sunLight.shadowMinZ = cm(1000);
this.sunLight.shadowMaxZ = cm(2000);
const shadowGeneratorForSunLight = new BABYLON.ShadowGenerator(this.engine.graphicsQuality <= GRAPHICS_QUALITY.MEDIUM ? 1024 : 2048, this.sunLight);
shadowGeneratorForSunLight.forceBackFacesOnly = true;
shadowGeneratorForSunLight.bias = 0.00001;
shadowGeneratorForSunLight.usePercentageCloserFiltering = true;
shadowGeneratorForSunLight.usePoissonSampling = true;
this.registerShadowGenerator(shadowGeneratorForSunLight);
}
this.loaderResult = await BABYLON.ImportMeshAsync('/client-assets/room/envs/japanese/japanese.glb', this.engine.scene);
this.envMapIndoor = BABYLON.CubeTexture.CreateFromPrefilteredData('/client-assets/room/indoor.env', this.engine.scene);
this.envMapIndoor.boundingBoxSize = new BABYLON.Vector3(cm(500), cm(500), cm(500));
this.meshes = this.loaderResult.meshes.filter(m => m instanceof BABYLON.Mesh);
this.meshes[0].scaling = this.meshes[0].scaling.scale(WORLD_SCALE);
this.meshes[0].rotationQuaternion = null;
this.meshes[0].rotation = new BABYLON.Vector3(0, 0, 0);
// instanced mesh を通常の mesh に変換 (そうしないとマテリアルが共有される)
for (const mesh of this.loaderResult.meshes) {
if (mesh instanceof BABYLON.InstancedMesh) {
const realizedMesh = mesh.sourceMesh.clone(mesh.name, null, true);
realizedMesh.position = mesh.position.clone();
if (mesh.rotationQuaternion) {
realizedMesh.rotationQuaternion = mesh.rotationQuaternion.clone();
} else {
realizedMesh.rotation = mesh.rotation.clone();
}
realizedMesh.scaling = mesh.scaling.clone();
realizedMesh.parent = mesh.parent;
mesh.dispose();
this.engine.scene.removeMesh(mesh);
this.meshes.push(realizedMesh);
}
}
for (const mesh of this.meshes) {
if (SYSTEM_HEYA_MESH_NAMES.some(name => mesh.name.includes(name))) continue;
mesh.receiveShadows = true;
this.addShadowCaster(mesh);
}
await this.applyOptions(options);
}
public setTime(time: number) {
if (this.skyboxMat == null) return;
if (time === 0) {
this.skyboxMat.emissiveColor = new BABYLON.Color3(0.7, 0.9, 1.0);
} else if (time === 1) {
this.skyboxMat.emissiveColor = new BABYLON.Color3(0.8, 0.5, 0.3);
} else {
this.skyboxMat.emissiveColor = new BABYLON.Color3(0.05, 0.05, 0.2);
}
if (this.sunLight != null) {
this.sunLight.diffuse = time === 0 ? new BABYLON.Color3(1.0, 0.9, 0.8) : time === 1 ? new BABYLON.Color3(1.0, 0.8, 0.6) : new BABYLON.Color3(0.6, 0.8, 1.0);
this.sunLight.intensity = time === 0 ? 3 : time === 1 ? 1 : 0.25;
}
}
public applyRoomLight(): void {
if (this.roomLight == null) return;
this.roomLight.diffuse = new BABYLON.Color3(...this.engine.roomState.light.color);
this.roomLight.intensity = 18 * WORLD_SCALE * WORLD_SCALE * this.engine.roomState.light.brightness * (this.isRoomLightOn ? 1 : 0);
if (this.envMapIndoor != null) this.envMapIndoor.level = 0.025 + (0.575 * this.engine.roomState.light.brightness * (this.isRoomLightOn ? 1 : 0));
for (const m of this.engine.scene.materials) {
if (m.metadata?.disableEnvMap) {
m.ambientColor = this.isRoomLightOn ? new BABYLON.Color3(0.5, 0.5, 0.5) : new BABYLON.Color3(0.025, 0.025, 0.025);
}
}
}
public applyOptions(options: JapaneseEnvOptions) {
this.registerMeshes(this.meshes);
}
public dispose() {
for (const m of this.meshes) {
m.dispose(false, true);
}
this.skybox?.dispose();
this.skyboxMat?.dispose();
this.envMapIndoor?.dispose();
this.roomLight?.dispose();
this.sunLight?.dispose();
if (this.loaderResult != null) {
for (const m of this.loaderResult.meshes) {
m.dispose(false, true);
}
for (const t of this.loaderResult.transformNodes) {
t.dispose(false, true);
}
}
super.dispose();
}
}
@@ -0,0 +1,136 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js';
import { findMaterial, GRAPHICS_QUALITY } from '../../utility.js';
import { SYSTEM_HEYA_MESH_NAMES } from '../utility.js';
import { RoomEnvManager } from '../env.js';
import type { RoomEngine } from '../engine.js';
import type { MuseumEnvOptions } from 'misskey-world/src/room/env.js';
export class MuseumEnvManager extends RoomEnvManager<MuseumEnvOptions> {
private loaderResult: BABYLON.ISceneLoaderAsyncResult | null = null;
private meshes: BABYLON.Mesh[] = [];
private roomLight: BABYLON.DirectionalLight | null = null;
private subRoomLights: BABYLON.SpotLight[] = [];
public envMapIndoor: BABYLON.CubeTexture | null = null;
public maxCameraZ = cm(3000);
constructor(engine: RoomEngine) {
super(engine);
}
public async load(options: MuseumEnvOptions) {
this.loaderResult = await BABYLON.ImportMeshAsync('/client-assets/room/envs/museum/museum.glb', this.engine.scene);
this.envMapIndoor = BABYLON.CubeTexture.CreateFromPrefilteredData('/client-assets/room/indoor.env', this.engine.scene);
this.envMapIndoor.boundingBoxSize = new BABYLON.Vector3(cm(2000), cm(500), cm(2000));
this.meshes = this.loaderResult.meshes.filter(m => m instanceof BABYLON.Mesh);
this.meshes[0].scaling = this.meshes[0].scaling.scale(WORLD_SCALE);
this.meshes[0].rotationQuaternion = null;
this.meshes[0].rotation = new BABYLON.Vector3(0, 0, 0);
// instanced mesh を通常の mesh に変換 (そうしないとマテリアルが共有される)
for (const mesh of this.loaderResult.meshes) {
if (mesh instanceof BABYLON.InstancedMesh) {
const realizedMesh = mesh.sourceMesh.clone(mesh.name, null, true);
realizedMesh.position = mesh.position.clone();
if (mesh.rotationQuaternion) {
realizedMesh.rotationQuaternion = mesh.rotationQuaternion.clone();
} else {
realizedMesh.rotation = mesh.rotation.clone();
}
realizedMesh.scaling = mesh.scaling.clone();
realizedMesh.parent = mesh.parent;
mesh.dispose();
this.engine.scene.removeMesh(mesh);
this.meshes.push(realizedMesh);
}
}
this.roomLight = new BABYLON.DirectionalLight('env:RoomLight', new BABYLON.Vector3(0, -1, 0), this.engine.scene);
this.roomLight.position = new BABYLON.Vector3(0, cm(300), 0);
this.roomLight.shadowMinZ = cm(10);
this.roomLight.shadowMaxZ = cm(500);
this.roomLight.radius = cm(30);
if (this.engine.graphicsQuality >= GRAPHICS_QUALITY.MEDIUM) {
const shadowGeneratorForRoomLight = new BABYLON.ShadowGenerator(this.engine.graphicsQuality <= GRAPHICS_QUALITY.MEDIUM ? 1024 : 2048, this.roomLight);
shadowGeneratorForRoomLight.forceBackFacesOnly = true;
shadowGeneratorForRoomLight.bias = 0.00001;
shadowGeneratorForRoomLight.normalBias = 0.005;
shadowGeneratorForRoomLight.usePercentageCloserFiltering = true;
shadowGeneratorForRoomLight.filteringQuality = BABYLON.ShadowGenerator.QUALITY_HIGH;
//this.shadowGeneratorForRoomLight.useContactHardeningShadow = true;
this.registerShadowGenerator(shadowGeneratorForRoomLight);
}
for (const node of this.meshes.filter(mesh => mesh.name.includes('__LIGHT__'))) {
const light = new BABYLON.SpotLight('env:SubRoomLight', node.position, new BABYLON.Vector3(0, -1, 0), 16, 8, this.engine.scene, true);
light.range = cm(500);
light.radius = cm(15);
light.parent = this.meshes[0];
this.engine.lightContainer.addLight(light);
this.subRoomLights.push(light);
}
this.applyRoomLight();
for (const mesh of this.meshes) {
if (SYSTEM_HEYA_MESH_NAMES.some(name => mesh.name.includes(name))) continue;
mesh.receiveShadows = true;
//this.addShadowCaster(mesh);
}
await this.applyOptions(options);
}
public setTime(time: number) {
}
public applyRoomLight(): void {
if (this.roomLight == null) return;
this.roomLight.diffuse = new BABYLON.Color3(...this.engine.roomState.light.color);
this.roomLight.intensity = 0.00005 * WORLD_SCALE * WORLD_SCALE * this.engine.roomState.light.brightness * (this.isRoomLightOn ? 1 : 0);
for (const subLight of this.subRoomLights) {
subLight.diffuse = new BABYLON.Color3(...this.engine.roomState.light.color);
subLight.intensity = 20 * WORLD_SCALE * WORLD_SCALE * this.engine.roomState.light.brightness * (this.isRoomLightOn ? 1 : 0);
}
if (this.envMapIndoor != null) this.envMapIndoor.level = 0.025 + (0.175 * this.engine.roomState.light.brightness * (this.isRoomLightOn ? 1 : 0));
for (const m of this.engine.scene.materials) {
if (m.metadata?.disableEnvMap) {
m.ambientColor = this.isRoomLightOn ? new BABYLON.Color3(0.5, 0.5, 0.5) : new BABYLON.Color3(0.025, 0.025, 0.025);
}
}
}
public applyOptions(options: MuseumEnvOptions) {
this.registerMeshes(this.meshes);
}
public dispose() {
this.envMapIndoor?.dispose();
this.roomLight?.dispose();
for (const subLight of this.subRoomLights) {
subLight.dispose();
}
if (this.loaderResult != null) {
for (const m of this.loaderResult.meshes) {
m.dispose(false, true);
}
for (const t of this.loaderResult.transformNodes) {
t.dispose(false, true);
}
}
for (const m of this.meshes) {
m.dispose(false, true);
}
super.dispose();
}
}
@@ -0,0 +1,474 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js';
import { findMaterial, GRAPHICS_QUALITY, treeClone } from '../../utility.js';
import { SYSTEM_HEYA_MESH_NAMES } from '../utility.js';
import { RoomEnvManager } from '../env.js';
import type { RoomEngine } from '../engine.js';
import type { SimpleEnvOptions } from 'misskey-world/src/room/env.js';
// TODO: マテリアルは必要になるまで作成しないようにする
export class SimpleEnvManager extends RoomEnvManager<SimpleEnvOptions> {
private loaderResult: BABYLON.ISceneLoaderAsyncResult | null = null;
private rootNode: BABYLON.TransformNode;
private wallRoots: Record<'zPositive' | 'zNegative' | 'xPositive' | 'xNegative', BABYLON.TransformNode>;
private wallScalingContainers: Record<'zPositive' | 'zNegative' | 'xPositive' | 'xNegative', BABYLON.TransformNode>;
private wallMaterials: Record<'zPositive' | 'zNegative' | 'xPositive' | 'xNegative', BABYLON.PBRMaterial>;
private wallBeamMaterials: Record<'zPositive' | 'zNegative' | 'xPositive' | 'xNegative', BABYLON.PBRMaterial>;
private pillarRoots: Record<'zp_xp' | 'zp_xn' | 'zn_xp' | 'zn_xn', BABYLON.TransformNode>;
private pillarScalingContainers: Record<'zp_xp' | 'zp_xn' | 'zn_xp' | 'zn_xn', BABYLON.TransformNode>;
private pillarMaterials: Record<'zp_xp' | 'zp_xn' | 'zn_xp' | 'zn_xn', BABYLON.PBRMaterial>;
private ceilingMaterial: BABYLON.PBRMaterial;
private floorMaterial: BABYLON.PBRMaterial;
private skybox: BABYLON.Mesh | null = null;
private skyboxMat: BABYLON.StandardMaterial | null = null;
private roomLight: BABYLON.SpotLight | null = null;
private sunLight: BABYLON.DirectionalLight | null = null;
public envMapIndoor: BABYLON.CubeTexture | null = null;
public maxCameraZ = cm(1000);
constructor(engine: RoomEngine) {
super(engine);
this.rootNode = new BABYLON.TransformNode('simpleEnvRoot', this.engine.scene);
this.wallRoots = {
zPositive: new BABYLON.TransformNode('wallRootZPositive', this.engine.scene),
zNegative: new BABYLON.TransformNode('wallRootZNegative', this.engine.scene),
xPositive: new BABYLON.TransformNode('wallRootXPositive', this.engine.scene),
xNegative: new BABYLON.TransformNode('wallRootXNegative', this.engine.scene),
};
this.wallRoots.zPositive.parent = this.rootNode;
this.wallRoots.zPositive.position.z = cm(150);
this.wallRoots.zPositive.rotation.y = Math.PI;
this.wallRoots.zNegative.parent = this.rootNode;
this.wallRoots.zNegative.position.z = -cm(150);
this.wallRoots.xPositive.parent = this.rootNode;
this.wallRoots.xPositive.position.x = cm(150);
this.wallRoots.xPositive.rotation.y = -Math.PI / 2;
this.wallRoots.xNegative.parent = this.rootNode;
this.wallRoots.xNegative.position.x = -cm(150);
this.wallRoots.xNegative.rotation.y = Math.PI / 2;
this.wallScalingContainers = {
zPositive: new BABYLON.TransformNode('wallScalingContainerZPositive', this.engine.scene),
zNegative: new BABYLON.TransformNode('wallScalingContainerZNegative', this.engine.scene),
xPositive: new BABYLON.TransformNode('wallScalingContainerXPositive', this.engine.scene),
xNegative: new BABYLON.TransformNode('wallScalingContainerXNegative', this.engine.scene),
};
for (const [k, v] of Object.entries(this.wallScalingContainers)) {
v.parent = this.wallRoots[k as keyof typeof this.wallRoots];
v.scaling = new BABYLON.Vector3(-WORLD_SCALE, WORLD_SCALE, WORLD_SCALE);
}
this.pillarRoots = {
zp_xp: new BABYLON.TransformNode('pillarRootZpXp', this.engine.scene),
zp_xn: new BABYLON.TransformNode('pillarRootZpXn', this.engine.scene),
zn_xp: new BABYLON.TransformNode('pillarRootZnXp', this.engine.scene),
zn_xn: new BABYLON.TransformNode('pillarRootZnXn', this.engine.scene),
};
this.pillarRoots.zp_xp.parent = this.rootNode;
this.pillarRoots.zp_xp.position = new BABYLON.Vector3(cm(150), 0, cm(150));
this.pillarRoots.zp_xp.rotation.y = -Math.PI / 2;
this.pillarRoots.zp_xn.parent = this.rootNode;
this.pillarRoots.zp_xn.position = new BABYLON.Vector3(-cm(150), 0, cm(150));
this.pillarRoots.zp_xn.rotation.y = Math.PI;
this.pillarRoots.zn_xp.parent = this.rootNode;
this.pillarRoots.zn_xp.position = new BABYLON.Vector3(cm(150), 0, -cm(150));
this.pillarRoots.zn_xp.rotation.y = 0;
this.pillarRoots.zn_xn.parent = this.rootNode;
this.pillarRoots.zn_xn.position = new BABYLON.Vector3(-cm(150), 0, -cm(150));
this.pillarRoots.zn_xn.rotation.y = Math.PI / 2;
this.pillarScalingContainers = {
zp_xp: new BABYLON.TransformNode('pillarScalingContainerZpXp', this.engine.scene),
zp_xn: new BABYLON.TransformNode('pillarScalingContainerZpXn', this.engine.scene),
zn_xp: new BABYLON.TransformNode('pillarScalingContainerZnXp', this.engine.scene),
zn_xn: new BABYLON.TransformNode('pillarScalingContainerZnXn', this.engine.scene),
};
for (const [k, v] of Object.entries(this.pillarScalingContainers)) {
v.parent = this.pillarRoots[k as keyof typeof this.pillarRoots];
v.scaling = new BABYLON.Vector3(-WORLD_SCALE, WORLD_SCALE, WORLD_SCALE);
}
const wallMaterial = new BABYLON.PBRMaterial('wallMaterial', this.engine.scene);
wallMaterial.albedoColor = new BABYLON.Color3(0.8, 0.8, 0.8);
wallMaterial.roughness = 0.7;
wallMaterial.metallic = 0;
this.wallMaterials = {
zPositive: wallMaterial.clone('wallZPositiveMaterial'),
zNegative: wallMaterial.clone('wallZNegativeMaterial'),
xPositive: wallMaterial.clone('wallXPositiveMaterial'),
xNegative: wallMaterial.clone('wallXNegativeMaterial'),
};
const beamMaterial = wallMaterial.clone('beamMaterial');
this.wallBeamMaterials = {
zPositive: beamMaterial.clone('beamZPositiveMaterial'),
zNegative: beamMaterial.clone('beamZNegativeMaterial'),
xPositive: beamMaterial.clone('beamXPositiveMaterial'),
xNegative: beamMaterial.clone('beamXNegativeMaterial'),
};
const pillarMaterial = wallMaterial.clone('pillarMaterial');
this.pillarMaterials = {
zp_xp: pillarMaterial.clone('pillarMaterialZpXp'),
zp_xn: pillarMaterial.clone('pillarMaterialZpXn'),
zn_xp: pillarMaterial.clone('pillarMaterialZnXp'),
zn_xn: pillarMaterial.clone('pillarMaterialZnXn'),
};
this.ceilingMaterial = new BABYLON.PBRMaterial('ceilingMaterial', this.engine.scene);
this.ceilingMaterial.albedoColor = new BABYLON.Color3(0.8, 0.8, 0.8);
this.ceilingMaterial.roughness = 0.7;
this.ceilingMaterial.metallic = 0;
this.floorMaterial = new BABYLON.PBRMaterial('floorMaterial', this.engine.scene);
this.floorMaterial.albedoColor = new BABYLON.Color3(0.8, 0.8, 0.8);
this.floorMaterial.roughness = 0.7;
this.floorMaterial.metallic = 0;
const baseboardMaterial = new BABYLON.PBRMaterial('baseboardMaterial', this.engine.scene);
baseboardMaterial.albedoColor = new BABYLON.Color3(0.8, 0.8, 0.8);
baseboardMaterial.roughness = 0.7;
baseboardMaterial.metallic = 0;
this.skybox = BABYLON.MeshBuilder.CreateBox('skybox', { size: cm(1000) }, this.engine.scene);
this.skyboxMat = new BABYLON.StandardMaterial('skyboxMat', this.engine.scene);
this.skyboxMat.backFaceCulling = false;
this.skyboxMat.disableLighting = true;
this.skybox.material = this.skyboxMat;
this.skybox.infiniteDistance = true;
this.roomLight = new BABYLON.SpotLight('env:RoomLight', new BABYLON.Vector3(0, cm(249), 0), new BABYLON.Vector3(0, -1, 0), 16, 8, this.engine.scene);
this.roomLight.shadowMinZ = cm(10);
this.roomLight.shadowMaxZ = cm(300);
this.roomLight.radius = cm(30);
this.applyRoomLight();
if (this.engine.graphicsQuality >= GRAPHICS_QUALITY.MEDIUM) {
const shadowGeneratorForRoomLight = new BABYLON.ShadowGenerator(this.engine.graphicsQuality <= GRAPHICS_QUALITY.MEDIUM ? 1024 : 2048, this.roomLight);
shadowGeneratorForRoomLight.forceBackFacesOnly = true;
shadowGeneratorForRoomLight.bias = 0.0005;
shadowGeneratorForRoomLight.usePercentageCloserFiltering = true;
shadowGeneratorForRoomLight.filteringQuality = BABYLON.ShadowGenerator.QUALITY_HIGH;
//shadowGeneratorForRoomLight.useContactHardeningShadow = true;
//shadowGeneratorForRoomLight.contactHardeningLightSizeUVRatio = 0.01;
this.registerShadowGenerator(shadowGeneratorForRoomLight);
}
if (this.engine.graphicsQuality >= GRAPHICS_QUALITY.MEDIUM) {
this.sunLight = new BABYLON.DirectionalLight('env:SunLight', new BABYLON.Vector3(0.2, -1, -1), this.engine.scene);
this.sunLight.position = new BABYLON.Vector3(cm(-20), cm(1000), cm(1000));
this.sunLight.shadowMinZ = cm(1000);
this.sunLight.shadowMaxZ = cm(2000);
const shadowGeneratorForSunLight = new BABYLON.ShadowGenerator(this.engine.graphicsQuality <= GRAPHICS_QUALITY.MEDIUM ? 1024 : 2048, this.sunLight);
shadowGeneratorForSunLight.forceBackFacesOnly = true;
shadowGeneratorForSunLight.bias = 0.00001;
shadowGeneratorForSunLight.usePercentageCloserFiltering = true;
shadowGeneratorForSunLight.usePoissonSampling = true;
this.registerShadowGenerator(shadowGeneratorForSunLight);
}
this.envMapIndoor = BABYLON.CubeTexture.CreateFromPrefilteredData('/client-assets/room/indoor.env', this.engine.scene);
this.envMapIndoor.boundingBoxSize = new BABYLON.Vector3(cm(500), cm(500), cm(500));
}
public async load(options: SimpleEnvOptions) {
this.loaderResult = await BABYLON.LoadAssetContainerAsync('/client-assets/room/envs/simple/300.glb', this.engine.scene);
const collisionScalingContainer = new BABYLON.TransformNode('collisionScalingContainer', this.engine.scene);
collisionScalingContainer.scaling = new BABYLON.Vector3(-WORLD_SCALE, WORLD_SCALE, WORLD_SCALE);
collisionScalingContainer.parent = this.rootNode;
const collision = this.loaderResult.meshes.find(m => m.name.includes('__COLLISION__'))!;
collision.parent = collisionScalingContainer;
const lightBlockerScalingContainer = new BABYLON.TransformNode('lightBlockerScalingContainer', this.engine.scene);
lightBlockerScalingContainer.scaling = new BABYLON.Vector3(-WORLD_SCALE, WORLD_SCALE, WORLD_SCALE);
lightBlockerScalingContainer.parent = this.rootNode;
const lightBlocker = this.loaderResult.meshes.find(m => m.name.includes('__LIGHT_BLOCKER__'))!;
lightBlocker.parent = lightBlockerScalingContainer;
lightBlocker.rotationQuaternion = null;
lightBlocker.rotation.y = Math.PI;
const originalFloorRoot = this.loaderResult.transformNodes.find(t => t.name.includes('__FLOOR__'))!;
originalFloorRoot.scaling = new BABYLON.Vector3(-WORLD_SCALE, WORLD_SCALE, WORLD_SCALE);
originalFloorRoot.parent = this.rootNode;
for (const child of originalFloorRoot.getChildMeshes()) {
if (child.material.name.includes('__FLOOR__')) {
child.material = this.floorMaterial;
}
}
const originalCeilingRoot = this.loaderResult.transformNodes.find(t => t.name.includes('__CEILING__'))!;
originalCeilingRoot.scaling = new BABYLON.Vector3(-WORLD_SCALE, WORLD_SCALE, WORLD_SCALE);
originalCeilingRoot.position.y = cm(250);
originalCeilingRoot.parent = this.rootNode;
for (const child of originalCeilingRoot.getChildMeshes()) {
if (child.material.name.includes('__CEILING__')) {
child.material = this.ceilingMaterial;
}
}
await this.applyOptions(options);
}
public applyOptions(options: SimpleEnvOptions) {
// clean up
for (const type of ['zPositive', 'zNegative', 'xPositive', 'xNegative'] as const) {
const wallRoot = this.wallScalingContainers[type];
for (const mesh of wallRoot.getChildMeshes()) {
mesh.dispose();
this.engine.scene.removeMesh(mesh);
this.removeShadowCaster(mesh);
}
}
for (const type of ['zp_xp', 'zp_xn', 'zn_xp', 'zn_xn'] as const) {
const pillarRoot = this.pillarScalingContainers[type];
for (const mesh of pillarRoot.getChildMeshes()) {
mesh.dispose();
this.engine.scene.removeMesh(mesh);
this.removeShadowCaster(mesh);
}
}
// TODO: 返り値をpromiseにしてちゃんとテクスチャが読み終わってからresolveする
for (const type of ['zPositive', 'zNegative', 'xPositive', 'xNegative'] as const) {
const wallRoot = this.wallScalingContainers[type];
const wallOptions = options.walls[type];
const originalRoot =
type === 'zPositive' ?
options.window === 'kosidakamado' ? this.loaderResult!.transformNodes.find(t => t.name.includes('__WALL_KOSIDAKAMADO__'))! :
options.window === 'demado' ? this.loaderResult!.transformNodes.find(t => t.name.includes('__WALL_DEMADO__'))! :
this.loaderResult!.transformNodes.find(t => t.name.includes('__WALL__'))!
: type === 'zNegative'
? this.loaderResult!.transformNodes.find(t => t.name.includes('__WALL_DOOR__'))!
: this.loaderResult!.transformNodes.find(t => t.name.includes('__WALL__'))!;
for (const child of treeClone(originalRoot).getChildren()) {
child.parent = wallRoot;
}
for (const child of wallRoot.getChildMeshes()) {
if (child.material.name.includes('__WALL__')) {
child.material = this.wallMaterials[type];
} else if (child.material.name.includes('__BEAM__')) {
child.material = this.wallBeamMaterials[type];
}
}
for (const mesh of wallRoot.getChildMeshes()) {
if (mesh.name.includes('__BEAM__')) {
mesh.setEnabled(wallOptions.withBeam);
} else if (mesh.name.includes('__BASEBOARD__')) {
mesh.setEnabled(wallOptions.withBaseboard);
}
}
{
const targetMaterial = this.wallMaterials[type];
targetMaterial.unfreeze();
targetMaterial.albedoColor = new BABYLON.Color3(...wallOptions.color);
const texPath = wallOptions.material === 'wood' ? '/client-assets/room/textures/wall-wood2.png'
: wallOptions.material === 'concrete' ? '/client-assets/room/textures/concrete1.png'
: null;
if (texPath != null) {
const tex = new BABYLON.Texture(texPath, this.engine.scene, false, false);
tex.wrapU = BABYLON.Texture.WRAP_ADDRESSMODE;
tex.wrapV = BABYLON.Texture.WRAP_ADDRESSMODE;
targetMaterial.albedoTexture = tex;
} else {
targetMaterial.albedoTexture = null;
}
targetMaterial.freeze();
}
{
const targetMaterial = this.wallBeamMaterials[type];
targetMaterial.unfreeze();
targetMaterial.albedoColor = new BABYLON.Color3(...wallOptions.beamColor);
const texPath = wallOptions.beamMaterial === 'wood' ? '/client-assets/room/textures/wall-wood2.png'
: wallOptions.beamMaterial === 'concrete' ? '/client-assets/room/textures/concrete1.png'
: null;
if (texPath != null) {
const tex = new BABYLON.Texture(texPath, this.engine.scene, false, false);
targetMaterial.albedoTexture = tex;
} else {
targetMaterial.albedoTexture = null;
}
targetMaterial.freeze();
}
}
for (const type of ['zp_xp', 'zp_xn', 'zn_xp', 'zn_xn'] as const) {
const pillarRoot = this.pillarScalingContainers[type];
const pillarOptions = options.pillars[type];
let isEnabled = pillarOptions.show;
if (!isEnabled) {
// 梁同士が直交することは許さない(z-fightingが発生する)ので柱を強制追加
if (type === 'zp_xp') {
isEnabled = options.walls.zPositive.withBeam && options.walls.xPositive.withBeam;
} else if (type === 'zp_xn') {
isEnabled = options.walls.zPositive.withBeam && options.walls.xNegative.withBeam;
} else if (type === 'zn_xp') {
isEnabled = options.walls.zNegative.withBeam && options.walls.xPositive.withBeam;
} else if (type === 'zn_xn') {
isEnabled = options.walls.zNegative.withBeam && options.walls.xNegative.withBeam;
}
}
if (!isEnabled) continue;
const originalRoot = this.loaderResult!.transformNodes.find(t => t.name.includes('__PILLAR__'))!;
for (const child of treeClone(originalRoot).getChildren()) {
child.parent = pillarRoot;
}
for (const child of pillarRoot.getChildMeshes()) {
if (child.material.name.includes('__PILLAR__')) {
child.material = this.pillarMaterials[type];
}
}
{
const targetMaterial = this.pillarMaterials[type];
targetMaterial.unfreeze();
targetMaterial.albedoColor = new BABYLON.Color3(...pillarOptions.color);
const texPath = pillarOptions.material === 'wood' ? '/client-assets/room/textures/wall-wood2.png'
: pillarOptions.material === 'concrete' ? '/client-assets/room/textures/concrete1.png'
: null;
if (texPath != null) {
const tex = new BABYLON.Texture(texPath, this.engine.scene, false, false);
targetMaterial.albedoTexture = tex;
} else {
targetMaterial.albedoTexture = null;
}
targetMaterial.freeze();
}
}
{
this.ceilingMaterial.unfreeze();
this.ceilingMaterial.albedoColor = new BABYLON.Color3(...options.ceiling.color);
const texPath = options.ceiling.material === 'wood' ? '/client-assets/room/textures/ceiling-wood.png'
: options.ceiling.material === 'concrete' ? '/client-assets/room/textures/concrete3.png'
: null;
if (texPath != null) {
const tex = new BABYLON.Texture(texPath, this.engine.scene, false, false);
this.ceilingMaterial.albedoTexture = tex;
} else {
this.ceilingMaterial.albedoTexture = null;
}
this.ceilingMaterial.freeze();
}
{
this.floorMaterial.unfreeze();
this.floorMaterial.albedoColor = new BABYLON.Color3(...options.flooring.color);
const texPath = options.flooring.material === 'wood' ? '/client-assets/room/textures/flooring-wood.png'
: options.flooring.material === 'concrete' ? '/client-assets/room/textures/concrete3.png'
: null;
if (texPath != null) {
const tex = new BABYLON.Texture(texPath, this.engine.scene, false, false);
this.floorMaterial.albedoTexture = tex;
} else {
this.floorMaterial.albedoTexture = null;
}
this.floorMaterial.freeze();
}
for (const mesh of this.rootNode.getChildMeshes()) {
if (SYSTEM_HEYA_MESH_NAMES.some(name => mesh.name.includes(name))) continue;
mesh.receiveShadows = true;
//if (mesh.material !== this.floorMaterial) { // 床は他の何にも影を落とさないことが確定している
this.addShadowCaster(mesh);
//}
}
this.registerMeshes(this.rootNode.getChildMeshes());
}
public setTime(time: number) {
if (this.skyboxMat == null) return;
if (time === 0) {
this.skyboxMat.emissiveColor = new BABYLON.Color3(0.7, 0.9, 1.0);
} else if (time === 1) {
this.skyboxMat.emissiveColor = new BABYLON.Color3(0.8, 0.5, 0.3);
} else {
this.skyboxMat.emissiveColor = new BABYLON.Color3(0.05, 0.05, 0.2);
}
if (this.sunLight != null) {
this.sunLight.diffuse = time === 0 ? new BABYLON.Color3(1.0, 0.9, 0.8) : time === 1 ? new BABYLON.Color3(1.0, 0.8, 0.6) : new BABYLON.Color3(0.6, 0.8, 1.0);
this.sunLight.intensity = time === 0 ? 3 : time === 1 ? 1 : 0.25;
}
}
public applyRoomLight(): void {
if (this.roomLight == null) return;
this.roomLight.diffuse = new BABYLON.Color3(...this.engine.roomState.light.color);
this.roomLight.intensity = 18 * WORLD_SCALE * WORLD_SCALE * this.engine.roomState.light.brightness * (this.isRoomLightOn ? 1 : 0);
if (this.envMapIndoor != null) this.envMapIndoor.level = 0.025 + (0.575 * this.engine.roomState.light.brightness * (this.isRoomLightOn ? 1 : 0));
for (const m of this.engine.scene.materials) {
if (m.metadata?.disableEnvMap) {
m.ambientColor = this.isRoomLightOn ? new BABYLON.Color3(0.5, 0.5, 0.5) : new BABYLON.Color3(0.025, 0.025, 0.025);
}
}
}
public dispose() {
for (const m of this.rootNode.getChildMeshes()) {
m.dispose(false, true);
}
for (const m of Object.values(this.wallMaterials ?? {})) {
m.dispose();
}
for (const m of Object.values(this.wallBeamMaterials ?? {})) {
m.dispose();
}
for (const m of Object.values(this.pillarMaterials ?? {})) {
m.dispose();
}
this.skybox?.dispose();
this.skyboxMat?.dispose();
this.envMapIndoor?.dispose();
this.roomLight?.dispose();
this.sunLight?.dispose();
if (this.loaderResult != null) {
for (const m of this.loaderResult.meshes) {
m.dispose(false, true);
}
for (const t of this.loaderResult.transformNodes) {
t.dispose(false, true);
}
}
super.dispose();
}
}
@@ -0,0 +1,247 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { a4Case } from './furnitures/a4Case.js';
import { aircon } from './furnitures/aircon.js';
import { allInOnePc } from './furnitures/allInOnePc.js';
import { aquarium } from './furnitures/aquarium.js';
import { aromaReedDiffuser } from './furnitures/aromaReedDiffuser.js';
import { banknote } from './furnitures/banknote.js';
import { beamLamp } from './furnitures/beamLamp.js';
import { bed } from './furnitures/bed.js';
import { blind } from './furnitures/blind.js';
import { book } from './furnitures/book.js';
import { books } from './furnitures/books.js';
import { boxWallShelf } from './furnitures/boxWallShelf.js';
import { cactusS } from './furnitures/cactusS.js';
import { cardboardBox } from './furnitures/cardboardBox.js';
import { ceilingFanLight } from './furnitures/ceilingFanLight.js';
import { chair } from './furnitures/chair.js';
import { clippedPicture } from './furnitures/clippedPicture.js';
import { coffeeCup } from './furnitures/coffeeCup.js';
import { colorBox } from './furnitures/colorBox.js';
import { cuboid } from './furnitures/cuboid.js';
import { cupNoodle } from './furnitures/cupNoodle.js';
import { curtain } from './furnitures/curtain.js';
import { custardPudding } from './furnitures/custardPudding.js';
import { debugHipoly } from './furnitures/debugHipoly.js';
import { debugMetal } from './furnitures/debugMetal.js';
import { descriptionPlate } from './furnitures/descriptionPlate.js';
import { desk } from './furnitures/desk.js';
import { desktopPc } from './furnitures/desktopPc.js';
import { djMixer } from './furnitures/djMixer.js';
import { djPlayer } from './furnitures/djPlayer.js';
import { ductRailSpotLights } from './furnitures/ductRailSpotLights.js';
import { ductTape } from './furnitures/ductTape.js';
import { electronicDisplayBoard } from './furnitures/electronicDisplayBoard.js';
import { emptyBento } from './furnitures/emptyBento.js';
import { energyDrink } from './furnitures/energyDrink.js';
import { envelope } from './furnitures/envelope.js';
import { facialTissue } from './furnitures/facialTissue.js';
import { glassCylinderPotPlant } from './furnitures/glassCylinderPotPlant.js';
import { handheldGameConsole } from './furnitures/handheldGameConsole.js';
import { hangingDuctRail } from './furnitures/hangingDuctRail.js';
import { hangingTShirt } from './furnitures/hangingTShirt.js';
import { icosahedron } from './furnitures/icosahedron.js';
import { ironFrameShelf } from './furnitures/ironFrameShelf.js';
import { ironFrameTable } from './furnitures/ironFrameTable.js';
import { issyoubin } from './furnitures/issyoubin.js';
import { keyboard } from './furnitures/keyboard.js';
import { laptopPc } from './furnitures/laptopPc.js';
import { largeMousepad } from './furnitures/largeMousepad.js';
import { lavaLamp } from './furnitures/lavaLamp.js';
import { letterCase } from './furnitures/letterCase.js';
import { lowPartitionBar } from './furnitures/lowPartitionBar.js';
import { miObjet } from './furnitures/miObjet.js';
import { milk } from './furnitures/milk.js';
import { miPlate } from './furnitures/miPlate.js';
import { miPlateDisplayed } from './furnitures/miPlateDisplayed.js';
import { mixer } from './furnitures/mixer.js';
import { monitor } from './furnitures/monitor.js';
import { monitorSpeaker } from './furnitures/monitorSpeaker.js';
import { monstera } from './furnitures/monstera.js';
import { mug } from './furnitures/mug.js';
import { newtonsCradle } from './furnitures/newtonsCradle.js';
import { openedCardboardBox } from './furnitures/openedCardboardBox.js';
import { pachira } from './furnitures/pachira.js';
import { petBottle } from './furnitures/petBottle.js';
import { piano } from './furnitures/piano.js';
import { pictureFrame } from './furnitures/pictureFrame.js';
import { pizza } from './furnitures/pizza.js';
import { plant } from './furnitures/plant.js';
import { plant2 } from './furnitures/plant2.js';
import { poster } from './furnitures/poster.js';
import { powerStrip } from './furnitures/powerStrip.js';
import { radiometer } from './furnitures/radiometer.js';
import { randomBooks } from './furnitures/randomBooks.js';
import { recordPlayer } from './furnitures/recordPlayer.js';
import { rolledUpPoster } from './furnitures/rolledUpPoster.js';
import { roundRug } from './furnitures/roundRug.js';
import { router } from './furnitures/router.js';
import { siphon } from './furnitures/siphon.js';
import { snakeplant } from './furnitures/snakeplant.js';
import { sofa } from './furnitures/sofa.js';
import { speaker } from './furnitures/speaker.js';
import { speakerStand } from './furnitures/speakerStand.js';
import { spotLight } from './furnitures/spotLight.js';
import { sprayer } from './furnitures/sprayer.js';
import { stanchionPole } from './furnitures/stanchionPole.js';
import { steelRack } from './furnitures/steelRack.js';
import { stormGlass } from './furnitures/stormGlass.js';
import { tableSalt } from './furnitures/tableSalt.js';
import { tabletopCalendar } from './furnitures/tabletopCalendar.js';
import { tabletopDigitalClock } from './furnitures/tabletopDigitalClock.js';
import { tabletopFlag } from './furnitures/tabletopFlag.js';
import { tabletopGlassPictureFrame } from './furnitures/tabletopGlassPictureFrame.js';
import { tabletopIronFrameStand } from './furnitures/tabletopIronFrameStand.js';
import { tabletopLcdButtonsController } from './furnitures/tabletopLcdButtonsController.js';
import { tabletopPictureFrame } from './furnitures/tabletopPictureFrame.js';
import { tapestry } from './furnitures/tapestry.js';
import { tetrapod } from './furnitures/tetrapod.js';
import { tv } from './furnitures/tv.js';
import { twistedCubeObjet } from './furnitures/twistedCubeObjet.js';
import { usedTissue } from './furnitures/usedTissue.js';
import { wallCanvas } from './furnitures/wallCanvas.js';
import { wallClock } from './furnitures/wallClock.js';
import { wallGlassPictureFrame } from './furnitures/wallGlassPictureFrame.js';
import { wallMirror } from './furnitures/wallMirror.js';
import { wallMountSpotLight } from './furnitures/wallMountSpotLight.js';
import { wallShelf } from './furnitures/wallShelf.js';
import { wireBasket } from './furnitures/wireBasket.js';
import { wireNet } from './furnitures/wireNet.js';
import { woodRingFloorLamp } from './furnitures/woodRingFloorLamp.js';
import { woodRingsPendantLight } from './furnitures/woodRingsPendantLight.js';
import { woodSoundAbsorbingPanel } from './furnitures/woodSoundAbsorbingPanel.js';
import { haniwa } from './furnitures/haniwa.js';
import { ceilingFan } from './furnitures/ceilingFan.js';
import { downlight } from './furnitures/downlight.js';
import { kakejiku } from './furnitures/kakejiku.js';
import { herbarium } from './furnitures/herbarium.js';
import type { FurnitureDef } from './furniture.js';
export const FURNITURE_DEFS = [
a4Case,
aircon,
allInOnePc,
aquarium,
aromaReedDiffuser,
banknote,
beamLamp,
bed,
blind,
books,
boxWallShelf,
cactusS,
cardboardBox,
ceilingFanLight,
ceilingFan,
chair,
coffeeCup,
colorBox,
cuboid,
cupNoodle,
custardPudding,
desk,
desktopPc,
djMixer,
djPlayer,
ductRailSpotLights,
ductTape,
electronicDisplayBoard,
emptyBento,
energyDrink,
envelope,
facialTissue,
glassCylinderPotPlant,
hangingTShirt,
icosahedron,
ironFrameShelf,
ironFrameTable,
issyoubin,
keyboard,
laptopPc,
largeMousepad,
lavaLamp,
letterCase,
miObjet,
milk,
miPlate,
miPlateDisplayed,
mixer,
monitor,
monitorSpeaker,
monstera,
mug,
newtonsCradle,
openedCardboardBox,
pachira,
petBottle,
piano,
pictureFrame,
pizza,
plant,
plant2,
poster,
powerStrip,
radiometer,
randomBooks,
recordPlayer,
rolledUpPoster,
roundRug,
router,
siphon,
snakeplant,
sofa,
speaker,
speakerStand,
sprayer,
steelRack,
stormGlass,
tableSalt,
tabletopCalendar,
tabletopDigitalClock,
tabletopFlag,
tabletopGlassPictureFrame,
tabletopIronFrameStand,
tabletopPictureFrame,
tabletopLcdButtonsController,
tapestry,
tetrapod,
tv,
twistedCubeObjet,
usedTissue,
wallCanvas,
wallClock,
wallGlassPictureFrame,
wallMirror,
wallMountSpotLight,
wallShelf,
woodRingFloorLamp,
woodRingsPendantLight,
woodSoundAbsorbingPanel,
hangingDuctRail,
spotLight,
lowPartitionBar,
descriptionPlate,
stanchionPole,
handheldGameConsole,
debugMetal,
curtain,
wireNet,
clippedPicture,
wireBasket,
haniwa,
downlight,
kakejiku,
herbarium,
] as FurnitureDef[];
export function getFurnitureDef(type: string): FurnitureDef {
const def = FURNITURE_DEFS.find(x => x.id === type) as FurnitureDef | undefined;
if (def == null) {
throw new Error(`Unrecognized furniture type: ${type}`);
}
return def;
}
@@ -0,0 +1,111 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { createPlaneUvMapper } from '../utility.js';
import type { Timer } from '../utility.js';
import type { ModelManager } from './utility.js';
import type { FurnitureSchemaDef } from 'misskey-world/src/room/object.js';
import type { OptionsSchema } from 'misskey-world/src/mono.js';
import type { ConvertedOptions, GetConvertedOptionsSchemaValues } from '../mono.js';
export type RoomFurnitureInstance<Options = any> = {
onInited?: () => void;
onOptionsUpdated?: <K extends keyof Options, V extends Options[K]>(kv: [K, V]) => void;
interactions: Record<string, {
fn: () => void;
}>;
primaryInteraction?: string | null;
resetTemporaryState?: () => void;
dispose: () => void;
};
export type SnapshotRenderingHelperWrapper = {
updateMesh: (meshes: BABYLON.Mesh[]) => void;
reset: () => void;
fixParticleSystem: (ps: BABYLON.ParticleSystem) => void;
};
export type FurnitureDef<Schema extends FurnitureSchemaDef = FurnitureSchemaDef> = Schema & {
path?: (options: string extends keyof Schema['options']['schema'] ? ConvertedOptions : Readonly<GetConvertedOptionsSchemaValues<Schema['options']['schema']>>) => string;
createInstance: (args: {
scene: BABYLON.Scene;
// TODO: snapshot renderingの関心を隠蔽した方が綺麗かもしれない
// 例えばmaterialUpdatedというメソッドを用意して内部的にresetを呼ぶなど
sr: SnapshotRenderingHelperWrapper;
lc: BABYLON.ClusteredLightContainer | null;
root: BABYLON.TransformNode;
options: string extends keyof Schema['options']['schema'] ? ConvertedOptions : Readonly<GetConvertedOptionsSchemaValues<Schema['options']['schema']>>;
model: ModelManager;
id: string;
timer: Timer;
graphicsQuality: number;
stickyMarkerMeshUpdated?: (mesh: BABYLON.Mesh) => void;
sitChair?: () => void;
reloadModel: () => void;
}) => RoomFurnitureInstance<string extends keyof Schema['options']['schema'] ? ConvertedOptions : GetConvertedOptionsSchemaValues<Schema['options']['schema']>> | Promise<RoomFurnitureInstance<Schema['options']['schema'] extends undefined ? ConvertedOptions : GetConvertedOptionsSchemaValues<Schema['options']['schema']>>>; // TODO: createInstanceをasyncにするのではなく、別にreadyみたいなものを返させる
};
export function defineFurnitureSchema<const OpSc extends OptionsSchema>(def: FurnitureSchemaDef<OpSc>): FurnitureSchemaDef<OpSc> {
return def;
}
export function defineFurniture<const Schema extends FurnitureSchemaDef<any>>(schema: Schema, def: Pick<FurnitureDef<Schema>, 'path' | 'createInstance'>): FurnitureDef<Schema> {
return { ...schema, ...def };
}
export const createTextureManager = (targetMesh: BABYLON.Mesh, calcTargetAspect: () => number, scene: BABYLON.Scene) => {
let currentUrl: string | null = null;
let currentTexture: BABYLON.Texture | null = null;
const updateUv = createPlaneUvMapper(targetMesh);
const calcUv = (method?: 'cover' | 'contain' | 'stretch', rotation?: 0 | 1 | 2 | 3) => {
if (currentTexture == null) return;
const srcSize = currentTexture.getSize();
updateUv(srcSize.width / srcSize.height, calcTargetAspect(), method ?? 'cover', rotation ?? 0);
};
const change = (url: string | null, fit?: 'cover' | 'contain' | 'stretch', rotation?: 0 | 1 | 2 | 3) => new Promise<BABYLON.Texture | null>((resolve) => {
if (currentUrl === url) {
calcUv(fit, rotation);
resolve(currentTexture);
return;
}
if (currentTexture != null) {
currentTexture.dispose();
}
currentUrl = url;
if (url == null) {
currentTexture = null;
resolve(null);
return;
}
currentTexture = new BABYLON.Texture(url, scene, false, false, undefined, () => {
currentTexture!.level = 1;
currentTexture!.wrapU = BABYLON.Texture.MIRROR_ADDRESSMODE;
currentTexture!.wrapV = BABYLON.Texture.MIRROR_ADDRESSMODE;
calcUv(fit, rotation);
resolve(currentTexture);
}, (message, exception) => {
console.warn('Failed to load texture:', message, exception);
currentTexture!.dispose();
currentTexture = null;
resolve(null);
});
});
return {
change,
calcUv,
dispose: () => {
if (currentTexture != null) {
currentTexture.dispose();
}
},
};
};
@@ -0,0 +1,31 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { defineFurniture } from '../furniture.js';
import { a4Case_schema } from 'misskey-world/src/room/furnitures/a4Case.schema.js';
export const a4Case = defineFurniture(a4Case_schema, {
createInstance: ({ options, model }) => {
const bodyMesh = model.findMesh('__X_BODY__');
const bodyMaterial = bodyMesh.material as BABYLON.PBRMaterial;
const applyMat = () => {
bodyMaterial.albedoColor = new BABYLON.Color3(options.mat.color[0], options.mat.color[1], options.mat.color[2]);
bodyMaterial.roughness = options.mat.roughness;
bodyMaterial.metallic = options.mat.metallic;
};
applyMat();
return {
onOptionsUpdated: ([k, _v]) => {
applyMat();
},
interactions: {},
dispose: () => {},
};
},
});
@@ -0,0 +1,16 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { defineFurniture } from '../furniture.js';
import { aircon_schema } from 'misskey-world/src/room/furnitures/aircon.schema.js';
export const aircon = defineFurniture(aircon_schema, {
createInstance: () => {
return {
interactions: {},
dispose: () => {},
};
},
});
@@ -0,0 +1,97 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js';
import { allInOnePc_schema } from 'misskey-world/src/room/furnitures/allInOnePc.schema.js';
import { createTextureManager, defineFurniture } from '../furniture.js';
import { getLightRangeFactorByGraphicsQuality } from '../utility.js';
export const allInOnePc = defineFurniture(allInOnePc_schema, {
createInstance: async ({ lc, scene, options, model, graphicsQuality }) => {
const matrix = model.root.getWorldMatrix(true);
const scale = new BABYLON.Vector3();
matrix.decompose(scale);
// TODO: graphicsQualityがLOWならそもそも追加しない
const light = new BABYLON.SpotLight('', new BABYLON.Vector3(cm(0), cm(30) / Math.abs(scale.y), 0), new BABYLON.Vector3(0, 0, 1), Math.PI / 1, 2, scene, lc != null);
light.parent = model.root;
light.diffuse = new BABYLON.Color3(1.0, 1.0, 1.0);
light.range = cm(100) * getLightRangeFactorByGraphicsQuality(graphicsQuality);
light.radius = cm(20);
if (lc != null) lc.addLight(light);
const screenMesh = model.findMesh('__X_SCREEN__');
const bodyMaterial = model.findMaterial('__X_BODY__');
const bezelMaterial = model.findMaterial('__X_BEZEL__');
const screenMaterial = model.findMaterial('__X_SCREEN__');
screenMaterial.ambientColor = new BABYLON.Color3(0, 0, 0);
screenMaterial.albedoColor = new BABYLON.Color3(0, 0, 0);
screenMaterial.emissiveColor = new BABYLON.Color3(1, 1, 1);
screenMaterial.roughness = 0;
screenMaterial.metallic = 0;
const textureManager = createTextureManager(screenMesh, () => 50 / 27.5, scene);
const applyScreenBrightness = () => {
const b = options.screenBrightness;
screenMaterial.emissiveIntensity = b * 2;
light.intensity = (5 * b) * WORLD_SCALE * WORLD_SCALE;
};
applyScreenBrightness();
const applyImage = () => {
screenMaterial.unfreeze();
let url: string | null = null;
if (options.image.type === '_custom_') {
url = options.image.custom?.url ?? null;
} else if (options.image.type === 'desktop') {
url = '/assets/objects/all-in-one-pc/desktop.png';
}
return textureManager.change(url, options.image.fit, options.image.rotation).then((tex) => {
screenMaterial.emissiveTexture = tex;
});
};
await applyImage();
const applyBodyMat = () => {
bodyMaterial.albedoColor = new BABYLON.Color3(options.bodyMat.color[0], options.bodyMat.color[1], options.bodyMat.color[2]);
bodyMaterial.roughness = options.bodyMat.roughness;
bodyMaterial.metallic = options.bodyMat.metallic;
};
const applyBezelMat = () => {
bezelMaterial.albedoColor = new BABYLON.Color3(options.bezelMat.color[0], options.bezelMat.color[1], options.bezelMat.color[2]);
bezelMaterial.roughness = options.bezelMat.roughness;
bezelMaterial.metallic = options.bezelMat.metallic;
};
applyBodyMat();
applyBezelMat();
return {
onOptionsUpdated: ([k, v]) => {
switch (k) {
case 'bodyMat': applyBodyMat(); break;
case 'bezelMat': applyBezelMat(); break;
case 'screenBrightness': applyScreenBrightness(); break;
case 'image': applyImage(); break;
}
},
interactions: {},
dispose: () => {
light.dispose();
if (lc != null) lc.removeLight(light);
scene.removeLight(light); // lc使用時はsceneには追加してないはずだが、これがないとクラッシュする babylonのバグ?
textureManager.dispose();
},
};
},
});
@@ -0,0 +1,54 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { defineFurniture } from '../furniture.js';
import { cm } from 'misskey-world/src/utility.js';
import { aquarium_schema } from 'misskey-world/src/room/furnitures/aquarium.schema.js';
export const aquarium = defineFurniture(aquarium_schema, {
createInstance: ({ scene, root }) => {
return {
onInited: () => {
const noiseTexture = new BABYLON.NoiseProceduralTexture('perlin', 256, scene);
noiseTexture.animationSpeedFactor = 70;
noiseTexture.persistence = 10;
noiseTexture.brightness = 0.5;
noiseTexture.octaves = 5;
const emitter = new BABYLON.TransformNode('emitter', scene);
emitter.parent = root;
emitter.position = new BABYLON.Vector3(cm(17), cm(7), cm(-9));
const ps = new BABYLON.ParticleSystem('', 128, scene);
ps.particleTexture = new BABYLON.Texture('/client-assets/world/objects/lava-lamp/bubble.png');
ps.emitter = emitter;
ps.isLocal = true;
ps.minEmitBox = new BABYLON.Vector3(cm(-2), 0, cm(-2));
ps.maxEmitBox = new BABYLON.Vector3(cm(2), 0, cm(2));
ps.minEmitPower = cm(40);
ps.maxEmitPower = cm(60);
ps.minLifeTime = 0.5;
ps.maxLifeTime = 0.5;
ps.minSize = cm(0.1);
ps.maxSize = cm(1);
ps.direction1 = new BABYLON.Vector3(0, 1, 0);
ps.direction2 = new BABYLON.Vector3(0, 1, 0);
ps.noiseTexture = noiseTexture;
ps.noiseStrength = new BABYLON.Vector3(500, 0, 500);
ps.emitRate = 32;
ps.blendMode = BABYLON.ParticleSystem.BLENDMODE_ADD;
//ps.color1 = new BABYLON.Color4(1, 1, 1, 0.3);
//ps.color2 = new BABYLON.Color4(1, 1, 1, 0.2);
//ps.colorDead = new BABYLON.Color4(1, 1, 1, 0);
ps.preWarmCycles = Math.random() * 1000;
ps.start();
},
interactions: {},
dispose: () => {
// TODO
},
};
},
});
@@ -0,0 +1,39 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { aromaReedDiffuser_schema } from 'misskey-world/src/room/furnitures/aromaReedDiffuser.schema.js';
import { defineFurniture } from '../furniture.js';
export const aromaReedDiffuser = defineFurniture(aromaReedDiffuser_schema, {
createInstance: ({ options, model }) => {
const bottleMaterial = model.findMaterial('__X_BOTTLE__');
const oilMaterial = model.findMaterial('__X_OIL__');
const applyBottleMat = () => {
bottleMaterial.albedoColor = new BABYLON.Color3(options.bottleMat.color[0], options.bottleMat.color[1], options.bottleMat.color[2]);
bottleMaterial.roughness = options.bottleMat.roughness;
bottleMaterial.metallic = options.bottleMat.metallic;
};
const applyOilMat = () => {
oilMaterial.albedoColor = new BABYLON.Color3(options.oilMat.color[0], options.oilMat.color[1], options.oilMat.color[2]);
oilMaterial.roughness = options.oilMat.roughness;
oilMaterial.metallic = options.oilMat.metallic;
};
applyBottleMat();
applyOilMat();
return {
onOptionsUpdated: ([k, v]) => {
applyBottleMat();
applyOilMat();
},
interactions: {},
dispose: () => {},
};
},
});
@@ -0,0 +1,16 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { defineFurniture } from '../furniture.js';
import { banknote_schema } from 'misskey-world/src/room/furnitures/banknote.schema.js';
export const banknote = defineFurniture(banknote_schema, {
createInstance: () => {
return {
interactions: {},
dispose: () => {},
};
},
});
@@ -0,0 +1,32 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { defineFurniture } from '../furniture.js';
import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js';
import { getLightRangeFactorByGraphicsQuality } from '../utility.js';
import { beamLamp_schema } from 'misskey-world/src/room/furnitures/beamLamp.schema.js';
export const beamLamp = defineFurniture(beamLamp_schema, {
createInstance: ({ lc, root, scene, graphicsQuality }) => {
const light = new BABYLON.PointLight('beamLampLight', new BABYLON.Vector3(0, cm(10), 0), scene, lc != null);
light.parent = root;
light.diffuse = new BABYLON.Color3(1.0, 0.5, 0.2);
light.intensity = 0.03 * WORLD_SCALE * WORLD_SCALE;
light.range = cm(100) * getLightRangeFactorByGraphicsQuality(graphicsQuality);
if (lc != null) lc.addLight(light);
return {
onInited: () => {
},
interactions: {},
dispose: () => {
light.dispose();
if (lc != null) lc.removeLight(light);
scene.removeLight(light); // lc使用時はsceneには追加してないはずだが、これがないとクラッシュする babylonのバグ?
},
};
},
});
@@ -0,0 +1,33 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { defineFurniture } from '../furniture.js';
import { bed_schema } from 'misskey-world/src/room/furnitures/bed.schema.js';
export const bed = defineFurniture(bed_schema, {
createInstance: ({ options, model }) => {
const bodyMesh = model.findMesh('__X_BODY__');
const bodyMaterial = bodyMesh.material as BABYLON.PBRMaterial;
const applyFrameMat = () => {
bodyMaterial.albedoColor = new BABYLON.Color3(options.frameMat.color[0], options.frameMat.color[1], options.frameMat.color[2]);
bodyMaterial.roughness = options.frameMat.roughness;
bodyMaterial.metallic = options.frameMat.metallic;
};
applyFrameMat();
return {
onOptionsUpdated: ([k, v]) => {
switch (k) {
case 'frameMat': applyFrameMat(); break;
}
},
interactions: {},
dispose: () => {},
};
},
});
@@ -0,0 +1,105 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { defineFurniture } from '../furniture.js';
import { cm, remap } from 'misskey-world/src/utility.js';
import { createOverridedStates } from '../utility.js';
import { blind_schema } from 'misskey-world/src/room/furnitures/blind.schema.js';
export const blind = defineFurniture(blind_schema, {
createInstance: ({ options, model }) => {
const temp = createOverridedStates({
angle: () => options.angle,
open: () => options.open,
});
const blade = model.findMesh('__X_BLADE__');
blade.rotation = new BABYLON.Vector3(options.angle, 0, 0);
let blades = [] as BABYLON.InstancedMesh[];
const applyOpeningState = () => {
for (const b of blades) {
b.dispose();
}
blades = [];
const matrix = blade.parent.getWorldMatrix(true);
const scale = new BABYLON.Vector3();
matrix.decompose(scale);
for (let i = 0; i < options.blades; i++) {
const b = blade.clone('blade_' + i); // createInstanceを使いたいが、削除するときになぜかエラーになる
if (i / options.blades < temp.open) {
b.position.y -= (i * cm(4)) / Math.abs(scale.y);
} else {
b.position.y -= (((options.blades - 1) * temp.open * cm(4)) + (i * cm(0.3))) / Math.abs(scale.y);
}
blades.push(b);
}
const length = Math.abs(blades.at(-1).position.y * Math.abs(scale.y));
for (const mesh of model.root.getChildMeshes()) {
if (mesh.morphTargetManager != null && mesh.morphTargetManager.getTargetByName('Length') != null) {
mesh.morphTargetManager.getTargetByName('Length').influence = remap(length, cm(10), cm(200), 0, 1);
}
}
model.updated();
model.updated();
};
const applyAngle = () => {
for (const b of [blade, ...blades]) {
b.rotation.x = temp.angle;
b.rotation.x += Math.random() * 0.3 - 0.15;
}
};
applyOpeningState();
applyAngle();
return {
onInited: () => {
},
interactions: {
adjustBladeRotation: {
label: 'Adjust blade rotation',
fn: () => {
temp.angle += Math.PI / 8;
if (temp.angle >= Math.PI / 2) temp.angle = -Math.PI / 2;
applyAngle();
},
},
openClose: {
label: 'Open/close',
fn: () => {
temp.open -= 0.25;
if (temp.open < 0) temp.open = 1;
applyOpeningState();
},
},
},
onOptionsUpdated: ([k, v]) => {
temp.$reset();
switch (k) {
case 'angle': applyAngle(); break;
case 'open': applyOpeningState(); break;
case 'blades': applyOpeningState(); break;
}
},
resetTemporaryState: () => {
temp.$reset();
applyAngle();
applyOpeningState();
},
primaryInteraction: 'openClose',
dispose: () => {},
};
},
});
@@ -0,0 +1,38 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { defineFurniture } from '../furniture.js';
import { book_schema } from 'misskey-world/src/room/furnitures/book.schema.js';
export const book = defineFurniture(book_schema, {
createInstance: ({ options, model }) => {
const bodyMesh = model.findMesh('__X_BODY__');
const applySize = () => {
bodyMesh.morphTargetManager!.getTargetByName('Width')!.influence = options.width;
bodyMesh.morphTargetManager!.getTargetByName('Height')!.influence = options.height;
bodyMesh.morphTargetManager!.getTargetByName('Thickness')!.influence = options.thickness;
model.updated();
};
applySize();
return {
onInited: () => {
},
onOptionsUpdated: ([k, v]) => {
switch (k) {
case 'width':
case 'height':
case 'thickness':
applySize();
break;
}
},
interactions: {},
dispose: () => {},
};
},
});
@@ -0,0 +1,59 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { defineFurniture } from '../furniture.js';
import { cm } from 'misskey-world/src/utility.js';
import { books_schema } from 'misskey-world/src/room/furnitures/books.schema.js';
export const books = defineFurniture(books_schema, {
createInstance: ({ scene, options, model }) => {
const coverMaterial = model.findMaterial('__X_COVER__');
const applyVariation = () => {
const coverTexture =
options.variation === 'A' ? new BABYLON.Texture('/client-assets/world/objects/books/textures/a.png', scene, false, false) :
options.variation === 'B' ? new BABYLON.Texture('/client-assets/world/objects/books/textures/b.png', scene, false, false) :
options.variation === 'C' ? new BABYLON.Texture('/client-assets/world/objects/books/textures/c.png', scene, false, false) :
options.variation === 'D' ? new BABYLON.Texture('/client-assets/world/objects/books/textures/d.png', scene, false, false) :
new BABYLON.Texture('/client-assets/world/objects/books/textures/e.png', scene, false, false);
coverMaterial.albedoTexture = coverTexture;
};
applyVariation();
const bookMeshes = [
model.findMeshes('__X_BOOK_1__'),
model.findMeshes('__X_BOOK_2__'),
model.findMeshes('__X_BOOK_3__'),
model.findMeshes('__X_BOOK_4__'),
model.findMeshes('__X_BOOK_5__'),
model.findMeshes('__X_BOOK_6__'),
model.findMeshes('__X_BOOK_7__'),
model.findMeshes('__X_BOOK_8__'),
model.findMeshes('__X_BOOK_9__'),
model.findMeshes('__X_BOOK_10__'),
];
for (const meshes of bookMeshes) {
const z = Math.random() * 0.005;
const y = Math.random() * 0.0025;
for (const mesh of meshes) {
mesh.position.z -= z;
mesh.position.y += y;
}
}
model.updated();
return {
onOptionsUpdated: ([k, v]) => {
applyVariation();
},
interactions: {},
dispose: () => {},
};
},
});
@@ -0,0 +1,66 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { defineFurniture } from '../furniture.js';
import { boxWallShelf_schema } from 'misskey-world/src/room/furnitures/boxWallShelf.schema.js';
export const boxWallShelf = defineFurniture(boxWallShelf_schema, {
createInstance: async ({ scene, options, model }) => {
const backMesh = model.findMesh('__X_BACK__');
const bodyMaterial = model.findMaterial('__X_BODY__');
const applySize = () => {
for (const mesh of model.root.getChildMeshes()) {
if (mesh.morphTargetManager != null && mesh.morphTargetManager.getTargetByName('W') != null) {
mesh.morphTargetManager.getTargetByName('W').influence = options.width;
}
if (mesh.morphTargetManager != null && mesh.morphTargetManager.getTargetByName('H') != null) {
mesh.morphTargetManager.getTargetByName('H').influence = options.height;
}
}
model.updated();
};
applySize();
const applyBodyMat = () => {
bodyMaterial.albedoColor = new BABYLON.Color3(options.bodyMat.color[0], options.bodyMat.color[1], options.bodyMat.color[2]);
bodyMaterial.roughness = options.bodyMat.roughness;
bodyMaterial.metallic = options.bodyMat.metallic;
};
applyBodyMat();
const applyWithBack = () => {
backMesh.isVisible = options.withBack;
model.updated();
};
applyWithBack();
return {
onInited: () => {
},
onOptionsUpdated: ([k, v]) => {
switch (k) {
case 'width':
case 'height':
applySize();
break;
case 'bodyMat':
applyBodyMat();
break;
case 'withBack':
applyWithBack();
break;
}
},
interactions: {},
dispose: () => {},
};
},
});
@@ -0,0 +1,30 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { defineFurniture } from '../furniture.js';
import { cactusS_schema } from 'misskey-world/src/room/furnitures/cactusS.schema.js';
export const cactusS = defineFurniture(cactusS_schema, {
createInstance: ({ options, model }) => {
const potMaterial = model.findMaterial('__X_POT__');
const applyPotMat = () => {
potMaterial.albedoColor = new BABYLON.Color3(options.potMat.color[0], options.potMat.color[1], options.potMat.color[2]);
potMaterial.roughness = options.potMat.roughness;
potMaterial.metallic = options.potMat.metallic;
};
applyPotMat();
return {
onOptionsUpdated: ([k, v]) => {
applyPotMat();
},
interactions: {},
dispose: () => {},
};
},
});
@@ -0,0 +1,50 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { defineFurniture } from '../furniture.js';
import { cardboardBox_schema } from 'misskey-world/src/room/furnitures/cardboardBox.schema.js';
export const cardboardBox = defineFurniture(cardboardBox_schema, {
createInstance: ({ scene, options, model }) => {
const material = model.findMaterial('__X_BODY__');
let tex: BABYLON.Texture | null = null;
const applyVariation = () => {
if (options.variation === 'mikan') {
tex = new BABYLON.Texture('/client-assets/world/objects/cardboard-box/textures/mikan.png', scene, false, false);
} else if (options.variation === 'aizon') {
tex = new BABYLON.Texture('/client-assets/world/objects/cardboard-box/textures/aizon.png', scene, false, false);
}
if (tex != null) {
material.albedoTexture = tex;
material.albedoColor = new BABYLON.Color3(1, 1, 1);
} else {
material.albedoTexture = null;
material.albedoColor = new BABYLON.Color3(0.6, 0.485, 0.31);
}
};
applyVariation();
return {
onOptionsUpdated: ([k, v]) => {
switch (k) {
case 'variation':
applyVariation();
break;
}
},
interactions: {},
dispose: () => {
if (tex) {
tex.dispose();
}
},
};
},
});
@@ -0,0 +1,65 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { ceilingFan_schema } from 'misskey-world/src/room/furnitures/ceilingFan.schema.js';
import { defineFurniture } from '../furniture.js';
export const ceilingFan = defineFurniture(ceilingFan_schema, {
createInstance: ({ options, sr, scene, model }) => {
const shadeMaterial = model.findMaterial('__X_SHADE__');
const applyShadeMat = () => {
shadeMaterial.albedoColor = new BABYLON.Color3(options.shadeMat.color[0], options.shadeMat.color[1], options.shadeMat.color[2]);
shadeMaterial.roughness = options.shadeMat.roughness;
shadeMaterial.metallic = options.shadeMat.metallic;
};
applyShadeMat();
const bodyMaterial = model.findMaterial('__X_BODY__');
const applyBodyMat = () => {
bodyMaterial.albedoColor = new BABYLON.Color3(options.bodyMat.color[0], options.bodyMat.color[1], options.bodyMat.color[2]);
bodyMaterial.roughness = options.bodyMat.roughness;
bodyMaterial.metallic = options.bodyMat.metallic;
};
applyBodyMat();
const rotor = model.findMesh('__X_ROTOR__');
model.bakeExcludeMeshes = [rotor, ...rotor.getChildMeshes()];
let animationObserver: BABYLON.Observer<BABYLON.Scene>;
return {
onInited: () => {
rotor.rotation = rotor.rotationQuaternion != null ? rotor.rotationQuaternion.toEulerAngles() : rotor.rotation;
const anim = new BABYLON.Animation('', 'rotation.y', 60, BABYLON.Animation.ANIMATIONTYPE_FLOAT, BABYLON.Animation.ANIMATIONLOOPMODE_CYCLE);
anim.setKeys([
{ frame: 0, value: 0 },
{ frame: 100, value: Math.PI * 2 },
]);
rotor.animations = [anim];
animationObserver = scene.onAfterAnimationsObservable.add(() => {
sr.updateMesh([rotor, ...rotor.getChildMeshes()], false);
});
scene.beginAnimation(rotor, 0, 100, true);
},
onOptionsUpdated: ([k, v]) => {
switch (k) {
case 'shadeMat': applyShadeMat(); break;
case 'bodyMat': applyBodyMat(); break;
}
},
interactions: {},
dispose: () => {
if (animationObserver != null) {
scene.onAfterAnimationsObservable.remove(animationObserver);
}
},
};
},
});
@@ -0,0 +1,65 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { ceilingFanLight_schema } from 'misskey-world/src/room/furnitures/ceilingFanLight.schema.js';
import { defineFurniture } from '../furniture.js';
export const ceilingFanLight = defineFurniture(ceilingFanLight_schema, {
createInstance: ({ options, sr, scene, model }) => {
const shadeMaterial = model.findMaterial('__X_SHADE__');
const applyShadeMat = () => {
shadeMaterial.albedoColor = new BABYLON.Color3(options.shadeMat.color[0], options.shadeMat.color[1], options.shadeMat.color[2]);
shadeMaterial.roughness = options.shadeMat.roughness;
shadeMaterial.metallic = options.shadeMat.metallic;
};
applyShadeMat();
const bodyMaterial = model.findMaterial('__X_BODY__');
const applyBodyMat = () => {
bodyMaterial.albedoColor = new BABYLON.Color3(options.bodyMat.color[0], options.bodyMat.color[1], options.bodyMat.color[2]);
bodyMaterial.roughness = options.bodyMat.roughness;
bodyMaterial.metallic = options.bodyMat.metallic;
};
applyBodyMat();
const rotor = model.findMesh('__X_ROTOR__');
model.bakeExcludeMeshes = [rotor, ...rotor.getChildMeshes()];
let animationObserver: BABYLON.Observer<BABYLON.Scene>;
return {
onInited: () => {
rotor.rotation = rotor.rotationQuaternion != null ? rotor.rotationQuaternion.toEulerAngles() : rotor.rotation;
const anim = new BABYLON.Animation('', 'rotation.y', 60, BABYLON.Animation.ANIMATIONTYPE_FLOAT, BABYLON.Animation.ANIMATIONLOOPMODE_CYCLE);
anim.setKeys([
{ frame: 0, value: 0 },
{ frame: 100, value: Math.PI * 2 },
]);
rotor.animations = [anim];
animationObserver = scene.onAfterAnimationsObservable.add(() => {
sr.updateMesh([rotor, ...rotor.getChildMeshes()], false);
});
scene.beginAnimation(rotor, 0, 100, true);
},
onOptionsUpdated: ([k, v]) => {
switch (k) {
case 'shadeMat': applyShadeMat(); break;
case 'bodyMat': applyBodyMat(); break;
}
},
interactions: {},
dispose: () => {
if (animationObserver != null) {
scene.onAfterAnimationsObservable.remove(animationObserver);
}
},
};
},
});
@@ -0,0 +1,58 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { defineFurniture } from '../furniture.js';
import { chair_schema } from 'misskey-world/src/room/furnitures/chair.schema.js';
export const chair = defineFurniture(chair_schema, {
createInstance: ({ model, options, sitChair }) => {
const primaryMaterial = model.findMaterial('__X_PRIMARY__');
const secondaryMaterial = model.findMaterial('__X_SECONDARY__');
const frameMaterial = model.findMaterial('__X_FRAME__');
const applyPrimaryMat = () => {
primaryMaterial.albedoColor = new BABYLON.Color3(options.primaryMat.color[0], options.primaryMat.color[1], options.primaryMat.color[2]);
primaryMaterial.roughness = options.primaryMat.roughness;
primaryMaterial.metallic = options.primaryMat.metallic;
};
const applySecondaryMat = () => {
secondaryMaterial.albedoColor = new BABYLON.Color3(options.secondaryMat.color[0], options.secondaryMat.color[1], options.secondaryMat.color[2]);
secondaryMaterial.roughness = options.secondaryMat.roughness;
secondaryMaterial.metallic = options.secondaryMat.metallic;
};
const applyFrameMat = () => {
frameMaterial.albedoColor = new BABYLON.Color3(options.frameMat.color[0], options.frameMat.color[1], options.frameMat.color[2]);
frameMaterial.roughness = options.frameMat.roughness;
frameMaterial.metallic = options.frameMat.metallic;
};
applyPrimaryMat();
applySecondaryMat();
applyFrameMat();
return {
onOptionsUpdated: ([k, v]) => {
switch (k) {
case 'primaryMat': applyPrimaryMat(); break;
case 'secondaryMat': applySecondaryMat(); break;
case 'frameMat': applyFrameMat(); break;
}
},
interactions: {
sit: {
label: 'Sit',
fn: () => {
sitChair?.();
},
},
},
primaryInteraction: 'sit',
dispose: () => {},
};
},
});
@@ -0,0 +1,70 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { createTextureManager, defineFurniture } from '../furniture.js';
import { remap } from 'misskey-world/src/utility.js';
import { clippedPicture_schema } from 'misskey-world/src/room/furnitures/clippedPicture.schema.js';
export const clippedPicture = defineFurniture(clippedPicture_schema, {
createInstance: async ({ scene, options, model }) => {
const pictureMesh = model.findMesh('__X_PICTURE__');
pictureMesh.rotationQuaternion = null;
const pictureMaterial = model.findMaterial('__X_PICTURE__');
pictureMaterial.albedoColor = new BABYLON.Color3(1, 1, 1);
const textureManager = createTextureManager(pictureMesh, () => {
const targetWidth = remap(options.width, 0, 1, 2, 100); // 最小値(値を0にした場合)でのサイズは2cmで、最大値(値を1にした場合)でのサイズは100cmなので。比率の計算だから単位はなんでもいいけど、とにかく0が0にならない点を考慮させる必要がある
const targetHeight = remap(options.height, 0, 1, 2, 100); // 最小値(値を0にした場合)でのサイズは2cmで、最大値(値を1にした場合)でのサイズは100cmなので。比率の計算だから単位はなんでもいいけど、とにかく0が0にならない点を考慮させる必要がある
return targetWidth / targetHeight;
}, scene);
const applySize = () => {
for (const mesh of model.root.getChildMeshes()) {
if (mesh.morphTargetManager != null && mesh.morphTargetManager.getTargetByName('Width') != null) {
mesh.morphTargetManager.getTargetByName('Width').influence = options.width;
}
if (mesh.morphTargetManager != null && mesh.morphTargetManager.getTargetByName('Height') != null) {
mesh.morphTargetManager.getTargetByName('Height').influence = options.height;
}
}
model.updated();
textureManager.calcUv();
};
applySize();
const applyImage = () => {
pictureMaterial.unfreeze();
let url: string | null = null;
if (options.image.type === '_custom_') {
url = options.image.custom?.url ?? null;
}
return textureManager.change(url, options.image.fit, options.image.rotation).then((tex) => {
pictureMaterial.albedoTexture = tex;
});
};
await applyImage();
return {
onInited: () => {
},
onOptionsUpdated: ([k, v]) => {
switch (k) {
case 'width': applySize(); break;
case 'height': applySize(); break;
case 'image': applyImage(); break;
}
},
interactions: {},
dispose: () => {
textureManager.dispose();
},
};
},
});
@@ -0,0 +1,16 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { defineFurniture } from '../furniture.js';
import { coffeeCup_schema } from 'misskey-world/src/room/furnitures/coffeeCup.schema.js';
export const coffeeCup = defineFurniture(coffeeCup_schema, {
createInstance: () => {
return {
interactions: {},
dispose: () => {},
};
},
});
@@ -0,0 +1,30 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { defineFurniture } from '../furniture.js';
import { colorBox_schema } from 'misskey-world/src/room/furnitures/colorBox.schema.js';
export const colorBox = defineFurniture(colorBox_schema, {
createInstance: ({ options, model }) => {
const bodyMaterial = model.findMaterial('__X_BODY__');
const applyMat = () => {
bodyMaterial.albedoColor = new BABYLON.Color3(options.mat.color[0], options.mat.color[1], options.mat.color[2]);
bodyMaterial.roughness = options.mat.roughness;
bodyMaterial.metallic = options.mat.metallic;
};
applyMat();
return {
onOptionsUpdated: ([k, v]) => {
applyMat();
},
interactions: {},
dispose: () => {},
};
},
});
@@ -0,0 +1,52 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { defineFurniture } from '../furniture.js';
import { cuboid_schema } from 'misskey-world/src/room/furnitures/cuboid.schema.js';
export const cuboid = defineFurniture(cuboid_schema, {
createInstance: async ({ scene, options, model }) => {
const mesh = model.findMesh('__X_BODY__');
const mat = model.findMaterial('__X_BODY__');
const applySize = () => {
mesh.morphTargetManager!.getTargetByName('X')!.influence = options.x;
mesh.morphTargetManager!.getTargetByName('Y')!.influence = options.y;
mesh.morphTargetManager!.getTargetByName('Z')!.influence = options.z;
model.updated();
};
applySize();
const applyMat = () => {
mat.albedoColor = new BABYLON.Color3(options.mat.color[0], options.mat.color[1], options.mat.color[2]);
mat.roughness = options.mat.roughness;
mat.metallic = options.mat.metallic;
};
applyMat();
return {
onInited: () => {
},
onOptionsUpdated: ([k, v]) => {
switch (k) {
case 'mat':
applyMat();
break;
case 'x':
case 'y':
case 'z':
applySize();
break;
}
},
interactions: {},
dispose: () => {},
};
},
});
@@ -0,0 +1,26 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { defineFurniture } from '../furniture.js';
import { cm } from 'misskey-world/src/utility.js';
import { yuge } from '../utility.js';
import { cupNoodle_schema } from 'misskey-world/src/room/furnitures/cupNoodle.schema.js';
export const cupNoodle = defineFurniture(cupNoodle_schema, {
createInstance: ({ scene, root, sr }) => {
let yugeDispose: (() => void) | null = null;
return {
onInited: () => {
yugeDispose = yuge(scene, root, new BABYLON.Vector3(0, cm(10), 0), sr);
},
interactions: {},
dispose: () => {
yugeDispose?.();
},
};
},
});
@@ -0,0 +1,16 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { defineFurniture } from '../furniture.js';
import { curtain_schema } from 'misskey-world/src/room/furnitures/curtain.schema.js';
export const curtain = defineFurniture(curtain_schema, {
createInstance: () => {
return {
interactions: {},
dispose: () => {},
};
},
});
@@ -0,0 +1,16 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { defineFurniture } from '../furniture.js';
import { custardPudding_schema } from 'misskey-world/src/room/furnitures/custardPudding.schema.js';
export const custardPudding = defineFurniture(custardPudding_schema, {
createInstance: () => {
return {
interactions: {},
dispose: () => {},
};
},
});
@@ -0,0 +1,16 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { defineFurniture } from '../furniture.js';
import { debugHipoly_schema } from 'misskey-world/src/room/furnitures/debugHipoly.schema.js';
export const debugHipoly = defineFurniture(debugHipoly_schema, {
createInstance: () => {
return {
interactions: {},
dispose: () => {},
};
},
});
@@ -0,0 +1,16 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { defineFurniture } from '../furniture.js';
import { debugMetal_schema } from 'misskey-world/src/room/furnitures/debugMetal.schema.js';
export const debugMetal = defineFurniture(debugMetal_schema, {
createInstance: () => {
return {
interactions: {},
dispose: () => {},
};
},
});
@@ -0,0 +1,16 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { defineFurniture } from '../furniture.js';
import { descriptionPlate_schema } from 'misskey-world/src/room/furnitures/descriptionPlate.schema.js';
export const descriptionPlate = defineFurniture(descriptionPlate_schema, {
createInstance: () => {
return {
interactions: {},
dispose: () => {},
};
},
});
@@ -0,0 +1,58 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { defineFurniture } from '../furniture.js';
import { desk_schema } from 'misskey-world/src/room/furnitures/desk.schema.js';
export const desk = defineFurniture(desk_schema, {
createInstance: ({ options, model }) => {
const frameMaterial = model.findMaterial('__X_FRAME__');
const boardMaterial = model.findMaterial('__X_BOARD__');
const applyFrameMat = () => {
frameMaterial.albedoColor = new BABYLON.Color3(options.frameMat.color[0], options.frameMat.color[1], options.frameMat.color[2]);
frameMaterial.roughness = options.frameMat.roughness;
frameMaterial.metallic = options.frameMat.metallic;
};
applyFrameMat();
const applyBoardMat = () => {
boardMaterial.albedoColor = new BABYLON.Color3(options.boardMat.color[0], options.boardMat.color[1], options.boardMat.color[2]);
boardMaterial.roughness = options.boardMat.roughness;
boardMaterial.metallic = options.boardMat.metallic;
};
applyBoardMat();
const applySize = () => {
for (const mesh of model.root.getChildMeshes()) {
if (mesh.morphTargetManager != null && mesh.morphTargetManager.getTargetByName('W') != null) {
mesh.morphTargetManager.getTargetByName('W').influence = options.width;
}
if (mesh.morphTargetManager != null && mesh.morphTargetManager.getTargetByName('D') != null) {
mesh.morphTargetManager.getTargetByName('D').influence = options.depth;
}
}
model.updated();
};
applySize();
return {
onOptionsUpdated: ([k, v]) => {
switch (k) {
case 'frameMat': applyFrameMat(); break;
case 'boardMat': applyBoardMat(); break;
case 'width': applySize(); break;
case 'depth': applySize(); break;
}
},
interactions: {},
dispose: () => {},
};
},
});
@@ -0,0 +1,107 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { defineFurniture } from '../furniture.js';
import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js';
import { getLightRangeFactorByGraphicsQuality } from '../utility.js';
import { desktopPc_schema } from 'misskey-world/src/room/furnitures/desktopPc.schema.js';
export const desktopPc = defineFurniture(desktopPc_schema, {
createInstance: ({ options, model, root, scene, lc, graphicsQuality }) => {
// TODO: graphicsQualityがLOWならそもそも追加しない
const light1 = new BABYLON.SpotLight('', new BABYLON.Vector3(0, cm(10), cm(22)), new BABYLON.Vector3(0, 0, 1), Math.PI / 1, 2, scene, lc != null);
light1.parent = root;
light1.intensity = 0.05 * WORLD_SCALE * WORLD_SCALE;
light1.range = cm(30) * getLightRangeFactorByGraphicsQuality(graphicsQuality);
if (lc != null) lc.addLight(light1);
const light2 = new BABYLON.SpotLight('', new BABYLON.Vector3(cm(-5), cm(33), cm(-9)), new BABYLON.Vector3(1, 0, 0), Math.PI / 1, 2, scene, lc != null);
light2.parent = root;
light2.intensity = 0.05 * WORLD_SCALE * WORLD_SCALE;
light2.range = cm(30) * getLightRangeFactorByGraphicsQuality(graphicsQuality);
if (lc != null) lc.addLight(light2);
const bodyMaterial = model.findMaterial('__X_BODY__');
const coverMaterial = model.findMaterial('__X_COVER__');
const inner1Material = model.findMaterial('__X_INNER__');
const inner2Material = model.findMaterial('__X_INNER2__');
const inner3Material = model.findMaterial('__X_TUBE__');
const ledMaterial = model.findMaterial('__X_LED__');
ledMaterial.emissiveIntensity = 1;
const applyBodyMat = () => {
bodyMaterial.albedoColor = new BABYLON.Color3(options.bodyMat.color[0], options.bodyMat.color[1], options.bodyMat.color[2]);
bodyMaterial.roughness = options.bodyMat.roughness;
bodyMaterial.metallic = options.bodyMat.metallic;
};
applyBodyMat();
const applyCoverMat = () => {
coverMaterial.albedoColor = new BABYLON.Color3(options.coverMat.color[0], options.coverMat.color[1], options.coverMat.color[2]);
coverMaterial.roughness = options.coverMat.roughness;
coverMaterial.metallic = options.coverMat.metallic;
};
applyCoverMat();
const applyInner1Mat = () => {
inner1Material.albedoColor = new BABYLON.Color3(options.inner1Mat.color[0], options.inner1Mat.color[1], options.inner1Mat.color[2]);
inner1Material.roughness = options.inner1Mat.roughness;
inner1Material.metallic = options.inner1Mat.metallic;
};
applyInner1Mat();
const applyInner2Mat = () => {
inner2Material.albedoColor = new BABYLON.Color3(options.inner2Mat.color[0], options.inner2Mat.color[1], options.inner2Mat.color[2]);
inner2Material.roughness = options.inner2Mat.roughness;
inner2Material.metallic = options.inner2Mat.metallic;
};
applyInner2Mat();
const applyInner3Mat = () => {
inner3Material.albedoColor = new BABYLON.Color3(options.inner3Mat.color[0], options.inner3Mat.color[1], options.inner3Mat.color[2]);
inner3Material.roughness = options.inner3Mat.roughness;
inner3Material.metallic = options.inner3Mat.metallic;
};
applyInner3Mat();
const applyLedColor = () => {
const [r, g, b] = options.ledColor;
ledMaterial.emissiveColor = new BABYLON.Color3(r, g, b);
light1.diffuse = new BABYLON.Color3(r, g, b);
light2.diffuse = new BABYLON.Color3(r, g, b);
};
applyLedColor();
return {
onOptionsUpdated: ([k, v]) => {
applyBodyMat();
applyCoverMat();
applyInner1Mat();
applyInner2Mat();
applyInner3Mat();
applyLedColor();
},
interactions: {},
dispose: () => {
light1.dispose();
light2.dispose();
if (lc != null) {
lc.removeLight(light1);
lc.removeLight(light2);
}
scene.removeLight(light1); // lc使用時はsceneには追加してないはずだが、これがないとクラッシュする babylonのバグ?
scene.removeLight(light2); // lc使用時はsceneには追加してないはずだが、これがないとクラッシュする babylonのバグ?
},
};
},
});
@@ -0,0 +1,16 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { defineFurniture } from '../furniture.js';
import { djMixer_schema } from 'misskey-world/src/room/furnitures/djMixer.schema.js';
export const djMixer = defineFurniture(djMixer_schema, {
createInstance: () => {
return {
interactions: {},
dispose: () => {},
};
},
});
@@ -0,0 +1,58 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { djPlayer_schema } from 'misskey-world/src/room/furnitures/djPlayer.schema.js';
import { createTextureManager, defineFurniture } from '../furniture.js';
import { normalizeUvToSquare } from '../../utility.js';
export const djPlayer = defineFurniture(djPlayer_schema, {
createInstance: async ({ model, options, scene }) => {
const screenMesh = model.findMesh('__X_SCREEN__');
const screenMaterial = model.findMaterial('__X_SCREEN__');
screenMaterial.emissiveColor = new BABYLON.Color3(1, 1, 1);
screenMaterial.roughness = 0;
screenMaterial.metallic = 0;
normalizeUvToSquare(screenMesh);
const textureManager = createTextureManager(screenMesh, () => 15.6 / 8.33, scene);
const applyScreenBrightness = () => {
const b = options.screenBrightness;
screenMaterial.emissiveIntensity = b * 2;
};
applyScreenBrightness();
const applyImage = () => {
screenMaterial.unfreeze();
let url: string | null = null;
if (options.image.type === '_custom_') {
url = options.image.custom?.url ?? null;
} else if (options.image.type === 'waveform') {
url = '/client-assets/world/objects/dj-player/textures/display-waveform.png';
}
return textureManager.change(url, options.image.fit, options.image.rotation).then((tex) => {
screenMaterial.emissiveTexture = tex;
});
};
await applyImage();
return {
onOptionsUpdated: ([k, v]) => {
switch (k) {
case 'screenBrightness': applyScreenBrightness(); break;
case 'image': applyImage(); break;
}
},
interactions: {},
dispose: () => {
textureManager.dispose();
},
};
},
});
@@ -0,0 +1,57 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
import * as BABYLON from '@babylonjs/core/pure.js';
import { cm, remap, WORLD_SCALE } from 'misskey-world/src/utility.js';
import { downlight_schema } from 'misskey-world/src/room/furnitures/downlight.schema.js';
import { defineFurniture } from '../furniture.js';
import { getLightRangeFactorByGraphicsQuality } from '../utility.js';
export const downlight = defineFurniture(downlight_schema, {
createInstance: ({ lc, scene, options, model, graphicsQuality }) => {
const bodyMaterial = model.findMaterial('__X_BODY__');
const lightMaterial = model.findMaterial('__X_LIGHT__');
const applyBodyMat = () => {
bodyMaterial.albedoColor = new BABYLON.Color3(options.bodyMat.color[0], options.bodyMat.color[1], options.bodyMat.color[2]);
bodyMaterial.roughness = options.bodyMat.roughness;
bodyMaterial.metallic = options.bodyMat.metallic;
};
applyBodyMat();
const body = model.findMesh('__X_BODY__');
const light = new BABYLON.SpotLight('', new BABYLON.Vector3(cm(0), cm(0), 0), new BABYLON.Vector3(0, -1, 0), Math.PI / 1, 2, scene, lc != null);
light.parent = body;
light.radius = cm(8);
if (lc != null) lc.addLight(light);
const applyLight = () => {
const [r, g, b] = options.light.color;
light.diffuse = new BABYLON.Color3(r, g, b);
light.intensity = 5 * options.light.brightness * WORLD_SCALE * WORLD_SCALE;
light.range = remap(options.light.brightness, 0, 1, cm(200), cm(400)) * getLightRangeFactorByGraphicsQuality(graphicsQuality);
lightMaterial.emissiveColor = new BABYLON.Color3(r, g, b);
lightMaterial.emissiveIntensity = options.light.brightness * 100;
};
applyLight();
return {
onOptionsUpdated: ([k, v]) => {
switch (k) {
case 'bodyMat': applyBodyMat(); break;
case 'light': applyLight(); break;
}
},
interactions: {},
dispose: () => {
light.dispose();
if (lc != null) lc.removeLight(light);
scene.removeLight(light); // lc使用時はsceneには追加してないはずだが、これがないとクラッシュする babylonのバグ?
},
};
},
});

Some files were not shown because too many files have changed in this diff Show More