mirrors/misskey
1
0
Fork 1
mirror of https://github.com/misskey-dev/misskey.git synced 2026-05-23 23:54:10 +02:00
Code Releases Activity

grid

Browse Source
This commit is contained in:
syuilo
2026-04-21 12:36:44 +09:00
parent 0f0bc9b54f
commit fc4d769e1e
1 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
packages/frontend/src/world/room/engine.ts
View File

@@ -187,9 +187,7 @@ export class RoomEngine extends EventEmitter<RoomEngineEvents> {
private roomLight: BABYLON.SpotLight; private roomLight: BABYLON.SpotLight;
public lightContainer: BABYLON.ClusteredLightContainer; public lightContainer: BABYLON.ClusteredLightContainer;
private gridMaterial: GridMaterial; private gridMaterial: GridMaterial;
private xGridPreviewPlane: BABYLON.Mesh; private gridPlane: BABYLON.Mesh;
private yGridPreviewPlane: BABYLON.Mesh;
private zGridPreviewPlane: BABYLON.Mesh;
private selectionOutlineLayer: BABYLON.SelectionOutlineLayer; private selectionOutlineLayer: BABYLON.SelectionOutlineLayer;
public sr: BABYLON.SnapshotRenderingHelper; public sr: BABYLON.SnapshotRenderingHelper;
private gl: BABYLON.GlowLayer | null = null; private gl: BABYLON.GlowLayer | null = null;
@@ -386,22 +384,10 @@ export class RoomEngine extends EventEmitter<RoomEngineEvents> {
this.gridMaterial.opacity = 0.5; this.gridMaterial.opacity = 0.5;
this.gridMaterial.gridRatio = this.gridSnapping.scale; this.gridMaterial.gridRatio = this.gridSnapping.scale;
this.xGridPreviewPlane = BABYLON.MeshBuilder.CreatePlane('xGridPreviewPlane', { width: cm(1000), height: cm(1000) }, this.scene); this.gridPlane = BABYLON.MeshBuilder.CreatePlane('gridPlane', { width: cm(1000), height: cm(1000) }, this.scene);
this.xGridPreviewPlane.rotation = new BABYLON.Vector3(0, 0, Math.PI / 2); this.gridPlane.material = this.gridMaterial;
this.xGridPreviewPlane.material = this.gridMaterial; this.gridPlane.isPickable = false;
this.xGridPreviewPlane.isPickable = false; this.gridPlane.isVisible = false;
this.xGridPreviewPlane.isVisible = false;
this.yGridPreviewPlane = BABYLON.MeshBuilder.CreatePlane('yGridPreviewPlane', { width: cm(1000), height: cm(1000) }, this.scene);
this.yGridPreviewPlane.rotation = new BABYLON.Vector3(Math.PI / 2, 0, 0);
this.yGridPreviewPlane.material = this.gridMaterial;
this.yGridPreviewPlane.isPickable = false;
this.yGridPreviewPlane.isVisible = false;
this.zGridPreviewPlane = BABYLON.MeshBuilder.CreatePlane('zGridPreviewPlane', { width: cm(1000), height: cm(1000) }, this.scene);
this.zGridPreviewPlane.material = this.gridMaterial;
this.zGridPreviewPlane.isPickable = false;
this.zGridPreviewPlane.isVisible = false;
this.selectionOutlineLayer = new BABYLON.SelectionOutlineLayer('outliner', this.scene); this.selectionOutlineLayer = new BABYLON.SelectionOutlineLayer('outliner', this.scene);
this.scene.setRenderingAutoClearDepthStencil(this.selectionOutlineLayer.renderingGroupId, false); this.scene.setRenderingAutoClearDepthStencil(this.selectionOutlineLayer.renderingGroupId, false);
@@ -626,6 +612,14 @@ export class RoomEngine extends EventEmitter<RoomEngineEvents> {
const targetRotationY = Math.atan2(pickedMeshNormal.x, pickedMeshNormal.z); const targetRotationY = Math.atan2(pickedMeshNormal.x, pickedMeshNormal.z);
newRotation.y = targetRotationY; newRotation.y = targetRotationY;
sticky = hit.pickedMesh.metadata?.objectId ?? null; sticky = hit.pickedMesh.metadata?.objectId ?? null;
if (this.gridSnapping.enabled) {
this.gridPlane.rotationQuaternion = null;
this.gridPlane.rotation.x = Math.PI;
this.gridPlane.rotation.y = targetRotationY;
this.gridPlane.position = new BABYLON.Vector3(hit.pickedPoint.x, 0, hit.pickedPoint.z).addInPlace(pickedMeshNormal.scale(cm(0.1)));
this.gridPlane.isVisible = true;
}
} }
} else if (placement === 'wall') { } else if (placement === 'wall') {
// 前方に向かってレイを飛ばす // 前方に向かってレイを飛ばす
@@ -638,6 +632,14 @@ export class RoomEngine extends EventEmitter<RoomEngineEvents> {
const pickedMeshNormal = hit.getNormal(true, true); const pickedMeshNormal = hit.getNormal(true, true);
const targetRotationY = Math.atan2(pickedMeshNormal.x, pickedMeshNormal.z); const targetRotationY = Math.atan2(pickedMeshNormal.x, pickedMeshNormal.z);
newRotation.y = targetRotationY; newRotation.y = targetRotationY;
if (this.gridSnapping.enabled) {
this.gridPlane.rotationQuaternion = null;
this.gridPlane.rotation.x = Math.PI;
this.gridPlane.rotation.y = targetRotationY;
this.gridPlane.position = new BABYLON.Vector3(hit.pickedPoint.x, 0, hit.pickedPoint.z).addInPlace(pickedMeshNormal.scale(cm(0.1)));
this.gridPlane.isVisible = true;
}
} }
} else if (placement === 'bottom') { } else if (placement === 'bottom') {
// 上に向かってレイを飛ばす // 上に向かってレイを飛ばす
@@ -652,15 +654,21 @@ export class RoomEngine extends EventEmitter<RoomEngineEvents> {
newPos.y = cm(250); newPos.y = cm(250);
if (this.gridSnapping.enabled) { if (this.gridSnapping.enabled) {
this.yGridPreviewPlane.position = new BABYLON.Vector3(grabbing.mesh.position.x, cm(250) - cm(0.1), grabbing.mesh.position.z); this.gridPlane.rotationQuaternion = null;
this.yGridPreviewPlane.isVisible = true; this.gridPlane.rotation.x = Math.PI * 1.5;
this.gridPlane.rotation.y = 0;
this.gridPlane.position = new BABYLON.Vector3(grabbing.mesh.position.x, cm(250) - cm(0.1), grabbing.mesh.position.z);
this.gridPlane.isVisible = true;
} }
} else if (placement === 'floor') { } else if (placement === 'floor') {
newPos.y = 0; newPos.y = 0;
if (this.gridSnapping.enabled) { if (this.gridSnapping.enabled) {
this.yGridPreviewPlane.position = new BABYLON.Vector3(grabbing.mesh.position.x, cm(0.1), grabbing.mesh.position.z); this.gridPlane.rotationQuaternion = null;
this.yGridPreviewPlane.isVisible = true; this.gridPlane.rotation.x = 0;
this.gridPlane.rotation.y = 0;
this.gridPlane.position = new BABYLON.Vector3(grabbing.mesh.position.x, cm(0.1), grabbing.mesh.position.z);
this.gridPlane.isVisible = true;
} }
} else { } else {
// 下に向かってレイを飛ばす // 下に向かってレイを飛ばす
@@ -673,8 +681,11 @@ export class RoomEngine extends EventEmitter<RoomEngineEvents> {
if (newPos.y < 0) newPos.y = 0; if (newPos.y < 0) newPos.y = 0;
if (this.gridSnapping.enabled) { if (this.gridSnapping.enabled) {
this.yGridPreviewPlane.position = new BABYLON.Vector3(grabbing.mesh.position.x, grabbing.mesh.position.y + cm(0.1), grabbing.mesh.position.z); this.gridPlane.rotationQuaternion = null;
this.yGridPreviewPlane.isVisible = true; this.gridPlane.rotation.x = Math.PI / 2;
this.gridPlane.rotation.y = 0;
this.gridPlane.position = new BABYLON.Vector3(grabbing.mesh.position.x, grabbing.mesh.position.y + cm(0.1), grabbing.mesh.position.z);
this.gridPlane.isVisible = true;
} }
} }
@@ -1257,9 +1268,7 @@ export class RoomEngine extends EventEmitter<RoomEngineEvents> {
this.grabbingCtx.onDone?.(); this.grabbingCtx.onDone?.();
this.grabbingCtx = null; this.grabbingCtx = null;
this.xGridPreviewPlane.isVisible = false; this.gridPlane.isVisible = false;
this.yGridPreviewPlane.isVisible = false;
this.zGridPreviewPlane.isVisible = false;
} }
public interact(oid: string) { public interact(oid: string) {