removed setuptools dependency

Author: HexDecimal

README.rst

@@ -11,7 +11,7 @@ This module can also be manually installed by going into the "setup.py" director
 
     python setup.py install
 
-Already compiled libtcod libraries are included as part of the package data.  They won't need to be compiled as part of the installation, but can be replaced with newer versions if necessary.
+This will require that your Python installation can compile binaries.
 
 =======
  About
@@ -28,13 +28,14 @@ Online Documentation: http://pythonhosted.org/tdl/
 
 Issue Tracker: https://github.com/HexDecimal/python-tdl/issues
 
-python-tdl is a ctypes port of "libtcod".  You can find more about libtcod at http://roguecentral.org/doryen/libtcod/
+python-tdl is a cffi port of "libtcod".  You can find more about libtcod at http://roguecentral.org/doryen/libtcod/
 
 ==============
  Requirements
 ==============
 * Python 2.6+ or 3.x
 * 32 bit Windows, 32/64 bit Linux, or Mac OS/X (64 bit architecture)
+* An up-to-date version of the Python module: cffi
 
 =========
  License

setup.py

@@ -11,9 +11,9 @@
     version=open('tdl/version.txt', 'r').read(),
     author='Kyle Stewart',
     author_email='4B796C65+pythonTDL@gmail.com',
-    description='Pythonic port of rogue-like library libtcod.',
+    description='Pythonic cffi port of libtcod.',
     long_description='\n'.join([open('README.rst', 'r').read(),
-                              open('CHANGELOG.rst', 'r').read()]),
+                                open('CHANGELOG.rst', 'r').read()]),
     url='https://github.com/HexDecimal/python-tdl',
     download_url='https://pypi.python.org/pypi/tdl',
     packages=['tdl'],
@@ -23,8 +23,7 @@
                           'lib/linux*/*']},
     setup_requires=["cffi>=1.0.0"],
     cffi_modules=["tdl/build_libtcod.py:ffi"],
-    install_requires=["cffi>=1.0.0",
-                      "setuptools>=1.0.0"],
+    install_requires=["cffi>=1.0.0"],
     classifiers=['Development Status :: 5 - Production/Stable',
                'Environment :: Win32 (MS Windows)',
                'Environment :: MacOS X',
@@ -49,7 +48,7 @@
                'Topic :: Multimedia :: Graphics',
                'Topic :: Software Development :: Libraries :: Python Modules',
                ],
-    keywords = 'portable rogue-like rogue-likes text ctypes ASCII ANSI Unicode libtcod fov',
+    keywords = 'portable rogue-like rogue-likes text cffi ASCII ANSI Unicode libtcod fov',
     platforms = ['Windows', 'Mac OS X', 'Linux'],
     license = 'New BSD License'
     )

tdl/__init__.py

@@ -70,7 +70,6 @@
 import warnings as _warnings
 
 from . import event, map, noise
-from .libtcod import _unpackfile
 from .libtcod import _ffi, _lib
 from . import style as _style
 
@@ -1140,7 +1139,8 @@ def init(width, height, title=None, fullscreen=False, renderer='OPENGL'):
     RENDERERS = {'GLSL': 0, 'OPENGL': 1, 'SDL': 2}
     global _rootinitialized, _rootConsoleRef
     if not _fontinitialized: # set the default font to the one that comes with tdl
-        set_font(_unpackfile('terminal8x8.png'), None, None, True, True)
+        set_font(_os.path.join(__path__[0], 'terminal8x8.png'),
+                 None, None, True, True)
 
     if renderer.upper() not in RENDERERS:
         raise TDLError('No such render type "%s", expected one of "%s"' % (renderer, '", "'.join(RENDERERS)))

tdl/build_libtcod.py

@@ -437,6 +437,50 @@
 int TCOD_random_dice_roll_s (TCOD_random_t mersenne, const char * s);
 
 
+// FOV
+
+typedef enum {
+	FOV_BASIC,
+	FOV_DIAMOND,
+	FOV_SHADOW,
+	FOV_PERMISSIVE_0,
+	FOV_PERMISSIVE_1,
+	FOV_PERMISSIVE_2,
+	FOV_PERMISSIVE_3,
+	FOV_PERMISSIVE_4,
+	FOV_PERMISSIVE_5,
+	FOV_PERMISSIVE_6,
+	FOV_PERMISSIVE_7,
+	FOV_PERMISSIVE_8,
+	FOV_RESTRICTIVE,
+	NB_FOV_ALGORITHMS }TCOD_fov_algorithm_t;
+
+typedef void *TCOD_map_t;
+
+/* allocate a new map */
+TCOD_map_t TCOD_map_new(int width, int height);
+/* set all cells as solid rock (cannot see through nor walk) */
+void TCOD_map_clear(TCOD_map_t map, bool transparent, bool walkable);
+/* copy a map to another, reallocating it when needed */
+void TCOD_map_copy(TCOD_map_t source, TCOD_map_t dest);
+/* change a cell properties */
+void TCOD_map_set_properties(TCOD_map_t map, int x, int y, bool is_transparent, bool is_walkable);
+/* destroy a map */
+void TCOD_map_delete(TCOD_map_t map);
+
+/* calculate the field of view (potentially visible cells from player_x,player_y) */
+void TCOD_map_compute_fov(TCOD_map_t map, int player_x, int player_y, int max_radius, bool light_walls, TCOD_fov_algorithm_t algo);
+/* check if a cell is in the last computed field of view */
+bool TCOD_map_is_in_fov(TCOD_map_t map, int x, int y);
+void TCOD_map_set_in_fov(TCOD_map_t map, int x, int y, bool fov);
+
+/* retrieve properties from the map */
+bool TCOD_map_is_transparent(TCOD_map_t map, int x, int y);
+bool TCOD_map_is_walkable(TCOD_map_t map, int x, int y);
+int TCOD_map_get_width(TCOD_map_t map);
+int TCOD_map_get_height(TCOD_map_t map);
+int TCOD_map_get_nb_cells(TCOD_map_t map);
+
 
 // NOISE
 

tdl/libtcod.py

@@ -6,23 +6,6 @@
 
 from . import __path__
 
-try: # decide how files are unpacked depending on if we have the pkg_resources module
-    from pkg_resources import resource_filename
-    def _unpackfile(filename):
-        return resource_filename(__name__, filename)
-except ImportError:
-    #from tdl import __path__
-    def _unpackfile(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))
-
-def _loadDLL(dll):
-    """shorter version of file unpacking and linking"""
-    return ffi.LoadLibrary(_unpackfile(dll))
-
 def _get_library_crossplatform():
     bits, linkage = platform.architecture()
     if 'win32' in sys.platform: