UnrealXR/raylib-python-cffi
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve struct creation helper methods by auto converting arguments: (#119)

Browse source 
* None to ffi.NULL
 * array and ndarray to buffer, and keep weakref so it doesn't get GCed

This makes it possible to create Mesh structs without too much faffing.
This commit is contained in:
Richard Smith 2024-03-03 11:45:09 +00:00 • committed by GitHub
parent ef3681fc5b
commit 33dce4ecfd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 139 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

22
pyray/__init__.py
View file

@ -11,6 +11,8 @@
# 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 weakref
from array import array
from raylib import rl, ffi
from raylib.colors import *
@ -43,7 +45,7 @@ def makefunc(a):
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)))
# 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')
@ -53,7 +55,7 @@ def makefunc(a):
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 * *'>":
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)
@ -74,10 +76,24 @@ def makefunc(a):
return func
global_weakkeydict = weakref.WeakKeyDictionary()
def makeStructHelper(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