raylib 5.0.0.1__cp311-cp311-macosx_13_0_arm64.whl → 5.0.0.2__cp311-cp311-macosx_13_0_arm64.whl

pyray/__init__.py

@@ -11,6 +11,9 @@
 #  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
+import re
+import weakref
+from array import array
 
 from raylib import rl, ffi
 from raylib.colors import *
@@ -21,12 +24,21 @@ except AttributeError:
     print("sorry deprecated enums dont work on dynamic version")
 
 from inspect import getmembers, isbuiltin
-import inflection
 
 current_module = __import__(__name__)
 
 
-def pointer(self, struct):
+def _underscore(word: str) -> str:
+    """
+    from inflection
+    """
+    word = re.sub(r"([A-Z]+)([A-Z][a-z])", r'\1_\2', word)
+    word = re.sub(r"([a-z\d])([A-Z])", r'\1_\2', word)
+    word = word.replace("-", "_")
+    return word.lower()
+
+
+def pointer(struct):
     return ffi.addressof(struct)
 
 
@@ -38,70 +50,93 @@ def pointer(self, struct):
 # Another possibility is ffi.typeof() but that will throw an exception if you give it a type that isn't a ctype
 # Another way to improve performance might be to special-case simple types before doing the string comparisons
 
-def makefunc(a):
+def _wrap_function(original_func):
     # print("makefunc ",a, ffi.typeof(a).args)
-    def func(*args):
+    def wrapped_func(*args):
         modified_args = []
-        for (c_arg, arg) in zip(ffi.typeof(a).args, args):
-            #print("arg:",str(arg), "c_arg.kind:", c_arg.kind, "c_arg:", c_arg, "type(arg):",str(type(arg)))
+        for (c_arg, arg) in zip(ffi.typeof(original_func).args, args):
+            # print("arg:",str(arg), "c_arg.kind:", c_arg.kind, "c_arg:", c_arg, "type(arg):",str(type(arg)))
             if c_arg.kind == 'pointer':
-                if type(arg) == str:
+                if type(arg) is str:
                     arg = arg.encode('utf-8')
-                elif type(arg) is bool:
-                    arg = ffi.new("bool *", arg)
-                elif type(arg) is int:
-                    arg = ffi.new("int *", arg)
-                elif type(arg) is float:
-                    arg = ffi.new("float *", arg)
-                elif type(arg) is list  and str(c_arg) == "<ctype 'char * *'>":
+                # if c_arg is a 'char *' not a 'const char *' then we ought to raise here because its an out
+                # parameter and user should supply a ctype pointer, but cffi cant detect const
+                # so we would have to get the info from raylib.json
+                elif type(arg) is list and str(c_arg) == "<ctype 'char * *'>":
                     arg = [ffi.new("char[]", x.encode('utf-8')) for x in arg]
-                elif str(type(arg)) == "<class '_cffi_backend.__CDataOwn'>" and "*" not in str(arg):  # CPython
-                    arg = ffi.addressof(arg)
-                elif str(type(arg)) == "<class '_cffi_backend._CDataBase'>" and "*" not in str(arg):  # Pypy
+                elif is_cdata(arg) and "*" not in str(arg):
                     arg = ffi.addressof(arg)
                 elif arg is None:
                     arg = ffi.NULL
+                elif not is_cdata(arg):
+                    if str(c_arg) == "<ctype '_Bool *'>":
+                        raise TypeError(
+                            "Argument must be a ctype bool, please create one with: pyray.ffi.new('bool *', True)")
+                    elif str(c_arg) == "<ctype 'int *'>":
+                        raise TypeError(
+                            "Argument must be a ctype int, please create one with: pyray.ffi.new('int *', 1)")
+                    elif str(c_arg) == "<ctype 'float *'>":
+                        raise TypeError(
+                            "Argument must be a ctype float, please create one with: pyray.ffi.new('float *', 1.0)")
             modified_args.append(arg)
