removed more refereces to __tcod.py, currently working in pypy

Author: HexDecimal

dev/benchmark.py

@@ -19,9 +19,9 @@ def print_result(string):
     print(string, file=log)
 
 class Benchmark:
-    default_frames = 50
+    default_frames = 100
 
-    def run(self, console, frames=None, times=3):
+    def run(self, console, frames=None, times=4):
         if times > 1:
             print_result('Running %s' % self.__class__.__name__)
             while times > 0:

tdl/Release/_libtcod.obj

@@ -72,7 +72,7 @@
 from . import event, map, noise
 from .libtcod import _unpackfile
 from .libtcod import _ffi, _lib
-from . import __style as _style
+from . import style as _style
 
 
 _IS_PYTHON3 = (_sys.version_info[0] == 3)
@@ -110,7 +110,10 @@ def _formatChar(char):
 def _format_str(string):
     if isinstance(string, str):
         array = _array.array('I')
-        array.frombytes(string.encode(_utf32_codec))
+        if _IS_PYTHON3:
+            array.frombytes(string.encode(_utf32_codec))
+        else:
+            array.fromstring(string.encode(_utf32_codec))
         return array
     return string
 

tdl/Release/_libtcod.pypy-26.exp

@@ -390,7 +390,7 @@ static PyObject **_cffi_unpack_args(PyObject *args_tuple, Py_ssize_t expected,
 
 #include <libtcod.h>
 
-static void set_char(TCOD_console_t console, int x, int y,
+void set_char(TCOD_console_t console, int x, int y,
                      int ch, int fg, int bg){
     // normalize x, y
     int width=TCOD_console_get_width(console);
@@ -402,7 +402,6 @@ static void set_char(TCOD_console_t console, int x, int y,
     y = y % height;
     if(y<0){y += height;};
 
-    
     if(ch != -1){
         TCOD_console_set_char(console, x, y, ch);
     }

tdl/Release/_libtcod.pypy-26.lib

@@ -506,8 +506,8 @@
 }
 
 """,
-include_dirs=['include/'],
-library_dirs=['lib/win32/'],
+include_dirs=['include/', 'tdl/include/'],
+library_dirs=['lib/win32/', 'tdl/lib/win32/'],
 libraries=['libtcod-VS'])
 
 

tdl/__init__.py

@@ -36,7 +36,7 @@
 from .libtcod import _ffi, _lib
 
 #from . import __tcod as _tcod
-from . import __style as _style
+from . import style as _style
 import tdl as _tdl
 
 _eventQueue = []
@@ -323,12 +323,12 @@ def _processEvents():
     mouse = _ffi.new('TCOD_mouse_t *')
     libkey = _ffi.new('TCOD_key_t *')
     while 1:
-        libevent = _lib.TCOD_sys_check_for_event(_tcod.TCOD_EVENT_ANY, libkey, mouse)
+        libevent = _lib.TCOD_sys_check_for_event(_lib.TCOD_EVENT_ANY, libkey, mouse)
         if not libevent: # no more events from libtcod
             break
 
         #if mouse.dx or mouse.dy:
-        if libevent & _tcod.TCOD_EVENT_MOUSE_MOVE:
+        if libevent & _lib.TCOD_EVENT_MOUSE_MOVE:
             events.append(MouseMotion((mouse.x, mouse.y),
                                       (mouse.cx, mouse.cy),
                                       (mouse.dx, mouse.dy),
@@ -360,7 +360,7 @@ def _processEvents():
         _mousem = mouse.mbutton
         _mouser = mouse.rbutton
 
-        if libkey.vk == _tcod.K_NONE:
+        if libkey.vk == _lib.TCODK_NONE:
             break
         if libkey.pressed:
             keyevent = KeyDown

tdl/_libtcod.c

@@ -14,11 +14,11 @@ def _unpackfile(filename):
 except ImportError:
     #from tdl import __path__
     def _unpackfile(filename):
-        return os.path.abspath(os.path.join(__path__[0], filename))
+        return _os.path.abspath(_os.path.join(__path__[0], filename))
 
 def _unpackFramework(framework, path):
     """get framework.tar file, remove ".tar" and add path"""
-    return os.path.abspath(os.path.join(_unpackfile(framework)[:-4], path))
+    return _os.path.abspath(_os.path.join(_unpackfile(framework)[:-4], path))
 
 def _loadDLL(dll):
     """shorter version of file unpacking and linking"""

tdl/build_libtcod.py

@@ -9,7 +9,7 @@
 import tdl as _tdl
 #from .__tcod import _lib, _PATHCALL
 from .libtcod import _ffi, _lib
-from . import __style as _style
+from . import style as _style
 
 _FOVTYPES = {'BASIC' : 0, 'DIAMOND': 1, 'SHADOW': 2, 'RESTRICTIVE': 12, 'PERMISSIVE': 11}
 
@@ -182,7 +182,7 @@ def quick_fov(x, y, callback, fov='PERMISSIVE', radius=7.5, lightWalls=True, sph
         # pass one, write callback data to the tcodMap
         #for (x_, cX), (y_, cY) in _itertools.product(((i, _ctypes.c_int(i)) for i in range(mapSize)),
         #                                            ((i, _ctypes.c_int(i)) for i in range(mapSize))):
-        for x_, y_ in _itertools.product(range(mapSize), range(mapSize))
+        for x_, y_ in _itertools.product(range(mapSize), range(mapSize)):
             pos = (x_ + x - radius, 
                    y_ + y - radius)
             transparent = bool(callback(*pos))
@@ -193,7 +193,7 @@ def quick_fov(x, y, callback, fov='PERMISSIVE', radius=7.5, lightWalls=True, sph
         touched = set() # points touched by field of view
         #for (x_, cX),(y_, cY) in _itertools.product(((i, _ctypes.c_int(i)) for i in range(mapSize)),
         #                                           ((i, _ctypes.c_int(i)) for i in range(mapSize))):
-        for x_, y_ in _itertools.product(range(mapSize), range(mapSize))
+        for x_, y_ in _itertools.product(range(mapSize), range(mapSize)):
             if sphere and _math.hypot(x_ - radius, y_ - radius) > trueRadius:
                 continue
             if inFOV(tcodMap, x_, y_):