diff --git a/packages/frontend/assets/room/objects/picture-frame/picture-frame.blend b/packages/frontend/assets/room/objects/picture-frame/picture-frame.blend index 8d3f6ed9ea..9eb477fe31 100644 Binary files a/packages/frontend/assets/room/objects/picture-frame/picture-frame.blend and b/packages/frontend/assets/room/objects/picture-frame/picture-frame.blend differ diff --git a/packages/frontend/assets/room/objects/picture-frame/picture-frame.glb b/packages/frontend/assets/room/objects/picture-frame/picture-frame.glb index 8f8c0ff484..59949a0fe0 100644 Binary files a/packages/frontend/assets/room/objects/picture-frame/picture-frame.glb and b/packages/frontend/assets/room/objects/picture-frame/picture-frame.glb differ diff --git a/packages/frontend/src/utility/room/objects/pictureFrame.ts b/packages/frontend/src/utility/room/objects/pictureFrame.ts index 8701cec0bd..0259682fc1 100644 --- a/packages/frontend/src/utility/room/objects/pictureFrame.ts +++ b/packages/frontend/src/utility/room/objects/pictureFrame.ts @@ -20,6 +20,13 @@ export const pictureFrame = defineObject({ label: 'Direction', enum: ['vertical', 'horizontal'], }, + frameThickness: { + type: 'range', + label: 'Frame thickness', + min: 0, + max: 1, + step: 0.01, + }, matHThickness: { type: 'range', label: 'Mat horizontal thickness', @@ -42,6 +49,7 @@ export const pictureFrame = defineObject({ default: { frameColor: [0.71, 0.58, 0.39], direction: 'vertical', + frameThickness: 0.5, matHThickness: 0.125, matVThickness: 0.15, customPicture: null, @@ -105,6 +113,12 @@ export const pictureFrame = defineObject({ applyDirection(); + const applyFrameThickness = () => { + frameMesh.morphTargetManager!.getTargetByName('FrameThickness')!.influence = options.frameThickness; + }; + + applyFrameThickness(); + const applyMatThickness = () => { matMesh.morphTargetManager!.getTargetByName('MatH')!.influence = options.matHThickness; matMesh.morphTargetManager!.getTargetByName('MatV')!.influence = options.matVThickness; @@ -150,6 +164,9 @@ export const pictureFrame = defineObject({ if (k === 'direction') { applyDirection(); } + if (k === 'frameThickness') { + applyFrameThickness(); + } if (k === 'matHThickness' || k === 'matVThickness') { applyMatThickness(); }