raylib 5.0.0.2__cp311-cp311-manylinux2014_aarch64.whl → 5.0.0.4__cp311-cp311-manylinux2014_aarch64.whl

pyray/__init__.py

@@ -38,48 +38,61 @@ def _underscore(word: str) -> str:
     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)
+    c_args = [str(x) for x in ffi.typeof(original_func).args]
+    number_of_args = len(c_args)
+    c_arg_is_pointer = [x.kind == 'pointer' for x in ffi.typeof(original_func).args]
+    c_arg_is_string = [str(x) == "<ctype 'char *'>" for x in ffi.typeof(original_func).args]
+    # c_arg_is_void_pointer = [str(x) == "<ctype 'void *'>" for x in ffi.typeof(original_func).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
+        args = list(args)  # tuple is immutable, converting it to mutable list is faster than constructing new list!
+        for i in range(number_of_args):
+            try:
+                arg = args[i]
+            except IndexError:
+                raise RuntimeError(f"function requires {number_of_args} arguments but you supplied {len(args)}")
+            if c_arg_is_pointer[i]:
+                if c_arg_is_string[i]:  # we assume c_arg is 'const char *'
+                    try:  # if it's a non-const 'char *' then user should be supplying a ctype pointer, not a Python
+                        # string
+                        args[i] = arg.encode('utf-8')  # in that case this conversion will fail
+                    except AttributeError:  # but those functions are uncommon, so quicker on average to try the
+                        # conversion
+                        pass  # and ignore the exception
+                # if user supplied a Python string but c_arg is a 'char *' not a 'const char *' then we ought to raise
+                # exception because its an out
+                # parameter and user should supply a ctype pointer, but we cant because 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 c_args[i] == "<ctype 'char * *'>" and type(arg) is list:
+                    args[i] = [ffi.new("char[]", x.encode('utf-8')) for x in arg]
                 elif is_cdata(arg) and "*" not in str(arg):
-                    arg = ffi.addressof(arg)
+                    args[i] = ffi.addressof(arg)
                 elif arg is None:
-                    arg = ffi.NULL
+                    args[i] = ffi.NULL
                 elif not is_cdata(arg):
-                    if str(c_arg) == "<ctype '_Bool *'>":
+                    if c_args[i] == "<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 *'>":
+                            f"Argument {i} ({arg}) must be a ctype bool, please create one with: pyray.ffi.new('bool "
+                            f"*', True)")
+                    elif c_args[i] == "<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 *'>":
+                            f"Argument {i} ({arg}) must be a ctype int, please create one with: pyray.ffi.new('int "
+                            f"*', 1)")
+                    elif c_args[i] == "<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)
+                            f"Argument {i} ({arg}) must be a ctype float, please create one with: pyray.ffi.new("
+                            f"'float *', 1.0)")
+                    elif c_args[i] == "<ctype 'void *'>":
+                        # we could assume it's a string and try to convert it but we would have to be sure it's
+                        # const.  that seems reasonable assumption for char* but i'm not confident it is for void*
+                        raise TypeError(
+                            f"Argument {i} ({arg}) must be a cdata pointer. Type is void so I don't know what type it "
+                            f"should be."
+                            "If it's a const string you can create it with pyray.ffi.new('char []', b\"whatever\") . "
+                            "If it's a float you can create it with pyray.ffi.new('float *', 1.0)")
+
+        result = original_func(*args)
         if result is None:
             return
         elif is_cdata(result) and str(result).startswith("<cdata 'char *'"):
@@ -141,3 +154,7 @@ for struct in ffi.list_types()[0]:
 
 # overwrite ffi enums with our own
 from raylib.enums import *
+
+
+def text_format(*args):
+    raise RuntimeError("Use Python f-strings etc rather than calling text_format().")

pyray/__init__.pyi

@@ -2344,10 +2344,10 @@ def glfw_get_required_instance_extensions(count: Any,) -> list[str]:
 def glfw_get_time() -> float:
         """"""
         ...
-def glfw_get_timer_frequency() -> uint64_t:
+def glfw_get_timer_frequency() -> int:
         """"""
         ...
-def glfw_get_timer_value() -> uint64_t:
+def glfw_get_timer_value() -> int:
         """"""
         ...
 def glfw_get_version(major: Any,minor: Any,rev: Any,) -> None:
