fixed _set_batch regression, removed dead cffi code

Author: HexDecimal

examples/life.py

@@ -145,6 +145,7 @@ def main():
             console.clear()
             for x, y in board.live_cells:
                 console.draw_char(x, y, '*')
+            #console.draw_rect(0, -1, None, None, None, bg=(64, 64, 80))
             console.draw_rect(0, -1, None, None, None, bg=(64, 64, 80))
             console.draw_str(0, -1, "Mouse:Toggle Cells, Space:%5s, [S]tep, [C]lear, [W]rap Turn %s" % (['Play', 'Pause'][play], ['On', 'Off'][board.wrap]), None, None)
             if (mouse_x, mouse_y) in console:

tdl/__init__.py

@@ -978,30 +978,32 @@ def _set_batch(self, batch, fg, bg, bgblend=1, nullChar=False):
         if bg is Ellipsis:
             bg = self._bg
 
-        if fg != -1:
-            fg = _to_tcod_color(fg)
-        if bg != -1:
-            bg = _to_tcod_color(bg)
+        #if fg != -1:
+        #    fg = _to_tcod_color(fg)
+        #if bg != -1:
+        #    bg = _to_tcod_color(bg)
 
-
-        if fg != -1 and not nullChar:
-            # buffer values as ctypes objects
-            self._typewriter = None # clear the typewriter as colors will be set
-            console = self._as_parameter_
-            #bgblend = _ctypes.c_int(bgblend)
-
-            if bg == -1:
-                bgblend = 0
-            else:
-                _lib.TCOD_console_set_default_background(console, bg[0])
-            _lib.TCOD_console_set_default_foreground(console, fg[0])
-            _putChar = _lib.TCOD_console_put_char # remove dots and make local
-            for (x, y), char in batch:
-                _putChar(console, x, y, char, bgblend)
+        for (x, y), char in batch:
+            self._set_char(x, y, char, fg, bg, bgblend)
 
-        else:
-            for (x, y), char in batch:
-                self._set_char(x, y, char, fg, bg, bgblend)
+        # if fg != -1 and not nullChar:
+            # # buffer values as ctypes objects
+            # self._typewriter = None # clear the typewriter as colors will be set
+            # console = self._as_parameter_
+            # #bgblend = _ctypes.c_int(bgblend)
+
+            # if bg == -1:
+                # bgblend = 0
+            # else:
+                # _lib.TCOD_console_set_default_background(console, bg[0])
+            # _lib.TCOD_console_set_default_foreground(console, fg[0])
+            # _putChar = _lib.TCOD_console_put_char # remove dots and make local
+            # for (x, y), char in batch:
+                # _putChar(console, x, y, char, bgblend)
+            
+        # else:
+            # for (x, y), char in batch:
+                # self._set_char(x, y, char, fg, bg, bgblend)
 
     def get_char(self, x, y):
         # inherit docstring

tdl/libtcod.py

@@ -1,11 +1,10 @@
 
-import os as _os
-from tdl import __path__
+import sys
+import os
 
-_os.environ['PATH'] += ';' + _os.path.join(__path__[0], 'lib/win32/')
-
-from ._libtcod import ffi
+import platform
 
+from . import __path__
 
 try: # decide how files are unpacked depending on if we have the pkg_resources module
     from pkg_resources import resource_filename
@@ -14,36 +13,33 @@ 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"""
     return ffi.LoadLibrary(_unpackfile(dll))
 
 def _get_library_crossplatform():
     bits, linkage = platform.architecture()
-    libpath = None
     if 'win32' in sys.platform:
-        pass
+        return 'lib/win32/'
     elif 'linux' in sys.platform:
         if bits == '32bit':
-            pass
+            return 'lib/linux32/'
         elif bits == '64bit':
-            pass
+            return 'lib/linux64/'
     elif 'darwin' in sys.platform:
-        pass
-    else:
-        raise ImportError('Operating system "%s" has no supported dynamic link libarary. (%s, %s)' % (sys.platform, bits, linkage))
-    return libTCOD, libSDL
+        return 'lib/darwin/'
+    raise ImportError('Operating system "%s" has no supported dynamic link libarary. (%s, %s)' % (sys.platform, bits, linkage))
 
+os.environ['PATH'] += ';' + os.path.join(__path__[0],
+                                         _get_library_crossplatform())
 
-ffi.dlopen(_unpackfile('lib/win32/zlib1.dll'))
-ffi.dlopen(_unpackfile('lib/win32/SDL.dll'))
-lib = ffi.dlopen(_unpackfile('lib/win32/libtcod-VS.dll'))
+from ._libtcod import ffi, lib
 
 _ffi = ffi
-_lib = lib
+_lib = lib