Merge pull request #2813 from umlaeute/python-fixes

Python fixes: ctypes declarations and cosmetics
pull/2839/head^2
Kim Kulling 2019-12-19 14:25:51 +01:00 committed by GitHub
commit 9f196f7d02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 138 additions and 135 deletions

View File

@ -1,4 +1,4 @@
#-*- coding: UTF-8 -*- #-*- coding: utf-8 -*-
from ctypes import POINTER, c_void_p, c_uint, c_char, c_float, Structure, c_char_p, c_double, c_ubyte, c_size_t, c_uint32 from ctypes import POINTER, c_void_p, c_uint, c_char, c_float, Structure, c_char_p, c_double, c_ubyte, c_size_t, c_uint32
@ -76,7 +76,7 @@ class String(Structure):
# Binary length of the string excluding the terminal 0. This is NOT the # Binary length of the string excluding the terminal 0. This is NOT the
# logical length of strings containing UTF-8 multibyte sequences! It's # logical length of strings containing UTF-8 multibyte sequences! It's
# the number of bytes from the beginning of the string to its end. # the number of bytes from the beginning of the string to its end.
("length", c_size_t), ("length", c_uint32),
# String buffer. Size limit is MAXLEN # String buffer. Size limit is MAXLEN
("data", c_char*MAXLEN), ("data", c_char*MAXLEN),
@ -573,6 +573,9 @@ class AnimMesh(Structure):
AI_MAX_NUMBER_OF_COLOR_SETS = 0x8 AI_MAX_NUMBER_OF_COLOR_SETS = 0x8
_fields_ = [ _fields_ = [
# Anim Mesh name
("mName", String),
# Replacement for aiMesh::mVertices. If this array is non-NULL, # Replacement for aiMesh::mVertices. If this array is non-NULL,
# it *must* contain mNumVertices entries. The corresponding # it *must* contain mNumVertices entries. The corresponding
# array in the host mesh must be non-NULL as well - animation # array in the host mesh must be non-NULL as well - animation
@ -752,7 +755,7 @@ class Mesh(Structure):
# Attachment meshes carry replacement data for some of the # Attachment meshes carry replacement data for some of the
# mesh'es vertex components (usually positions, normals). # mesh'es vertex components (usually positions, normals).
# Note! Currently only works with Collada loader. # Note! Currently only works with Collada loader.
("mAnimMesh", POINTER(POINTER(AnimMesh))), ("mAnimMeshes", POINTER(POINTER(AnimMesh))),
# Method of morphing when animeshes are specified. # Method of morphing when animeshes are specified.
("mMethod", c_uint), ("mMethod", c_uint),