diff --git a/.gitattributes b/.gitattributes index 952d6cd0e9..a175917f31 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,7 @@ *.svg -diff -text *.psd -diff -text *.ai -diff -text +*.mqo -diff -text +*.glb -diff -text +*.blend -diff -text +*.afdesign -diff -text diff --git a/.gitignore b/.gitignore index e438ad890c..4baefc147f 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,10 @@ api-docs.json .DS_Store /files ormconfig.json + +# blender backups +*.blend1 +*.blend2 +*.blend3 +*.blend4 +*.blend5 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ba45f5d23c..0c3bfa42f7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -38,6 +38,16 @@ Documentation of Vue I18n is available at http://kazupon.github.io/vue-i18n/intr Misskey uses CircleCI for executing automated tests. Configuration files are located in [`/.circleci`](/.circleci). +## Adding MisskeyRoom items +Currently, we accept only 3D models created with [Blender](https://www.blender.org/). + +* Use English for material, object and texture names +* Use meter for unit of length +* Your PR must include all source files of your models (for later editing) +* Your PR must include the glTF binary files (.glb) of your models + +You can find information on glTF 2.0 at [glTF 2.0 — Blender Manual]( https://docs.blender.org/manual/en/dev/addons/io_scene_gltf2.html). + ## FAQ ### How to resolve conflictions occurred at yarn.lock? diff --git a/gulpfile.ts b/gulpfile.ts index 85305cd0e4..6ed597731f 100644 --- a/gulpfile.ts +++ b/gulpfile.ts @@ -47,7 +47,11 @@ gulp.task('build:copy:views', () => gulp.src('./src/server/web/views/**/*').pipe(gulp.dest('./built/server/web/views')) ); -gulp.task('build:copy', gulp.parallel('build:copy:views', () => +gulp.task('build:copy:fonts', () => + gulp.src('./node_modules/three/examples/fonts/**/*').pipe(gulp.dest('./built/client/assets/fonts/')) +); + +gulp.task('build:copy', gulp.parallel('build:copy:views', 'build:copy:fonts', () => gulp.src([ './src/const.json', './src/server/web/views/**/*', diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index dc9dd87a7f..8a34ea935b 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -308,6 +308,16 @@ common: saved: "保存しました" home-profile: "ホームのプロファイル" deck-profile: "デッキのプロファイル" + room: "ルーム" + _room: + graphicsQuality: "グラフィックの品質" + _graphicsQuality: + ultra: "最高" + high: "高" + medium: "中" + low: "低" + cheep: "最低" + useOrthographicCamera: "平行投影カメラを使用" search: "検索" delete: "削除" @@ -1250,6 +1260,7 @@ desktop/views/components/ui.header.account.vue: groups: "グループ" follow-requests: "フォロー申請" admin: "管理" + room: "ルーム" desktop/views/components/ui.header.nav.vue: game: "ゲーム" @@ -2281,3 +2292,55 @@ pages: enviromentVariables: "環境変数" pageVariables: "ページ要素" argVariables: "入力スロット" + +room: + add-furniture: "家具を置く" + translate: "移動" + rotate: "回転" + exit: "戻る" + remove: "しまう" + save: "保存" + chooseImage: "画像を選択" + room-type: "部屋のタイプ" + carpet-color: "床の色" + rooms: + default: "デフォルト" + washitsu: "和室" + furnitures: + milk: "牛乳パック" + bed: "ベッド" + low-table: "ローテーブル" + desk: "デスク" + chair: "チェア" + chair2: "チェア2" + fan: "換気扇" + pc: "パソコン" + plant: "観葉植物" + plant2: "観葉植物2" + eraser: "消しゴム" + pencil: "鉛筆" + pudding: "プリン" + cardboard-box: "段ボール箱" + cardboard-box2: "段ボール箱2" + cardboard-box3: "段ボール箱3" + book: "本" + book2: "本2" + piano: "ピアノ" + facial-tissue: "ティッシュボックス" + server: "サーバー" + moon: "月" + corkboard: "コルクボード" + mousepad: "マウスパッド" + monitor: "モニター" + keyboard: "キーボード" + carpet-stripe: "カーペット(縞)" + mat: "マット" + color-box: "カラーボックス" + wall-clock: "壁掛け時計" + photoframe: "額縁" + cube: "キューブ" + tv: "テレビ" + pinguin: "ピンギン" + rubik-cube: "ルービックキューブ" + poster-h: "ポスター(横長)" + poster-v: "ポスター(縦長)" diff --git a/migration/1565634203341-room.ts b/migration/1565634203341-room.ts new file mode 100644 index 0000000000..783b375ff9 --- /dev/null +++ b/migration/1565634203341-room.ts @@ -0,0 +1,13 @@ +import {MigrationInterface, QueryRunner} from "typeorm"; + +export class room1565634203341 implements MigrationInterface { + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE "user_profile" ADD "room" jsonb NOT NULL DEFAULT '{}'`); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "room"`); + } + +} diff --git a/package.json b/package.json index 5cd0299c0e..85beac348c 100644 --- a/package.json +++ b/package.json @@ -223,6 +223,7 @@ "syuilo-password-strength": "0.0.1", "terser-webpack-plugin": "1.3.0", "textarea-caret": "3.1.0", + "three": "0.107.0", "tinycolor2": "1.4.1", "tmp": "0.1.0", "ts-loader": "5.3.3", diff --git a/src/client/app/common/scripts/room/furniture.ts b/src/client/app/common/scripts/room/furniture.ts new file mode 100644 index 0000000000..7734e32668 --- /dev/null +++ b/src/client/app/common/scripts/room/furniture.ts @@ -0,0 +1,21 @@ +export type RoomInfo = { + roomType: string; + carpetColor: string; + furnitures: Furniture[]; +}; + +export type Furniture = { + id: string; // 同じ家具が複数ある場合にそれぞれを識別するためのIDであり、家具IDではない + type: string; // こっちが家具ID(chairとか) + position: { + x: number; + y: number; + z: number; + }; + rotation: { + x: number; + y: number; + z: number; + }; + props?: Record; +}; diff --git a/src/client/app/common/scripts/room/furnitures.json5 b/src/client/app/common/scripts/room/furnitures.json5 new file mode 100644 index 0000000000..d88228ca36 --- /dev/null +++ b/src/client/app/common/scripts/room/furnitures.json5 @@ -0,0 +1,324 @@ +// 家具メタデータ + +// 家具にはユーザーが設定できるプロパティを設定可能です: +// +// props: { +// : +// } +// +// proptype一覧: +// * image ... 画像選択ダイアログを出し、その画像のURLが格納されます +// * color ... 色選択コントロールを出し、選択された色が格納されます + +// 家具にカスタムテクスチャを適用できるようにするには、textureプロパティに以下の追加の情報を含めます: +// 便宜上そのUVのどの部分にカスタムテクスチャを貼り合わせるかのエリアをテクスチャエリアと呼びます。 +// UVは1024*1024だと仮定します。 +// +// : { +// prop: <プロパティ名>, +// uv: { +// x: <テクスチャエリアX座標>, +// y: <テクスチャエリアY座標>, +// width: <テクスチャエリアの幅>, +// height: <テクスチャエリアの高さ>, +// }, +// } +// +// には、カスタムテクスチャを適用したいメッシュ名を指定します +// <プロパティ名>には、カスタムテクスチャとして使用する画像を格納するプロパティ(前述)名を指定します + +// 家具にカスタムカラーを適用できるようにするには、colorプロパティに以下の追加の情報を含めます: +// +// : <プロパティ名> +// +// には、カスタムカラーを適用したいマテリアル名を指定します +// <プロパティ名>には、カスタムカラーとして使用する色を格納するプロパティ(前述)名を指定します + +[ + { + id: "milk", + place: "floor" + }, + { + id: "bed", + place: "floor" + }, + { + id: "low-table", + place: "floor", + props: { + color: 'color' + }, + color: { + Table: 'color' + } + }, + { + id: "desk", + place: "floor", + props: { + color: 'color' + }, + color: { + Board: 'color' + } + }, + { + id: "chair", + place: "floor", + props: { + color: 'color' + }, + color: { + Chair: 'color' + } + }, + { + id: "chair2", + place: "floor", + props: { + color1: 'color', + color2: 'color' + }, + color: { + Cushion: 'color1', + Leg: 'color2' + } + }, + { + id: "fan", + place: "wall" + }, + { + id: "pc", + place: "floor" + }, + { + id: "plant", + place: "floor" + }, + { + id: "plant2", + place: "floor" + }, + { + id: "eraser", + place: "floor" + }, + { + id: "pencil", + place: "floor" + }, + { + id: "pudding", + place: "floor" + }, + { + id: "cardboard-box", + place: "floor" + }, + { + id: "cardboard-box2", + place: "floor" + }, + { + id: "cardboard-box3", + place: "floor" + }, + { + id: "book", + place: "floor", + props: { + color: 'color' + }, + color: { + Cover: 'color' + } + }, + { + id: "book2", + place: "floor" + }, + { + id: "piano", + place: "floor" + }, + { + id: "facial-tissue", + place: "floor" + }, + { + id: "server", + place: "floor" + }, + { + id: "moon", + place: "floor" + }, + { + id: "corkboard", + place: "wall" + }, + { + id: "mousepad", + place: "floor", + props: { + color: 'color' + }, + color: { + Pad: 'color' + } + }, + { + id: "monitor", + place: "floor", + props: { + screen: 'image' + }, + texture: { + Screen: { + prop: 'screen', + uv: { + x: 0, + y: 434, + width: 1024, + height: 588, + }, + }, + }, + }, + { + id: "tv", + place: "floor", + props: { + screen: 'image' + }, + texture: { + Screen: { + prop: 'screen', + uv: { + x: 0, + y: 434, + width: 1024, + height: 588, + }, + }, + }, + }, + { + id: "keyboard", + place: "floor" + }, + { + id: "carpet-stripe", + place: "floor", + props: { + color1: 'color', + color2: 'color' + }, + color: { + CarpetAreaA: 'color1', + CarpetAreaB: 'color2' + }, + }, + { + id: "mat", + place: "floor", + props: { + color: 'color' + }, + color: { + Mat: 'color' + } + }, + { + id: "color-box", + place: "floor", + props: { + color: 'color' + }, + color: { + main: 'color' + } + }, + { + id: "wall-clock", + place: "wall" + }, + { + id: "cube", + place: "floor", + props: { + color: 'color' + }, + color: { + Cube: 'color' + } + }, + { + id: "photoframe", + place: "wall", + props: { + photo: 'image', + color: 'color' + }, + texture: { + Photo: { + prop: 'photo', + uv: { + x: 0, + y: 342, + width: 1024, + height: 683, + }, + }, + }, + color: { + Frame: 'color' + } + }, + { + id: "pinguin", + place: "floor" + }, + { + id: "rubik-cube", + place: "floor", + }, + { + id: "poster-h", + place: "wall", + props: { + picture: 'image' + }, + texture: { + Poster: { + prop: 'picture', + uv: { + x: 0, + y: 277, + width: 1024, + height: 745, + }, + }, + }, + }, + { + id: "poster-v", + place: "wall", + props: { + picture: 'image' + }, + texture: { + Poster: { + prop: 'picture', + uv: { + x: 0, + y: 0, + width: 745, + height: 1024, + }, + }, + }, + }, +] diff --git a/src/client/app/common/scripts/room/room.ts b/src/client/app/common/scripts/room/room.ts new file mode 100644 index 0000000000..2a06f5bc5b --- /dev/null +++ b/src/client/app/common/scripts/room/room.ts @@ -0,0 +1,690 @@ +import autobind from 'autobind-decorator'; +import * as THREE from 'three'; +import { GLTFLoader, GLTF } from 'three/examples/jsm/loaders/GLTFLoader'; +import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls.js'; +import { EffectComposer } from 'three/examples/jsm/postprocessing/EffectComposer.js'; +import { RenderPass } from 'three/examples/jsm/postprocessing/RenderPass.js'; +import { ShaderPass } from 'three/examples/jsm/postprocessing/ShaderPass.js'; +import { BloomPass } from 'three/examples/jsm/postprocessing/BloomPass.js'; +import { FXAAShader } from 'three/examples/jsm/shaders/FXAAShader.js'; +import { TransformControls } from 'three/examples/jsm/controls/TransformControls.js'; +import { Furniture, RoomInfo } from './furniture'; +import { v4 as uuid } from 'uuid'; +const furnitureDefs = require('./furnitures.json5'); + +THREE.ImageUtils.crossOrigin = ''; + +type Options = { + graphicsQuality: Room['graphicsQuality']; + onChangeSelect: Room['onChangeSelect']; + useOrthographicCamera: boolean; +}; + +export class Room { + private clock: THREE.Clock; + private scene: THREE.Scene; + private renderer: THREE.WebGLRenderer; + private camera: THREE.PerspectiveCamera | THREE.OrthographicCamera; + private controls: OrbitControls; + private composer: EffectComposer; + private mixers: THREE.AnimationMixer[] = []; + private furnitureControl: TransformControls; + private roomInfo: RoomInfo; + private graphicsQuality: 'cheep' | 'low' | 'medium' | 'high' | 'ultra'; + private roomObj: THREE.Object3D; + private objects: THREE.Object3D[] = []; + private selectedObject: THREE.Object3D = null; + private onChangeSelect: Function; + private isTransformMode = false; + public canvas: HTMLCanvasElement; + + private get furnitures(): Furniture[] { + return this.roomInfo.furnitures; + } + + private set furnitures(furnitures: Furniture[]) { + this.roomInfo.furnitures = furnitures; + } + + private get enableShadow() { + return this.graphicsQuality != 'cheep'; + } + + private get usePostFXs() { + return this.graphicsQuality !== 'cheep' && this.graphicsQuality !== 'low'; + } + + private get shadowQuality() { + return ( + this.graphicsQuality === 'ultra' ? 16384 : + this.graphicsQuality === 'high' ? 8192 : + this.graphicsQuality === 'medium' ? 4096 : + this.graphicsQuality === 'low' ? 1024 : + 0); // cheep + } + + constructor(user, isMyRoom, roomInfo: RoomInfo, container, options: Options) { + this.roomInfo = roomInfo; + this.graphicsQuality = options.graphicsQuality; + this.onChangeSelect = options.onChangeSelect; + + this.clock = new THREE.Clock(true); + + //#region Init a scene + this.scene = new THREE.Scene(); + + const width = window.innerWidth; + const height = window.innerHeight; + + //#region Init a renderer + this.renderer = new THREE.WebGLRenderer({ + antialias: false, + stencil: false, + alpha: false, + powerPreference: + this.graphicsQuality === 'ultra' ? 'high-performance' : + this.graphicsQuality === 'high' ? 'high-performance' : + this.graphicsQuality === 'medium' ? 'default' : + this.graphicsQuality === 'low' ? 'low-power' : + 'low-power' // cheep + }); + + this.renderer.setPixelRatio(window.devicePixelRatio); + this.renderer.setSize(width, height); + this.renderer.autoClear = false; + this.renderer.setClearColor(new THREE.Color(0x051f2d)); + this.renderer.shadowMap.enabled = this.enableShadow; + this.renderer.gammaOutput = true; + this.renderer.shadowMap.type = + this.graphicsQuality === 'ultra' ? THREE.PCFSoftShadowMap : + this.graphicsQuality === 'high' ? THREE.PCFSoftShadowMap : + this.graphicsQuality === 'medium' ? THREE.PCFShadowMap : + this.graphicsQuality === 'low' ? THREE.BasicShadowMap : + THREE.BasicShadowMap; // cheep + + this.canvas = this.renderer.domElement; + container.appendChild(this.renderer.domElement); + //#endregion + + //#region Init a camera + this.camera = options.useOrthographicCamera + ? new THREE.OrthographicCamera( + width / - 2, width / 2, height / 2, height / - 2, -10, 10) + : new THREE.PerspectiveCamera(45, width / height); + + if (options.useOrthographicCamera) { + this.camera.position.x = 2; + this.camera.position.y = 2; + this.camera.position.z = 2; + this.camera.zoom = 100; + this.camera.updateProjectionMatrix(); + } else { + this.camera.position.x = 5; + this.camera.position.y = 2; + this.camera.position.z = 5; + } + + this.scene.add(this.camera); + //#endregion + + //#region AmbientLight + const ambientLight = new THREE.AmbientLight(0xffffff, 1); + this.scene.add(ambientLight); + //#endregion + + if (this.graphicsQuality !== 'cheep') { + //#region Room light + const roomLight = new THREE.SpotLight(0xffffff, 0.1); + + roomLight.position.set(0, 8, 0); + roomLight.castShadow = this.enableShadow; + roomLight.shadow.bias = -0.0001; + roomLight.shadow.mapSize.width = this.shadowQuality; + roomLight.shadow.mapSize.height = this.shadowQuality; + roomLight.shadow.camera.near = 0.1; + roomLight.shadow.camera.far = 9; + roomLight.shadow.camera.fov = 45; + + this.scene.add(roomLight); + //#endregion + } + + //#region Out light + const outLight = new THREE.SpotLight(0xffffff, 0.4); + + outLight.position.set(9, 3, -2); + outLight.castShadow = this.enableShadow; + outLight.shadow.bias = -0.001; // アクネ、アーチファクト対策 その代わりピーターパンが発生する可能性がある + outLight.shadow.mapSize.width = this.shadowQuality; + outLight.shadow.mapSize.height = this.shadowQuality; + outLight.shadow.camera.near = 6; + outLight.shadow.camera.far = 15; + outLight.shadow.camera.fov = 45; + + this.scene.add(outLight); + //#endregion + + //#region Init a controller + this.controls = new OrbitControls(this.camera, this.renderer.domElement); + + this.controls.target.set(0, 1, 0); + this.controls.enableZoom = true; + this.controls.enablePan = isMyRoom; + this.controls.minPolarAngle = 0; + this.controls.maxPolarAngle = Math.PI / 2; + this.controls.minAzimuthAngle = 0; + this.controls.maxAzimuthAngle = Math.PI / 2; + this.controls.enableDamping = true; + this.controls.dampingFactor = 0.2; + this.controls.mouseButtons.LEFT = 1; + this.controls.mouseButtons.MIDDLE = 2; + this.controls.mouseButtons.RIGHT = 0; + //#endregion + + //#region POST FXs + if (!this.usePostFXs) { + this.composer = null; + } else { + const renderTarget = new THREE.WebGLRenderTarget(width, height, { + minFilter: THREE.LinearFilter, + magFilter: THREE.LinearFilter, + format: THREE.RGBFormat, + stencilBuffer: false, + }); + + const fxaa = new ShaderPass(FXAAShader); + fxaa.uniforms['resolution'].value = new THREE.Vector2(1 / width, 1 / height); + fxaa.renderToScreen = true; + + this.composer = new EffectComposer(this.renderer, renderTarget); + this.composer.addPass(new RenderPass(this.scene, this.camera)); + if (this.graphicsQuality === 'ultra') { + this.composer.addPass(new BloomPass(0.25, 30, 128.0, 512)); + } + this.composer.addPass(fxaa); + } + //#endregion + //#endregion + + //#region Label + //#region Avatar + const avatarUrl = user.avatarUrl; + + const iconTexture = new THREE.TextureLoader().load(avatarUrl); + iconTexture.wrapS = THREE.RepeatWrapping; + iconTexture.wrapT = THREE.RepeatWrapping; + iconTexture.anisotropy = 16; + + const avatarMaterial = new THREE.MeshLambertMaterial({ + emissive: 0x111111, + map: iconTexture, + side: THREE.DoubleSide, + alphaTest: 0.5 + }); + + const iconGeometry = new THREE.PlaneGeometry(1, 1); + + const avatarObject = new THREE.Mesh(iconGeometry, avatarMaterial); + avatarObject.position.set(-3, 2.5, 2); + avatarObject.rotation.y = Math.PI / 2; + avatarObject.castShadow = false; + + this.scene.add(avatarObject); + //#endregion + + //#region Username + const name = user.username; + + new THREE.FontLoader().load('/assets/fonts/helvetiker_regular.typeface.json', font => { + const nameGeometry = new THREE.TextGeometry(name, { + size: 0.5, + height: 0, + curveSegments: 8, + font: font, + bevelThickness: 0, + bevelSize: 0, + bevelEnabled: false + }); + + const nameMaterial = new THREE.MeshLambertMaterial({ + color: 0xffffff + }); + + const nameObject = new THREE.Mesh(nameGeometry, nameMaterial); + nameObject.position.set(-3, 2.25, 1.25); + nameObject.rotation.y = Math.PI / 2; + nameObject.castShadow = false; + + this.scene.add(nameObject); + }); + //#endregion + //#endregion + + //#region Interaction + if (isMyRoom) { + this.furnitureControl = new TransformControls(this.camera, this.renderer.domElement); + this.scene.add(this.furnitureControl); + + // Hover highlight + this.renderer.domElement.onmousemove = this.onmousemove; + + // Click + this.renderer.domElement.onmousedown = this.onmousedown; + } + //#endregion + + //#region Init room + this.loadRoom(); + //#endregion + + //#region Load furnitures + for (const furniture of this.furnitures) { + this.loadFurniture(furniture).then(obj => { + this.scene.add(obj.scene); + this.objects.push(obj.scene); + }); + } + //#endregion + + // Start render + if (this.usePostFXs) { + this.renderWithPostFXs(); + } else { + this.renderWithoutPostFXs(); + } + } + + @autobind + private renderWithoutPostFXs() { + requestAnimationFrame(this.renderWithoutPostFXs); + + // Update animations + const clock = this.clock.getDelta(); + for (const mixer of this.mixers) { + mixer.update(clock); + } + + this.controls.update(); + this.renderer.render(this.scene, this.camera); + } + + @autobind + private renderWithPostFXs() { + requestAnimationFrame(this.renderWithPostFXs); + + // Update animations + const clock = this.clock.getDelta(); + for (const mixer of this.mixers) { + mixer.update(clock); + } + + this.controls.update(); + this.renderer.clear(); + this.composer.render(); + } + + @autobind + private loadRoom() { + new GLTFLoader().load(`/assets/room/rooms/${this.roomInfo.roomType}/${this.roomInfo.roomType}.glb`, gltf => { + gltf.scene.traverse(child => { + if (!(child instanceof THREE.Mesh)) return; + + child.receiveShadow = this.enableShadow; + + child.material = new THREE.MeshLambertMaterial({ + color: (child.material as THREE.MeshStandardMaterial).color, + map: (child.material as THREE.MeshStandardMaterial).map, + name: (child.material as THREE.MeshStandardMaterial).name, + }); + + // 異方性フィルタリング + if ((child.material as THREE.MeshLambertMaterial).map && this.graphicsQuality !== 'cheep') { + (child.material as THREE.MeshLambertMaterial).map.minFilter = THREE.LinearMipMapLinearFilter; + (child.material as THREE.MeshLambertMaterial).map.magFilter = THREE.LinearMipMapLinearFilter; + (child.material as THREE.MeshLambertMaterial).map.anisotropy = 8; + } + }); + + gltf.scene.position.set(0, 0, 0); + + this.scene.add(gltf.scene); + this.roomObj = gltf.scene; + if (this.roomInfo.roomType === 'default') { + this.applyCarpetColor(); + } + }); + } + + @autobind + private loadFurniture(furniture: Furniture) { + const def = furnitureDefs.find(d => d.id === furniture.type); + return new Promise((res, rej) => { + const loader = new GLTFLoader(); + loader.load(`/assets/room/furnitures/${furniture.type}/${furniture.type}.glb`, gltf => { + const model = gltf.scene; + + // Load animation + if (gltf.animations.length > 0) { + const mixer = new THREE.AnimationMixer(model); + this.mixers.push(mixer); + for (const clip of gltf.animations) { + mixer.clipAction(clip).play(); + } + } + + model.name = furniture.id; + model.position.x = furniture.position.x; + model.position.y = furniture.position.y; + model.position.z = furniture.position.z; + model.rotation.x = furniture.rotation.x; + model.rotation.y = furniture.rotation.y; + model.rotation.z = furniture.rotation.z; + + model.traverse(child => { + if (!(child instanceof THREE.Mesh)) return; + child.castShadow = this.enableShadow; + child.receiveShadow = this.enableShadow; + child.material = new THREE.MeshLambertMaterial({ + color: (child.material as THREE.MeshStandardMaterial).color, + map: (child.material as THREE.MeshStandardMaterial).map, + name: (child.material as THREE.MeshStandardMaterial).name, + }); + + // 異方性フィルタリング + if ((child.material as THREE.MeshLambertMaterial).map && this.graphicsQuality !== 'cheep') { + (child.material as THREE.MeshLambertMaterial).map.minFilter = THREE.LinearMipMapLinearFilter; + (child.material as THREE.MeshLambertMaterial).map.magFilter = THREE.LinearMipMapLinearFilter; + (child.material as THREE.MeshLambertMaterial).map.anisotropy = 8; + } + }); + + if (def.color) { // カスタムカラー + this.applyCustomColor(model); + } + + if (def.texture) { // カスタムテクスチャ + this.applyCustomTexture(model); + } + + res(gltf); + }, null, rej); + }); + } + + @autobind + private applyCarpetColor() { + this.roomObj.traverse(child => { + if (!(child instanceof THREE.Mesh)) return; + if (child.material && (child.material as THREE.MeshStandardMaterial).name && (child.material as THREE.MeshStandardMaterial).name === 'Carpet') { + (child.material as THREE.MeshStandardMaterial).color.setHex(parseInt(this.roomInfo.carpetColor.substr(1), 16)); + } + }); + } + + @autobind + public applyCustomColor(model: THREE.Object3D) { + const furniture = this.furnitures.find(furniture => furniture.id === model.name); + const def = furnitureDefs.find(d => d.id === furniture.type); + if (def.color == null) return; + model.traverse(child => { + if (!(child instanceof THREE.Mesh)) return; + for (const t of Object.keys(def.color)) { + if (!child.material || !(child.material as THREE.MeshStandardMaterial).name || (child.material as THREE.MeshStandardMaterial).name !== t) continue; + + const prop = def.color[t]; + const val = furniture.props ? furniture.props[prop] : undefined; + + if (val == null) continue; + + (child.material as THREE.MeshStandardMaterial).color.setHex(parseInt(val.substr(1), 16)); + } + }); + } + + @autobind + public applyCustomTexture(model: THREE.Object3D) { + const furniture = this.furnitures.find(furniture => furniture.id === model.name); + const def = furnitureDefs.find(d => d.id === furniture.type); + if (def.texture == null) return; + model.traverse(child => { + if (!(child instanceof THREE.Mesh)) return; + for (const t of Object.keys(def.texture)) { + if (child.name !== t) continue; + + const prop = def.texture[t].prop; + const val = furniture.props ? furniture.props[prop] : undefined; + + if (val == null) continue; + + const canvas = document.createElement('canvas'); + canvas.height = 1024; + canvas.width = 1024; + + child.material = new THREE.MeshLambertMaterial({ + emissive: 0x111111, + side: THREE.DoubleSide, + alphaTest: 0.5, + }); + + const img = new Image(); + img.onload = () => { + const uvInfo = def.texture[t].uv; + + const ctx = canvas.getContext('2d'); + ctx.drawImage(img, 0, 0, img.width, img.height, uvInfo.x, uvInfo.y, uvInfo.width, uvInfo.height); + + const texture = new THREE.Texture(canvas); + texture.wrapS = THREE.RepeatWrapping; + texture.wrapT = THREE.RepeatWrapping; + texture.anisotropy = 16; + texture.flipY = false; + + (child.material as THREE.MeshLambertMaterial).map = texture; + (child.material as THREE.MeshLambertMaterial).needsUpdate = true; + (child.material as THREE.MeshLambertMaterial).map.needsUpdate = true; + }; + img.src = val; + } + }); + } + + @autobind + private onmousemove(ev: MouseEvent) { + if (this.isTransformMode) return; + + const rect = (ev.target as HTMLElement).getBoundingClientRect(); + const x = (((ev.clientX * window.devicePixelRatio) - rect.left) / this.renderer.domElement.width) * 2 - 1; + const y = -(((ev.clientY * window.devicePixelRatio) - rect.top) / this.renderer.domElement.height) * 2 + 1; + const pos = new THREE.Vector2(x, y); + + this.camera.updateMatrixWorld(); + + const raycaster = new THREE.Raycaster(); + raycaster.setFromCamera(pos, this.camera); + + const intersects = raycaster.intersectObjects(this.objects, true); + + for (const object of this.objects) { + if (this.isSelectedObject(object)) continue; + object.traverse(child => { + if (child instanceof THREE.Mesh) { + (child.material as THREE.MeshStandardMaterial).emissive.setHex(0x000000); + } + }); + } + + if (intersects.length > 0) { + const intersected = this.getRoot(intersects[0].object); + if (!this.isSelectedObject(intersected)) { + intersected.traverse(child => { + if (child instanceof THREE.Mesh) { + (child.material as THREE.MeshStandardMaterial).emissive.setHex(0x191919); + } + }); + } + } + } + + @autobind + private onmousedown(ev: MouseEvent) { + if (this.isTransformMode) return; + if (ev.target !== this.renderer.domElement || ev.button !== 0) return; + + const rect = (ev.target as HTMLElement).getBoundingClientRect(); + const x = (((ev.clientX * window.devicePixelRatio) - rect.left) / this.renderer.domElement.width) * 2 - 1; + const y = -(((ev.clientY * window.devicePixelRatio) - rect.top) / this.renderer.domElement.height) * 2 + 1; + const pos = new THREE.Vector2(x, y); + + this.camera.updateMatrixWorld(); + + const raycaster = new THREE.Raycaster(); + raycaster.setFromCamera(pos, this.camera); + + const intersects = raycaster.intersectObjects(this.objects, true); + + for (const object of this.objects) { + object.traverse(child => { + if (child instanceof THREE.Mesh) { + (child.material as THREE.MeshStandardMaterial).emissive.setHex(0x000000); + } + }); + } + + if (intersects.length > 0) { + const selectedObj = this.getRoot(intersects[0].object); + this.selectFurniture(selectedObj); + } else { + this.selectedObject = null; + this.onChangeSelect(null); + } + } + + @autobind + private getRoot(obj: THREE.Object3D): THREE.Object3D { + let found = false; + let x = obj.parent; + while (!found) { + if (x.parent.parent == null) { + found = true; + } else { + x = x.parent; + } + } + return x; + } + + @autobind + private isSelectedObject(obj: THREE.Object3D): boolean { + if (this.selectedObject == null) { + return false; + } else { + return obj.name === this.selectedObject.name; + } + } + + @autobind + private selectFurniture(obj: THREE.Object3D) { + this.selectedObject = obj; + this.onChangeSelect(obj); + obj.traverse(child => { + if (child instanceof THREE.Mesh) { + (child.material as THREE.MeshStandardMaterial).emissive.setHex(0xff0000); + } + }); + } + + @autobind + public enterTransformMode(type: 'translate' | 'rotate') { + this.isTransformMode = true; + this.furnitureControl.setMode(type); + this.furnitureControl.attach(this.selectedObject); + } + + @autobind + public exitTransformMode() { + this.isTransformMode = false; + this.furnitureControl.detach(); + } + + @autobind + public updateProp(key: string, value: any) { + const furniture = this.furnitures.find(furniture => furniture.id === this.selectedObject.name); + if (furniture.props == null) furniture.props = {}; + furniture.props[key] = value; + this.applyCustomColor(this.selectedObject); + this.applyCustomTexture(this.selectedObject); + } + + @autobind + public addFurniture(type: string) { + const furniture = { + id: uuid(), + type: type, + position: { + x: 0, + y: 0, + z: 0, + }, + rotation: { + x: 0, + y: 0, + z: 0, + }, + }; + + this.furnitures.push(furniture); + + this.loadFurniture(furniture).then(obj => { + this.scene.add(obj.scene); + this.objects.push(obj.scene); + }); + } + + @autobind + public removeFurniture() { + const obj = this.selectedObject; + this.scene.remove(obj); + this.objects = this.objects.filter(object => object.name !== obj.name); + this.furnitures = this.furnitures.filter(furniture => furniture.id !== obj.name); + this.selectedObject = null; + this.onChangeSelect(null); + } + + @autobind + public updateCarpetColor(color: string) { + this.roomInfo.carpetColor = color; + this.applyCarpetColor(); + } + + @autobind + public changeRoomType(type: string) { + this.roomInfo.roomType = type; + this.scene.remove(this.roomObj); + this.loadRoom(); + } + + @autobind + public getRoomInfo() { + for (const obj of this.objects) { + const furniture = this.furnitures.find(f => f.id === obj.name); + furniture.position.x = obj.position.x; + furniture.position.y = obj.position.y; + furniture.position.z = obj.position.z; + furniture.rotation.x = obj.rotation.x; + furniture.rotation.y = obj.rotation.y; + furniture.rotation.z = obj.rotation.z; + } + + return this.roomInfo; + } + + @autobind + public getSelectedObject() { + return this.selectedObject; + } + + @autobind + public findFurnitureById(id: string) { + return this.furnitures.find(furniture => furniture.id === id); + } +} diff --git a/src/client/app/common/views/components/settings/settings.vue b/src/client/app/common/views/components/settings/settings.vue index c609a96722..914d5bf84f 100644 --- a/src/client/app/common/views/components/settings/settings.vue +++ b/src/client/app/common/views/components/settings/settings.vue @@ -159,6 +159,19 @@ + +
+
{{ $t('@._settings.room') }}
+ + + + + + + + + {{ $t('@._settings._room.useOrthographicCamera') }} +
@@ -503,6 +516,16 @@ export default Vue.extend({ set(value) { this.$store.dispatch('settings/set', { key: 'iLikeSushi', value }); } }, + roomUseOrthographicCamera: { + get() { return this.$store.state.device.roomUseOrthographicCamera; }, + set(value) { this.$store.commit('device/set', { key: 'roomUseOrthographicCamera', value }); } + }, + + roomGraphicsQuality: { + get() { return this.$store.state.device.roomGraphicsQuality; }, + set(value) { this.$store.commit('device/set', { key: 'roomGraphicsQuality', value }); } + }, + games_reversi_showBoardLabels: { get() { return this.$store.state.settings.gamesReversiShowBoardLabels; }, set(value) { this.$store.dispatch('settings/set', { key: 'gamesReversiShowBoardLabels', value }); } diff --git a/src/client/app/common/views/pages/room/preview.vue b/src/client/app/common/views/pages/room/preview.vue new file mode 100644 index 0000000000..3f849d8c04 --- /dev/null +++ b/src/client/app/common/views/pages/room/preview.vue @@ -0,0 +1,98 @@ + + + diff --git a/src/client/app/common/views/pages/room/room.vue b/src/client/app/common/views/pages/room/room.vue new file mode 100644 index 0000000000..955e35701e --- /dev/null +++ b/src/client/app/common/views/pages/room/room.vue @@ -0,0 +1,237 @@ + + + + + diff --git a/src/client/app/desktop/script.ts b/src/client/app/desktop/script.ts index 32e4886de3..f77a00ae6b 100644 --- a/src/client/app/desktop/script.ts +++ b/src/client/app/desktop/script.ts @@ -187,6 +187,7 @@ init(async (launch, os) => { { path: '/i/drive/folder/:folder', component: MkDrive }, { path: '/i/settings', component: MkSettings }, { path: '/selectdrive', component: MkSelectDrive }, + { path: '/@:acct/room', props: true, component: () => import('../common/views/pages/room/room.vue').then(m => m.default) }, { path: '/share', component: MkShare }, { path: '/games/reversi/:game?', component: MkReversi }, { path: '/authorize-follow', component: MkFollow }, diff --git a/src/client/app/desktop/views/components/ui.header.account.vue b/src/client/app/desktop/views/components/ui.header.account.vue index 5d7ed8c302..690f3a5587 100644 --- a/src/client/app/desktop/views/components/ui.header.account.vue +++ b/src/client/app/desktop/views/components/ui.header.account.vue @@ -56,6 +56,13 @@ +
  • + + + {{ $t('room') }} + + +
    • @@ -106,7 +113,7 @@ import i18n from '../../../i18n'; // import MkSettingsWindow from './settings-window.vue'; import MkDriveWindow from './drive-window.vue'; import contains from '../../../common/scripts/contains'; -import { faHome, faColumns, faUsers } from '@fortawesome/free-solid-svg-icons'; +import { faHome, faColumns, faUsers, faDoorOpen } from '@fortawesome/free-solid-svg-icons'; import { faMoon, faSun, faStickyNote } from '@fortawesome/free-regular-svg-icons'; export default Vue.extend({ @@ -114,7 +121,7 @@ export default Vue.extend({ data() { return { isOpen: false, - faHome, faColumns, faMoon, faSun, faStickyNote, faUsers + faHome, faColumns, faMoon, faSun, faStickyNote, faUsers, faDoorOpen }; }, computed: { diff --git a/src/client/app/store.ts b/src/client/app/store.ts index d9f1631a82..92fb1568b0 100644 --- a/src/client/app/store.ts +++ b/src/client/app/store.ts @@ -76,6 +76,8 @@ const defaultDeviceSettings = { expandUsersPhotos: true, expandUsersActivity: true, enableMobileQuickNotificationView: false, + roomGraphicsQuality: 'medium', + roomUseOrthographicCamera: true, }; export default (os: MiOS) => new Vuex.Store({ diff --git a/src/client/app/tsconfig.json b/src/client/app/tsconfig.json index 8605da75ab..3ec0271f63 100644 --- a/src/client/app/tsconfig.json +++ b/src/client/app/tsconfig.json @@ -11,11 +11,17 @@ "sourceMap": false, "target": "es2017", "module": "esnext", + "moduleResolution": "node", "removeComments": false, "noLib": false, "strict": true, "strictNullChecks": false, - "experimentalDecorators": true + "experimentalDecorators": true, + "resolveJsonModule": true, + "typeRoots": [ + "node_modules/@types", + "src/@types" + ] }, "compileOnSave": false, "include": [ diff --git a/src/client/assets/room/furnitures/bed/bed.blend b/src/client/assets/room/furnitures/bed/bed.blend new file mode 100644 index 0000000000..731df76d0c Binary files /dev/null and b/src/client/assets/room/furnitures/bed/bed.blend differ diff --git a/src/client/assets/room/furnitures/bed/bed.glb b/src/client/assets/room/furnitures/bed/bed.glb new file mode 100644 index 0000000000..f35ecb9ef4 Binary files /dev/null and b/src/client/assets/room/furnitures/bed/bed.glb differ diff --git a/src/client/assets/room/furnitures/book/book.blend b/src/client/assets/room/furnitures/book/book.blend new file mode 100644 index 0000000000..0d4899d4ae Binary files /dev/null and b/src/client/assets/room/furnitures/book/book.blend differ diff --git a/src/client/assets/room/furnitures/book/book.glb b/src/client/assets/room/furnitures/book/book.glb new file mode 100644 index 0000000000..546893da06 Binary files /dev/null and b/src/client/assets/room/furnitures/book/book.glb differ diff --git a/src/client/assets/room/furnitures/book2/barcode.png b/src/client/assets/room/furnitures/book2/barcode.png new file mode 100644 index 0000000000..2694854227 Binary files /dev/null and b/src/client/assets/room/furnitures/book2/barcode.png differ diff --git a/src/client/assets/room/furnitures/book2/book2.blend b/src/client/assets/room/furnitures/book2/book2.blend new file mode 100644 index 0000000000..e0fdb48101 Binary files /dev/null and b/src/client/assets/room/furnitures/book2/book2.blend differ diff --git a/src/client/assets/room/furnitures/book2/book2.glb b/src/client/assets/room/furnitures/book2/book2.glb new file mode 100644 index 0000000000..2b26402f8c Binary files /dev/null and b/src/client/assets/room/furnitures/book2/book2.glb differ diff --git a/src/client/assets/room/furnitures/book2/texture.afdesign b/src/client/assets/room/furnitures/book2/texture.afdesign new file mode 100644 index 0000000000..b63771607a Binary files /dev/null and b/src/client/assets/room/furnitures/book2/texture.afdesign differ diff --git a/src/client/assets/room/furnitures/book2/texture.png b/src/client/assets/room/furnitures/book2/texture.png new file mode 100644 index 0000000000..f34328cb4a Binary files /dev/null and b/src/client/assets/room/furnitures/book2/texture.png differ diff --git a/src/client/assets/room/furnitures/book2/uv.png b/src/client/assets/room/furnitures/book2/uv.png new file mode 100644 index 0000000000..9d282d0b69 Binary files /dev/null and b/src/client/assets/room/furnitures/book2/uv.png differ diff --git a/src/client/assets/room/furnitures/cardboard-box/cardboard-box.blend b/src/client/assets/room/furnitures/cardboard-box/cardboard-box.blend new file mode 100644 index 0000000000..3a528de32a Binary files /dev/null and b/src/client/assets/room/furnitures/cardboard-box/cardboard-box.blend differ diff --git a/src/client/assets/room/furnitures/cardboard-box/cardboard-box.glb b/src/client/assets/room/furnitures/cardboard-box/cardboard-box.glb new file mode 100644 index 0000000000..bed372e94f Binary files /dev/null and b/src/client/assets/room/furnitures/cardboard-box/cardboard-box.glb differ diff --git a/src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.blend b/src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.blend new file mode 100644 index 0000000000..5f146267ac Binary files /dev/null and b/src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.blend differ diff --git a/src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.glb b/src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.glb new file mode 100644 index 0000000000..85fcb5c0b6 Binary files /dev/null and b/src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.glb differ diff --git a/src/client/assets/room/furnitures/cardboard-box2/texture.png b/src/client/assets/room/furnitures/cardboard-box2/texture.png new file mode 100644 index 0000000000..abc1b3de64 Binary files /dev/null and b/src/client/assets/room/furnitures/cardboard-box2/texture.png differ diff --git a/src/client/assets/room/furnitures/cardboard-box2/uv.png b/src/client/assets/room/furnitures/cardboard-box2/uv.png new file mode 100644 index 0000000000..104c141b2c Binary files /dev/null and b/src/client/assets/room/furnitures/cardboard-box2/uv.png differ diff --git a/src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.blend b/src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.blend new file mode 100644 index 0000000000..00681a3cfd Binary files /dev/null and b/src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.blend differ diff --git a/src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.glb b/src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.glb new file mode 100644 index 0000000000..1ef0427689 Binary files /dev/null and b/src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.glb differ diff --git a/src/client/assets/room/furnitures/cardboard-box3/texture.png b/src/client/assets/room/furnitures/cardboard-box3/texture.png new file mode 100644 index 0000000000..e68292dce0 Binary files /dev/null and b/src/client/assets/room/furnitures/cardboard-box3/texture.png differ diff --git a/src/client/assets/room/furnitures/cardboard-box3/texture.xcf b/src/client/assets/room/furnitures/cardboard-box3/texture.xcf new file mode 100644 index 0000000000..7ffb3e3439 Binary files /dev/null and b/src/client/assets/room/furnitures/cardboard-box3/texture.xcf differ diff --git a/src/client/assets/room/furnitures/cardboard-box3/uv.png b/src/client/assets/room/furnitures/cardboard-box3/uv.png new file mode 100644 index 0000000000..3ac23ef584 Binary files /dev/null and b/src/client/assets/room/furnitures/cardboard-box3/uv.png differ diff --git a/src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.blend b/src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.blend new file mode 100644 index 0000000000..750343d4f0 Binary files /dev/null and b/src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.blend differ diff --git a/src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.glb b/src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.glb new file mode 100644 index 0000000000..3066a69e35 Binary files /dev/null and b/src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.glb differ diff --git a/src/client/assets/room/furnitures/chair/chair.blend b/src/client/assets/room/furnitures/chair/chair.blend new file mode 100644 index 0000000000..79c29a8401 Binary files /dev/null and b/src/client/assets/room/furnitures/chair/chair.blend differ diff --git a/src/client/assets/room/furnitures/chair/chair.glb b/src/client/assets/room/furnitures/chair/chair.glb new file mode 100644 index 0000000000..08ee1a0bb0 Binary files /dev/null and b/src/client/assets/room/furnitures/chair/chair.glb differ diff --git a/src/client/assets/room/furnitures/chair2/chair2.blend b/src/client/assets/room/furnitures/chair2/chair2.blend new file mode 100644 index 0000000000..c6a1acd96f Binary files /dev/null and b/src/client/assets/room/furnitures/chair2/chair2.blend differ diff --git a/src/client/assets/room/furnitures/chair2/chair2.glb b/src/client/assets/room/furnitures/chair2/chair2.glb new file mode 100644 index 0000000000..5ea2f3518b Binary files /dev/null and b/src/client/assets/room/furnitures/chair2/chair2.glb differ diff --git a/src/client/assets/room/furnitures/color-box/color-box.blend b/src/client/assets/room/furnitures/color-box/color-box.blend new file mode 100644 index 0000000000..f96a4ff766 Binary files /dev/null and b/src/client/assets/room/furnitures/color-box/color-box.blend differ diff --git a/src/client/assets/room/furnitures/color-box/color-box.glb b/src/client/assets/room/furnitures/color-box/color-box.glb new file mode 100644 index 0000000000..43f2abcae8 Binary files /dev/null and b/src/client/assets/room/furnitures/color-box/color-box.glb differ diff --git a/src/client/assets/room/furnitures/corkboard/corkboard.blend b/src/client/assets/room/furnitures/corkboard/corkboard.blend new file mode 100644 index 0000000000..9a7e1878cd Binary files /dev/null and b/src/client/assets/room/furnitures/corkboard/corkboard.blend differ diff --git a/src/client/assets/room/furnitures/corkboard/corkboard.glb b/src/client/assets/room/furnitures/corkboard/corkboard.glb new file mode 100644 index 0000000000..fee108fb91 Binary files /dev/null and b/src/client/assets/room/furnitures/corkboard/corkboard.glb differ diff --git a/src/client/assets/room/furnitures/cube/cube.blend b/src/client/assets/room/furnitures/cube/cube.blend new file mode 100644 index 0000000000..1af5bf40a9 Binary files /dev/null and b/src/client/assets/room/furnitures/cube/cube.blend differ diff --git a/src/client/assets/room/furnitures/cube/cube.glb b/src/client/assets/room/furnitures/cube/cube.glb new file mode 100644 index 0000000000..4ac8b6036d Binary files /dev/null and b/src/client/assets/room/furnitures/cube/cube.glb differ diff --git a/src/client/assets/room/furnitures/desk/desk.blend b/src/client/assets/room/furnitures/desk/desk.blend new file mode 100644 index 0000000000..c88d01f0b2 Binary files /dev/null and b/src/client/assets/room/furnitures/desk/desk.blend differ diff --git a/src/client/assets/room/furnitures/desk/desk.glb b/src/client/assets/room/furnitures/desk/desk.glb new file mode 100644 index 0000000000..4a58513095 Binary files /dev/null and b/src/client/assets/room/furnitures/desk/desk.glb differ diff --git a/src/client/assets/room/furnitures/eraser/cover.png b/src/client/assets/room/furnitures/eraser/cover.png new file mode 100644 index 0000000000..e64bfde11a Binary files /dev/null and b/src/client/assets/room/furnitures/eraser/cover.png differ diff --git a/src/client/assets/room/furnitures/eraser/cover.psd b/src/client/assets/room/furnitures/eraser/cover.psd new file mode 100644 index 0000000000..c393337833 Binary files /dev/null and b/src/client/assets/room/furnitures/eraser/cover.psd differ diff --git a/src/client/assets/room/furnitures/eraser/eraser-uv.png b/src/client/assets/room/furnitures/eraser/eraser-uv.png new file mode 100644 index 0000000000..2124114e70 Binary files /dev/null and b/src/client/assets/room/furnitures/eraser/eraser-uv.png differ diff --git a/src/client/assets/room/furnitures/eraser/eraser.blend b/src/client/assets/room/furnitures/eraser/eraser.blend new file mode 100644 index 0000000000..103c54fbae Binary files /dev/null and b/src/client/assets/room/furnitures/eraser/eraser.blend differ diff --git a/src/client/assets/room/furnitures/eraser/eraser.glb b/src/client/assets/room/furnitures/eraser/eraser.glb new file mode 100644 index 0000000000..016b60df20 Binary files /dev/null and b/src/client/assets/room/furnitures/eraser/eraser.glb differ diff --git a/src/client/assets/room/furnitures/facial-tissue/facial-tissue-uv.png b/src/client/assets/room/furnitures/facial-tissue/facial-tissue-uv.png new file mode 100644 index 0000000000..b6dfa8f308 Binary files /dev/null and b/src/client/assets/room/furnitures/facial-tissue/facial-tissue-uv.png differ diff --git a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.blend b/src/client/assets/room/furnitures/facial-tissue/facial-tissue.blend new file mode 100644 index 0000000000..d59f87c1ee Binary files /dev/null and b/src/client/assets/room/furnitures/facial-tissue/facial-tissue.blend differ diff --git a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.glb b/src/client/assets/room/furnitures/facial-tissue/facial-tissue.glb new file mode 100644 index 0000000000..48b36ef347 Binary files /dev/null and b/src/client/assets/room/furnitures/facial-tissue/facial-tissue.glb differ diff --git a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.png b/src/client/assets/room/furnitures/facial-tissue/facial-tissue.png new file mode 100644 index 0000000000..f25c882027 Binary files /dev/null and b/src/client/assets/room/furnitures/facial-tissue/facial-tissue.png differ diff --git a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.psd b/src/client/assets/room/furnitures/facial-tissue/facial-tissue.psd new file mode 100644 index 0000000000..cd59fc007b Binary files /dev/null and b/src/client/assets/room/furnitures/facial-tissue/facial-tissue.psd differ diff --git a/src/client/assets/room/furnitures/fan/fan.blend b/src/client/assets/room/furnitures/fan/fan.blend new file mode 100644 index 0000000000..8c8106e5fe Binary files /dev/null and b/src/client/assets/room/furnitures/fan/fan.blend differ diff --git a/src/client/assets/room/furnitures/fan/fan.glb b/src/client/assets/room/furnitures/fan/fan.glb new file mode 100644 index 0000000000..d9367f3534 Binary files /dev/null and b/src/client/assets/room/furnitures/fan/fan.glb differ diff --git a/src/client/assets/room/furnitures/keyboard/keyboard.blend b/src/client/assets/room/furnitures/keyboard/keyboard.blend new file mode 100644 index 0000000000..ab33d134b3 Binary files /dev/null and b/src/client/assets/room/furnitures/keyboard/keyboard.blend differ diff --git a/src/client/assets/room/furnitures/keyboard/keyboard.glb b/src/client/assets/room/furnitures/keyboard/keyboard.glb new file mode 100644 index 0000000000..15dc69f47a Binary files /dev/null and b/src/client/assets/room/furnitures/keyboard/keyboard.glb differ diff --git a/src/client/assets/room/furnitures/low-table/low-table.blend b/src/client/assets/room/furnitures/low-table/low-table.blend new file mode 100644 index 0000000000..e1592174d9 Binary files /dev/null and b/src/client/assets/room/furnitures/low-table/low-table.blend differ diff --git a/src/client/assets/room/furnitures/low-table/low-table.glb b/src/client/assets/room/furnitures/low-table/low-table.glb new file mode 100644 index 0000000000..c69bf35d7b Binary files /dev/null and b/src/client/assets/room/furnitures/low-table/low-table.glb differ diff --git a/src/client/assets/room/furnitures/mat/mat.blend b/src/client/assets/room/furnitures/mat/mat.blend new file mode 100644 index 0000000000..a1e1a68c55 Binary files /dev/null and b/src/client/assets/room/furnitures/mat/mat.blend differ diff --git a/src/client/assets/room/furnitures/mat/mat.glb b/src/client/assets/room/furnitures/mat/mat.glb new file mode 100644 index 0000000000..87ccd44e1a Binary files /dev/null and b/src/client/assets/room/furnitures/mat/mat.glb differ diff --git a/src/client/assets/room/furnitures/milk/milk-uv.png b/src/client/assets/room/furnitures/milk/milk-uv.png new file mode 100644 index 0000000000..70060c9190 Binary files /dev/null and b/src/client/assets/room/furnitures/milk/milk-uv.png differ diff --git a/src/client/assets/room/furnitures/milk/milk.blend b/src/client/assets/room/furnitures/milk/milk.blend new file mode 100644 index 0000000000..2df508d5b9 Binary files /dev/null and b/src/client/assets/room/furnitures/milk/milk.blend differ diff --git a/src/client/assets/room/furnitures/milk/milk.glb b/src/client/assets/room/furnitures/milk/milk.glb new file mode 100644 index 0000000000..b335fe3d02 Binary files /dev/null and b/src/client/assets/room/furnitures/milk/milk.glb differ diff --git a/src/client/assets/room/furnitures/milk/milk.png b/src/client/assets/room/furnitures/milk/milk.png new file mode 100644 index 0000000000..2ce010ce78 Binary files /dev/null and b/src/client/assets/room/furnitures/milk/milk.png differ diff --git a/src/client/assets/room/furnitures/milk/milk.psd b/src/client/assets/room/furnitures/milk/milk.psd new file mode 100644 index 0000000000..f31e439277 Binary files /dev/null and b/src/client/assets/room/furnitures/milk/milk.psd differ diff --git a/src/client/assets/room/furnitures/monitor/monitor.blend b/src/client/assets/room/furnitures/monitor/monitor.blend new file mode 100644 index 0000000000..bf37cd5da2 Binary files /dev/null and b/src/client/assets/room/furnitures/monitor/monitor.blend differ diff --git a/src/client/assets/room/furnitures/monitor/monitor.glb b/src/client/assets/room/furnitures/monitor/monitor.glb new file mode 100644 index 0000000000..efe42bd71c Binary files /dev/null and b/src/client/assets/room/furnitures/monitor/monitor.glb differ diff --git a/src/client/assets/room/furnitures/monitor/monitor.psd b/src/client/assets/room/furnitures/monitor/monitor.psd new file mode 100644 index 0000000000..57afff9cd9 Binary files /dev/null and b/src/client/assets/room/furnitures/monitor/monitor.psd differ diff --git a/src/client/assets/room/furnitures/monitor/screen-uv.png b/src/client/assets/room/furnitures/monitor/screen-uv.png new file mode 100644 index 0000000000..5599087364 Binary files /dev/null and b/src/client/assets/room/furnitures/monitor/screen-uv.png differ diff --git a/src/client/assets/room/furnitures/monitor/screen.jpg b/src/client/assets/room/furnitures/monitor/screen.jpg new file mode 100644 index 0000000000..6f03a9ee90 Binary files /dev/null and b/src/client/assets/room/furnitures/monitor/screen.jpg differ diff --git a/src/client/assets/room/furnitures/moon/moon.blend b/src/client/assets/room/furnitures/moon/moon.blend new file mode 100644 index 0000000000..4ff3deab8e Binary files /dev/null and b/src/client/assets/room/furnitures/moon/moon.blend differ diff --git a/src/client/assets/room/furnitures/moon/moon.glb b/src/client/assets/room/furnitures/moon/moon.glb new file mode 100644 index 0000000000..07fa7e4c02 Binary files /dev/null and b/src/client/assets/room/furnitures/moon/moon.glb differ diff --git a/src/client/assets/room/furnitures/moon/moon.jpg b/src/client/assets/room/furnitures/moon/moon.jpg new file mode 100644 index 0000000000..1b0798755c Binary files /dev/null and b/src/client/assets/room/furnitures/moon/moon.jpg differ diff --git a/src/client/assets/room/furnitures/mousepad/mousepad.blend b/src/client/assets/room/furnitures/mousepad/mousepad.blend new file mode 100644 index 0000000000..14bd139c94 Binary files /dev/null and b/src/client/assets/room/furnitures/mousepad/mousepad.blend differ diff --git a/src/client/assets/room/furnitures/mousepad/mousepad.glb b/src/client/assets/room/furnitures/mousepad/mousepad.glb new file mode 100644 index 0000000000..681ada49cd Binary files /dev/null and b/src/client/assets/room/furnitures/mousepad/mousepad.glb differ diff --git a/src/client/assets/room/furnitures/pc/motherboard-uv.png b/src/client/assets/room/furnitures/pc/motherboard-uv.png new file mode 100644 index 0000000000..490ae86810 Binary files /dev/null and b/src/client/assets/room/furnitures/pc/motherboard-uv.png differ diff --git a/src/client/assets/room/furnitures/pc/motherboard-uv.psd b/src/client/assets/room/furnitures/pc/motherboard-uv.psd new file mode 100644 index 0000000000..971f33f79e Binary files /dev/null and b/src/client/assets/room/furnitures/pc/motherboard-uv.psd differ diff --git a/src/client/assets/room/furnitures/pc/motherboard.jpg b/src/client/assets/room/furnitures/pc/motherboard.jpg new file mode 100644 index 0000000000..415f8d0b1d Binary files /dev/null and b/src/client/assets/room/furnitures/pc/motherboard.jpg differ diff --git a/src/client/assets/room/furnitures/pc/pc.blend b/src/client/assets/room/furnitures/pc/pc.blend new file mode 100644 index 0000000000..13dfec6ccc Binary files /dev/null and b/src/client/assets/room/furnitures/pc/pc.blend differ diff --git a/src/client/assets/room/furnitures/pc/pc.glb b/src/client/assets/room/furnitures/pc/pc.glb new file mode 100644 index 0000000000..44a48b18ae Binary files /dev/null and b/src/client/assets/room/furnitures/pc/pc.glb differ diff --git a/src/client/assets/room/furnitures/pencil/pencil.blend b/src/client/assets/room/furnitures/pencil/pencil.blend new file mode 100644 index 0000000000..0fc6bdd776 Binary files /dev/null and b/src/client/assets/room/furnitures/pencil/pencil.blend differ diff --git a/src/client/assets/room/furnitures/pencil/pencil.glb b/src/client/assets/room/furnitures/pencil/pencil.glb new file mode 100644 index 0000000000..a938b5cdcc Binary files /dev/null and b/src/client/assets/room/furnitures/pencil/pencil.glb differ diff --git a/src/client/assets/room/furnitures/photoframe/photo-uv.png b/src/client/assets/room/furnitures/photoframe/photo-uv.png new file mode 100644 index 0000000000..befa32c367 Binary files /dev/null and b/src/client/assets/room/furnitures/photoframe/photo-uv.png differ diff --git a/src/client/assets/room/furnitures/photoframe/photo.jpg b/src/client/assets/room/furnitures/photoframe/photo.jpg new file mode 100644 index 0000000000..9597571fef Binary files /dev/null and b/src/client/assets/room/furnitures/photoframe/photo.jpg differ diff --git a/src/client/assets/room/furnitures/photoframe/photoframe.blend b/src/client/assets/room/furnitures/photoframe/photoframe.blend new file mode 100644 index 0000000000..4224cde45b Binary files /dev/null and b/src/client/assets/room/furnitures/photoframe/photoframe.blend differ diff --git a/src/client/assets/room/furnitures/photoframe/photoframe.glb b/src/client/assets/room/furnitures/photoframe/photoframe.glb new file mode 100644 index 0000000000..4255a77de6 Binary files /dev/null and b/src/client/assets/room/furnitures/photoframe/photoframe.glb differ diff --git a/src/client/assets/room/furnitures/piano/piano.blend b/src/client/assets/room/furnitures/piano/piano.blend new file mode 100644 index 0000000000..7653cdf672 Binary files /dev/null and b/src/client/assets/room/furnitures/piano/piano.blend differ diff --git a/src/client/assets/room/furnitures/piano/piano.glb b/src/client/assets/room/furnitures/piano/piano.glb new file mode 100644 index 0000000000..7242e78ceb Binary files /dev/null and b/src/client/assets/room/furnitures/piano/piano.glb differ diff --git a/src/client/assets/room/furnitures/pinguin/pinguin.glb b/src/client/assets/room/furnitures/pinguin/pinguin.glb new file mode 100644 index 0000000000..0ddf611ad9 Binary files /dev/null and b/src/client/assets/room/furnitures/pinguin/pinguin.glb differ diff --git a/src/client/assets/room/furnitures/plant/plant-soil-uv.png b/src/client/assets/room/furnitures/plant/plant-soil-uv.png new file mode 100644 index 0000000000..ca690fdeb8 Binary files /dev/null and b/src/client/assets/room/furnitures/plant/plant-soil-uv.png differ diff --git a/src/client/assets/room/furnitures/plant/plant-soil.png b/src/client/assets/room/furnitures/plant/plant-soil.png new file mode 100644 index 0000000000..dc26ba062e Binary files /dev/null and b/src/client/assets/room/furnitures/plant/plant-soil.png differ diff --git a/src/client/assets/room/furnitures/plant/plant-soil.psd b/src/client/assets/room/furnitures/plant/plant-soil.psd new file mode 100644 index 0000000000..1457b7ea5b Binary files /dev/null and b/src/client/assets/room/furnitures/plant/plant-soil.psd differ diff --git a/src/client/assets/room/furnitures/plant/plant.blend b/src/client/assets/room/furnitures/plant/plant.blend new file mode 100644 index 0000000000..aa38c7b54e Binary files /dev/null and b/src/client/assets/room/furnitures/plant/plant.blend differ diff --git a/src/client/assets/room/furnitures/plant/plant.glb b/src/client/assets/room/furnitures/plant/plant.glb new file mode 100644 index 0000000000..38422b4a9b Binary files /dev/null and b/src/client/assets/room/furnitures/plant/plant.glb differ diff --git a/src/client/assets/room/furnitures/plant2/plant2.blend b/src/client/assets/room/furnitures/plant2/plant2.blend new file mode 100644 index 0000000000..6592c5d98d Binary files /dev/null and b/src/client/assets/room/furnitures/plant2/plant2.blend differ diff --git a/src/client/assets/room/furnitures/plant2/plant2.glb b/src/client/assets/room/furnitures/plant2/plant2.glb new file mode 100644 index 0000000000..223e6f5834 Binary files /dev/null and b/src/client/assets/room/furnitures/plant2/plant2.glb differ diff --git a/src/client/assets/room/furnitures/plant2/soil.png b/src/client/assets/room/furnitures/plant2/soil.png new file mode 100644 index 0000000000..dc26ba062e Binary files /dev/null and b/src/client/assets/room/furnitures/plant2/soil.png differ diff --git a/src/client/assets/room/furnitures/poster-h/poster-h.blend b/src/client/assets/room/furnitures/poster-h/poster-h.blend new file mode 100644 index 0000000000..40f944f3c1 Binary files /dev/null and b/src/client/assets/room/furnitures/poster-h/poster-h.blend differ diff --git a/src/client/assets/room/furnitures/poster-h/poster-h.glb b/src/client/assets/room/furnitures/poster-h/poster-h.glb new file mode 100644 index 0000000000..c6032c1009 Binary files /dev/null and b/src/client/assets/room/furnitures/poster-h/poster-h.glb differ diff --git a/src/client/assets/room/furnitures/poster-h/uv.png b/src/client/assets/room/furnitures/poster-h/uv.png new file mode 100644 index 0000000000..700e6b1cf0 Binary files /dev/null and b/src/client/assets/room/furnitures/poster-h/uv.png differ diff --git a/src/client/assets/room/furnitures/poster-v/poster-v.blend b/src/client/assets/room/furnitures/poster-v/poster-v.blend new file mode 100644 index 0000000000..07fe971634 Binary files /dev/null and b/src/client/assets/room/furnitures/poster-v/poster-v.blend differ diff --git a/src/client/assets/room/furnitures/poster-v/poster-v.glb b/src/client/assets/room/furnitures/poster-v/poster-v.glb new file mode 100644 index 0000000000..6e3782f193 Binary files /dev/null and b/src/client/assets/room/furnitures/poster-v/poster-v.glb differ diff --git a/src/client/assets/room/furnitures/poster-v/uv.png b/src/client/assets/room/furnitures/poster-v/uv.png new file mode 100644 index 0000000000..225b0061a2 Binary files /dev/null and b/src/client/assets/room/furnitures/poster-v/uv.png differ diff --git a/src/client/assets/room/furnitures/pudding/pudding.blend b/src/client/assets/room/furnitures/pudding/pudding.blend new file mode 100644 index 0000000000..bba40ce161 Binary files /dev/null and b/src/client/assets/room/furnitures/pudding/pudding.blend differ diff --git a/src/client/assets/room/furnitures/pudding/pudding.glb b/src/client/assets/room/furnitures/pudding/pudding.glb new file mode 100644 index 0000000000..06c9ed80cc Binary files /dev/null and b/src/client/assets/room/furnitures/pudding/pudding.glb differ diff --git a/src/client/assets/room/furnitures/rubik-cube/rubik-cube.blend b/src/client/assets/room/furnitures/rubik-cube/rubik-cube.blend new file mode 100644 index 0000000000..6c09067e78 Binary files /dev/null and b/src/client/assets/room/furnitures/rubik-cube/rubik-cube.blend differ diff --git a/src/client/assets/room/furnitures/rubik-cube/rubik-cube.glb b/src/client/assets/room/furnitures/rubik-cube/rubik-cube.glb new file mode 100644 index 0000000000..d640df9b06 Binary files /dev/null and b/src/client/assets/room/furnitures/rubik-cube/rubik-cube.glb differ diff --git a/src/client/assets/room/furnitures/server/rack-uv.png b/src/client/assets/room/furnitures/server/rack-uv.png new file mode 100644 index 0000000000..c317bd0b1a Binary files /dev/null and b/src/client/assets/room/furnitures/server/rack-uv.png differ diff --git a/src/client/assets/room/furnitures/server/rack.png b/src/client/assets/room/furnitures/server/rack.png new file mode 100644 index 0000000000..2c8231f878 Binary files /dev/null and b/src/client/assets/room/furnitures/server/rack.png differ diff --git a/src/client/assets/room/furnitures/server/server.blend b/src/client/assets/room/furnitures/server/server.blend new file mode 100644 index 0000000000..6675dfbdc2 Binary files /dev/null and b/src/client/assets/room/furnitures/server/server.blend differ diff --git a/src/client/assets/room/furnitures/server/server.glb b/src/client/assets/room/furnitures/server/server.glb new file mode 100644 index 0000000000..a8b530a2d2 Binary files /dev/null and b/src/client/assets/room/furnitures/server/server.glb differ diff --git a/src/client/assets/room/furnitures/server/server.png b/src/client/assets/room/furnitures/server/server.png new file mode 100644 index 0000000000..ac62a8b165 Binary files /dev/null and b/src/client/assets/room/furnitures/server/server.png differ diff --git a/src/client/assets/room/furnitures/server/uv.png b/src/client/assets/room/furnitures/server/uv.png new file mode 100644 index 0000000000..6c7e495014 Binary files /dev/null and b/src/client/assets/room/furnitures/server/uv.png differ diff --git a/src/client/assets/room/furnitures/tv/screen-uv.png b/src/client/assets/room/furnitures/tv/screen-uv.png new file mode 100644 index 0000000000..c02e01c2e5 Binary files /dev/null and b/src/client/assets/room/furnitures/tv/screen-uv.png differ diff --git a/src/client/assets/room/furnitures/tv/tv.blend b/src/client/assets/room/furnitures/tv/tv.blend new file mode 100644 index 0000000000..490e298e7b Binary files /dev/null and b/src/client/assets/room/furnitures/tv/tv.blend differ diff --git a/src/client/assets/room/furnitures/tv/tv.glb b/src/client/assets/room/furnitures/tv/tv.glb new file mode 100644 index 0000000000..b9bd23896b Binary files /dev/null and b/src/client/assets/room/furnitures/tv/tv.glb differ diff --git a/src/client/assets/room/furnitures/wall-clock/wall-clock.blend b/src/client/assets/room/furnitures/wall-clock/wall-clock.blend new file mode 100644 index 0000000000..0a61c8f01e Binary files /dev/null and b/src/client/assets/room/furnitures/wall-clock/wall-clock.blend differ diff --git a/src/client/assets/room/furnitures/wall-clock/wall-clock.glb b/src/client/assets/room/furnitures/wall-clock/wall-clock.glb new file mode 100644 index 0000000000..b9f0093a8d Binary files /dev/null and b/src/client/assets/room/furnitures/wall-clock/wall-clock.glb differ diff --git a/src/client/assets/room/rooms/default/default.blend b/src/client/assets/room/rooms/default/default.blend new file mode 100644 index 0000000000..661154724a Binary files /dev/null and b/src/client/assets/room/rooms/default/default.blend differ diff --git a/src/client/assets/room/rooms/default/default.glb b/src/client/assets/room/rooms/default/default.glb new file mode 100644 index 0000000000..3d378deee2 Binary files /dev/null and b/src/client/assets/room/rooms/default/default.glb differ diff --git a/src/client/assets/room/rooms/washitsu/husuma-uv.png b/src/client/assets/room/rooms/washitsu/husuma-uv.png new file mode 100644 index 0000000000..3d0b08f488 Binary files /dev/null and b/src/client/assets/room/rooms/washitsu/husuma-uv.png differ diff --git a/src/client/assets/room/rooms/washitsu/husuma.png b/src/client/assets/room/rooms/washitsu/husuma.png new file mode 100644 index 0000000000..fd1f5ef231 Binary files /dev/null and b/src/client/assets/room/rooms/washitsu/husuma.png differ diff --git a/src/client/assets/room/rooms/washitsu/tatami-single1600.png b/src/client/assets/room/rooms/washitsu/tatami-single1600.png new file mode 100644 index 0000000000..49fd2d6476 Binary files /dev/null and b/src/client/assets/room/rooms/washitsu/tatami-single1600.png differ diff --git a/src/client/assets/room/rooms/washitsu/tatami-uv.png b/src/client/assets/room/rooms/washitsu/tatami-uv.png new file mode 100644 index 0000000000..b4bba33850 Binary files /dev/null and b/src/client/assets/room/rooms/washitsu/tatami-uv.png differ diff --git a/src/client/assets/room/rooms/washitsu/tatami.afdesign b/src/client/assets/room/rooms/washitsu/tatami.afdesign new file mode 100644 index 0000000000..9300a26950 Binary files /dev/null and b/src/client/assets/room/rooms/washitsu/tatami.afdesign differ diff --git a/src/client/assets/room/rooms/washitsu/tatami.png b/src/client/assets/room/rooms/washitsu/tatami.png new file mode 100644 index 0000000000..2137d4eca7 Binary files /dev/null and b/src/client/assets/room/rooms/washitsu/tatami.png differ diff --git a/src/client/assets/room/rooms/washitsu/washitsu.blend b/src/client/assets/room/rooms/washitsu/washitsu.blend new file mode 100644 index 0000000000..84dc11374d Binary files /dev/null and b/src/client/assets/room/rooms/washitsu/washitsu.blend differ diff --git a/src/client/assets/room/rooms/washitsu/washitsu.glb b/src/client/assets/room/rooms/washitsu/washitsu.glb new file mode 100644 index 0000000000..5b4767bc73 Binary files /dev/null and b/src/client/assets/room/rooms/washitsu/washitsu.glb differ diff --git a/src/models/entities/user-profile.ts b/src/models/entities/user-profile.ts index 61e80049c3..1244fa4390 100644 --- a/src/models/entities/user-profile.ts +++ b/src/models/entities/user-profile.ts @@ -99,6 +99,12 @@ export class UserProfile { }) public clientData: Record; + @Column('jsonb', { + default: {}, + comment: 'The room data of the User.' + }) + public room: Record; + @Column('boolean', { default: false, }) diff --git a/src/server/api/endpoints/room/show.ts b/src/server/api/endpoints/room/show.ts new file mode 100644 index 0000000000..17634834ac --- /dev/null +++ b/src/server/api/endpoints/room/show.ts @@ -0,0 +1,92 @@ +import $ from 'cafy'; +import define from '../../define'; +import { ApiError } from '../../error'; +import { Users, UserProfiles } from '../../../../models'; +import { ID } from '../../../../misc/cafy-id'; +import { ensure } from '../../../../prelude/ensure'; +import { toPunyNullable } from '../../../../misc/convert-host'; + +export const meta = { + desc: { + 'ja-JP': '指定した部屋の情報を取得します。', + }, + + tags: ['room'], + + requireCredential: false, + + params: { + userId: { + validator: $.optional.type(ID), + desc: { + 'ja-JP': '対象のユーザーのID', + 'en-US': 'Target user ID' + } + }, + + username: { + validator: $.optional.str + }, + + host: { + validator: $.optional.nullable.str + }, + }, + + errors: { + noSuchUser: { + message: 'No such user.', + code: 'NO_SUCH_USER', + id: '7ad3fa3e-5e12-42f0-b23a-f3d13f10ee4b' + } + } +}; + +export default define(meta, async (ps, me) => { + const user = await Users.findOne(ps.userId != null + ? { id: ps.userId } + : { usernameLower: ps.username!.toLowerCase(), host: toPunyNullable(ps.host) }); + + if (user == null) { + throw new ApiError(meta.errors.noSuchUser); + } + + const profile = await UserProfiles.findOne(user.id).then(ensure); + + if (profile.room.furnitures == null) { + await UserProfiles.update({ userId: user.id }, { + room: { + furnitures: [], + ...profile.room + } + }); + + profile.room.furnitures = []; + } + + if (profile.room.roomType == null) { + const initialType = 'default'; + await UserProfiles.update({ userId: user.id }, { + room: { + roomType: initialType as any, + ...profile.room + } + }); + + profile.room.roomType = initialType; + } + + if (profile.room.carpetColor == null) { + const initialColor = '#85CAF0'; + await UserProfiles.update({ userId: user.id }, { + room: { + carpetColor: initialColor as any, + ...profile.room + } + }); + + profile.room.carpetColor = initialColor; + } + + return profile.room; +}); diff --git a/src/server/api/endpoints/room/update.ts b/src/server/api/endpoints/room/update.ts new file mode 100644 index 0000000000..897f65f2d2 --- /dev/null +++ b/src/server/api/endpoints/room/update.ts @@ -0,0 +1,48 @@ +import $ from 'cafy'; +import { publishMainStream } from '../../../../services/stream'; +import define from '../../define'; +import { Users, UserProfiles } from '../../../../models'; + +export const meta = { + requireCredential: true, + + params: { + room: { + validator: $.obj({ + furnitures: $.arr($.obj({ + id: $.str, + type: $.str, + position: $.obj({ + x: $.num, + y: $.num, + z: $.num, + }), + rotation: $.obj({ + x: $.num, + y: $.num, + z: $.num, + }), + props: $.optional.nullable.obj(), + })), + roomType: $.str, + carpetColor: $.str + }) + }, + }, +}; + +export default define(meta, async (ps, user) => { + await UserProfiles.update({ userId: user.id }, { + room: ps.room as any + }); + + const iObj = await Users.pack(user.id, user, { + detail: true, + includeSecrets: true + }); + + // Publish meUpdated event + publishMainStream(user.id, 'meUpdated', iObj); + + return iObj; +}); diff --git a/tsconfig.json b/tsconfig.json index 4f1d1b9cd5..62107507ac 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,6 +11,7 @@ "sourceMap": true, "target": "es2017", "module": "commonjs", + "moduleResolution": "node", "removeComments": false, "noLib": false, "strict": true, diff --git a/yarn.lock b/yarn.lock index 1ac9e145f2..1d5bf3226c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10994,6 +10994,11 @@ thenify-all@^1.0.0: dependencies: any-promise "^1.0.0" +three@0.107.0: + version "0.107.0" + resolved "https://registry.yarnpkg.com/three/-/three-0.107.0.tgz#0c862c348d61bd3f22058e01f5e771c1294315a1" + integrity sha512-vqbKJRLBEviPVa7poEzXocobicwxzsctr5mnymA7n8fEzcVS49rYP0RrwqZ98JqujRoruK+/YzcchNpRP+kXsQ== + through2-concurrent@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/through2-concurrent/-/through2-concurrent-2.0.0.tgz#c9dd2c146504ec9962dbc86a5168b63d662669fa"