From e6ff5d119a0371b43ea1546d4043f3a6b71960f5 Mon Sep 17 00:00:00 2001 From: Trey Moen Date: Wed, 26 Aug 2026 23:46:09 -0700 Subject: [PATCH] raylib: remove raygui --- raylib/build.sh | 5 - raylib/build_cffi.py | 9 +- raylib/raylib/__init__.py | 2 +- raylib/raylib/defines.py | 45 ----- raylib/raylib/enums.py | 381 ------------------------------------ raylib/raylib/version.py | 2 +- raylib/validate_bindings.py | 4 +- 7 files changed, 6 insertions(+), 442 deletions(-) diff --git a/raylib/build.sh b/raylib/build.sh index c9cbdeb..a178f34 100755 --- a/raylib/build.sh +++ b/raylib/build.sh @@ -91,10 +91,5 @@ for backend in $BACKENDS; do build_raylib "$(backend_platform "$backend")" "libraylib_${backend}.a" done -# Download raygui header -RAYGUI_COMMIT="1e03efca48c50c5ea4b4a053d5bf04bad58d3e43" -curl -fsSLo "$INSTALL_DIR/include/raygui.h" \ - "https://raw.githubusercontent.com/raysan5/raygui/$RAYGUI_COMMIT/src/raygui.h" - echo "Installed raylib to $INSTALL_DIR" du -sh "$INSTALL_DIR" diff --git a/raylib/build_cffi.py b/raylib/build_cffi.py index e0350f1..f6f5eda 100644 --- a/raylib/build_cffi.py +++ b/raylib/build_cffi.py @@ -37,7 +37,7 @@ def pre_process_header(filename, remove_function_bodies=False): filetext = "".join([line for line in f if '#include' not in line]) command = ['gcc', '-CC', '-P', '-undef', '-nostdinc', '-DRL_MATRIX_TYPE', '-DRL_QUATERNION_TYPE', '-DRL_VECTOR4_TYPE', '-DRL_VECTOR3_TYPE', '-DRL_VECTOR2_TYPE', - '-DRLAPI=', '-DPHYSACDEF=', '-DRAYGUIDEF=', '-DRMAPI=', + '-DRLAPI=', '-DPHYSACDEF=', '-DRMAPI=', '-dDI', '-E', '-'] filetext = subprocess.run(command, text=True, input=filetext, stdout=subprocess.PIPE, check=True).stdout filetext = filetext.replace("va_list", "void *") @@ -52,9 +52,8 @@ def build_ffi(): raylib_h = os.path.join(RAYLIB_INCLUDE_PATH, "raylib.h") rlgl_h = os.path.join(RAYLIB_INCLUDE_PATH, "rlgl.h") raymath_h = os.path.join(RAYLIB_INCLUDE_PATH, "raymath.h") - raygui_h = os.path.join(RAYLIB_INCLUDE_PATH, "raygui.h") - for header in (raylib_h, rlgl_h, raymath_h, raygui_h): + for header in (raylib_h, rlgl_h, raymath_h): if not os.path.isfile(header): raise FileNotFoundError(f"{header} not found. Please run build.sh first.") @@ -62,15 +61,11 @@ def build_ffi(): #include "raylib.h" #include "rlgl.h" #include "raymath.h" - #define RAYGUI_IMPLEMENTATION - #define RAYGUI_SUPPORT_RICONS - #include "raygui.h" """ ffibuilder.cdef(pre_process_header(raylib_h)) ffibuilder.cdef(pre_process_header(rlgl_h)) ffibuilder.cdef(pre_process_header(raymath_h, True)) - ffibuilder.cdef(pre_process_header(raygui_h)) validate_static_bindings(PACKAGE_DIR, RAYLIB_INCLUDE_PATH) diff --git a/raylib/raylib/__init__.py b/raylib/raylib/__init__.py index 25a1724..9a4f91e 100644 --- a/raylib/raylib/__init__.py +++ b/raylib/raylib/__init__.py @@ -21,7 +21,7 @@ def _expected_archives(): def smoketest(): assert ffi is not None assert rl is not None - for header in ("raylib.h", "raymath.h", "rlgl.h", "raygui.h"): + for header in ("raylib.h", "raymath.h", "rlgl.h"): assert os.path.isfile(os.path.join(INCLUDE_DIR, header)), f"{header} not found" for archive in _expected_archives(): assert os.path.isfile(os.path.join(LIB_DIR, archive)), f"{archive} not found" diff --git a/raylib/raylib/defines.py b/raylib/raylib/defines.py index b83bd58..29c2a36 100644 --- a/raylib/raylib/defines.py +++ b/raylib/raylib/defines.py @@ -138,51 +138,6 @@ RL_DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE0: str = "texture0" RL_DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE1: str = "texture1" RL_DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE2: str = "texture2" -RAYGUI_VERSION_MAJOR: int = 4 -RAYGUI_VERSION_MINOR: int = 5 -RAYGUI_VERSION_PATCH: int = 0 -RAYGUI_VERSION: str = "4.5-dev" -SCROLLBAR_LEFT_SIDE: int = 0 -SCROLLBAR_RIGHT_SIDE: int = 1 -RAYGUI_ICON_SIZE: int = 16 -RAYGUI_ICON_MAX_ICONS: int = 256 -RAYGUI_ICON_MAX_NAME_LENGTH: int = 32 -RAYGUI_MAX_CONTROLS: int = 16 -RAYGUI_MAX_PROPS_BASE: int = 16 -RAYGUI_MAX_PROPS_EXTENDED: int = 8 -KEY_RIGHT: int = 262 -KEY_LEFT: int = 263 -KEY_DOWN: int = 264 -KEY_UP: int = 265 -KEY_BACKSPACE: int = 259 -KEY_ENTER: int = 257 -MOUSE_LEFT_BUTTON: int = 0 -RAYGUI_WINDOWBOX_STATUSBAR_HEIGHT: int = 24 -RAYGUI_GROUPBOX_LINE_THICK: int = 1 -RAYGUI_LINE_MARGIN_TEXT: int = 12 -RAYGUI_LINE_TEXT_PADDING: int = 4 -RAYGUI_PANEL_BORDER_WIDTH: int = 1 -RAYGUI_TABBAR_ITEM_WIDTH: int = 160 -RAYGUI_MIN_SCROLLBAR_WIDTH: int = 40 -RAYGUI_MIN_SCROLLBAR_HEIGHT: int = 40 -RAYGUI_MIN_MOUSE_WHEEL_SPEED: int = 20 -RAYGUI_TOGGLEGROUP_MAX_ITEMS: int = 32 -RAYGUI_TEXTBOX_AUTO_CURSOR_COOLDOWN: int = 40 -RAYGUI_TEXTBOX_AUTO_CURSOR_DELAY: int = 1 -RAYGUI_VALUEBOX_MAX_CHARS: int = 32 -RAYGUI_COLORBARALPHA_CHECKED_SIZE: int = 10 -RAYGUI_MESSAGEBOX_BUTTON_HEIGHT: int = 24 -RAYGUI_MESSAGEBOX_BUTTON_PADDING: int = 12 -RAYGUI_TEXTINPUTBOX_BUTTON_HEIGHT: int = 24 -RAYGUI_TEXTINPUTBOX_BUTTON_PADDING: int = 12 -RAYGUI_TEXTINPUTBOX_HEIGHT: int = 26 -RAYGUI_GRID_ALPHA: float = 0.15 -MAX_LINE_BUFFER_SIZE: int = 256 -ICON_TEXT_PADDING: int = 4 -RAYGUI_MAX_TEXT_LINES: int = 128 -RAYGUI_TEXTSPLIT_MAX_ITEMS: int = 128 -RAYGUI_TEXTSPLIT_MAX_TEXT_SIZE: int = 1024 -RAYGUI_TEXTFORMAT_MAX_SIZE: int = 256 PHYSAC_MAX_BODIES: int = 64 PHYSAC_MAX_MANIFOLDS: int = 4096 PHYSAC_MAX_VERTICES: int = 24 diff --git a/raylib/raylib/enums.py b/raylib/raylib/enums.py index 8802191..efe56da 100644 --- a/raylib/raylib/enums.py +++ b/raylib/raylib/enums.py @@ -346,384 +346,3 @@ class NPatchLayout(IntEnum): NPATCH_NINE_PATCH = 0 NPATCH_THREE_PATCH_VERTICAL = 1 NPATCH_THREE_PATCH_HORIZONTAL = 2 - -class GuiState(IntEnum): - STATE_NORMAL = 0 - STATE_FOCUSED = 1 - STATE_PRESSED = 2 - STATE_DISABLED = 3 - -class GuiPropertyElement(IntEnum): - BORDER = 0 - BASE = 1 - TEXT = 2 - OTHER = 3 - -class GuiTextAlignment(IntEnum): - TEXT_ALIGN_LEFT = 0 - TEXT_ALIGN_CENTER = 1 - TEXT_ALIGN_RIGHT = 2 - -class GuiTextAlignmentVertical(IntEnum): - TEXT_ALIGN_TOP = 0 - TEXT_ALIGN_MIDDLE = 1 - TEXT_ALIGN_BOTTOM = 2 - -class GuiTextWrapMode(IntEnum): - TEXT_WRAP_NONE = 0 - TEXT_WRAP_CHAR = 1 - TEXT_WRAP_WORD = 2 - -class GuiControl(IntEnum): - DEFAULT = 0 - LABEL = 1 - BUTTON = 2 - TOGGLE = 3 - SLIDER = 4 - PROGRESSBAR = 5 - CHECKBOX = 6 - COMBOBOX = 7 - DROPDOWNBOX = 8 - TEXTBOX = 9 - VALUEBOX = 10 - SPINNER = 11 - LISTVIEW = 12 - COLORPICKER = 13 - SCROLLBAR = 14 - STATUSBAR = 15 - -class GuiControlProperty(IntEnum): - BORDER_COLOR_NORMAL = 0 - BASE_COLOR_NORMAL = 1 - TEXT_COLOR_NORMAL = 2 - BORDER_COLOR_FOCUSED = 3 - BASE_COLOR_FOCUSED = 4 - TEXT_COLOR_FOCUSED = 5 - BORDER_COLOR_PRESSED = 6 - BASE_COLOR_PRESSED = 7 - TEXT_COLOR_PRESSED = 8 - BORDER_COLOR_DISABLED = 9 - BASE_COLOR_DISABLED = 10 - TEXT_COLOR_DISABLED = 11 - BORDER_WIDTH = 12 - TEXT_PADDING = 13 - TEXT_ALIGNMENT = 14 - -class GuiDefaultProperty(IntEnum): - TEXT_SIZE = 16 - TEXT_SPACING = 17 - LINE_COLOR = 18 - BACKGROUND_COLOR = 19 - TEXT_LINE_SPACING = 20 - TEXT_ALIGNMENT_VERTICAL = 21 - TEXT_WRAP_MODE = 22 - -class GuiToggleProperty(IntEnum): - GROUP_PADDING = 16 - -class GuiSliderProperty(IntEnum): - SLIDER_WIDTH = 16 - SLIDER_PADDING = 17 - -class GuiProgressBarProperty(IntEnum): - PROGRESS_PADDING = 16 - -class GuiScrollBarProperty(IntEnum): - ARROWS_SIZE = 16 - ARROWS_VISIBLE = 17 - SCROLL_SLIDER_PADDING = 18 - SCROLL_SLIDER_SIZE = 19 - SCROLL_PADDING = 20 - SCROLL_SPEED = 21 - -class GuiCheckBoxProperty(IntEnum): - CHECK_PADDING = 16 - -class GuiComboBoxProperty(IntEnum): - COMBO_BUTTON_WIDTH = 16 - COMBO_BUTTON_SPACING = 17 - -class GuiDropdownBoxProperty(IntEnum): - ARROW_PADDING = 16 - DROPDOWN_ITEMS_SPACING = 17 - DROPDOWN_ARROW_HIDDEN = 18 - DROPDOWN_ROLL_UP = 19 - -class GuiTextBoxProperty(IntEnum): - TEXT_READONLY = 16 - -class GuiSpinnerProperty(IntEnum): - SPIN_BUTTON_WIDTH = 16 - SPIN_BUTTON_SPACING = 17 - -class GuiListViewProperty(IntEnum): - LIST_ITEMS_HEIGHT = 16 - LIST_ITEMS_SPACING = 17 - SCROLLBAR_WIDTH = 18 - SCROLLBAR_SIDE = 19 - LIST_ITEMS_BORDER_WIDTH = 20 - -class GuiColorPickerProperty(IntEnum): - COLOR_SELECTOR_SIZE = 16 - HUEBAR_WIDTH = 17 - HUEBAR_PADDING = 18 - HUEBAR_SELECTOR_HEIGHT = 19 - HUEBAR_SELECTOR_OVERFLOW = 20 - -class GuiIconName(IntEnum): - ICON_NONE = 0 - ICON_FOLDER_FILE_OPEN = 1 - ICON_FILE_SAVE_CLASSIC = 2 - ICON_FOLDER_OPEN = 3 - ICON_FOLDER_SAVE = 4 - ICON_FILE_OPEN = 5 - ICON_FILE_SAVE = 6 - ICON_FILE_EXPORT = 7 - ICON_FILE_ADD = 8 - ICON_FILE_DELETE = 9 - ICON_FILETYPE_TEXT = 10 - ICON_FILETYPE_AUDIO = 11 - ICON_FILETYPE_IMAGE = 12 - ICON_FILETYPE_PLAY = 13 - ICON_FILETYPE_VIDEO = 14 - ICON_FILETYPE_INFO = 15 - ICON_FILE_COPY = 16 - ICON_FILE_CUT = 17 - ICON_FILE_PASTE = 18 - ICON_CURSOR_HAND = 19 - ICON_CURSOR_POINTER = 20 - ICON_CURSOR_CLASSIC = 21 - ICON_PENCIL = 22 - ICON_PENCIL_BIG = 23 - ICON_BRUSH_CLASSIC = 24 - ICON_BRUSH_PAINTER = 25 - ICON_WATER_DROP = 26 - ICON_COLOR_PICKER = 27 - ICON_RUBBER = 28 - ICON_COLOR_BUCKET = 29 - ICON_TEXT_T = 30 - ICON_TEXT_A = 31 - ICON_SCALE = 32 - ICON_RESIZE = 33 - ICON_FILTER_POINT = 34 - ICON_FILTER_BILINEAR = 35 - ICON_CROP = 36 - ICON_CROP_ALPHA = 37 - ICON_SQUARE_TOGGLE = 38 - ICON_SYMMETRY = 39 - ICON_SYMMETRY_HORIZONTAL = 40 - ICON_SYMMETRY_VERTICAL = 41 - ICON_LENS = 42 - ICON_LENS_BIG = 43 - ICON_EYE_ON = 44 - ICON_EYE_OFF = 45 - ICON_FILTER_TOP = 46 - ICON_FILTER = 47 - ICON_TARGET_POINT = 48 - ICON_TARGET_SMALL = 49 - ICON_TARGET_BIG = 50 - ICON_TARGET_MOVE = 51 - ICON_CURSOR_MOVE = 52 - ICON_CURSOR_SCALE = 53 - ICON_CURSOR_SCALE_RIGHT = 54 - ICON_CURSOR_SCALE_LEFT = 55 - ICON_UNDO = 56 - ICON_REDO = 57 - ICON_REREDO = 58 - ICON_MUTATE = 59 - ICON_ROTATE = 60 - ICON_REPEAT = 61 - ICON_SHUFFLE = 62 - ICON_EMPTYBOX = 63 - ICON_TARGET = 64 - ICON_TARGET_SMALL_FILL = 65 - ICON_TARGET_BIG_FILL = 66 - ICON_TARGET_MOVE_FILL = 67 - ICON_CURSOR_MOVE_FILL = 68 - ICON_CURSOR_SCALE_FILL = 69 - ICON_CURSOR_SCALE_RIGHT_FILL = 70 - ICON_CURSOR_SCALE_LEFT_FILL = 71 - ICON_UNDO_FILL = 72 - ICON_REDO_FILL = 73 - ICON_REREDO_FILL = 74 - ICON_MUTATE_FILL = 75 - ICON_ROTATE_FILL = 76 - ICON_REPEAT_FILL = 77 - ICON_SHUFFLE_FILL = 78 - ICON_EMPTYBOX_SMALL = 79 - ICON_BOX = 80 - ICON_BOX_TOP = 81 - ICON_BOX_TOP_RIGHT = 82 - ICON_BOX_RIGHT = 83 - ICON_BOX_BOTTOM_RIGHT = 84 - ICON_BOX_BOTTOM = 85 - ICON_BOX_BOTTOM_LEFT = 86 - ICON_BOX_LEFT = 87 - ICON_BOX_TOP_LEFT = 88 - ICON_BOX_CENTER = 89 - ICON_BOX_CIRCLE_MASK = 90 - ICON_POT = 91 - ICON_ALPHA_MULTIPLY = 92 - ICON_ALPHA_CLEAR = 93 - ICON_DITHERING = 94 - ICON_MIPMAPS = 95 - ICON_BOX_GRID = 96 - ICON_GRID = 97 - ICON_BOX_CORNERS_SMALL = 98 - ICON_BOX_CORNERS_BIG = 99 - ICON_FOUR_BOXES = 100 - ICON_GRID_FILL = 101 - ICON_BOX_MULTISIZE = 102 - ICON_ZOOM_SMALL = 103 - ICON_ZOOM_MEDIUM = 104 - ICON_ZOOM_BIG = 105 - ICON_ZOOM_ALL = 106 - ICON_ZOOM_CENTER = 107 - ICON_BOX_DOTS_SMALL = 108 - ICON_BOX_DOTS_BIG = 109 - ICON_BOX_CONCENTRIC = 110 - ICON_BOX_GRID_BIG = 111 - ICON_OK_TICK = 112 - ICON_CROSS = 113 - ICON_ARROW_LEFT = 114 - ICON_ARROW_RIGHT = 115 - ICON_ARROW_DOWN = 116 - ICON_ARROW_UP = 117 - ICON_ARROW_LEFT_FILL = 118 - ICON_ARROW_RIGHT_FILL = 119 - ICON_ARROW_DOWN_FILL = 120 - ICON_ARROW_UP_FILL = 121 - ICON_AUDIO = 122 - ICON_FX = 123 - ICON_WAVE = 124 - ICON_WAVE_SINUS = 125 - ICON_WAVE_SQUARE = 126 - ICON_WAVE_TRIANGULAR = 127 - ICON_CROSS_SMALL = 128 - ICON_PLAYER_PREVIOUS = 129 - ICON_PLAYER_PLAY_BACK = 130 - ICON_PLAYER_PLAY = 131 - ICON_PLAYER_PAUSE = 132 - ICON_PLAYER_STOP = 133 - ICON_PLAYER_NEXT = 134 - ICON_PLAYER_RECORD = 135 - ICON_MAGNET = 136 - ICON_LOCK_CLOSE = 137 - ICON_LOCK_OPEN = 138 - ICON_CLOCK = 139 - ICON_TOOLS = 140 - ICON_GEAR = 141 - ICON_GEAR_BIG = 142 - ICON_BIN = 143 - ICON_HAND_POINTER = 144 - ICON_LASER = 145 - ICON_COIN = 146 - ICON_EXPLOSION = 147 - ICON_1UP = 148 - ICON_PLAYER = 149 - ICON_PLAYER_JUMP = 150 - ICON_KEY = 151 - ICON_DEMON = 152 - ICON_TEXT_POPUP = 153 - ICON_GEAR_EX = 154 - ICON_CRACK = 155 - ICON_CRACK_POINTS = 156 - ICON_STAR = 157 - ICON_DOOR = 158 - ICON_EXIT = 159 - ICON_MODE_2D = 160 - ICON_MODE_3D = 161 - ICON_CUBE = 162 - ICON_CUBE_FACE_TOP = 163 - ICON_CUBE_FACE_LEFT = 164 - ICON_CUBE_FACE_FRONT = 165 - ICON_CUBE_FACE_BOTTOM = 166 - ICON_CUBE_FACE_RIGHT = 167 - ICON_CUBE_FACE_BACK = 168 - ICON_CAMERA = 169 - ICON_SPECIAL = 170 - ICON_LINK_NET = 171 - ICON_LINK_BOXES = 172 - ICON_LINK_MULTI = 173 - ICON_LINK = 174 - ICON_LINK_BROKE = 175 - ICON_TEXT_NOTES = 176 - ICON_NOTEBOOK = 177 - ICON_SUITCASE = 178 - ICON_SUITCASE_ZIP = 179 - ICON_MAILBOX = 180 - ICON_MONITOR = 181 - ICON_PRINTER = 182 - ICON_PHOTO_CAMERA = 183 - ICON_PHOTO_CAMERA_FLASH = 184 - ICON_HOUSE = 185 - ICON_HEART = 186 - ICON_CORNER = 187 - ICON_VERTICAL_BARS = 188 - ICON_VERTICAL_BARS_FILL = 189 - ICON_LIFE_BARS = 190 - ICON_INFO = 191 - ICON_CROSSLINE = 192 - ICON_HELP = 193 - ICON_FILETYPE_ALPHA = 194 - ICON_FILETYPE_HOME = 195 - ICON_LAYERS_VISIBLE = 196 - ICON_LAYERS = 197 - ICON_WINDOW = 198 - ICON_HIDPI = 199 - ICON_FILETYPE_BINARY = 200 - ICON_HEX = 201 - ICON_SHIELD = 202 - ICON_FILE_NEW = 203 - ICON_FOLDER_ADD = 204 - ICON_ALARM = 205 - ICON_CPU = 206 - ICON_ROM = 207 - ICON_STEP_OVER = 208 - ICON_STEP_INTO = 209 - ICON_STEP_OUT = 210 - ICON_RESTART = 211 - ICON_BREAKPOINT_ON = 212 - ICON_BREAKPOINT_OFF = 213 - ICON_BURGER_MENU = 214 - ICON_CASE_SENSITIVE = 215 - ICON_REG_EXP = 216 - ICON_FOLDER = 217 - ICON_FILE = 218 - ICON_SAND_TIMER = 219 - ICON_WARNING = 220 - ICON_HELP_BOX = 221 - ICON_INFO_BOX = 222 - ICON_PRIORITY = 223 - ICON_LAYERS_ISO = 224 - ICON_LAYERS2 = 225 - ICON_MLAYERS = 226 - ICON_MAPS = 227 - ICON_HOT = 228 - ICON_229 = 229 - ICON_230 = 230 - ICON_231 = 231 - ICON_232 = 232 - ICON_233 = 233 - ICON_234 = 234 - ICON_235 = 235 - ICON_236 = 236 - ICON_237 = 237 - ICON_238 = 238 - ICON_239 = 239 - ICON_240 = 240 - ICON_241 = 241 - ICON_242 = 242 - ICON_243 = 243 - ICON_244 = 244 - ICON_245 = 245 - ICON_246 = 246 - ICON_247 = 247 - ICON_248 = 248 - ICON_249 = 249 - ICON_250 = 250 - ICON_251 = 251 - ICON_252 = 252 - ICON_253 = 253 - ICON_254 = 254 - ICON_255 = 255 diff --git a/raylib/raylib/version.py b/raylib/raylib/version.py index 1e9708b..09c1ae2 100644 --- a/raylib/raylib/version.py +++ b/raylib/raylib/version.py @@ -1 +1 @@ -__version__ = "6.0.0.1" +__version__ = "6.0.0.2" diff --git a/raylib/validate_bindings.py b/raylib/validate_bindings.py index d062713..2801632 100644 --- a/raylib/validate_bindings.py +++ b/raylib/validate_bindings.py @@ -74,7 +74,7 @@ def _read_c_enums(header_texts): def validate_static_bindings(package_dir, include_dir): headers = {} - for name in ("raylib.h", "rlgl.h", "raygui.h"): + for name in ("raylib.h", "rlgl.h"): with open(os.path.join(include_dir, name), "r") as f: headers[name] = _strip_c_comments(f.read()) @@ -94,7 +94,7 @@ def validate_static_bindings(package_dir, include_dir): raise ValueError(f"{name} in defines.py is {actual}, expected {expected}") py_enums = _read_python_enums(os.path.join(package_dir, "enums.py")) - c_enums = _read_c_enums((headers["raylib.h"], headers["raygui.h"])) + c_enums = _read_c_enums((headers["raylib.h"],)) missing_classes = sorted(set(c_enums) - set(py_enums) - {"bool"}) extra_classes = sorted(set(py_enums) - set(c_enums)) if missing_classes or extra_classes: