diff --git a/packages/frontend/assets/room/objects/cardboard-box/cardboard-box.blend b/packages/frontend/assets/room/objects/cardboard-box/cardboard-box.blend index 3a528de32a..6a38f22ef5 100644 Binary files a/packages/frontend/assets/room/objects/cardboard-box/cardboard-box.blend and b/packages/frontend/assets/room/objects/cardboard-box/cardboard-box.blend differ diff --git a/packages/frontend/assets/room/objects/cardboard-box/cardboard-box.glb b/packages/frontend/assets/room/objects/cardboard-box/cardboard-box.glb index bed372e94f..0dcaf5b121 100644 Binary files a/packages/frontend/assets/room/objects/cardboard-box/cardboard-box.glb and b/packages/frontend/assets/room/objects/cardboard-box/cardboard-box.glb differ diff --git a/packages/frontend/assets/room/objects/cardboard-box2/cardboard-box2.blend b/packages/frontend/assets/room/objects/cardboard-box2/cardboard-box2.blend index 5f146267ac..2210c4fb54 100644 Binary files a/packages/frontend/assets/room/objects/cardboard-box2/cardboard-box2.blend and b/packages/frontend/assets/room/objects/cardboard-box2/cardboard-box2.blend differ diff --git a/packages/frontend/assets/room/objects/cardboard-box2/cardboard-box2.glb b/packages/frontend/assets/room/objects/cardboard-box2/cardboard-box2.glb index 85fcb5c0b6..6a494243bb 100644 Binary files a/packages/frontend/assets/room/objects/cardboard-box2/cardboard-box2.glb and b/packages/frontend/assets/room/objects/cardboard-box2/cardboard-box2.glb differ diff --git a/packages/frontend/assets/room/objects/cardboard-box3/cardboard-box3.blend b/packages/frontend/assets/room/objects/cardboard-box3/cardboard-box3.blend index 00681a3cfd..571c6b2608 100644 Binary files a/packages/frontend/assets/room/objects/cardboard-box3/cardboard-box3.blend and b/packages/frontend/assets/room/objects/cardboard-box3/cardboard-box3.blend differ diff --git a/packages/frontend/assets/room/objects/cardboard-box3/cardboard-box3.glb b/packages/frontend/assets/room/objects/cardboard-box3/cardboard-box3.glb index 1ef0427689..a7821e3eb7 100644 Binary files a/packages/frontend/assets/room/objects/cardboard-box3/cardboard-box3.glb and b/packages/frontend/assets/room/objects/cardboard-box3/cardboard-box3.glb differ diff --git a/packages/frontend/assets/room/objects/steel-rack/steel-rack.blend b/packages/frontend/assets/room/objects/steel-rack/steel-rack.blend index bff091cbf2..7d26d92687 100644 Binary files a/packages/frontend/assets/room/objects/steel-rack/steel-rack.blend and b/packages/frontend/assets/room/objects/steel-rack/steel-rack.blend differ diff --git a/packages/frontend/assets/room/objects/steel-rack/steel-rack.glb b/packages/frontend/assets/room/objects/steel-rack/steel-rack.glb index 80c76bd1ed..4bffdbd692 100644 Binary files a/packages/frontend/assets/room/objects/steel-rack/steel-rack.glb and b/packages/frontend/assets/room/objects/steel-rack/steel-rack.glb differ diff --git a/packages/frontend/src/utility/room/engine.ts b/packages/frontend/src/utility/room/engine.ts index ea3217cadc..094e0d8b39 100644 --- a/packages/frontend/src/utility/room/engine.ts +++ b/packages/frontend/src/utility/room/engine.ts @@ -584,11 +584,13 @@ export class RoomEngine { for (const [id, o] of checkObjectEntries) { for (const om of o.getChildMeshes()) { + if (!om.name.startsWith('_COLLISION_TOP_')) continue; const omb = om.getBoundingInfo().boundingBox; for (const tm of this.grabbing.mesh.getChildMeshes()) { const tmb = tm.getBoundingInfo().boundingBox; if (isIntersectXZ(tmb, omb)) { const topY = omb.maximumWorld.y; + if (topY > this.grabbing.ghost.position.y) continue; if (y === 0 || topY > y) { y = topY; sticky = id; @@ -684,11 +686,17 @@ export class RoomEngine { for (const m of obj.meshes) { const mesh = m; + mesh.metadata = { isObject: true, objectId: id, objectType: type }; + if (mesh.name.startsWith('_TV_SCREEN_')) { 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; //if (mesh.name === '__root__') continue; mesh.receiveShadows = true;