Fix texture coordinates everywhere instead of in just the one place.

CesiumGS · Mar 31, 2020 · c5ac455 · c5ac455
1 parent d631c21
commit c5ac455
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/Source/Shaders/Materials/PolylineArrowMaterial.glsl b/Source/Shaders/Materials/PolylineArrowMaterial.glsl
@@ -12,7 +12,6 @@ float getPointOnLine(vec2 p0, vec2 p1, float x)
 
 czm_material czm_getMaterial(czm_materialInput materialInput)
 {
-    materialInput.st.t *= gl_FragCoord.w;
     czm_material material = czm_getDefaultMaterial(materialInput);
 
     vec2 st = materialInput.st;

diff --git a/Source/Shaders/PolylineFS.glsl b/Source/Shaders/PolylineFS.glsl
@@ -8,10 +8,12 @@ void main()
 {
     czm_materialInput materialInput;
 
-    vec2 stNonPerspective = czm_readNonPerspective(v_st, gl_FragCoord.w);
-    materialInput.s = stNonPerspective.s;
-    materialInput.st = stNonPerspective;
-    materialInput.str = vec3(stNonPerspective, 0.0);
+    vec2 st = v_st;
+    st.t *= gl_FragCoord.w;
+
+    materialInput.s = st.s;
+    materialInput.st = st;
+    materialInput.str = vec3(st, 0.0);
 
     czm_material material = czm_getMaterial(materialInput);
     gl_FragColor = vec4(material.diffuse + material.emission, material.alpha);

diff --git a/Source/Shaders/PolylineVS.glsl b/Source/Shaders/PolylineVS.glsl
@@ -94,7 +94,9 @@ void main()
     vec4 positionWC = getPolylineWindowCoordinates(p, prev, next, expandDir, width, usePrev, polylineAngle);
     gl_Position = czm_viewportOrthographic * positionWC * show;
 
-    v_st = czm_writeNonPerspective(vec2(texCoord, clamp(expandDir, 0.0, 1.0)), gl_Position.w);
+    v_st.s = texCoord;
+    v_st.t = clamp(expandDir, 0.0, 1.0) * gl_Position.w;
+
     v_width = czm_writeNonPerspective(width, gl_Position.w);
     v_pickColor = czm_writeNonPerspective(pickColor, gl_Position.w);
     v_polylineAngle = czm_writeNonPerspective(polylineAngle, gl_Position.w);