修复:尽量还原渲染器材质旋转

pull/2040/MERGE
ChenX 2 years ago
parent c6c55f341a
commit 63a7fd0b90

@ -138,13 +138,13 @@ export async function ConverMaterial2(m: MeshPhongMaterial, url: string)
mtl.map = t; mtl.map = t;
//世界坐标系UV //世界坐标系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]) if (mtl[USE_WORLD_UV])
{ {
mtl[U_WORLD_REP] = data[U_WORLD_REP] ?? 1; mtl[U_WORLD_REP] = data[U_WORLD_REP] ?? 1;
mtl[V_WORLD_REP] = data[V_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[U_WORLD_MOVE] = data[U_WORLD_MOVE] ?? 0;
mtl[V_WORLD_MOVE] = data[V_WORLD_MOVE] ?? 0; mtl[V_WORLD_MOVE] = data[V_WORLD_MOVE] ?? 0;

@ -14,4 +14,4 @@ export const V_REP = "v_rep";
export const U_MOVE = "u_move"; export const U_MOVE = "u_move";
export const V_MOVE = "v_move"; export const V_MOVE = "v_move";
export const U_RO = "v_ro"; export const U_RO = "u_ro";

@ -246,16 +246,20 @@ export default class ResourceStore
t.WrapT = RepeatWrapping; t.WrapT = RepeatWrapping;
//世界坐标系UV //世界坐标系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) if (mtl.UseWorldUV)
{ {
mtl.UWroldRep = data[U_WORLD_REP] ?? 1; mtl.UWroldRep = data[U_WORLD_REP] ?? 1;
mtl.VWroldRep = data[V_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[U_WORLD_MOVE] ?? 0;
mtl.UWorldMove = data[V_WORLD_MOVE] ?? 0; mtl.UWorldMove = data[V_WORLD_MOVE] ?? 0;
t.rotation = -mtl.UWroldRo;
t.moveX = mtl.UWorldMove;
t.moveY = mtl.UWorldMove;
} }
else else
{ {

Loading…
Cancel
Save