-        result = a(*modified_args)
+        result = original_func(*modified_args)
         if result is None:
             return
-        if str(type(result)) == "<class '_cffi_backend._CDataBase'>" and str(result).startswith("<cdata 'char *'"):
+        elif is_cdata(result) and str(result).startswith("<cdata 'char *'"):
             if str(result) == "<cdata 'char *' NULL>":
-                result = ""
+                return ""
             else:
-                result = ffi.string(result).decode('utf-8')
-        return result
+                return ffi.string(result).decode('utf-8')
+        else:
+            return result
 
-    return func
+    # apparently pypy and cpython produce different types so check for both
+    def is_cdata(arg):
+        return str(type(arg)) == "<class '_cffi_backend.__CDataOwn'>" or str(
+            type(arg)) == "<class '_cffi_backend._CDataBase'>"
 
+    return wrapped_func
 
-def makeStructHelper(struct):
+
+global_weakkeydict = weakref.WeakKeyDictionary()
+
+
+def _make_struct_constructor_function(struct):
     def func(*args):
-        return ffi.new(f"struct {struct} *", args)[0]
+        # print(struct, args)
+        modified_args = []
+        for (field, arg) in zip(ffi.typeof(struct).fields, args):
+            # print("arg:", str(arg), "field:", field[1], "field type:", field[1].type, "type(arg):", str(type(arg)))
+            if arg is None:
+                arg = ffi.NULL
+            elif (field[1].type.kind == 'pointer'
+                  and (str(type(arg)) == "<class 'numpy.ndarray'>"
+                       or isinstance(arg, (array, bytes, bytearray, memoryview)))):
+                arg = ffi.from_buffer(field[1].type, arg)
+            modified_args.append(arg)
+        s = ffi.new(f"struct {struct} *", modified_args)[0]
+        global_weakkeydict[s] = modified_args
+        return s
 
     return func
 
 
 for name, attr in getmembers(rl):
     # print(name, attr)
-    uname = inflection.underscore(name).replace('3_d', '_3d').replace('2_d', '_2d')
+    uname = _underscore(name).replace('3_d', '_3d').replace('2_d', '_2d')
     if isbuiltin(attr) or str(type(attr)) == "<class '_cffi_backend.__FFIFunctionWrapper'>" or str(
             type(attr)) == "<class '_cffi_backend._CDataBase'>":
         # print(attr.__call__)
         # print(attr.__doc__)
-        # print(attr.__text_signature__)
         # print(dir(attr))
         # print(dir(attr.__repr__))
-        f = makefunc(attr)
+        f = _wrap_function(attr)
         setattr(current_module, uname, f)
-        # def wrap(*args):
-        #    print("call to ",attr)
-        # setattr(PyRay, uname, lambda *args: print("call to ",attr))
     else:
         setattr(current_module, name, attr)
 
 for struct in ffi.list_types()[0]:
-    f = makeStructHelper(struct)
+    f = _make_struct_constructor_function(struct)
     setattr(current_module, struct, f)
 
 # overwrite ffi enums with our own

pyray/__init__.pyi

@@ -937,10 +937,10 @@ def gui_line(bounds: Rectangle,text: str,) -> int:
 def gui_list_view(bounds: Rectangle,text: str,scrollIndex: Any,active: Any,) -> int:
         """List View control, returns selected list item index"""
         ...
-def gui_list_view_ex(bounds: Rectangle,text: str,count: int,scrollIndex: Any,active: Any,focus: Any,) -> int:
+def gui_list_view_ex(bounds: Rectangle,text: list[str],count: int,scrollIndex: Any,active: Any,focus: Any,) -> int:
         """List View with extended parameters"""
         ...
-def gui_load_icons(fileName: str,loadIconsName: bool,) -> str:
+def gui_load_icons(fileName: str,loadIconsName: bool,) -> list[str]:
         """Load raygui icons file (.rgi) into internal icons data"""
         ...
 def gui_load_style(fileName: str,) -> None:
