Add glyph2tile array.

.github/workflows/lint_cc.yml

@@ -21,7 +21,8 @@ jobs:
     name: "clang-format"
     runs-on: ubuntu-latest
     steps:
-      - name: Clone NLE repo
-        uses: actions/checkout@v2
-      - name: Run clang
-        run: "./nle/scripts/run-clang-format -r win/rl src/nle.c sys/unix/nledl.c include/nle.h include/nledl.h include/nleobs.h"
+    - uses: actions/checkout@v2
+    - uses: DoozyX/[email protected]
+      with:
+        source: 'win/rl src/nle.c sys/unix/nledl.c include/nle.h include/nledl.h include/nleobs.h'
+        clangFormatVersion: 12

.pre-commit-config.yaml

@@ -21,9 +21,9 @@ repos:
     -   id: clang-format
         name: clang-format
         description: Format files with clang-format
-        entry: nle/scripts/run-clang-format
+        entry: clang-format
         language: system
-        files: ^(src\/nle|include\/nle|win\/rl)\.(c|cc|cxx|cpp|cu|h|hpp|hxx|cuh|proto)$
+        files: ^(src\/nle|include\/nle|win\/rl|sys\/unix\/nle).*\.(c|cc|cxx|cpp|cu|h|hpp|hxx|cuh|proto)$
 -   repo: https://github.com/pycqa/isort
     rev: 5.8.0
     hooks:

CMakeLists.txt

@@ -54,7 +54,8 @@ add_compile_definitions(
   HACKDIR="${HACKDIR}"
   DEFAULT_WINDOW_SYS="rl"
   DLB
-  NOCWD_ASSUMPTIONS)
+  NOCWD_ASSUMPTIONS
+  NLE_USE_TILES)
 
 option(USE_SEEDING "Use seeding support in NLE" ON)
 
@@ -70,6 +71,8 @@ set(NLE_INC ${nle_SOURCE_DIR}/include)
 set(NLE_DAT ${nle_SOURCE_DIR}/dat)
 set(NLE_UTIL ${nle_SOURCE_DIR}/util)
 set(NLE_DOC ${nle_SOURCE_DIR}/doc)
+set(NLE_SSYS ${nle_SOURCE_DIR}/sys/share)
+set(NLE_WIN ${nle_SOURCE_DIR}/win)
 
 set(NLE_SRC_GEN ${nle_BINARY_DIR}/src)
 set(NLE_INC_GEN ${nle_BINARY_DIR}/include)
@@ -125,8 +128,14 @@ add_dependencies(rlmain util) # For pm.h.
 
 # pybind11 python library.
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/third_party/pybind11)
-pybind11_add_module(_pynethack win/rl/pynethack.cc src/monst.c src/decl.c
-                    src/drawing.c src/objects.c)
+pybind11_add_module(
+  _pynethack
+  win/rl/pynethack.cc
+  src/monst.c
+  src/decl.c
+  src/drawing.c
+  src/objects.c
+  $<TARGET_OBJECTS:tile>)
 target_link_libraries(_pynethack PUBLIC nethackdl)
 set_target_properties(_pynethack PROPERTIES CXX_STANDARD 14)
 target_include_directories(_pynethack PUBLIC ${NLE_INC_GEN})

Files.nle

@@ -1,4 +1,4 @@
-Following Files.nh, this is a listing of all files that NLE adds to the NetHack
+Following Files.nh, this is a listing of some files that NLE adds to the NetHack
 distribution.
 
 .:
@@ -63,7 +63,7 @@ __init__.py  actions.py  nethack.py  print_message.py  ptyprocess.py
 nle/scripts:
 (files for the nle.scripts module)
 __init__.py         check_nethack_speed.py  collect_env.py  lint_changed.sh
-nh-clean-install    play.py                 plot.py         run-clang-format
+nh-clean-install    play.py                 plot.py
 test_raw_nethack.py ttyplay.py              ttyrec.py
 
 nle/tests:

MANIFEST.in

@@ -9,11 +9,11 @@ recursive-include src *
 recursive-include sys *
 recursive-include util *
 recursive-include win/rl *
+recursive-include win/share *
 recursive-include win/tty *
 recursive-include third_party *
 
 recursive-exclude build *
 exclude nle/dashboard
 exclude nle/scripts/nh-clean-install.sh
-exclude nle/scripts/run-clang-format.py
 exclude nle/scripts/line-changed.sh

include/nleobs.h

@@ -42,6 +42,7 @@
 #define NLE_BL_CONDITION 25 /* condition bit mask */
 
 /* #define NLE_ALLOW_SEEDING 1 */ /* Set in CMakeLists.txt if not disabled. */
+/* #define NLE_USE_TILES 1 */     /* Set in CMakeLists.txt. */
 
 typedef struct nle_observation {
     int action;