Matrixes: define value structure

synergine2_xyz/physics.py

@@ -36,16 +36,26 @@ class MoveCostComputer(object):
         return 1.0
 
 
-class VisibilityMatrix(object):
+class Matrixes(object):
     _matrixes = shared.create('matrixes', value=lambda: {})  # type: typing.Dict[str, typing.List[typing.List[tuple]]]
 
-    def initialize_empty_matrix(self, name: str, matrix_width: int, matrix_height: int) -> None:
+    def __init__(self):
+        self._value_structures = {}  # type: typing.List[str]
+
+    def initialize_empty_matrix(
+        self,
+        name: str,
+        matrix_width: int,
+        matrix_height: int,
+        value_structure: typing.List[str],
+    ) -> None:
         self._matrixes[name] = []
+        self._value_structures[name] = value_structure
 
         for y in range(matrix_height):
             x_list = []
             for x in range(matrix_width):
-                x_list.append((0.0,))
+                x_list.append(tuple([0.0] * len(value_structure)))
             self._matrixes[name].append(x_list)
 
     def get_matrix(self, name: str) -> typing.List[typing.List[tuple]]:
@@ -73,9 +83,15 @@ class VisibilityMatrix(object):
             values.append(matrix[y][x])
         return values
 
+    def get_value(self, matrix_name: str, x: int, y: int, value_name: str) -> float:
+        matrix = self.get_matrix(matrix_name)
+        values = matrix[y][x]
+        value_position = self._value_structures[matrix_name].index(value_name)
+        return values[value_position]
+
 
 class Physics(object):
-    visibility_matrix = VisibilityMatrix
+    visibility_matrix = Matrixes
     move_cost_computer_class = MoveCostComputer
 
     def __init__(

tests/test_physics.py

@@ -1,14 +1,14 @@
 # coding: utf-8
 import pytest
 
-from synergine2_xyz.physics import VisibilityMatrix
+from synergine2_xyz.physics import Matrixes
 from tests import BaseTest
 
 
 class TestVisibilityMatrix(BaseTest):
     def test_initialize_empty_matrix(self):
-        visibility = VisibilityMatrix()
-        visibility.initialize_empty_matrix('testing', matrix_width=3, matrix_height=2)
+        visibility = Matrixes()
+        visibility.initialize_empty_matrix('testing', matrix_width=3, matrix_height=2, value_structure=['opacity'])
         matrix = visibility.get_matrix('testing')
 
         assert isinstance(matrix, list)
@@ -17,8 +17,8 @@ class TestVisibilityMatrix(BaseTest):
         assert [(0.0,), (0.0,), (0.0,)] == matrix[1]
 
     def test_update_matrix(self):
-        visibility = VisibilityMatrix()
-        visibility.initialize_empty_matrix('testing', matrix_width=3, matrix_height=2)
+        visibility = Matrixes()
+        visibility.initialize_empty_matrix('testing', matrix_width=3, matrix_height=2, value_structure=['opacity'])
         visibility.update_matrix('testing', x=2, y=1, value=(0.5,))
         visibility.update_matrix('testing', x=0, y=0, value=(0.7,))
         matrix = visibility.get_matrix('testing')
@@ -27,8 +27,8 @@ class TestVisibilityMatrix(BaseTest):
         assert [(0.0,), (0.0,), (0.5,)] == matrix[1]
 
     def test_get_path_positions(self):
-        visibility = VisibilityMatrix()
-        visibility.initialize_empty_matrix('testing', matrix_width=3, matrix_height=2)
+        visibility = Matrixes()
+        visibility.initialize_empty_matrix('testing', matrix_width=3, matrix_height=2, value_structure=['opacity'])
         visibility.update_matrix('testing', x=2, y=1, value=(0.5,))
         visibility.update_matrix('testing', x=0, y=0, value=(0.7,))
 
@@ -36,11 +36,18 @@ class TestVisibilityMatrix(BaseTest):
         assert [(0, 0), (1, 0), (2, 1)] == path_positions
 
     def test_get_path_values(self):
-        visibility = VisibilityMatrix()
-        visibility.initialize_empty_matrix('testing', matrix_width=3, matrix_height=2)
+        visibility = Matrixes()
+        visibility.initialize_empty_matrix('testing', matrix_width=3, matrix_height=2, value_structure=['opacity'])
         visibility.update_matrix('testing', x=2, y=1, value=(0.5,))
         visibility.update_matrix('testing', 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('testing', path_positions=path_positions)
         assert [(0.7,), (0.0,), (0.5,)] == path_values
+
+    def test_get_value(self):
+        visibility = Matrixes()
+        visibility.initialize_empty_matrix('testing', matrix_width=3, matrix_height=2, value_structure=['opacity'])
+        visibility.update_matrix('testing', x=2, y=1, value=(0.5,))
+        value = visibility.get_value('testing', x=2, y=1, value_name='opacity')
+        assert 0.5 == value