@@ -3397,6 +3397,34 @@ class rlVertexBuffer:
         self.indices=indices
         self.vaoId=vaoId
         self.vboId=vboId
+
+LIGHTGRAY  : Color
+GRAY       : Color
+DARKGRAY   : Color
+YELLOW     : Color
+GOLD       : Color
+ORANGE     : Color
+PINK       : Color
+RED        : Color
+MAROON     : Color
+GREEN      : Color
+LIME       : Color
+DARKGREEN  : Color
+SKYBLUE    : Color
+BLUE       : Color
+DARKBLUE   : Color
+PURPLE     : Color
+VIOLET     : Color
+DARKPURPLE : Color
+BEIGE      : Color
+BROWN      : Color
+DARKBROWN  : Color
+WHITE      : Color
+BLACK      : Color
+BLANK      : Color
+MAGENTA    : Color
+RAYWHITE   : Color
+
 from enum import IntEnum
 
 class ConfigFlags(IntEnum):
@@ -4111,44 +4139,3 @@ class GuiIconName(IntEnum):
     ICON_254 = 254
     ICON_255 = 255
 
-#  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
-
-LIGHTGRAY  =( 200, 200, 200, 255 )
-GRAY       =( 130, 130, 130, 255 )
-DARKGRAY   =( 80, 80, 80, 255 )
-YELLOW     =( 253, 249, 0, 255 )
-GOLD       =( 255, 203, 0, 255 )
-ORANGE     =( 255, 161, 0, 255 )
-PINK       =( 255, 109, 194, 255 )
-RED        =( 230, 41, 55, 255 )
-MAROON     =( 190, 33, 55, 255 )
-GREEN      =( 0, 228, 48, 255 )
-LIME       =( 0, 158, 47, 255 )
-DARKGREEN  =( 0, 117, 44, 255 )
-SKYBLUE    =( 102, 191, 255, 255 )
-BLUE       =( 0, 121, 241, 255 )
-DARKBLUE   =( 0, 82, 172, 255 )
-PURPLE     =( 200, 122, 255, 255 )
-VIOLET     =( 135, 60, 190, 255 )
-DARKPURPLE =( 112, 31, 126, 255 )
-BEIGE      =( 211, 176, 131, 255 )
-BROWN      =( 127, 106, 79, 255 )
-DARKBROWN  =( 76, 63, 47, 255 )
-WHITE      =( 255, 255, 255, 255 )
-BLACK      =( 0, 0, 0, 255 )
-BLANK      =( 0, 0, 0, 0 )
-MAGENTA    =( 255, 0, 255, 255 )
-RAYWHITE   =( 245, 245, 245, 255 )
-

raylib/__init__.py

@@ -12,12 +12,18 @@
 #
 #  SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 
-from ._raylib_cffi import ffi, lib as rl
+import sys
+try:
+    from ._raylib_cffi import ffi, lib as rl
+except ModuleNotFoundError:
+    print("\n*** ERROR LOADING NATIVE CODE ***\n")
+    print("See https://github.com/electronstudio/raylib-python-cffi/issues/142\n", file=sys.stderr)
+    print("Your Python is: "+str(sys.implementation)+"\n", file=sys.stderr)
+    raise
 from raylib._raylib_cffi.lib import *
 from raylib.colors import *
 from raylib.defines import *
 import cffi
-import sys
 from .version import  __version__
 
 print("RAYLIB STATIC "+__version__+" LOADED", file=sys.stderr)

raylib/__init__.pyi

@@ -1041,10 +1041,10 @@ def GuiLine(bounds: Rectangle,text: str,) -> int:
 def GuiListView(bounds: Rectangle,text: str,scrollIndex: Any,active: Any,) -> int:
         """List View control, returns selected list item index"""
         ...
-def GuiListViewEx(bounds: Rectangle,text: str,count: int,scrollIndex: Any,active: Any,focus: Any,) -> int:
+def GuiListViewEx(bounds: Rectangle,text: list[str],count: int,scrollIndex: Any,active: Any,focus: Any,) -> int:
         """List View with extended parameters"""
         ...
