mirror of
https://github.com/misskey-dev/misskey.git
synced 2026-05-25 12:04:04 +02:00
wip
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -584,11 +584,13 @@ export class RoomEngine {
|
|||||||
|
|
||||||
for (const [id, o] of checkObjectEntries) {
|
for (const [id, o] of checkObjectEntries) {
|
||||||
for (const om of o.getChildMeshes()) {
|
for (const om of o.getChildMeshes()) {
|
||||||
|
if (!om.name.startsWith('_COLLISION_TOP_')) continue;
|
||||||
const omb = om.getBoundingInfo().boundingBox;
|
const omb = om.getBoundingInfo().boundingBox;
|
||||||
for (const tm of this.grabbing.mesh.getChildMeshes()) {
|
for (const tm of this.grabbing.mesh.getChildMeshes()) {
|
||||||
const tmb = tm.getBoundingInfo().boundingBox;
|
const tmb = tm.getBoundingInfo().boundingBox;
|
||||||
if (isIntersectXZ(tmb, omb)) {
|
if (isIntersectXZ(tmb, omb)) {
|
||||||
const topY = omb.maximumWorld.y;
|
const topY = omb.maximumWorld.y;
|
||||||
|
if (topY > this.grabbing.ghost.position.y) continue;
|
||||||
if (y === 0 || topY > y) {
|
if (y === 0 || topY > y) {
|
||||||
y = topY;
|
y = topY;
|
||||||
sticky = id;
|
sticky = id;
|
||||||
@@ -684,11 +686,17 @@ export class RoomEngine {
|
|||||||
for (const m of obj.meshes) {
|
for (const m of obj.meshes) {
|
||||||
const mesh = m;
|
const mesh = m;
|
||||||
|
|
||||||
|
mesh.metadata = { isObject: true, objectId: id, objectType: type };
|
||||||
|
|
||||||
if (mesh.name.startsWith('_TV_SCREEN_')) {
|
if (mesh.name.startsWith('_TV_SCREEN_')) {
|
||||||
mesh.markVerticesDataAsUpdatable(BABYLON.VertexBuffer.UVKind, true);
|
mesh.markVerticesDataAsUpdatable(BABYLON.VertexBuffer.UVKind, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
mesh.metadata = { isObject: true, objectId: id, objectType: type };
|
if (mesh.name.startsWith('_COLLISION_TOP_')) {
|
||||||
|
mesh.isVisible = false;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
mesh.checkCollisions = true;
|
mesh.checkCollisions = true;
|
||||||
//if (mesh.name === '__root__') continue;
|
//if (mesh.name === '__root__') continue;
|
||||||
mesh.receiveShadows = true;
|
mesh.receiveShadows = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user