v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1355 from RodrigoFigueroaM/patch-1 

Added support for python3
pull/1364/head
Alexander Gessler 2017-07-23 01:57:57 +02:00 committed by GitHub
parent 96cb3f7140 01a288ff35
commit 6bf68e063f
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
port/PyAssimp/pyassimp/core.py
View File

@ -119,7 +119,10 @@ def _init(self, target = None, parent = None):
if m == 'mName': if m == 'mName':
obj = self.mName obj = self.mName
uni = unicode(obj.data, errors='ignore') try:
uni = unicode(obj.data, errors='ignore')
except:
uni = str(obj.data, errors='ignore')
target.name = str( uni ) target.name = str( uni )
target.__class__.__repr__ = lambda x: str(x.__class__) + "(" + x.name + ")" target.__class__.__repr__ = lambda x: str(x.__class__) + "(" + x.name + ")"
target.__class__.__str__ = lambda x: x.name target.__class__.__str__ = lambda x: x.name
@ -440,7 +443,10 @@ def _get_properties(properties, length):
for p in [properties[i] for i in range(length)]: for p in [properties[i] for i in range(length)]:
#the name #the name
p = p.contents p = p.contents
uni = unicode(p.mKey.data, errors='ignore') try:
uni = unicode(p.mKey.data, errors='ignore')
except:
uni = str(p.mKey.data, errors='ignore')
key = (str(uni).split('.')[1], p.mSemantic) key = (str(uni).split('.')[1], p.mSemantic)
#the data #the data
@ -449,7 +455,10 @@ def _get_properties(properties, length):
arr = cast(p.mData, POINTER(c_float * int(p.mDataLength/sizeof(c_float)) )).contents arr = cast(p.mData, POINTER(c_float * int(p.mDataLength/sizeof(c_float)) )).contents
value = [x for x in arr] value = [x for x in arr]
elif p.mType == 3: #string can't be an array elif p.mType == 3: #string can't be an array
uni = unicode(cast(p.mData, POINTER(structs.MaterialPropertyString)).contents.data, errors='ignore') try:
uni = unicode(cast(p.mData, POINTER(structs.MaterialPropertyString)).contents.data, errors='ignore')
except:
uni = str(cast(p.mData, POINTER(structs.MaterialPropertyString)).contents.data, errors='ignore')
value = uni value = uni
elif p.mType == 4: elif p.mType == 4:
@ -476,3 +485,4 @@ def decompose_matrix(matrix):
from ctypes import byref, pointer from ctypes import byref, pointer
_assimp_lib.dll.aiDecomposeMatrix(pointer(matrix), byref(scaling), byref(rotation), byref(position)) _assimp_lib.dll.aiDecomposeMatrix(pointer(matrix), byref(scaling), byref(rotation), byref(position))
return scaling._init(), rotation._init(), position._init() return scaling._init(), rotation._init(), position._init()