🐛 fix: improve point and line visibility for Vulkan backend - Fixes #517

Author: ra100

model/arc.py

@@ -102,8 +102,15 @@ def update(self):
             mat = self.wp.matrix_basis @ mat_local
             coords = [(mat @ Vector((*co, 0)))[:] for co in coords]
 
-        kwargs = {"pos": coords}
-        self._batch = batch_for_shader(self._shader, "LINE_STRIP", kwargs)
+        from ..utilities.draw import draw_thick_line_strip_3d, draw_thick_dashed_line_strip_3d
+        if self.is_dashed():
+            thick_coords, indices = draw_thick_dashed_line_strip_3d(coords, self.line_width)
+        else:
+            thick_coords, indices = draw_thick_line_strip_3d(coords, self.line_width)
+        kwargs = {"pos": thick_coords}
+        self._batch = batch_for_shader(self._shader, "TRIS", kwargs, indices=indices)
+
+
         self.is_dirty = False
 
     def create_slvs_data(self, solvesys, group=Solver.group_fixed):

model/base_entity.py

@@ -63,15 +63,11 @@ def is_dirty(self, value: bool):
 
     @property
     def _shader(self):
-        if self.is_point():
-            return Shaders.uniform_color_3d()
-        return Shaders.uniform_color_line_3d()
+        return Shaders.uniform_color_3d()
 
     @property
     def _id_shader(self):
-        if self.is_point():
-            return Shaders.id_shader_3d()
-        return Shaders.id_line_3d()
+        return Shaders.id_shader_3d()
 
     @property
     def point_size(self):
@@ -222,18 +218,18 @@ def draw(self, context):
         shader = self._shader
         shader.bind()
 
+        # Enable required GPU features for Vulkan compatibility
+        try:
+            gpu.state.program_point_size_set(True)
+        except (AttributeError, RuntimeError):
+            pass  # Not available in older Blender versions or when GPU context unavailable
+
         gpu.state.blend_set("ALPHA")
         gpu.state.point_size_set(self.point_size)
 
         col = self.color(context)
         shader.uniform_float("color", col)
 
-        if not self.is_point():
-            shader.uniform_bool("dashed", (self.is_dashed(),))
-            shader.uniform_float("dash_width", 0.05)
-            shader.uniform_float("dash_factor", 0.3)
-            gpu.state.line_width_set(self.line_width)
-
         batch.draw(shader)
         gpu.shader.unbind()
         self.restore_opengl_defaults()
@@ -250,14 +246,15 @@ def draw_id(self, context):
         shader = self._id_shader
         shader.bind()
 
+        # Enable required GPU features for Vulkan compatibility
+        try:
+            gpu.state.program_point_size_set(True)
+        except AttributeError:
+            pass  # Not available in older Blender versions
+
         gpu.state.point_size_set(self.point_size_select)
 
         shader.uniform_float("color", (*index_to_rgb(self.slvs_index), 1.0))
-        if not self.is_point():
-            # viewport = [context.area.width, context.area.height]
-            # shader.uniform_float("Viewport", viewport)
-            shader.uniform_bool("dashed", (False,))
-            gpu.state.line_width_set(self.line_width_select)
 
         batch.draw(shader)
         gpu.shader.unbind()

model/circle.py

@@ -17,7 +17,7 @@
 from .utilities import slvs_entity_pointer, tag_update
 from .constants import CURVE_RESOLUTION
 from ..utilities.constants import HALF_TURN, FULL_TURN
