diff --git a/requirements.txt b/requirements.txt index e87b5c40..0e8e27eb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -61,4 +61,3 @@ wslink==2.6.0 yarl==1.* # via aiohttp -opengeodeweb-microservice==1.*,>=1.3.3 diff --git a/src/opengeodeweb_viewer/object/object_methods.py b/src/opengeodeweb_viewer/object/object_methods.py index c67f9368..bfefd59c 100644 --- a/src/opengeodeweb_viewer/object/object_methods.py +++ b/src/opengeodeweb_viewer/object/object_methods.py @@ -1,7 +1,8 @@ import logging -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Any # Third party imports +from vtkmodules.vtkCommonCore import reference from vtkmodules.vtkCommonDataModel import ( vtkDataSet, vtkMultiBlockDataSet, @@ -11,6 +12,7 @@ vtkActor, vtkCompositePolyDataMapper, vtkDataSetMapper, + vtkMapper, ) # Local application imports @@ -22,6 +24,9 @@ logger = logging.getLogger(__name__) +# Share of the gap between the polygons and lines offset factors given to the edges actors +EDGES_DEPTH_FACTOR_SHARE = 0.5 + class VtkObjectView(VtkView): def __init__(self) -> None: @@ -262,6 +267,22 @@ def update_style_scalar_bars_visibility(self, pipeline: VtkPipeline) -> None: ) ) + @staticmethod + def match_edges_depth_to_polygons(mapper: vtkMapper) -> None: + # Edges drawn by their own wireframe actor are lines, and the global offsets push lines + # back less than polygons: the edges of a surface just behind another one showed through + # it. Halfway to the polygons' factor removes most of it; the full factor would hide wide + # edges behind their own surface on sharp folds. + polygon_factor: Any = reference(0.0) + polygon_units: Any = reference(0.0) + mapper.GetResolveCoincidentTopologyPolygonOffsetParameters(polygon_factor, polygon_units) + line_factor: Any = reference(0.0) + line_units: Any = reference(0.0) + mapper.GetResolveCoincidentTopologyLineOffsetParameters(line_factor, line_units) + mapper.SetRelativeCoincidentTopologyLineOffsetParameters( + EDGES_DEPTH_FACTOR_SHARE * (float(polygon_factor) - float(line_factor)), 0.0 + ) + def ensure_edges_actor(self, pipeline: VtkPipeline) -> vtkActor: # Edges get their own actor so their scalars stay independent from the polygons if pipeline.edges_actor is not None: @@ -269,6 +290,7 @@ def ensure_edges_actor(self, pipeline: VtkPipeline) -> vtkActor: mapper = vtkDataSetMapper() mapper.SetInputConnection(pipeline.filter.GetOutputPort()) mapper.ScalarVisibilityOff() + self.match_edges_depth_to_polygons(mapper) actor = vtkActor() actor.SetMapper(mapper) actor.PickableOff() diff --git a/src/opengeodeweb_viewer/rpc/model/model_protocols.py b/src/opengeodeweb_viewer/rpc/model/model_protocols.py index b6591e26..5490759d 100644 --- a/src/opengeodeweb_viewer/rpc/model/model_protocols.py +++ b/src/opengeodeweb_viewer/rpc/model/model_protocols.py @@ -391,6 +391,7 @@ def sync_edges_width_actors(self, pipeline: VtkPipeline) -> None: mapper.SetInputDataObject(pipeline.mapper.GetInputDataObject(0, 0)) mapper.ScalarVisibilityOn() mapper.SetColorModeToMapScalars() + self.match_edges_depth_to_polygons(mapper) actor = vtkActor() actor.SetMapper(mapper) actor.PickableOff() diff --git a/tests/data/images/model/edges/blocks_edges_color.jpeg b/tests/data/images/model/edges/blocks_edges_color.jpeg index 3c409077..b84f118a 100644 Binary files a/tests/data/images/model/edges/blocks_edges_color.jpeg and b/tests/data/images/model/edges/blocks_edges_color.jpeg differ diff --git a/tests/data/images/model/edges/surface_edges_width.jpeg b/tests/data/images/model/edges/surface_edges_width.jpeg index 5ae14756..05191ad3 100644 Binary files a/tests/data/images/model/edges/surface_edges_width.jpeg and b/tests/data/images/model/edges/surface_edges_width.jpeg differ diff --git a/tests/data/images/model/edges/surfaces_edges_attribute.jpeg b/tests/data/images/model/edges/surfaces_edges_attribute.jpeg index b4de0b78..6164d730 100644 Binary files a/tests/data/images/model/edges/surfaces_edges_attribute.jpeg and b/tests/data/images/model/edges/surfaces_edges_attribute.jpeg differ diff --git a/tests/data/images/model/edges/surfaces_edges_behind_surface.jpeg b/tests/data/images/model/edges/surfaces_edges_behind_surface.jpeg index b32b53b7..36f94a4d 100644 Binary files a/tests/data/images/model/edges/surfaces_edges_behind_surface.jpeg and b/tests/data/images/model/edges/surfaces_edges_behind_surface.jpeg differ diff --git a/tests/data/images/model/edges/surfaces_edges_color.jpeg b/tests/data/images/model/edges/surfaces_edges_color.jpeg index 2b61086d..a18e655b 100644 Binary files a/tests/data/images/model/edges/surfaces_edges_color.jpeg and b/tests/data/images/model/edges/surfaces_edges_color.jpeg differ diff --git a/tests/data/images/model/edges/surfaces_edges_explode.jpeg b/tests/data/images/model/edges/surfaces_edges_explode.jpeg index 096f8943..7485c853 100644 Binary files a/tests/data/images/model/edges/surfaces_edges_explode.jpeg and b/tests/data/images/model/edges/surfaces_edges_explode.jpeg differ diff --git a/tests/data/images/model/edges/width_after_component_width.jpeg b/tests/data/images/model/edges/width_after_component_width.jpeg index b195971f..f06e21ac 100644 Binary files a/tests/data/images/model/edges/width_after_component_width.jpeg and b/tests/data/images/model/edges/width_after_component_width.jpeg differ