@@ -994,7 +994,7 @@ def gui_spinner(bounds: Rectangle,text: str,value: Any,minValue: int,maxValue: i
 def gui_status_bar(bounds: Rectangle,text: str,) -> int:
         """Status Bar control, shows info text"""
         ...
-def gui_tab_bar(bounds: Rectangle,text: str,count: int,active: Any,) -> int:
+def gui_tab_bar(bounds: Rectangle,text: list[str],count: int,active: Any,) -> int:
         """Tab Bar control, returns TAB to be closed or -1"""
         ...
 def gui_text_box(bounds: Rectangle,text: str,textSize: int,editMode: bool,) -> int:
@@ -1864,7 +1864,7 @@ def text_insert(text: str,insert: str,position: int,) -> str:
 def text_is_equal(text1: str,text2: str,) -> bool:
         """Check if two text string are equal"""
         ...
-def text_join(textList: str,count: int,delimiter: str,) -> str:
+def text_join(textList: list[str],count: int,delimiter: str,) -> str:
         """Join text strings with delimiter"""
         ...
 def text_length(text: str,) -> int:
@@ -1873,7 +1873,7 @@ def text_length(text: str,) -> int:
 def text_replace(text: str,replace: str,by: str,) -> str:
         """Replace text string (WARNING: memory must be freed!)"""
         ...
-def text_split(text: str,delimiter: str,count: Any,) -> str:
+def text_split(text: str,delimiter: str,count: Any,) -> list[str]:
         """Split text into multiple strings"""
         ...
 def text_subtext(text: str,position: int,length: int,) -> str:
@@ -2260,7 +2260,7 @@ def glfw_get_current_context() -> Any:
 def glfw_get_cursor_pos(window: Any,xpos: Any,ypos: Any,) -> None:
         """"""
         ...
-def glfw_get_error(description: str,) -> int:
+def glfw_get_error(description: list[str],) -> int:
         """"""
         ...
 def glfw_get_framebuffer_size(window: Any,width: Any,height: Any,) -> None:
@@ -2338,7 +2338,7 @@ def glfw_get_primary_monitor() -> Any:
 def glfw_get_proc_address(procname: str,) -> Any:
         """"""
         ...
-def glfw_get_required_instance_extensions(count: Any,) -> str:
+def glfw_get_required_instance_extensions(count: Any,) -> list[str]:
         """"""
         ...
 def glfw_get_time() -> float:
@@ -2452,7 +2452,7 @@ def glfw_set_cursor_pos(window: Any,xpos: float,ypos: float,) -> None:
 def glfw_set_cursor_pos_callback(window: Any,callback: Any,) -> Any:
         """"""
         ...
-def glfw_set_drop_callback(window: Any,callback: str,) -> str:
+def glfw_set_drop_callback(window: Any,callback: list[str],) -> list[str]:
         """"""
         ...
 def glfw_set_error_callback(callback: str,) -> str:

raylib/build.py

@@ -162,16 +162,19 @@ def build_unix():
                            '-framework', 'IOKit', '-framework', 'CoreFoundation', '-framework',
                            'CoreVideo']
         libraries = []
+        extra_compile_args = ["-Wno-error=incompatible-function-pointer-types"]
     else:  #platform.system() == "Linux":
         print("BUILDING FOR LINUX")
         extra_link_args = get_lib_flags() + [ '-lm', '-lpthread', '-lGL',
                                               '-lrt', '-lm', '-ldl', '-lX11', '-lpthread', '-latomic']
+        extra_compile_args = []
         libraries = ['GL', 'm', 'pthread', 'dl', 'rt', 'X11', 'atomic']
 
     ffibuilder.set_source("raylib._raylib_cffi",
                           ffi_includes,
                           include_dirs=[get_the_include_path()],
                           extra_link_args=extra_link_args,
+                          extra_compile_args=extra_compile_args,
                           libraries=libraries)
 
 

