mirrors/misskey
2
0
Fork 1
mirror of https://github.com/misskey-dev/misskey.git synced 2026-06-25 17:10:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

refactoe

Browse source
This commit is contained in:
syuilo 2026-06-15 16:22:57 +09:00
commit 253dd052f8
3 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

26
packages/frontend-misskey-world-engine/src/room/engine.ts
View file

@ -791,7 +791,7 @@ export class RoomEngine extends EngineBase<{
bb.min.subtractInPlace(rootPos);
bb.max.subtractInPlace(rootPos);
let stickyOtherFurniture: string | null = null;
let stickyFurnitureId: string | null = null;
let stickyPlaneId: string | null = null;
let sticky = false;
@ -820,7 +820,7 @@ export class RoomEngine extends EngineBase<{
newRotation.y = targetRotationY;
newRotation.z = grabbing.originalDiffOfRotation.z + grabbing.rotation;
newPos = hit.pickedPoint;
stickyOtherFurniture = hit.pickedMesh.metadata?.furnitureId ?? null;
stickyFurnitureId = hit.pickedMesh.metadata?.furnitureId ?? null;
stickyPlaneId = hit.pickedMesh.name.includes('<') ? hit.pickedMesh.name.split('<')[1].split('>')[0] : null;
if (this.gridSnapping.enabled) {
@ -851,7 +851,7 @@ export class RoomEngine extends EngineBase<{
if (hit != null && hit.pickedPoint != null && hit.pickedMesh != null) {
sticky = true;
newPos = hit.pickedPoint;
stickyOtherFurniture = hit.pickedMesh.metadata?.furnitureId ?? null;
stickyFurnitureId = hit.pickedMesh.metadata?.furnitureId ?? null;
stickyPlaneId = hit.pickedMesh.name.includes('<') ? hit.pickedMesh.name.split('<')[1].split('>')[0] : null;
if (this.gridSnapping.enabled) {
@ -893,7 +893,7 @@ export class RoomEngine extends EngineBase<{
sticky = true;
newPos = hit.pickedPoint;
stickyOtherFurniture = hit.pickedMesh.metadata?.furnitureId ?? null;
stickyFurnitureId = hit.pickedMesh.metadata?.furnitureId ?? null;
stickyPlaneId = hit.pickedMesh.name.includes('<') ? hit.pickedMesh.name.split('<')[1].split('>')[0] : null;
if (this.gridSnapping.enabled) {
@ -946,7 +946,7 @@ export class RoomEngine extends EngineBase<{
grabbing.onMove?.({
position: newPos,
rotation: newRotation,
stickyFurnitureId: stickyOtherFurniture,
stickyFurnitureId: stickyFurnitureId,
stickyPlaneId: stickyPlaneId,
});
}
@ -1010,7 +1010,7 @@ export class RoomEngine extends EngineBase<{
// 子から先に適用していく
const setStickyParentRecursively = (mesh: BABYLON.AbstractMesh) => {
const stickyFurnitureIds = Array.from(this.roomState.installedFurnitures.filter(o => o.sticky === mesh.metadata.furnitureId)).map(o => o.id);
const stickyFurnitureIds = Array.from(this.roomState.installedFurnitures.filter(o => o.stickyFurnitureId === mesh.metadata.furnitureId)).map(o => o.id);
for (const soid of stickyFurnitureIds) {
const soMesh = this.furnitureContainers.get(soid)!.root;
setStickyParentRecursively(soMesh);
@ -1025,7 +1025,7 @@ export class RoomEngine extends EngineBase<{
const descendantStickyFurnitureIds: string[] = [];
const collectDescendantStickyFurnitureIds = (parentId: string) => {
const childIds = Array.from(this.roomState.installedFurnitures.filter(o => o.sticky === parentId)).map(o => o.id);
const childIds = Array.from(this.roomState.installedFurnitures.filter(o => o.stickyFurnitureId === parentId)).map(o => o.id);
for (const cid of childIds) {
descendantStickyFurnitureIds.push(cid);
collectDescendantStickyFurnitureIds(cid);
@ -1072,7 +1072,7 @@ export class RoomEngine extends EngineBase<{
// 親から先に外していく
const removeStickyParentRecursively = (mesh: BABYLON.Mesh) => {
const stickyFurnitureIds = Array.from(this.roomState.installedFurnitures.filter(o => o.sticky === mesh.metadata.furnitureId)).map(o => o.id);
const stickyFurnitureIds = Array.from(this.roomState.installedFurnitures.filter(o => o.stickyFurnitureId === mesh.metadata.furnitureId)).map(o => o.id);
for (const soid of stickyFurnitureIds) {
const soMesh = this.furnitureContainers.get(soid)!.root;
soMesh.setParent(null);
@ -1114,7 +1114,7 @@ export class RoomEngine extends EngineBase<{
// 親から先に外していく
const removeStickyParentRecursively = (mesh: BABYLON.Mesh) => {
const stickyFurnitureIds = Array.from(this.roomState.installedFurnitures.filter(o => o.sticky === mesh.metadata.furnitureId)).map(o => o.id);
const stickyFurnitureIds = Array.from(this.roomState.installedFurnitures.filter(o => o.stickyFurnitureId === mesh.metadata.furnitureId)).map(o => o.id);
for (const soid of stickyFurnitureIds) {
const soMesh = this.furnitureContainers.get(soid)!.root;
soMesh.setParent(null);
@ -1135,7 +1135,7 @@ export class RoomEngine extends EngineBase<{
const pos = selectedFurniture.position.clone();
const rotation = selectedFurniture.rotation.clone();
this.roomState.installedFurnitures.find(o => o.id === selectedFurniture.metadata.furnitureId)!.sticky = stickyFurnitureId;
this.roomState.installedFurnitures.find(o => o.id === selectedFurniture.metadata.furnitureId)!.stickyFurnitureId = stickyFurnitureId;
this.roomState.installedFurnitures.find(o => o.id === selectedFurniture.metadata.furnitureId)!.stickyPlaneId = stickyPlaneId;
this.roomState.installedFurnitures.find(o => o.id === selectedFurniture.metadata.furnitureId)!.position = [pos.x, pos.y, pos.z];
this.roomState.installedFurnitures.find(o => o.id === selectedFurniture.metadata.furnitureId)!.rotation = [rotation.x, rotation.y, rotation.z];
@ -1373,7 +1373,7 @@ export class RoomEngine extends EngineBase<{
type,
position: [pos.x, pos.y, pos.z],
rotation: [rotation.x, rotation.y, rotation.z],
sticky: stickyFurnitureId,
stickyFurnitureId: stickyFurnitureId,
stickyPlaneId,
options,
});
@ -1498,8 +1498,8 @@ export class RoomEngine extends EngineBase<{
this.furnitureContainers.get(furnitureId)?.destroy();
this.furnitureContainers.delete(furnitureId);
this.roomState.installedFurnitures = this.roomState.installedFurnitures.filter(o => o.id !== furnitureId);
for (const o of this.roomState.installedFurnitures.filter(o => o.sticky === furnitureId)) {
o.sticky = null;
for (const o of this.roomState.installedFurnitures.filter(o => o.stickyFurnitureId === furnitureId)) {
o.stickyFurnitureId = null;
o.stickyPlaneId = null;
}
this.ev('changeRoomState', { roomState: this.roomState });

4
packages/frontend/src/pages/rooms/room.core.vue
View file

@ -275,6 +275,10 @@ for (const obj of initialRoomState.installedFurnitures) {
} else if (obj.type === 'ironFrameShelf3') {
obj.type = 'ironFrameShelf';
}
if (obj.sticky != null) {
obj.stickyFurnitureId = obj.sticky;
delete obj.sticky;
}
}
if (initialRoomState.env.type === 'simple' && initialRoomState.env.options.walls.n != null) {
initialRoomState.env.options.walls.zPositive = initialRoomState.env.options.walls.s;

2
packages/misskey-world/src/room/furniture.ts
View file

@ -15,7 +15,7 @@ export type RoomState_InstalledFurniture = {
/**
* 別の家具のID
*/
sticky?: string | null;
stickyFurnitureId?: string | null;
stickyPlaneId?: string | null;
};