fixed(display): Ensure the strokeWidth of Boxes is correctly rendered…

… in all cases Signed-off-by: Tim Deubler <[email protected]>
heremaps · Aug 23, 2024 · 19fa268 · 19fa268
1 parent 58c1f0a
commit 19fa268
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/packages/display/src/displays/webgl/glsl/box_fragment.glsl b/packages/display/src/displays/webgl/glsl/box_fragment.glsl
@@ -49,16 +49,9 @@ void main(void){
     normal = normalize(surfacePos - v_worldPos);
     #else
 
-    vec3 size = vSize;
-//    size.z *= u_zMeterToPixel;
-    vec3 pos = vPosition;
-//    vec3 pos = vec3(vPosition.xy,vPosition.z*u_zMeterToPixel);
-
-
-
-    float a = smoothstep(v_strokeWidth, v_strokeWidth + smoothness, length(abs(pos.xy) - size.xy));
-    a *= smoothstep(v_strokeWidth, v_strokeWidth + smoothness, length(abs(pos.yz) - size.yz));
-    a *= smoothstep(v_strokeWidth, v_strokeWidth + smoothness, length(abs(pos.xz) - size.xz));
+    float a = smoothstep(v_strokeWidth, v_strokeWidth + smoothness, length(abs(vPosition.xy) - vSize.xy));
+    a *= smoothstep(v_strokeWidth, v_strokeWidth + smoothness, length(abs(vPosition.yz) - vSize.yz));
+    a *= smoothstep(v_strokeWidth, v_strokeWidth + smoothness, length(abs(vPosition.xz) - vSize.xz));
     color = mix(u_stroke, u_fill, a);
 
     // interpolated varying -> unit vector

diff --git a/packages/display/src/displays/webgl/glsl/box_vertex.glsl b/packages/display/src/displays/webgl/glsl/box_vertex.glsl
@@ -85,7 +85,7 @@ void main(void){
     #else
     //    vPosition = vertexOffset;
     vPosition = vec3(vertexOffset.xy, vertexOffset.z * u_zMeterToPixel);
-    v_strokeWidth = u_strokeWidth / u_scale;
+    v_strokeWidth = u_strokeWidth / u_scale * scaleDZ;
     #endif
 
     vSize = size;