fix px_per_unit?

MakieOrg · Feb 10, 2024 · f0422a0 · f0422a0
1 parent 58f41eb
commit f0422a0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/GLMakie/src/drawing_primitives.jl b/GLMakie/src/drawing_primitives.jl
@@ -456,9 +456,7 @@ function draw_atomic(screen::Screen, scene::Scene, @nospecialize(plot::Lines))
 
             positions = lift(apply_transform, plot, transform_func, positions, space)
         else
-            linewidth = gl_attributes[:thickness]
-            px_per_unit = data[:px_per_unit]
-            data[:pattern] = map(*, plot, linestyle, px_per_unit)
+            data[:pattern] = linestyle
             data[:fast] = false
 
             pvm = lift(*, plot, data[:projectionview], data[:model])
@@ -489,8 +487,7 @@ function draw_atomic(screen::Screen, scene::Scene, @nospecialize(plot::LineSegme
         if isnothing(ls)
             data[:pattern] = nothing
         else
-            linewidth = gl_attributes[:thickness]
-            data[:pattern] = lift(*, plot, linestyle, px_per_unit)
+            data[:pattern] = linestyle
         end
         positions = handle_view(plot[1], data)
 

diff --git a/WGLMakie/src/Lines.js b/WGLMakie/src/Lines.js
@@ -138,7 +138,7 @@ function lines_vertex_shader(uniforms, attributes, is_linesegments) {
                 ////////////////////////////////////////////////////////////////////
 
 
-                float width = px_per_unit * (is_end ? linewidth_end : linewidth_start);
+                float width = is_end ? linewidth_end : linewidth_start;
                 float halfwidth = 0.5 * max(AA_RADIUS, width);
 
                 vec3 p1 = screen_space(linepoint_start);
@@ -409,7 +409,7 @@ function lines_vertex_shader(uniforms, attributes, is_linesegments) {
                 ////////////////////////////////////////////////////////////////////
 
 
-                float width = px_per_unit * (is_end ? linewidth_end : linewidth_start);
+                float width = is_end ? linewidth_end : linewidth_start;
                 float halfwidth = 0.5 * max(AA_RADIUS, width);
 
                 vec3 p0 = screen_space(linepoint_prev);

diff --git a/WGLMakie/src/wglmakie.bundled.js b/WGLMakie/src/wglmakie.bundled.js
@@ -21421,7 +21421,7 @@ function lines_vertex_shader(uniforms, attributes, is_linesegments) {
                 ////////////////////////////////////////////////////////////////////
 
 
-                float width = px_per_unit * (is_end ? linewidth_end : linewidth_start);
+                float width = is_end ? linewidth_end : linewidth_start;
                 float halfwidth = 0.5 * max(AA_RADIUS, width);
 
                 vec3 p1 = screen_space(linepoint_start);
@@ -21687,7 +21687,7 @@ function lines_vertex_shader(uniforms, attributes, is_linesegments) {
                 ////////////////////////////////////////////////////////////////////
 
 
-                float width = px_per_unit * (is_end ? linewidth_end : linewidth_start);
+                float width = is_end ? linewidth_end : linewidth_start;
                 float halfwidth = 0.5 * max(AA_RADIUS, width);
 
                 vec3 p0 = screen_space(linepoint_prev);