visibility: implement path and values functions

synergine2_xyz/physics.py

@@ -8,6 +8,7 @@ from synergine2.config import Config
 from synergine2.share import shared
 from synergine2_xyz.map import TMXMap, XYZTile
 from synergine2_xyz.subjects import XYZSubject
+from synergine2_xyz.utils import get_line_xy_path
 from synergine2_xyz.xyz import get_neighbor_positions
 
 
@@ -58,6 +59,21 @@ class VisibilityMatrix(object):
         # Force shared data update
         self._matrixes = dict(self._matrixes)
 
+    def get_path_positions(
+        self,
+        from_: typing.Tuple[int, int],
+        to: typing.Tuple[int, int],
+    ) -> typing.List[typing.Tuple[int, int]]:
+        return get_line_xy_path(from_, to)
+
+    def get_values_for_path(self, name: str, height: float, path_positions: typing.List[typing.Tuple[int, int]]):
+        values = []
+        matrix = self.get_matrix(name, height)
+        for path_position in path_positions:
+            x, y = path_position
+            values.append(matrix[y][x])
+        return values
+
 
 class Physics(object):
     visibility_matrix = VisibilityMatrix

tests/test_physics.py

@@ -26,7 +26,6 @@ class TestVisibilityMatrix(BaseTest):
         assert [0.7, 0.0, 0.0] == matrix[0]
         assert [0.0, 0.0, 0.5] == matrix[1]
 
-    @pytest.mark.skip(reason='Not implemented yet')
     def test_get_path_positions(self):
         visibility = VisibilityMatrix()
         visibility.initialize_empty_matrix('testing', height=0.5, matrix_width=3, matrix_height=2)
@@ -34,9 +33,8 @@ class TestVisibilityMatrix(BaseTest):
         visibility.update_matrix('testing', height=0.5, x=0, y=0, value=0.7)
 
         path_positions = visibility.get_path_positions(from_=(0, 0), to=(2, 1))
-        assert [(0, 0), (0, 1), (1, 2)] == path_positions
+        assert [(0, 0), (1, 0), (2, 1)] == path_positions
 
-    @pytest.mark.skip(reason='Not implemented yet')
     def test_get_path_values(self):
         visibility = VisibilityMatrix()
         visibility.initialize_empty_matrix('testing', height=0.5, matrix_width=3, matrix_height=2)
@@ -44,5 +42,5 @@ class TestVisibilityMatrix(BaseTest):
         visibility.update_matrix('testing', height=0.5, x=0, y=0, value=0.7)
 
         path_positions = visibility.get_path_positions(from_=(0, 0), to=(2, 1))
-        path_values = visibility.get_values_for_path(path_positions=path_positions)
+        path_values = visibility.get_values_for_path('testing', height=0.5, path_positions=path_positions)
         assert [0.7, 0.0, 0.5] == path_values