From b4c1cdbddabcdb9da39b8459220184ab1734e581 Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Tue, 12 May 2020 17:54:00 -0700 Subject: [PATCH] TextureCubeUVNode: Clean up. --- examples/jsm/nodes/misc/TextureCubeUVNode.js | 30 ++++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/examples/jsm/nodes/misc/TextureCubeUVNode.js b/examples/jsm/nodes/misc/TextureCubeUVNode.js index 2aad511406..5d5d0baf88 100644 --- a/examples/jsm/nodes/misc/TextureCubeUVNode.js +++ b/examples/jsm/nodes/misc/TextureCubeUVNode.js @@ -65,20 +65,20 @@ TextureCubeUVNode.Nodes = ( function () { var getUV = new FunctionNode( `vec2 getUV(vec3 direction, float face) { vec2 uv; - if (face == 0.0) { - uv = vec2(direction.z, direction.y) / abs(direction.x); // pos x - } else if (face == 1.0) { - uv = vec2(-direction.x, -direction.z) / abs(direction.y); // pos y - } else if (face == 2.0) { - uv = vec2(-direction.x, direction.y) / abs(direction.z); // pos z - } else if (face == 3.0) { - uv = vec2(-direction.z, direction.y) / abs(direction.x); // neg x - } else if (face == 4.0) { - uv = vec2(-direction.x, direction.z) / abs(direction.y); // neg y - } else { - uv = vec2(direction.x, direction.y) / abs(direction.z); // neg z - } - return 0.5 * (uv + 1.0); + if (face == 0.0) { + uv = vec2(direction.z, direction.y) / abs(direction.x); // pos x + } else if (face == 1.0) { + uv = vec2(-direction.x, -direction.z) / abs(direction.y); // pos y + } else if (face == 2.0) { + uv = vec2(-direction.x, direction.y) / abs(direction.z); // pos z + } else if (face == 3.0) { + uv = vec2(-direction.z, direction.y) / abs(direction.x); // neg x + } else if (face == 4.0) { + uv = vec2(-direction.x, direction.z) / abs(direction.y); // neg y + } else { + uv = vec2(direction.x, direction.y) / abs(direction.z); // neg z + } + return 0.5 * (uv + 1.0); }` ); getUV.useKeywords = false; @@ -106,7 +106,7 @@ TextureCubeUVNode.Nodes = ( function () { uv.y += filterInt * 2.0 * cubeUV_minTileSize; uv.x += 3.0 * max(0.0, cubeUV_maxTileSize - 2.0 * faceSize); uv *= texelSize; - + vec4 tl = texture2D(envMap, uv); uv.x += texelSize; vec4 tr = texture2D(envMap, uv); -- GitLab