remove all the ints from the pyray hints and docs. (leave them in pyray itself for backwards compability) add proper enums to pyray and to pyray hints/docs (generated from raylib.json). TODO: raygui, rlgl, maybe something for the C API. See issue #52

create_enums.py

@@ -0,0 +1,31 @@
+#  Copyright (c) 2021 Richard Smith and others
+#
+#  This program and the accompanying materials are made available under the
+#  terms of the Eclipse Public License 2.0 which is available at
+#  http://www.eclipse.org/legal/epl-2.0.
+#
+#  This Source Code may also be made available under the following Secondary
+#  licenses when the conditions for such availability set forth in the Eclipse
+#  Public License, v. 2.0 are satisfied: GNU General Public License, version 2
+#  with the GNU Classpath Exception which is
+#  available at https://www.gnu.org/software/classpath/license.html.
+#
+#  SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+from raylib import rl, ffi
+
+from inspect import ismethod, getmembers, isbuiltin
+import inflection, sys, json
+
+f = open("raylib.json", "r")
+js = json.load(f)
+
+print("""from enum import IntEnum
+""")
+
+for e in js['enums']:
+    print ("class "+e['name']+"("+"IntEnum):")
+    for value in e['values']:
+        print("    "+value['name']+" = "+str(value['value']))
+    print("")
+

create_stub_pyray.py

@@ -89,7 +89,9 @@ for name, attr in getmembers(rl):
             f'def {uname}(*args) -> {ctype_to_python_type(return_type)}:\n        """VARARG FUNCTION - MAY NOT BE SUPPORTED BY CFFI"""\n        ...')
     else:
         #print("*****", str(type(attr)))
-        print(f"{name}: {str(type(attr))[8:-2]}")  # this isolates the type
+        t = str(type(attr))[8:-2] # this isolates the type
+        if t != "int":
+            print(f"{name}: {t}")
 
 for struct in ffi.list_types()[0]:
     print("processing", struct, file=sys.stderr)
@@ -111,8 +113,8 @@ for struct in ffi.list_types()[0]:
         for arg in ffi.typeof(struct).fields:
             print(f"        self.{arg[0]}={arg[0]}")
 
-    elif ffi.typeof(struct).kind == "enum":
+    #elif ffi.typeof(struct).kind == "enum":
-        print(f"{struct}: int")
+    #    print(f"{struct}: int")
     else:
         print("ERROR UNKNOWN TYPE", ffi.typeof(struct), file=sys.stderr)
 

make_docs.sh

@@ -6,8 +6,13 @@ gcc raylib-c/parser/raylib_parser.c
 ./a.out -i raylib-c/src/raylib.h -o raylib.json -f JSON
 
 python3 raylib/build.py
+
+python3 create_enums.py > raylib/enums.py
+
+
 pip3 install sphinx-autoapi myst_parser sphinx_rtd_theme
 python3 create_stub_pyray.py > pyray/__init__.pyi
+python3 create_enums.py >> pyray/__init__.pyi
 python3 create_stub_static.py >raylib/__init__.pyi
 rm -r docs
 cd docs-src

pyray/__init__.py

@@ -116,3 +116,5 @@ for struct in ffi.list_types()[0]:
     f = makeStructHelper(struct)
     setattr(current_module, struct, f)
 
+# overwrite ffi enums with our own
+from raylib.enums import *

raylib/enums.py

