wip

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 {

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: {},

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 = model.findMaterial('__X_BODY__');
-		const bodyMaterial = bodyMesh.material as BABYLON.PBRMaterial;
 
 		const applyColor = () => {
 			const [r, g, b] = options.color;

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;
 

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__');
 

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: {},

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: {},

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: {},

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: {},