diff --git a/packages/frontend/assets/room/objects/monitor-speaker/monitor-speaker.blend b/packages/frontend/assets/room/objects/monitor-speaker/monitor-speaker.blend index 54976724b0..6d10f6b222 100644 Binary files a/packages/frontend/assets/room/objects/monitor-speaker/monitor-speaker.blend and b/packages/frontend/assets/room/objects/monitor-speaker/monitor-speaker.blend differ diff --git a/packages/frontend/assets/room/objects/monitor-speaker/monitor-speaker.glb b/packages/frontend/assets/room/objects/monitor-speaker/monitor-speaker.glb index d7719e0d41..0b3678f6b4 100644 Binary files a/packages/frontend/assets/room/objects/monitor-speaker/monitor-speaker.glb and b/packages/frontend/assets/room/objects/monitor-speaker/monitor-speaker.glb differ diff --git a/packages/frontend/src/world/room/objects/letterCase.ts b/packages/frontend/src/world/room/objects/letterCase.ts index 90f60444b1..f05e81b526 100644 --- a/packages/frontend/src/world/room/objects/letterCase.ts +++ b/packages/frontend/src/world/room/objects/letterCase.ts @@ -13,6 +13,7 @@ export const letterCase = defineObject({ default: {}, }, placement: 'top', + hasCollisions: false, canPreMeshesMerging: true, createInstance: () => { return { diff --git a/packages/frontend/src/world/room/objects/mixer.ts b/packages/frontend/src/world/room/objects/mixer.ts index 5ef459b3ce..7e9ec1e8c1 100644 --- a/packages/frontend/src/world/room/objects/mixer.ts +++ b/packages/frontend/src/world/room/objects/mixer.ts @@ -15,6 +15,7 @@ export const mixer = defineObject({ placement: 'top', hasCollisions: false, hasTexture: true, + canPreMeshesMerging: true, createInstance: () => { return { interactions: {}, diff --git a/packages/frontend/src/world/room/objects/monitorSpeaker.ts b/packages/frontend/src/world/room/objects/monitorSpeaker.ts index 8d718a91dd..f0be1a97bd 100644 --- a/packages/frontend/src/world/room/objects/monitorSpeaker.ts +++ b/packages/frontend/src/world/room/objects/monitorSpeaker.ts @@ -22,9 +22,9 @@ export const monitorSpeaker = defineObject({ }, placement: 'top', hasCollisions: false, + canPreMeshesMerging: true, createInstance: ({ options, model }) => { - const bodyMesh = model.findMesh('__X_BODY__'); - const bodyMaterial = bodyMesh.material as BABYLON.PBRMaterial; + const bodyMaterial = model.findMaterial('__X_BODY__'); const applyColor = () => { const [r, g, b] = options.color; diff --git a/packages/frontend/src/world/room/objects/mug.ts b/packages/frontend/src/world/room/objects/mug.ts index 2f4d090d66..f7cfbe609c 100644 --- a/packages/frontend/src/world/room/objects/mug.ts +++ b/packages/frontend/src/world/room/objects/mug.ts @@ -17,6 +17,7 @@ export const mug = defineObject({ }, placement: 'top', hasCollisions: false, + canPreMeshesMerging: true, createInstance: ({ scene, root }) => { let yugeDispose: (() => void) | null = null; diff --git a/packages/frontend/src/world/room/objects/newtonsCradle.ts b/packages/frontend/src/world/room/objects/newtonsCradle.ts index ece48fca14..98f2975154 100644 --- a/packages/frontend/src/world/room/objects/newtonsCradle.ts +++ b/packages/frontend/src/world/room/objects/newtonsCradle.ts @@ -22,6 +22,7 @@ export const newtonsCradle = defineObject({ }, placement: 'top', hasCollisions: false, + canPreMeshesMerging: true, createInstance: ({ options, model }) => { const frameMaterial = model.findMaterial('__X_FRAME__'); diff --git a/packages/frontend/src/world/room/objects/plant2.ts b/packages/frontend/src/world/room/objects/plant2.ts index c29f48f417..d08b0297e6 100644 --- a/packages/frontend/src/world/room/objects/plant2.ts +++ b/packages/frontend/src/world/room/objects/plant2.ts @@ -14,6 +14,7 @@ export const plant2 = defineObject({ }, placement: 'top', hasTexture: true, + canPreMeshesMerging: true, createInstance: () => { return { interactions: {}, diff --git a/packages/frontend/src/world/room/objects/powerStrip.ts b/packages/frontend/src/world/room/objects/powerStrip.ts index 133d8c9af1..1c8dfd8ac2 100644 --- a/packages/frontend/src/world/room/objects/powerStrip.ts +++ b/packages/frontend/src/world/room/objects/powerStrip.ts @@ -14,6 +14,7 @@ export const powerStrip = defineObject({ }, placement: 'top', hasCollisions: false, + canPreMeshesMerging: true, createInstance: () => { return { interactions: {}, diff --git a/packages/frontend/src/world/room/objects/siphon.ts b/packages/frontend/src/world/room/objects/siphon.ts index f204a90088..804fcba56b 100644 --- a/packages/frontend/src/world/room/objects/siphon.ts +++ b/packages/frontend/src/world/room/objects/siphon.ts @@ -14,6 +14,7 @@ export const siphon = defineObject({ }, placement: 'top', hasCollisions: false, + canPreMeshesMerging: true, createInstance: () => { return { interactions: {}, diff --git a/packages/frontend/src/world/room/objects/sprayer.ts b/packages/frontend/src/world/room/objects/sprayer.ts index 11c77a003d..8e2bb6aafe 100644 --- a/packages/frontend/src/world/room/objects/sprayer.ts +++ b/packages/frontend/src/world/room/objects/sprayer.ts @@ -14,6 +14,7 @@ export const sprayer = defineObject({ }, placement: 'top', hasCollisions: false, + canPreMeshesMerging: true, createInstance: () => { return { interactions: {},