[Fix] Fix to generated UV1 coordinates of Primitives (playcanvas#3429)

mvaligursky · Martin Valigursky · web-flow · commit 8b86603a6a48 · 2021-08-27T05:47:12.000-07:00
Co-authored-by: Martin Valigursky &lt;mvaligursky@snapchat.com&gt;
diff --git a/src/scene/procedural.js b/src/scene/procedural.js
@@ -406,9 +406,9 @@ function _createConeData(baseRadius, peakRadius, height, heightSegments, capSegm
                 var _v = v;
                 v = u;
                 u = _v;
-                u /= 3;
                 u = u * primitiveUv1PaddingScale + primitiveUv1Padding;
                 v = v * primitiveUv1PaddingScale + primitiveUv1Padding;
+                u /= 3;
                 uvs1.push(u, 1.0 - v);
 
                 if ((i < heightSegments) && (j < capSegments)) {
@@ -453,10 +453,10 @@ function _createConeData(baseRadius, peakRadius, height, heightSegments, capSegm
                 uvs.push(u, 1.0 - v);
 
                 // Pack UV1 to 2nd third
-                u /= 3;
-                v /= 3;
                 u = u * primitiveUv1PaddingScale + primitiveUv1Padding;
                 v = v * primitiveUv1PaddingScale + primitiveUv1Padding;
+                u /= 3;
+                v /= 3;
                 u += 1.0 / 3;
                 uvs1.push(u, 1.0 - v);
             }
@@ -496,10 +496,10 @@ function _createConeData(baseRadius, peakRadius, height, heightSegments, capSegm
                 uvs.push(u, 1.0 - v);
 
                 // Pack UV1 to 3rd third
-                u /= 3;
-                v /= 3;
                 u = u * primitiveUv1PaddingScale + primitiveUv1Padding;
                 v = v * primitiveUv1PaddingScale + primitiveUv1Padding;
+                u /= 3;
+                v /= 3;
                 u += 2.0 / 3;
                 uvs1.push(u, 1.0 - v);
             }
@@ -532,10 +532,10 @@ function _createConeData(baseRadius, peakRadius, height, heightSegments, capSegm
                 uvs.push(u, 1.0 - v);
 
                 // Pack UV1 to 2nd third
-                u /= 3;
-                v /= 3;
                 u = u * primitiveUv1PaddingScale + primitiveUv1Padding;
                 v = v * primitiveUv1PaddingScale + primitiveUv1Padding;
+                u /= 3;
+                v /= 3;
                 u += 1.0 / 3;
                 uvs1.push(u, 1.0 - v);
 
@@ -561,10 +561,10 @@ function _createConeData(baseRadius, peakRadius, height, heightSegments, capSegm
                 uvs.push(u, 1.0 - v);
 
                 // Pack UV1 to 3rd third
-                u /= 3;
-                v /= 3;
                 u = u * primitiveUv1PaddingScale + primitiveUv1Padding;
                 v = v * primitiveUv1PaddingScale + primitiveUv1Padding;
+                u /= 3;
+                v /= 3;
                 u += 2.0 / 3;
                 uvs1.push(u, 1.0 - v);
 
@@ -965,13 +965,13 @@ function createBox(device, opts) {
                 positions.push(r.x, r.y, r.z);
                 normals.push(faceNormals[side][0], faceNormals[side][1], faceNormals[side][2]);
                 uvs.push(u, 1.0 - v);
-                // pack as 3x2
-                // 1/3 will be empty, but it's either that or stretched pixels
+                // pack as 3x2. 1/3 will be empty, but it's either that or stretched pixels
                 // TODO: generate non-rectangular lightMaps, so we could use space without stretching
-                u /= 3;
-                v /= 3;
                 u = u * primitiveUv1PaddingScale + primitiveUv1Padding;
                 v = v * primitiveUv1PaddingScale + primitiveUv1Padding;
+                u /= 3;
+                v /= 3;
+
                 u += (side % 3) / 3;
                 v += Math.floor(side / 3) / 3;
                 uvs1.push(u, 1.0 - v);
