Added a field of view class.

Author: 4b796c65

tdl/__init__.py

@@ -31,7 +31,7 @@
 import itertools
 import textwrap
 
-from . import event, path
+from . import event, path, fov
 from .__tcod import _lib, _Color, _unpackfile
 
 _IS_PYTHON3 = (sys.version_info[0] == 3)
@@ -978,6 +978,6 @@ def forceResolution(width, height):
     @type height: int
     """
     _lib.TCOD_sys_force_fullscreen_resolution(width, height)
-
+        
 __all__ = [_var for _var in locals().keys() if _var[0] != '_' and _var not in ['sys', 'os', 'ctypes', 'array', 'weakref', 'itertools', 'textwrap']]
 __all__ += ['_MetaConsole'] # keep this object public to show the documentation in epydoc

tdl/__tcod.py

@@ -465,7 +465,69 @@ def __repr__(self):
 _lib.TCOD_sys_check_for_event.restype = c_int
 _lib.TCOD_sys_check_for_event.argtypes = (c_int, POINTER(_Key), POINTER(_Mouse))
 
+# FOV
+
+TCOD_map_t = c_void_p
+
+_lib.TCOD_map_new.restype = TCOD_map_t
+_lib.TCOD_map_new.argtypes = (c_int, c_int)
+_lib.TCOD_map_delete.restype = None
+_lib.TCOD_map_delete.argtypes = (TCOD_map_t,)
+_lib.TCOD_map_set_properties.restype = None
+_lib.TCOD_map_set_properties.argtypes = (TCOD_map_t, c_int, c_int, c_bool, c_bool)
+
+_lib.TCOD_map_compute_fov.restype = None
+_lib.TCOD_map_compute_fov.argtypes = (TCOD_map_t, c_int, c_int, c_int, c_bool, c_int)
+_lib.TCOD_map_is_in_fov.restype = c_bool
+_lib.TCOD_map_is_in_fov.argtypes = (TCOD_map_t, c_int, c_int)
+
+# PATH
+
+TCOD_path_t = c_void_p
+PATHCALL = CFUNCTYPE(c_float, (c_int, c_int, c_int, c_int, c_void_p))
+
+_lib.TCOD_path_new_using_map.restype = TCOD_path_t
+_lib.TCOD_path_new_using_map.argtypes = (TCOD_map_t, c_float)
+_lib.TCOD_path_new_using_function.restype = TCOD_path_t
+_lib.TCOD_path_new_using_function.argtypes = (c_int, c_int, PATHCALL, c_void_p, c_float)
+_lib.TCOD_path_compute.restype = c_bool
+_lib.TCOD_path_compute.argtypes = (TCOD_path_t, c_int, c_int, c_int, c_int)
+_lib.TCOD_path_walk.restype = c_bool
+_lib.TCOD_path_walk.argtypes = (TCOD_path_t, POINTER(c_int), POINTER(c_int), c_bool)
+_lib.TCOD_path_size.restype = c_int
+_lib.TCOD_path_size.argtypes = (TCOD_path_t,)
+_lib.TCOD_path_delete.restype = None
+_lib.TCOD_path_delete.argtypes = (TCOD_path_t,)
+
+# Dijkstra
+
+TCOD_dijkstra_t = c_void_p
+
+_lib.TCOD_dijkstra_new.restype = TCOD_dijkstra_t
+_lib.TCOD_dijkstra_new.argtypes = (TCOD_map_t, c_float)
+_lib.TCOD_dijkstra_new_using_function.restype = TCOD_dijkstra_t
+_lib.TCOD_dijkstra_new_using_function.argtypes = (c_int, c_int, PATHCALL, c_void_p, c_float)
+_lib.TCOD_dijkstra_compute.restype = None
+_lib.TCOD_dijkstra_compute.argtypes = (TCOD_dijkstra_t, c_int, c_int)
+_lib.TCOD_dijkstra_get_distance.restype = c_float
+_lib.TCOD_dijkstra_get_distance.argtypes = (TCOD_dijkstra_t, c_int, c_int)
+_lib.TCOD_dijkstra_path_set.restype = c_bool
+_lib.TCOD_dijkstra_path_set.argtypes = (TCOD_dijkstra_t, c_int, c_int)
+_lib.TCOD_dijkstra_size.restype = c_int
+_lib.TCOD_dijkstra_size.argtypes = (TCOD_dijkstra_t,)
+_lib.TCOD_dijkstra_reverse.restype = None
+_lib.TCOD_dijkstra_reverse.argtypes = (TCOD_dijkstra_t,)
+_lib.TCOD_dijkstra_path_walk.restype = None
+_lib.TCOD_dijkstra_path_walk.argtypes = (TCOD_path_t, POINTER(c_int), POINTER(c_int))
+_lib.TCOD_dijkstra_delete.restype = None
+_lib.TCOD_dijkstra_delete.argtypes = (TCOD_dijkstra_t,)
+
+#_lib..restype = None
+#_lib..argtypes = 
+
 # these functions should perform ultra fast once I set them up
+# after testing it seems that converting python types to ctypes is slow no
+# matter how they are passed to C
 _lib.TCOD_console_fill_background.restype = None
 _lib.TCOD_console_fill_background.argtypes = (TCOD_console_t, POINTER(c_int), POINTER(c_int), POINTER(c_int))
 _lib.TCOD_console_fill_foreground.restype = None

tdl/fov.py

@@ -0,0 +1,55 @@
+
+import itertools
+
+from .__tcod import _lib
+
+class Map(object):
+    
+    def __init__(self, width, height):
+        self._width = int(width)
+        self._height = int(height)
+        self._size = self._width * self._height
+        self._tcodMap = _lib.TCOD_map_new(width, height)
+        self._as_parameter_ = self._tcodMap
+        self._fovConf = (0, 0, 0) # fov settings (x, y, radius)
+        #self._walkable = array.array('b', [0] * self._size)
+        #self._transparent = array.array('b', [0] * self._size)
+        
+    def __del__(self):
+        _lib.TCOD_map_delete(self)
+        
+    def setFromCallbacks(self, walkableCall, transparentCall):
+        for x, y in itertools.product(range(self._width), range(self._height)):
+            _lib.TCOD_map_set_properties(self._tcodMap, x, y,
+                                         walkableCall(x, y),
+                                         transparentCall(x, y))
+        
+    def set(self, x, y, walkable, transparent):
+        #walkable = bool(walkable)
+        #transparent = bool(transparent)
+        _lib.TCOD_map_set_properties(self._as_parameter_,
+                                     x, y, walkable, transparent)
+        
+    def computeFOV(self, x, y, fov='PERMISSIVE', radius=8, lightWalls=True):
+        oldFOV = fov
+        fov = str(fov).upper()
+        FOVTYPES = {'BASIC' : 0, 'DIAMOND': 1, 'SHADOW': 2, 'RESTRICTIVE': 12,
+                    'PERMISSIVE': 11}
+        if fov in FOVTYPES:
+            fov = FOVTYPES[fov]
+        elif fov[:10] == 'PERMISSIVE' and fov[10].isdigit():
+            fov = 4 + int(fov[10])
+        else:
+            raise TDLError('No such fov as %s' % oldFOV)
+        _lib.TCOD_map_compute_fov(self, x, y, radius, lightWalls, fov)
+        self._fovConf = (x, y, radius)
+        return self._iterFOV()
+            
+    def _iterFOV(self):
+        x, y, radius = self._fovConf
+        inFOV = _lib.TCOD_map_is_in_fov
+        map = self._as_parameter_
+        for x,y in itertools.product(range(x - radius, x + radius + 1),
+                                     range(y - radius, y + radius + 1)):
+            if inFOV(map, x, y):
+                yield(x, y)