From 63a7fd0b9002107f46bb4ee7a82a432a57f53c0a Mon Sep 17 00:00:00 2001 From: ChenX Date: Tue, 6 Dec 2022 10:20:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=E5=B0=BD=E9=87=8F=E8=BF=98?= =?UTF-8?q?=E5=8E=9F=E6=B8=B2=E6=9F=93=E5=99=A8=E6=9D=90=E8=B4=A8=E6=97=8B?= =?UTF-8?q?=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Add-on/testEntity/ParseMaterialImage.ts | 4 ++-- src/Add-on/testEntity/USE_WORLD_UV.ts | 2 +- src/UI/Components/ToolBar/ResourceLibrary/RsourceStore.ts | 8 ++++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/Add-on/testEntity/ParseMaterialImage.ts b/src/Add-on/testEntity/ParseMaterialImage.ts index 1aa6e0ef8..a0fc6b734 100644 --- a/src/Add-on/testEntity/ParseMaterialImage.ts +++ b/src/Add-on/testEntity/ParseMaterialImage.ts @@ -138,13 +138,13 @@ export async function ConverMaterial2(m: MeshPhongMaterial, url: string) mtl.map = t; //世界坐标系UV - mtl[USE_WORLD_UV] = !(data.uv_enable && data.uv_type === 0); + mtl[USE_WORLD_UV] = ((data.uv_enable || data.uv_enable === undefined) && data.uv_type === 1); if (mtl[USE_WORLD_UV]) { mtl[U_WORLD_REP] = data[U_WORLD_REP] ?? 1; mtl[V_WORLD_REP] = data[V_WORLD_REP] ?? 1; - mtl[U_WORLD_RO] = data[U_WORLD_RO] ?? 0; + mtl[U_WORLD_RO] = data[U_WORLD_RO] ?? data[U_RO] ?? 0; mtl[U_WORLD_MOVE] = data[U_WORLD_MOVE] ?? 0; mtl[V_WORLD_MOVE] = data[V_WORLD_MOVE] ?? 0; diff --git a/src/Add-on/testEntity/USE_WORLD_UV.ts b/src/Add-on/testEntity/USE_WORLD_UV.ts index 60065f5f0..7589e6b8a 100644 --- a/src/Add-on/testEntity/USE_WORLD_UV.ts +++ b/src/Add-on/testEntity/USE_WORLD_UV.ts @@ -14,4 +14,4 @@ export const V_REP = "v_rep"; export const U_MOVE = "u_move"; export const V_MOVE = "v_move"; -export const U_RO = "v_ro"; +export const U_RO = "u_ro"; diff --git a/src/UI/Components/ToolBar/ResourceLibrary/RsourceStore.ts b/src/UI/Components/ToolBar/ResourceLibrary/RsourceStore.ts index 93a2f9682..887a016b8 100644 --- a/src/UI/Components/ToolBar/ResourceLibrary/RsourceStore.ts +++ b/src/UI/Components/ToolBar/ResourceLibrary/RsourceStore.ts @@ -246,16 +246,20 @@ export default class ResourceStore t.WrapT = RepeatWrapping; //世界坐标系UV - mtl.UseWorldUV = !(data.uv_enable && data.uv_type === 0); + mtl.UseWorldUV = ((data.uv_enable || data.uv_enable === undefined) && data.uv_type === 1); if (mtl.UseWorldUV) { mtl.UWroldRep = data[U_WORLD_REP] ?? 1; mtl.VWroldRep = data[V_WORLD_REP] ?? 1; - mtl.UWroldRo = data[U_WORLD_RO] ?? 0; + mtl.UWroldRo = data[U_WORLD_RO] ?? data[U_RO] ?? 0; mtl.UWorldMove = data[U_WORLD_MOVE] ?? 0; mtl.UWorldMove = data[V_WORLD_MOVE] ?? 0; + + t.rotation = -mtl.UWroldRo; + t.moveX = mtl.UWorldMove; + t.moveY = mtl.UWorldMove; } else {