mirrors/misskey
1
0
Fork 1
mirror of https://github.com/misskey-dev/misskey.git synced 2026-05-21 06:25:42 +02:00
Code Releases Activity

Update engine.ts

Browse Source
This commit is contained in:
syuilo
2026-02-10 11:40:25 +09:00
parent bce3411cef
commit cb1d9c38df
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/frontend/src/utility/room/engine.ts
View File

@@ -244,6 +244,7 @@ export class RoomEngine {
private grabbing: { private grabbing: {
mesh: BABYLON.AbstractMesh; mesh: BABYLON.AbstractMesh;
startOffset: BABYLON.Vector3; startOffset: BABYLON.Vector3;
startRotationY: number;
startDistance: number; startDistance: number;
ghost: BABYLON.AbstractMesh; ghost: BABYLON.AbstractMesh;
} | null = null; } | null = null;
@@ -465,6 +466,7 @@ export class RoomEngine {
const dir = this.camera.getDirection(BABYLON.Axis.Z); const dir = this.camera.getDirection(BABYLON.Axis.Z);
this.grabbing.ghost.position = this.camera.position.add(dir.scale(this.grabbing.startDistance)).add(this.grabbing.startOffset); this.grabbing.ghost.position = this.camera.position.add(dir.scale(this.grabbing.startDistance)).add(this.grabbing.startOffset);
this.grabbing.ghost.rotation = new BABYLON.Vector3(0, this.camera.rotation.y + this.grabbing.startRotationY, 0);
const stickyObjectIds = Array.from(this.def.objects.filter(o => o.sticky === this.grabbing.mesh.metadata.objectId)).map(o => o.id); const stickyObjectIds = Array.from(this.def.objects.filter(o => o.sticky === this.grabbing.mesh.metadata.objectId)).map(o => o.id);
@@ -529,6 +531,8 @@ export class RoomEngine {
//this.grabbing.mesh.position.z = Math.min(Math.max(this.grabbing.position.z, -(this.ROOM_SIZE / 2)), (this.ROOM_SIZE / 2)); //this.grabbing.mesh.position.z = Math.min(Math.max(this.grabbing.position.z, -(this.ROOM_SIZE / 2)), (this.ROOM_SIZE / 2));
this.grabbing.mesh.position.y = y; this.grabbing.mesh.position.y = y;
this.grabbing.mesh.rotation = this.grabbing.ghost.rotation.clone();
const ray = new BABYLON.Ray(this.camera.position, this.camera.getDirection(BABYLON.Axis.Z), 1000/*cm*/); const ray = new BABYLON.Ray(this.camera.position, this.camera.getDirection(BABYLON.Axis.Z), 1000/*cm*/);
const hit = this.scene.pickWithRay(ray, (m) => m.name.startsWith('_COLLISION_WALL_'))!; const hit = this.scene.pickWithRay(ray, (m) => m.name.startsWith('_COLLISION_WALL_'))!;
if (hit.pickedMesh != null) { if (hit.pickedMesh != null) {
@@ -669,6 +673,7 @@ export class RoomEngine {
this.grabbing = { this.grabbing = {
mesh: highlightedObject, mesh: highlightedObject,
startOffset: highlightedObject.position.subtract(this.camera.position.add(this.camera.getDirection(BABYLON.Axis.Z).scale(startDistance))), startOffset: highlightedObject.position.subtract(this.camera.position.add(this.camera.getDirection(BABYLON.Axis.Z).scale(startDistance))),
startRotationY: highlightedObject.rotation.subtract(this.camera.rotation).y,
startDistance: startDistance, startDistance: startDistance,
ghost: ghost, ghost: ghost,
}; };