@@ -0,0 +1,335 @@
+from enum import IntEnum
+
+class ConfigFlags(IntEnum):
+    FLAG_VSYNC_HINT = 64
+    FLAG_FULLSCREEN_MODE = 2
+    FLAG_WINDOW_RESIZABLE = 4
+    FLAG_WINDOW_UNDECORATED = 8
+    FLAG_WINDOW_HIDDEN = 128
+    FLAG_WINDOW_MINIMIZED = 512
+    FLAG_WINDOW_MAXIMIZED = 1024
+    FLAG_WINDOW_UNFOCUSED = 2048
+    FLAG_WINDOW_TOPMOST = 4096
+    FLAG_WINDOW_ALWAYS_RUN = 256
+    FLAG_WINDOW_TRANSPARENT = 16
+    FLAG_WINDOW_HIGHDPI = 8192
+    FLAG_MSAA_4X_HINT = 32
+    FLAG_INTERLACED_HINT = 65536
+
+class TraceLogLevel(IntEnum):
+    LOG_ALL = 0
+    LOG_TRACE = 1
+    LOG_DEBUG = 2
+    LOG_INFO = 3
+    LOG_WARNING = 4
+    LOG_ERROR = 5
+    LOG_FATAL = 6
+    LOG_NONE = 7
+
+class KeyboardKey(IntEnum):
+    KEY_NULL = 0
+    KEY_APOSTROPHE = 39
+    KEY_COMMA = 44
+    KEY_MINUS = 45
+    KEY_PERIOD = 46
+    KEY_SLASH = 47
+    KEY_ZERO = 48
+    KEY_ONE = 49
+    KEY_TWO = 50
+    KEY_THREE = 51
+    KEY_FOUR = 52
+    KEY_FIVE = 53
+    KEY_SIX = 54
+    KEY_SEVEN = 55
+    KEY_EIGHT = 56
+    KEY_NINE = 57
+    KEY_SEMICOLON = 59
+    KEY_EQUAL = 61
+    KEY_A = 65
+    KEY_B = 66
+    KEY_C = 67
+    KEY_D = 68
+    KEY_E = 69
+    KEY_F = 70
+    KEY_G = 71
+    KEY_H = 72
+    KEY_I = 73
+    KEY_J = 74
+    KEY_K = 75
+    KEY_L = 76
+    KEY_M = 77
+    KEY_N = 78
+    KEY_O = 79
+    KEY_P = 80
+    KEY_Q = 81
+    KEY_R = 82
+    KEY_S = 83
+    KEY_T = 84
+    KEY_U = 85
+    KEY_V = 86
+    KEY_W = 87
+    KEY_X = 88
+    KEY_Y = 89
+    KEY_Z = 90
+    KEY_LEFT_BRACKET = 91
+    KEY_BACKSLASH = 92
+    KEY_RIGHT_BRACKET = 93
+    KEY_GRAVE = 96
+    KEY_SPACE = 32
+    KEY_ESCAPE = 256
+    KEY_ENTER = 257
+    KEY_TAB = 258
+    KEY_BACKSPACE = 259
+    KEY_INSERT = 260
+    KEY_DELETE = 261
+    KEY_RIGHT = 262
+    KEY_LEFT = 263
+    KEY_DOWN = 264
+    KEY_UP = 265
+    KEY_PAGE_UP = 266
+    KEY_PAGE_DOWN = 267
+    KEY_HOME = 268
+    KEY_END = 269
+    KEY_CAPS_LOCK = 280
+    KEY_SCROLL_LOCK = 281
+    KEY_NUM_LOCK = 282
+    KEY_PRINT_SCREEN = 283
+    KEY_PAUSE = 284
+    KEY_F1 = 290
+    KEY_F2 = 291
+    KEY_F3 = 292
+    KEY_F4 = 293
+    KEY_F5 = 294
+    KEY_F6 = 295
+    KEY_F7 = 296
+    KEY_F8 = 297
+    KEY_F9 = 298
+    KEY_F10 = 299
+    KEY_F11 = 300
+    KEY_F12 = 301
+    KEY_LEFT_SHIFT = 340
+    KEY_LEFT_CONTROL = 341
+    KEY_LEFT_ALT = 342
+    KEY_LEFT_SUPER = 343
+    KEY_RIGHT_SHIFT = 344
+    KEY_RIGHT_CONTROL = 345
+    KEY_RIGHT_ALT = 346
+    KEY_RIGHT_SUPER = 347
+    KEY_KB_MENU = 348
+    KEY_KP_0 = 320
+    KEY_KP_1 = 321
+    KEY_KP_2 = 322
+    KEY_KP_3 = 323
+    KEY_KP_4 = 324
+    KEY_KP_5 = 325
+    KEY_KP_6 = 326
+    KEY_KP_7 = 327
+    KEY_KP_8 = 328
+    KEY_KP_9 = 329
+    KEY_KP_DECIMAL = 330
+    KEY_KP_DIVIDE = 331
+    KEY_KP_MULTIPLY = 332
+    KEY_KP_SUBTRACT = 333
+    KEY_KP_ADD = 334
+    KEY_KP_ENTER = 335
+    KEY_KP_EQUAL = 336
+    KEY_BACK = 4
+    KEY_MENU = 82
+    KEY_VOLUME_UP = 24
+    KEY_VOLUME_DOWN = 25
+
+class MouseButton(IntEnum):
+    MOUSE_BUTTON_LEFT = 0
+    MOUSE_BUTTON_RIGHT = 1
+    MOUSE_BUTTON_MIDDLE = 2
+    MOUSE_BUTTON_SIDE = 3
+    MOUSE_BUTTON_EXTRA = 4
+    MOUSE_BUTTON_FORWARD = 5
+    MOUSE_BUTTON_BACK = 6
+
+class MouseCursor(IntEnum):
+    MOUSE_CURSOR_DEFAULT = 0
+    MOUSE_CURSOR_ARROW = 1
+    MOUSE_CURSOR_IBEAM = 2
+    MOUSE_CURSOR_CROSSHAIR = 3
+    MOUSE_CURSOR_POINTING_HAND = 4
+    MOUSE_CURSOR_RESIZE_EW = 5
+    MOUSE_CURSOR_RESIZE_NS = 6
+    MOUSE_CURSOR_RESIZE_NWSE = 7
+    MOUSE_CURSOR_RESIZE_NESW = 8
+    MOUSE_CURSOR_RESIZE_ALL = 9
+    MOUSE_CURSOR_NOT_ALLOWED = 10
+
+class GamepadButton(IntEnum):
+    GAMEPAD_BUTTON_UNKNOWN = 0
+    GAMEPAD_BUTTON_LEFT_FACE_UP = 1
+    GAMEPAD_BUTTON_LEFT_FACE_RIGHT = 2
+    GAMEPAD_BUTTON_LEFT_FACE_DOWN = 3
+    GAMEPAD_BUTTON_LEFT_FACE_LEFT = 4
+    GAMEPAD_BUTTON_RIGHT_FACE_UP = 5
+    GAMEPAD_BUTTON_RIGHT_FACE_RIGHT = 6
+    GAMEPAD_BUTTON_RIGHT_FACE_DOWN = 7
+    GAMEPAD_BUTTON_RIGHT_FACE_LEFT = 8
+    GAMEPAD_BUTTON_LEFT_TRIGGER_1 = 9
+    GAMEPAD_BUTTON_LEFT_TRIGGER_2 = 10
+    GAMEPAD_BUTTON_RIGHT_TRIGGER_1 = 11
+    GAMEPAD_BUTTON_RIGHT_TRIGGER_2 = 12
+    GAMEPAD_BUTTON_MIDDLE_LEFT = 13
+    GAMEPAD_BUTTON_MIDDLE = 14
+    GAMEPAD_BUTTON_MIDDLE_RIGHT = 15
+    GAMEPAD_BUTTON_LEFT_THUMB = 16
+    GAMEPAD_BUTTON_RIGHT_THUMB = 17
+
+class GamepadAxis(IntEnum):
+    GAMEPAD_AXIS_LEFT_X = 0
+    GAMEPAD_AXIS_LEFT_Y = 1
+    GAMEPAD_AXIS_RIGHT_X = 2
+    GAMEPAD_AXIS_RIGHT_Y = 3
+    GAMEPAD_AXIS_LEFT_TRIGGER = 4
+    GAMEPAD_AXIS_RIGHT_TRIGGER = 5
+
+class MaterialMapIndex(IntEnum):
+    MATERIAL_MAP_ALBEDO = 0
+    MATERIAL_MAP_METALNESS = 1
+    MATERIAL_MAP_NORMAL = 2
+    MATERIAL_MAP_ROUGHNESS = 3
+    MATERIAL_MAP_OCCLUSION = 4
+    MATERIAL_MAP_EMISSION = 5
+    MATERIAL_MAP_HEIGHT = 6
+    MATERIAL_MAP_CUBEMAP = 7
+    MATERIAL_MAP_IRRADIANCE = 8
+    MATERIAL_MAP_PREFILTER = 9
+    MATERIAL_MAP_BRDF = 10
+
+class ShaderLocationIndex(IntEnum):
+    SHADER_LOC_VERTEX_POSITION = 0
+    SHADER_LOC_VERTEX_TEXCOORD01 = 1
+    SHADER_LOC_VERTEX_TEXCOORD02 = 2
+    SHADER_LOC_VERTEX_NORMAL = 3
+    SHADER_LOC_VERTEX_TANGENT = 4
+    SHADER_LOC_VERTEX_COLOR = 5
+    SHADER_LOC_MATRIX_MVP = 6
+    SHADER_LOC_MATRIX_VIEW = 7
+    SHADER_LOC_MATRIX_PROJECTION = 8
+    SHADER_LOC_MATRIX_MODEL = 9
+    SHADER_LOC_MATRIX_NORMAL = 10
+    SHADER_LOC_VECTOR_VIEW = 11
+    SHADER_LOC_COLOR_DIFFUSE = 12
+    SHADER_LOC_COLOR_SPECULAR = 13
+    SHADER_LOC_COLOR_AMBIENT = 14
+    SHADER_LOC_MAP_ALBEDO = 15
+    SHADER_LOC_MAP_METALNESS = 16
+    SHADER_LOC_MAP_NORMAL = 17
+    SHADER_LOC_MAP_ROUGHNESS = 18
+    SHADER_LOC_MAP_OCCLUSION = 19
+    SHADER_LOC_MAP_EMISSION = 20
+    SHADER_LOC_MAP_HEIGHT = 21
+    SHADER_LOC_MAP_CUBEMAP = 22
+    SHADER_LOC_MAP_IRRADIANCE = 23
+    SHADER_LOC_MAP_PREFILTER = 24
+    SHADER_LOC_MAP_BRDF = 25
+
+class ShaderUniformDataType(IntEnum):
+    SHADER_UNIFORM_FLOAT = 0
+    SHADER_UNIFORM_VEC2 = 1
+    SHADER_UNIFORM_VEC3 = 2
+    SHADER_UNIFORM_VEC4 = 3
+    SHADER_UNIFORM_INT = 4
+    SHADER_UNIFORM_IVEC2 = 5
+    SHADER_UNIFORM_IVEC3 = 6
+    SHADER_UNIFORM_IVEC4 = 7
+    SHADER_UNIFORM_SAMPLER2D = 8
+
+class ShaderAttributeDataType(IntEnum):
+    SHADER_ATTRIB_FLOAT = 0
+    SHADER_ATTRIB_VEC2 = 1
+    SHADER_ATTRIB_VEC3 = 2
+    SHADER_ATTRIB_VEC4 = 3
+
+class PixelFormat(IntEnum):
+    PIXELFORMAT_UNCOMPRESSED_GRAYSCALE = 1
+    PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA = 2
+    PIXELFORMAT_UNCOMPRESSED_R5G6B5 = 3
+    PIXELFORMAT_UNCOMPRESSED_R8G8B8 = 4
+    PIXELFORMAT_UNCOMPRESSED_R5G5B5A1 = 5
+    PIXELFORMAT_UNCOMPRESSED_R4G4B4A4 = 6
+    PIXELFORMAT_UNCOMPRESSED_R8G8B8A8 = 7
+    PIXELFORMAT_UNCOMPRESSED_R32 = 8
+    PIXELFORMAT_UNCOMPRESSED_R32G32B32 = 9
+    PIXELFORMAT_UNCOMPRESSED_R32G32B32A32 = 10
+    PIXELFORMAT_COMPRESSED_DXT1_RGB = 11
+    PIXELFORMAT_COMPRESSED_DXT1_RGBA = 12
+    PIXELFORMAT_COMPRESSED_DXT3_RGBA = 13
+    PIXELFORMAT_COMPRESSED_DXT5_RGBA = 14
+    PIXELFORMAT_COMPRESSED_ETC1_RGB = 15
+    PIXELFORMAT_COMPRESSED_ETC2_RGB = 16
+    PIXELFORMAT_COMPRESSED_ETC2_EAC_RGBA = 17
+    PIXELFORMAT_COMPRESSED_PVRT_RGB = 18
+    PIXELFORMAT_COMPRESSED_PVRT_RGBA = 19
+    PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA = 20
+    PIXELFORMAT_COMPRESSED_ASTC_8x8_RGBA = 21
+
+class TextureFilter(IntEnum):
+    TEXTURE_FILTER_POINT = 0
+    TEXTURE_FILTER_BILINEAR = 1
+    TEXTURE_FILTER_TRILINEAR = 2
+    TEXTURE_FILTER_ANISOTROPIC_4X = 3
+    TEXTURE_FILTER_ANISOTROPIC_8X = 4
+    TEXTURE_FILTER_ANISOTROPIC_16X = 5
+
+class TextureWrap(IntEnum):
+    TEXTURE_WRAP_REPEAT = 0
+    TEXTURE_WRAP_CLAMP = 1
+    TEXTURE_WRAP_MIRROR_REPEAT = 2
+    TEXTURE_WRAP_MIRROR_CLAMP = 3
+
+class CubemapLayout(IntEnum):
+    CUBEMAP_LAYOUT_AUTO_DETECT = 0
+    CUBEMAP_LAYOUT_LINE_VERTICAL = 1
+    CUBEMAP_LAYOUT_LINE_HORIZONTAL = 2
+    CUBEMAP_LAYOUT_CROSS_THREE_BY_FOUR = 3
+    CUBEMAP_LAYOUT_CROSS_FOUR_BY_THREE = 4
+    CUBEMAP_LAYOUT_PANORAMA = 5
+
+class FontType(IntEnum):
+    FONT_DEFAULT = 0
+    FONT_BITMAP = 1
+    FONT_SDF = 2
+
+class BlendMode(IntEnum):
+    BLEND_ALPHA = 0
+    BLEND_ADDITIVE = 1
+    BLEND_MULTIPLIED = 2
+    BLEND_ADD_COLORS = 3
+    BLEND_SUBTRACT_COLORS = 4
+    BLEND_CUSTOM = 5
+
+class Gesture(IntEnum):
+    GESTURE_NONE = 0
+    GESTURE_TAP = 1
+    GESTURE_DOUBLETAP = 2
+    GESTURE_HOLD = 4
+    GESTURE_DRAG = 8
+    GESTURE_SWIPE_RIGHT = 16
+    GESTURE_SWIPE_LEFT = 32
+    GESTURE_SWIPE_UP = 64
+    GESTURE_SWIPE_DOWN = 128
+    GESTURE_PINCH_IN = 256
+    GESTURE_PINCH_OUT = 512
+
+class CameraMode(IntEnum):
+    CAMERA_CUSTOM = 0
+    CAMERA_FREE = 1
+    CAMERA_ORBITAL = 2
+    CAMERA_FIRST_PERSON = 3
+    CAMERA_THIRD_PERSON = 4
+
+class CameraProjection(IntEnum):
+    CAMERA_PERSPECTIVE = 0
+    CAMERA_ORTHOGRAPHIC = 1
+
+class NPatchLayout(IntEnum):
+    NPATCH_NINE_PATCH = 0
+    NPATCH_THREE_PATCH_VERTICAL = 1
+    NPATCH_THREE_PATCH_HORIZONTAL = 2
+

tests/xtest_raygui_pyray.py

@@ -24,7 +24,7 @@ while not exitWindow and not pr.window_should_close():
 
     mousePosition = pr.get_mouse_position()
 
-    if pr.is_mouse_button_pressed(pr.MOUSE_BUTTON_LEFT):
+    if pr.is_mouse_button_pressed(pr.MouseButton.MOUSE_BUTTON_LEFT):
         if pr.check_collision_point_rec(mousePosition,  pr.Rectangle(0, 0, screenWidth, 20)):
             dragWindow = True
             panOffset = mousePosition
@@ -32,7 +32,7 @@ while not exitWindow and not pr.window_should_close():
     if dragWindow:
         windowPosition.x += (mousePosition.x - panOffset.x)
         windowPosition.y += (mousePosition.y - panOffset.y)
-        if pr.is_mouse_button_released(pr.MOUSE_BUTTON_LEFT):
+        if pr.is_mouse_button_released(pr.MouseButton.MOUSE_BUTTON_LEFT):
             dragWindow = False
 
         pr.set_window_position(int(windowPosition.x), int(windowPosition.y))