raylib/version.py

@@ -1 +1 @@
-__version__ = "5.0.0.1"
+__version__ = "5.0.0.2"

{raylib-5.0.0.1.dist-info → raylib-5.0.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: raylib
-Version: 5.0.0.1
+Version: 5.0.0.2
 Summary: Python CFFI bindings for Raylib
 Home-page: https://github.com/electronstudio/raylib-python-cffi
 Author: Electron Studio
@@ -16,7 +16,6 @@ Classifier: Programming Language :: Python :: 3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: cffi >=1.14.6
-Requires-Dist: inflection
 
 # Python Bindings for Raylib 5.0
 
@@ -26,7 +25,7 @@ original Raylib.
 * Faster, fewer bugs and easier to maintain than ctypes.
 * Commercial-friendly license.
 * Docstrings and auto-completion.
-* **Now includes extra libraries: raymath, raygui, rlgl and physac**
+* **Now includes extra libraries: raymath, raygui, rlgl, physac and GLFW**
 
 [Full documentation](http://electronstudio.github.io/raylib-python-cffi)
 
@@ -101,6 +100,48 @@ Use [the C API](https://electronstudio.github.io/raylib-python-cffi/raylib.html)
 
 Use [the Python API](https://electronstudio.github.io/raylib-python-cffi/pyray.html).
 
+# Running in a web browser
+
+[Pygbag](https://pypi.org/project/pygbag/) >=0.8.7 supports running in a web browser.
+
+Make a folder `my_project` with a file `main.py`:
+
+    # /// script
+    # dependencies = [
+    #     "cffi",
+    #     "inflection",
+    #     "raylib"
+    # ]
+    # ///
+    import asyncio
+    import platform
+    from pyray import *
+
+    async def main():   # You must have an async main function
+        init_window(500, 500, "Hello")
+        platform.window.window_resize()  # You must add this line
+        while not window_should_close():
+            begin_drawing()
+            clear_background(WHITE)
+            draw_text("Hello world", 190, 200, 20, VIOLET)
+            end_drawing()
+            await asyncio.sleep(0) # You must call this in your main loop
+        close_window()
+
+    asyncio.run(main())
+
+Then to create the web files and launch a web server:
+
+    python3 -m pip install --user --upgrade git+https://github.com/pygame-web/pygbag
+    python3 -m pygbag --git --PYBUILD 3.12 --ume_block 0 --template noctx.tmpl my_project
+
+Point your browser to http://localhost:8000
+
+This is all done by Pygbag rather than by me, so you should probably contact them with any issues.
+Carefully read all their [documentation](https://pygame-web.github.io/).
+
+It does work for most of the examples at https://electronstudio.github.io/raylib-python-cffi-pygbag-examples/
+
 # App showcase
 
 [Tanki](https://github.com/pkulev/tanki)

raylib-5.0.0.2.dist-info/RECORD

@@ -0,0 +1,15 @@
+pyray/__init__.py,sha256=rrclikSOpisehgQEhF0JJt0BNzJ1BctMe6yn2VTI7kg,5848
+pyray/__init__.pyi,sha256=aYJdrk6qhgSW82CpuQcZrI1VyW19YvXWcRSSjPUZyww,150549
+raylib/__init__.py,sha256=DWXPmoq7tC5wzZsrt6rReGy1RflyZwk-SdF-9lBZHok,919
+raylib/__init__.pyi,sha256=y0lmZ3wI63AC95uIddXQH2cw7e29Tk85b2FF0g0PZtY,138540
+raylib/_raylib_cffi.abi3.so,sha256=YI54fcfe2ECqrZtf7UWuSeWUeRZRU7zWzTwdYn86saM,2923073
+raylib/build.py,sha256=UsGR5Jaq3NHg5mEG9lt4Y09fs6bxdM2QMm7qu_38hrk,8390
+raylib/colors.py,sha256=_u-mYrpdx7_v_4wnJrnSu_m36ixKJWbort780_V6rTw,1523
+raylib/defines.py,sha256=lMv6zU8WSkaH5Dj5Ydx0AlggeA-r76xePcA1M7EudnA,15951
+raylib/enums.py,sha256=RtQpN23zViI2mQSHPPc0Ay4IvNdiDk_xggdMPLCR0ng,17586
+raylib/version.py,sha256=yryH--YVbWBWyZ6iG0g7w5O2zBm-xecY7jnSFTmKeFs,23
+raylib-5.0.0.2.dist-info/LICENSE,sha256=C-zxZWe-t3-iUrdmRjHdF3yPmhiJ5ImVtFN5xxMOUwM,14198
+raylib-5.0.0.2.dist-info/METADATA,sha256=V7KR-LXzTDFkkX56SBUU7x7RKUqLe0nRmY8Itbqqg_s,6871
+raylib-5.0.0.2.dist-info/WHEEL,sha256=2b-71v4wElgbMRjc3K6_XYKCbPJSo3YDBADvpZuPVr4,110
+raylib-5.0.0.2.dist-info/top_level.txt,sha256=PnMBDWaUP4jsbn_NewagcC9FjHYpzSAIQuhxNzt9hkg,13
+raylib-5.0.0.2.dist-info/RECORD,,

{raylib-5.0.0.1.dist-info → raylib-5.0.0.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: false
 Tag: cp311-cp311-macosx_13_0_arm64
 

raylib-5.0.0.1.dist-info/RECORD

@@ -1,15 +0,0 @@
-pyray/__init__.py,sha256=rqSg_m5QmUVqPcUpsKZLlemqr0YXbWe7JiEWM3ByNhk,4249
-pyray/__init__.pyi,sha256=YhqrlHPkD1pdZKJe3kvzGhHRaSlkt4i4tVkhysYYG1E,150495
-raylib/__init__.py,sha256=DWXPmoq7tC5wzZsrt6rReGy1RflyZwk-SdF-9lBZHok,919
-raylib/__init__.pyi,sha256=y0lmZ3wI63AC95uIddXQH2cw7e29Tk85b2FF0g0PZtY,138540
-raylib/_raylib_cffi.abi3.so,sha256=4k62pLp9juqg07myrxg7Y-uEKr2UicrUqSFLtEGZaNc,2829128
-raylib/build.py,sha256=cl1OCJOZNul1-SK264Eoa773PdBcFEFxLcpnpKT1XaI,8213
-raylib/colors.py,sha256=_u-mYrpdx7_v_4wnJrnSu_m36ixKJWbort780_V6rTw,1523
-raylib/defines.py,sha256=lMv6zU8WSkaH5Dj5Ydx0AlggeA-r76xePcA1M7EudnA,15951
-raylib/enums.py,sha256=RtQpN23zViI2mQSHPPc0Ay4IvNdiDk_xggdMPLCR0ng,17586
-raylib/version.py,sha256=jxR8hUOjIF7W_jxqRXhSenckU7b3etHSDsGt7TUhigE,23
-raylib-5.0.0.1.dist-info/LICENSE,sha256=C-zxZWe-t3-iUrdmRjHdF3yPmhiJ5ImVtFN5xxMOUwM,14198
-raylib-5.0.0.1.dist-info/METADATA,sha256=e1B1A9BEDpjh1PtQO9F5BMKPLMOuQOzPhKyZnxCcs48,5501
-raylib-5.0.0.1.dist-info/WHEEL,sha256=E-1gYRQuPxSUirHUpbFc1-QH3Vg3hrD7HRk3RIX_hQY,110
-raylib-5.0.0.1.dist-info/top_level.txt,sha256=PnMBDWaUP4jsbn_NewagcC9FjHYpzSAIQuhxNzt9hkg,13
-raylib-5.0.0.1.dist-info/RECORD,,