raylib 5.0.0.1__tar.gz → 5.0.0.2__tar.gz

{raylib-5.0.0.1/raylib.egg-info → raylib-5.0.0.2}/PKG-INFO

@@ -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
@@ -24,7 +24,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)
 
@@ -99,6 +99,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.1 → raylib-5.0.0.2}/README.md

@@ -6,7 +6,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)
 
@@ -81,6 +81,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/pyray/__init__.py

@@ -0,0 +1,143 @@
+#  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
+import re
+import weakref
+from array import array
+
+from raylib import rl, ffi
+from raylib.colors import *
+
+try:
+    from raylib.defines import *
+except AttributeError:
+    print("sorry deprecated enums dont work on dynamic version")
+
+from inspect import getmembers, isbuiltin
+
+current_module = __import__(__name__)
+
+
+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)
+
+
+# I'm concerned that we are doing a lot of string comparisons on every function call to detect types.
+# Quickest way would probably be isinstance(result, ffi._backend._CDataBase) but that class name varies
+# depending on if binding is static/dynamic
+# (and possibly also different on pypy implementations?).
+# which makes me reluctant to rely on it.
+# 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 _wrap_function(original_func):
+    # print("makefunc ",a, ffi.typeof(a).args)
+    def wrapped_func(*args):
+        modified_args = []
+        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) is str:
+                    arg = arg.encode('utf-8')
+                # 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 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 = original_func(*modified_args)
+        if result is None:
+            return
+        elif is_cdata(result) and str(result).startswith("<cdata 'char *'"):
+            if str(result) == "<cdata 'char *' NULL>":
+                return ""
+            else:
+                return ffi.string(result).decode('utf-8')
+        else:
+            return result
+
+    # 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
+
+
+global_weakkeydict = weakref.WeakKeyDictionary()
+
+
+def _make_struct_constructor_function(struct):
+    def func(*args):
+        # 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 = _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(dir(attr))
+        # print(dir(attr.__repr__))
+        f = _wrap_function(attr)
+        setattr(current_module, uname, f)
+    else:
+        setattr(current_module, name, attr)
+
+for struct in ffi.list_types()[0]:
+    f = _make_struct_constructor_function(struct)
+    setattr(current_module, struct, f)
+
+# overwrite ffi enums with our own
+from raylib.enums import *

{raylib-5.0.0.1 → raylib-5.0.0.2}/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-5.0.0.1 → raylib-5.0.0.2}/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-5.0.0.2/raylib/version.py

@@ -0,0 +1 @@
+__version__ = "5.0.0.2"

{raylib-5.0.0.1 → raylib-5.0.0.2/raylib.egg-info}/PKG-INFO

@@ -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
@@ -24,7 +24,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)
 
@@ -99,6 +99,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.1 → raylib-5.0.0.2}/raylib.egg-info/requires.txt

@@ -1,2 +1 @@
 cffi>=1.14.6
-inflection

{raylib-5.0.0.1 → raylib-5.0.0.2}/setup.py

@@ -38,7 +38,7 @@ setup(
     ],
     packages=["raylib", "pyray"],
     include_package_data=True,
-    install_requires=["cffi>=1.14.6","inflection"],
+    install_requires=["cffi>=1.14.6"],
     distclass=BinaryDistribution,
     cffi_modules=["raylib/build.py:ffibuilder"]
 )

raylib-5.0.0.2/version.py

@@ -0,0 +1 @@
+__version__ = "5.0.0.2"

raylib-5.0.0.1/pyray/__init__.py

@@ -1,108 +0,0 @@
-#  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 raylib.colors import *
-
-try:
-    from raylib.defines import *
-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):
-    return ffi.addressof(struct)
-
-
-# I'm concerned that we are doing a lot of string comparisons on every function call to detect types.
-# Quickest way would probably be isinstance(result, ffi._backend._CDataBase) but that class name varies
-# depending on if binding is static/dynamic
-# (and possibly also different on pypy implementations?).
-# which makes me reluctant to rely on it.
-# 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):
-    # print("makefunc ",a, ffi.typeof(a).args)
-    def 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)))
-            if c_arg.kind == 'pointer':
-                if type(arg) == 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 * *'>":
-                    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
-                    arg = ffi.addressof(arg)
-                elif arg is None:
-                    arg = ffi.NULL
-            modified_args.append(arg)
-        result = a(*modified_args)
-        if result is None:
-            return
-        if str(type(result)) == "<class '_cffi_backend._CDataBase'>" and str(result).startswith("<cdata 'char *'"):
-            if str(result) == "<cdata 'char *' NULL>":
-                result = ""
-            else:
-                result = ffi.string(result).decode('utf-8')
-        return result
-
-    return func
-
-
-def makeStructHelper(struct):
-    def func(*args):
-        return ffi.new(f"struct {struct} *", args)[0]
-
-    return func
-
-
-for name, attr in getmembers(rl):
-    # print(name, attr)
-    uname = inflection.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)
-        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)
-    setattr(current_module, struct, f)
-
-# overwrite ffi enums with our own
-from raylib.enums import *

raylib-5.0.0.1/raylib/version.py

@@ -1 +0,0 @@
-__version__ = "5.0.0.1"

raylib-5.0.0.1/version.py

@@ -1 +0,0 @@
-__version__ = "5.0.0.1"