-from ..utilities.draw import coords_arc_2d
+from ..utilities.draw import coords_arc_2d, draw_thick_line_strip_3d, draw_thick_dashed_line_strip_3d
 from .utilities import (
     get_bezier_curve_midpoint_positions,
     create_bezier_curve,
@@ -76,8 +76,13 @@ def update(self):
         mat = self.wp.matrix_basis @ mat_local
         coords = [(mat @ Vector((*co, 0)))[:] for co in coords]
 
-        kwargs = {"pos": coords}
-        self._batch = batch_for_shader(self._shader, "LINE_STRIP", kwargs)
+        if self.is_dashed():
+            thick_coords, indices = draw_thick_dashed_line_strip_3d(coords, self.line_width)
+        else:
+            thick_coords, indices = draw_thick_line_strip_3d(coords, self.line_width)
+        kwargs = {"pos": thick_coords}
+        self._batch = batch_for_shader(self._shader, "TRIS", kwargs, indices=indices)
+
         self.is_dirty = False
 
     def create_slvs_data(self, solvesys, group=Solver.group_fixed):

model/line_2d.py

@@ -14,6 +14,7 @@
 from .base_entity import Entity2D
 from .utilities import slvs_entity_pointer, get_connection_point, round_v
 from ..utilities.geometry import nearest_point_line_line
+from ..utilities.draw import draw_thick_line_3d, draw_thick_dashed_line_3d
 
 
 logger = logging.getLogger(__name__)
@@ -52,10 +53,14 @@ def update(self):
             return
 
         p1, p2 = self.p1.location, self.p2.location
-        coords = (p1, p2)
 
+        if self.is_dashed():
+            coords, indices = draw_thick_dashed_line_3d(p1, p2, self.line_width)
+        else:
+            coords, indices = draw_thick_line_3d(p1, p2, self.line_width)
         kwargs = {"pos": coords}
-        self._batch = batch_for_shader(self._shader, "LINES", kwargs)
+        self._batch = batch_for_shader(self._shader, "TRIS", kwargs, indices=indices)
+
         self.is_dirty = False
 
     def create_slvs_data(self, solvesys, group=Solver.group_fixed):

model/line_3d.py

@@ -10,6 +10,7 @@
 from .base_entity import SlvsGenericEntity
 from .utilities import slvs_entity_pointer
 from ..utilities.geometry import nearest_point_line_line
+from ..utilities.draw import draw_thick_line_3d, draw_thick_dashed_line_3d
 
 logger = logging.getLogger(__name__)
 
@@ -45,10 +46,13 @@ def update(self):
             return
 
         p1, p2 = self.p1.location, self.p2.location
-        coords = (p1, p2)
 
+        if self.is_dashed():
+            coords, indices = draw_thick_dashed_line_3d(p1, p2, self.line_width)
+        else:
+            coords, indices = draw_thick_line_3d(p1, p2, self.line_width)
         kwargs = {"pos": coords}
-        self._batch = batch_for_shader(self._shader, "LINES", kwargs)
+        self._batch = batch_for_shader(self._shader, "TRIS", kwargs, indices=indices)
 
         self.is_dirty = False
 

model/point_2d.py

@@ -8,7 +8,7 @@
 from mathutils import Matrix, Vector
 from bpy.utils import register_classes_factory
 
-from ..utilities.draw import draw_rect_2d
+from ..utilities.draw import draw_rect_2d, draw_thick_point_3d
 from ..solver import Solver
 from .base_entity import SlvsGenericEntity
 from .base_entity import Entity2D
@@ -27,16 +27,10 @@ def update(self):
         if bpy.app.background:
             return
 
-        u, v = self.co
-        mat_local = Matrix.Translation(Vector((u, v, 0)))
+        coords, indices = draw_thick_point_3d(self.location, self.point_size)
+        kwargs = {"pos": coords}
+        self._batch = batch_for_shader(self._shader, "TRIS", kwargs, indices=indices)
 
-        mat = self.wp.matrix_basis @ mat_local
-        size = 0.1
-        coords = draw_rect_2d(0, 0, size, size)
-        coords = [(mat @ Vector(co))[:] for co in coords]
-        indices = ((0, 1, 2), (0, 2, 3))
-        pos = self.location
-        self._batch = batch_for_shader(self._shader, "POINTS", {"pos": (pos[:],)})
         self.is_dirty = False
 
     @property

model/point_3d.py

@@ -6,7 +6,7 @@
 from gpu_extras.batch import batch_for_shader
 from bpy.utils import register_classes_factory
 
-from ..utilities.draw import draw_cube_3d
+from ..utilities.draw import draw_cube_3d, draw_thick_point_3d
 from ..solver import Solver
 from .base_entity import SlvsGenericEntity
 
@@ -23,10 +23,10 @@ def update(self):
         if bpy.app.background:
             return
 
-        coords, indices = draw_cube_3d(*self.location, 0.05)
-        self._batch = batch_for_shader(
-            self._shader, "POINTS", {"pos": (self.location[:],)}
-        )
+        coords, indices = draw_thick_point_3d(self.location, self.point_size)
+        kwargs = {"pos": coords}
+        self._batch = batch_for_shader(self._shader, "TRIS", kwargs, indices=indices)
+
         self.is_dirty = False
 
     # TODO: maybe rename -> pivot_point, midpoint

model/workplane.py

@@ -10,7 +10,7 @@
 
 from ..declarations import Operators
 from .. import global_data
-from ..utilities.draw import draw_rect_2d
+from ..utilities.draw import draw_rect_2d, draw_thick_line_3d, draw_thick_dashed_line_3d
 from ..shaders import Shaders
 from ..utilities import preferences
 from ..solver import Solver
@@ -44,15 +44,35 @@ def update(self):
         if bpy.app.background:
             return
 
-        p1, nm = self.p1, self.nm
+        # Create thick line geometry for workplane edges (Vulkan compatible)
+        rect_coords = draw_rect_2d(0, 0, self.size, self.size)
+        rect_coords = [Vector(co) for co in rect_coords]
 
-        coords = draw_rect_2d(0, 0, self.size, self.size)
-        coords = [(Vector(co))[:] for co in coords]
+        # Use a much smaller width for workplane edges (accounting for view distance scaling)
+        line_width = 0.2
+
+        all_coords = []
+        all_indices = []
+        vertex_offset = 0
+
+        # Draw each edge as thick line
+        edges = [(0, 1), (1, 2), (2, 3), (3, 0)]
+        for start_idx, end_idx in edges:
+            start_point = rect_coords[start_idx]
+            end_point = rect_coords[end_idx]
+
+            line_coords, line_indices = draw_thick_line_3d(start_point, end_point, line_width)
+            all_coords.extend(line_coords)
+
+            # Adjust indices for current vertex offset
+            adjusted_indices = [(idx[0] + vertex_offset, idx[1] + vertex_offset, idx[2] + vertex_offset) for idx in line_indices]
+            all_indices.extend(adjusted_indices)
+            vertex_offset += len(line_coords)
 
-        indices = ((0, 1), (1, 2), (2, 3), (3, 0))
         self._batch = batch_for_shader(
-            self._shader, "LINES", {"pos": coords}, indices=indices
+            self._shader, "TRIS", {"pos": all_coords}, indices=all_indices
         )
+
         self.is_dirty = False
 
     # NOTE: probably better to avoid overwriting draw func..