@@ -47,11 +47,11 @@ SPDX-License-Identifier: AGPL-3.0-only
import { ref, useTemplateRef, watch, onMounted, onUnmounted, reactive, nextTick, shallowRef, computed, triggerRef, markRaw } from 'vue';
import * as Misskey from 'misskey-js';
import { OBJECT_SCHEMA_DEFS } from 'misskey-world/src/room/object-schema-defs.js';
-import XObjectCustomizeForm from './room.object-customize-form.vue';
-import XItem from './room.add-object-dialog.item.vue';
-import type { PreviewEngineControllerOptions } from '@/world/room/previewEngineController.js';
import type { RawOptions } from 'misskey-world/src/room/object.js';
import type { RoomAttachments } from 'misskey-world/src/room/type.js';
+import type { WorldAvatar } from 'misskey-world/src/types.js';
+import type { AvatarPreviewEngineControllerOptions } from '@/world/avatarPreviewEngineController.js';
+import { AvatarPreviewEngineController } from '@/world/avatarPreviewEngineController.js';
import { i18n } from '@/i18n.js';
import MkModalWindow from '@/components/MkModalWindow.vue';
import * as os from '@/os.js';
@@ -59,15 +59,13 @@ import MkButton from '@/components/MkButton.vue';
import { prefer } from '@/preferences.js';
import { deepClone } from '@/utility/clone.js';
import { store } from '@/store.js';
-import MkFoldableSection from '@/components/MkFoldableSection.vue';
-import { PreviewEngineController } from '@/world/room/previewEngineController.js';
import MkInput from '@/components/MkInput.vue';
import { withTimeout } from '@/utility/promise-timeout.js';
-
-// TODO: instanceのidと紛らわしいのでid -> typeにする
+import { $i } from '@/i.js';
const props = defineProps<{
graphicsQuality: number;
+ avatar: WorldAvatar | null;
}>();
const emit = defineEmits<{
@@ -82,39 +80,44 @@ const emit = defineEmits<{
const dialog = useTemplateRef('dialog');
const canvas = useTemplateRef('canvas');
-const selectedId = ref
(null);
-const showPreview = ref(false);
-const selectedInstanceId = ref(null);
-const selectedObjectOptionsState = ref(null);
-const selectedObjectSchema = computed(() => selectedId.value == null ? null : OBJECT_SCHEMA_DEFS[selectedId.value]);
const showObjectOptions = ref(false);
-const searchKeyword = ref('');
-const attachments = {
- files: [],
-} as RoomAttachments;
+const avatar: WorldAvatar = props.avatar != null ? deepClone(props.avatar) : {
+ 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: [],
+};
-function addFileAttachment(file: Misskey.entities.DriveFile) {
- attachments.files.push(file);
-}
-
-const previewEngineControllerOptions = computed(() => ({
+const avatarPreviewEngineControllerOptions = computed(() => ({
graphicsQuality: props.graphicsQuality,
fps: null,
resolution: 1,
workerMode: prefer.s['world.separateRenderingThread'],
}));
-const controller = markRaw(new PreviewEngineController(previewEngineControllerOptions.value));
-
-const recentlyUsedSchemas = computed(() => {
- const recentlyUsed = store.s.recentlyUsedRoomObjects;
- return recentlyUsed.map(id => OBJECT_SCHEMA_DEFS[id]).filter((def): def is typeof OBJECT_SCHEMA_DEFS[string] => def != null);
-});
+const controller = markRaw(new AvatarPreviewEngineController(avatarPreviewEngineControllerOptions.value));
onMounted(async () => {
try {
await controller.init(canvas.value!);
+ await controller.load({
+ name: $i.name,
+ username: $i.username,
+ avatarUrl: $i.avatarUrl,
+ worldAvatar: avatar,
+ });
} catch (err) {
console.error(err);
os.alert({
@@ -132,42 +135,6 @@ onUnmounted(() => {
controller.destroy();
});
-watch(selectedId, (newId) => {
- showObjectOptions.value = false;
- showPreview.value = false;
-
- if (!controller.isReady.value) return;
-
- if (newId == null) {
- controller.clearObject();
- controller.pauseRender();
- selectedInstanceId.value = null;
- selectedObjectOptionsState.value = null;
- } else {
- const closeWaiting = os.waiting();
- nextTick(() => {
- try {
- withTimeout(controller.loadObject(newId), 10000).then(res => {
- selectedInstanceId.value = res.id;
- selectedObjectOptionsState.value = deepClone(res.options);
- controller.resumeRender();
- closeWaiting();
- showPreview.value = true;
- nextTick(() => {
- controller.resize();
- });
- }).catch(err => {
- closeWaiting();
- throw err;
- });
- } catch (err) {
- closeWaiting();
- throw err;
- }
- });
- }
-});
-
function updateObjectOption(k: string, v: any) {
controller.updateObjectOption(k, v, attachments);
selectedObjectOptionsState.value![k] = v;
diff --git a/packages/frontend/src/pages/settings/preferences.vue b/packages/frontend/src/pages/settings/preferences.vue
index b5e35b787f..a999707259 100644
--- a/packages/frontend/src/pages/settings/preferences.vue
+++ b/packages/frontend/src/pages/settings/preferences.vue
@@ -823,6 +823,19 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+
+
+
+ {{ i18n.ts._miWorld.avatar }}
+
+
+
+
@@ -1220,6 +1233,18 @@ function testNotification(): void {
}, 300);
}
+async function createWorldAvatar(ev: PointerEvent) {
+ const { dispose } = await os.popupAsyncWithDialog(import('../rooms/edit-world-avatar-dialog.vue').then(x => x.default), {
+ }, {
+ ok: async (res) => {
+ console.log(res);
+ },
+ closed: () => {
+ dispose();
+ },
+ });
+}
+
const headerActions = computed(() => []);
const headerTabs = computed(() => []);
diff --git a/packages/frontend/src/world/avatarPreviewEngineController.ts b/packages/frontend/src/world/avatarPreviewEngineController.ts
index 9d0f5e6230..7048bc49c8 100644
--- a/packages/frontend/src/world/avatarPreviewEngineController.ts
+++ b/packages/frontend/src/world/avatarPreviewEngineController.ts
@@ -3,7 +3,8 @@
* SPDX-License-Identifier: AGPL-3.0-only
*/
-import { EngineControllerBase } from './EngineControllerBase.js';
+import { EngineControllerBase } from './engineControllerBase.js';
+import type { PlayerProfile } from 'misskey-world-engine/src/PlayerContainer.js';
import type { AvatarPreviewEngine } from 'misskey-world-engine/src/avatarPreviewEngine.js';
export type AvatarPreviewEngineControllerOptions = {
@@ -44,11 +45,7 @@ export class AvatarPreviewEngineController extends EngineControllerBase