Pathfinding works now

Author: 4B796C65@gmail.com

tdl/__init__.py

@@ -450,6 +450,8 @@ class Console(_MetaConsole):
     def __init__(self, width, height):
         """Create a new offscreen console
         """
+        if not _rootinitialized:
+            raise TDLError('Can not create Console\'s before tdl.init')
         self._as_parameter_ = _lib.TCOD_console_new(width, height)
         self.width = width
         self.height = height

tdl/__tcod.py

@@ -484,12 +484,12 @@ def __repr__(self):
 # PATH
 
 TCOD_path_t = c_void_p
-PATHCALL = CFUNCTYPE(c_float, c_int, c_int, c_int, c_int, c_void_p)
+_PATHCALL = CFUNCTYPE(c_float, c_int, c_int, c_int, c_int, py_object)
 
 _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_new_using_function.argtypes = (c_int, c_int, _PATHCALL, py_object, 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
@@ -506,7 +506,7 @@ def __repr__(self):
 _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_new_using_function.argtypes = (c_int, c_int, POINTER(_PATHCALL), py_object, 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

tdl/fov.py

@@ -7,7 +7,7 @@
 
 class Map(object):
 
-    def __init__(self, width, height, callback):
+    def __init__(self, width, height, callback=None):
         self._width = int(width)
         self._height = int(height)
         self._size = self._width * self._height
@@ -49,6 +49,8 @@ def set(self, x, y, walkable, transparent):
                                      x, y, walkable, transparent)
 
     def _updateMap(self, x, y, radius):
+        if not self._callback:
+            return
         c_bool = ctypes.c_bool
         for (x, cX),(y, cY) in self._pointsInRadiusC(x, y, radius):
             #if (x, y) not in self._clean:

tdl/path.py

@@ -2,33 +2,43 @@
 import math
 import ctypes
 
-from .__tcod import _lib
+from .__tcod import _lib, _PATHCALL
 
 class AStar(object):
 
     def __init__(self, width, height, callback, diagnalCost=math.sqrt(2)):
         def newCallback(fromX, fromY, toX, toY, null):
             pathCost = callback(toX, toY) # expecting a float or 0
-            return pathCost
-        self.callback = newCallback
+            if pathCost:
+                return pathCost
+            return 0.0
+        self.callback = _PATHCALL(newCallback)
         self._as_parameter_ = _lib.TCOD_path_new_using_function(width, height,
-                                                newCallback, None, diagnalCost)
+                                     self.callback, None, diagnalCost)
 
+    @classmethod
+    def newFromMap(cls, map, diagnalCost=math.sqrt(2)):
+        self = cls.__new__(cls)
+        self.callback = None
+        self._as_parameter_ = _lib.TCOD_path_new_using_map(map, diagnalCost)
+        return self
+                                     
+    def __del__(self):
+        _lib.TCOD_path_delete(self)
+        
     def getPath(self, origX, origY, destX, destY):
         found = _lib.TCOD_path_compute(self, origX, origY, destX, destY)
         if not found:
-            pass # path not found, not sure what to do
+            return [] # path not found
         x, y = ctypes.c_int(), ctypes.c_int()
         xRef, yRef = ctypes.byref(x), ctypes.byref(y)
         recalculate = ctypes.c_bool(False)
         path = []
         while _lib.TCOD_path_walk(self, xRef, yRef, recalculate):
-            path.append(x.value, y.value)
+            path.append((x.value, y.value))
         return path
 
 
-    def __del__(self):
-        _lib.TCOD_path_delete(self)
 
 class Dijkstra(object):
 
@@ -38,9 +48,16 @@ def newCallback(fromX, fromY, toX, toY, null):
             return pathCost
         self.callback = newCallback
         self._as_parameter_ = _lib.TCOD_dijkstra_new_using_function(width, height,
-                                                newCallback, None, diagnalCost)
+                                     _PATHCALL(newCallback), None, diagnalCost)
         # add code to compute here with x,y
 
+    def __del__(self):
+        _lib.TCOD_dijkstra_delete(self)
+        
+    def setPos(self, x, y):
+        self.x, self.y = x, y
+        _lib.TCOD_dijkstra_compute(self, x, y)
+        
     def getPathFrom(self, startX, startY):
         pass