-def GuiLoadIcons(fileName: str,loadIconsName: bool,) -> str:
+def GuiLoadIcons(fileName: str,loadIconsName: bool,) -> list[str]:
         """Load raygui icons file (.rgi) into internal icons data"""
         ...
 def GuiLoadStyle(fileName: str,) -> None:
@@ -1098,7 +1098,7 @@ def GuiSpinner(bounds: Rectangle,text: str,value: Any,minValue: int,maxValue: in
 def GuiStatusBar(bounds: Rectangle,text: str,) -> int:
         """Status Bar control, shows info text"""
         ...
-def GuiTabBar(bounds: Rectangle,text: str,count: int,active: Any,) -> int:
+def GuiTabBar(bounds: Rectangle,text: list[str],count: int,active: Any,) -> int:
         """Tab Bar control, returns TAB to be closed or -1"""
         ...
 def GuiTextBox(bounds: Rectangle,text: str,textSize: int,editMode: bool,) -> int:
@@ -2612,7 +2612,7 @@ def TextInsert(text: str,insert: str,position: int,) -> str:
 def TextIsEqual(text1: str,text2: str,) -> bool:
         """Check if two text string are equal"""
         ...
-def TextJoin(textList: str,count: int,delimiter: str,) -> str:
+def TextJoin(textList: list[str],count: int,delimiter: str,) -> str:
         """Join text strings with delimiter"""
         ...
 def TextLength(text: str,) -> int:
@@ -2621,7 +2621,7 @@ def TextLength(text: str,) -> int:
 def TextReplace(text: str,replace: str,by: str,) -> str:
         """Replace text string (WARNING: memory must be freed!)"""
         ...
-def TextSplit(text: str,delimiter: str,count: Any,) -> str:
+def TextSplit(text: str,delimiter: str,count: Any,) -> list[str]:
         """Split text into multiple strings"""
         ...
 def TextSubtext(text: str,position: int,length: int,) -> str:
@@ -3009,7 +3009,7 @@ def glfwGetCurrentContext() -> Any:
 def glfwGetCursorPos(window: Any,xpos: Any,ypos: Any,) -> None:
         """"""
         ...
-def glfwGetError(description: str,) -> int:
+def glfwGetError(description: list[str],) -> int:
         """"""
         ...
 def glfwGetFramebufferSize(window: Any,width: Any,height: Any,) -> None:
@@ -3087,16 +3087,16 @@ def glfwGetPrimaryMonitor() -> Any:
 def glfwGetProcAddress(procname: str,) -> Any:
         """"""
         ...
-def glfwGetRequiredInstanceExtensions(count: Any,) -> str:
+def glfwGetRequiredInstanceExtensions(count: Any,) -> list[str]:
         """"""
         ...
 def glfwGetTime() -> float:
         """"""
         ...
-def glfwGetTimerFrequency() -> uint64_t:
+def glfwGetTimerFrequency() -> int:
         """"""
         ...
-def glfwGetTimerValue() -> uint64_t:
+def glfwGetTimerValue() -> int:
         """"""
         ...
 def glfwGetVersion(major: Any,minor: Any,rev: Any,) -> None:
@@ -3201,7 +3201,7 @@ def glfwSetCursorPos(window: Any,xpos: float,ypos: float,) -> None:
 def glfwSetCursorPosCallback(window: Any,callback: Any,) -> Any:
         """"""
         ...
-def glfwSetDropCallback(window: Any,callback: str,) -> str:
+def glfwSetDropCallback(window: Any,callback: list[str],) -> list[str]:
         """"""
         ...
 def glfwSetErrorCallback(callback: str,) -> str:
@@ -3886,44 +3886,31 @@ rlShaderUniformDataType: int
 rlTextureFilter: int
 rlTraceLogLevel: int
 rlVertexBuffer: struct
-#  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
 
-LIGHTGRAY  =( 200, 200, 200, 255 )
-GRAY       =( 130, 130, 130, 255 )
-DARKGRAY   =( 80, 80, 80, 255 )
-YELLOW     =( 253, 249, 0, 255 )
-GOLD       =( 255, 203, 0, 255 )
-ORANGE     =( 255, 161, 0, 255 )
-PINK       =( 255, 109, 194, 255 )
-RED        =( 230, 41, 55, 255 )
-MAROON     =( 190, 33, 55, 255 )
-GREEN      =( 0, 228, 48, 255 )
-LIME       =( 0, 158, 47, 255 )
-DARKGREEN  =( 0, 117, 44, 255 )
-SKYBLUE    =( 102, 191, 255, 255 )
-BLUE       =( 0, 121, 241, 255 )
-DARKBLUE   =( 0, 82, 172, 255 )
-PURPLE     =( 200, 122, 255, 255 )
-VIOLET     =( 135, 60, 190, 255 )
-DARKPURPLE =( 112, 31, 126, 255 )
-BEIGE      =( 211, 176, 131, 255 )
-BROWN      =( 127, 106, 79, 255 )
-DARKBROWN  =( 76, 63, 47, 255 )
-WHITE      =( 255, 255, 255, 255 )
-BLACK      =( 0, 0, 0, 255 )
-BLANK      =( 0, 0, 0, 0 )
-MAGENTA    =( 255, 0, 255, 255 )
-RAYWHITE   =( 245, 245, 245, 255 )
+LIGHTGRAY  : Color
+GRAY       : Color
+DARKGRAY   : Color
+YELLOW     : Color
+GOLD       : Color
+ORANGE     : Color
+PINK       : Color
+RED        : Color
+MAROON     : Color
+GREEN      : Color
+LIME       : Color
+DARKGREEN  : Color
+SKYBLUE    : Color
+BLUE       : Color
+DARKBLUE   : Color
+PURPLE     : Color
+VIOLET     : Color
+DARKPURPLE : Color
+BEIGE      : Color
+BROWN      : Color
+DARKBROWN  : Color
+WHITE      : Color
+BLACK      : Color
+BLANK      : Color
+MAGENTA    : Color
+RAYWHITE   : Color
 

raylib/build.py

@@ -147,7 +147,6 @@ def build_unix():
         """
 
     ffibuilder.cdef(pre_process_header(raylib_h))
-    ffibuilder.cdef(pre_process_header(glfw3_h))
     ffibuilder.cdef(pre_process_header(rlgl_h))
     ffibuilder.cdef(pre_process_header(raymath_h, True))
 
@@ -155,6 +154,9 @@ def build_unix():
         ffibuilder.cdef(pre_process_header(raygui_h))
     if os.path.isfile(physac_h):
         ffibuilder.cdef(pre_process_header(physac_h))
+    if os.path.isfile(glfw3_h):
+        ffibuilder.cdef(pre_process_header(glfw3_h))
+
 
     if platform.system() == "Darwin":
         print("BUILDING FOR MAC")
@@ -162,16 +164,17 @@ def build_unix():
                            '-framework', 'IOKit', '-framework', 'CoreFoundation', '-framework',
                            'CoreVideo']
         libraries = []
-        extra_compile_args = ["-Wno-error=incompatible-function-pointer-types"]
+        extra_compile_args = ["-Wno-error=incompatible-function-pointer-types", "-D_CFFI_NO_LIMITED_API"]
     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 = []
+        extra_compile_args = ["-Wno-incompatible-pointer-types", "-D_CFFI_NO_LIMITED_API"]
         libraries = ['GL', 'm', 'pthread', 'dl', 'rt', 'X11', 'atomic']
 
     ffibuilder.set_source("raylib._raylib_cffi",
                           ffi_includes,
+                          py_limited_api=False,
                           include_dirs=[get_the_include_path()],
                           extra_link_args=extra_link_args,
                           extra_compile_args=extra_compile_args,
@@ -198,6 +201,8 @@ def build_windows():
     #include "physac.h"  
     """,
                           extra_link_args=['/NODEFAULTLIB:MSVCRTD'],
+                          extra_compile_args="/D_CFFI_NO_LIMITED_API",
+                          py_limited_api=False,
                           libraries=['raylib', 'gdi32', 'shell32', 'user32', 'OpenGL32', 'winmm'],
                           include_dirs=['D:\\a\\raylib-python-cffi\\raylib-python-cffi\\raylib-c\\src',
                                         'D:\\a\\raylib-python-cffi\\raylib-python-cffi\\raylib-c\\src\\external\\glfw\\include',