curse/Curse
1
0
Fork 0
mirror of https://github.com/misskey-dev/misskey.git synced 2026-03-21 03:30:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update pictureFrame.ts

Browse Source
This commit is contained in:
syuilo
2026-03-04 11:35:46 +09:00
parent 2de50f893f
commit 0a4b81b0cc
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/frontend/src/utility/room/objects/pictureFrame.ts
View File

@@ -76,8 +76,6 @@ export const pictureFrame = defineObject({
}, },
placement: 'side', placement: 'side',
createInstance: ({ room, root, options, findMaterial, findMesh, meshUpdated }) => { createInstance: ({ room, root, options, findMaterial, findMesh, meshUpdated }) => {
const MAT_THICKNESS_FACTOR = 0.9;
const frameMesh = findMesh('__X_FRAME__'); const frameMesh = findMesh('__X_FRAME__');
frameMesh.rotationQuaternion = null; frameMesh.rotationQuaternion = null;
const matMesh = findMesh('__X_MAT__'); const matMesh = findMesh('__X_MAT__');
@@ -98,8 +96,8 @@ export const pictureFrame = defineObject({
const srcWidth = tex.getSize().width; const srcWidth = tex.getSize().width;
const srcHeight = tex.getSize().height; const srcHeight = tex.getSize().height;
const srcAspect = srcWidth / srcHeight; const srcAspect = srcWidth / srcHeight;
const targetWidth = options.width * (1 - (options.matHThickness * MAT_THICKNESS_FACTOR)); const targetWidth = options.width * (1 - options.matHThickness);
const targetHeight = options.height * (1 - (options.matVThickness * MAT_THICKNESS_FACTOR)); const targetHeight = options.height * (1 - options.matVThickness);
const targetAspect = targetWidth / targetHeight; const targetAspect = targetWidth / targetHeight;
updateUv(srcAspect, targetAspect, options.fit); updateUv(srcAspect, targetAspect, options.fit);
@@ -115,10 +113,10 @@ export const pictureFrame = defineObject({
applyFrameThickness(); applyFrameThickness();
const applyMatThickness = () => { const applyMatThickness = () => {
matMesh.morphTargetManager!.getTargetByName('MatH')!.influence = options.matHThickness * MAT_THICKNESS_FACTOR * options.width; matMesh.morphTargetManager!.getTargetByName('MatH')!.influence = options.matHThickness * options.width;
matMesh.morphTargetManager!.getTargetByName('MatV')!.influence = options.matVThickness * MAT_THICKNESS_FACTOR * options.height; matMesh.morphTargetManager!.getTargetByName('MatV')!.influence = options.matVThickness * options.height;
pictureMesh.morphTargetManager!.getTargetByName('PictureWidth')!.influence = options.width * (1 - (options.matHThickness * MAT_THICKNESS_FACTOR)); pictureMesh.morphTargetManager!.getTargetByName('PictureWidth')!.influence = options.width * (1 - options.matHThickness);
pictureMesh.morphTargetManager!.getTargetByName('PictureHeight')!.influence = options.height * (1 - (options.matVThickness * MAT_THICKNESS_FACTOR)); pictureMesh.morphTargetManager!.getTargetByName('PictureHeight')!.influence = options.height * (1 - options.matVThickness);
meshUpdated(); meshUpdated();
applyFit(); applyFit();