v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,536 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

310 Commits (a8822a2b29514700202d586a5397481de93bcbd2)

Author SHA1 Message Date
Kim Kulling 01070b4de7 closes https://github.com/assimp/assimp/issues/2439: add null ptr test before calling hasAttr. 2019-07-04 22:34:11 +02:00
Kim Kulling 4d66b33253
Update Readme.md 
Fix wrong link
 2019-06-03 22:36:57 +02:00
Eric Olson 3924a5c32a Ensure obj is not null before using hasattr 
Fixes error shown below:
  File "C:\Users\micro\build2\boxwin_external_libs\pyassimp\core.py", line 320, in load
    scene = _init(model.contents)
  File "C:\Users\micro\build2\boxwin_external_libs\pyassimp\core.py", line 206, in _init
    raise e
  File "C:\Users\micro\build2\boxwin_external_libs\pyassimp\core.py", line 187, in _init
    call_init(e, target)
  File "C:\Users\micro\build2\boxwin_external_libs\pyassimp\core.py", line 80, in call_init
    _init(obj.contents, obj, caller)
  File "C:\Users\micro\build2\boxwin_external_libs\pyassimp\core.py", line 214, in _init
    if _is_init_type(obj):
  File "C:\Users\micro\build2\boxwin_external_libs\pyassimp\core.py", line 86, in _is_init_type
    if helper.hasattr_silent(obj,'contents'): #pointer
  File "C:\Users\micro\build2\boxwin_external_libs\pyassimp\helper.py", line 277, in hasattr_silent
    return hasattr(object, name)
ValueError: NULL pointer access
 2019-05-27 13:06:38 -05:00
Andor Goetzendorff b10dc5747b Revert "Remove experimental change unintentionally included in commit f001dfc8" 
This reverts commit e45d120f21.
 2019-05-20 15:35:19 +02:00
Kim Kulling 8dacbf49f9
Merge branch 'master' into issue-2339 2019-05-01 19:47:36 +02:00
Huarong Chen b6d3cbcb61
Fix "bytes aketrans" issues in Python>=3.1 
Issue https://github.com/assimp/assimp/issues/2339
 2019-04-17 14:19:00 +08:00
Simon Puente 9b9b2c8339
Fix typo on README.md 
changing "fascade" to "facade"
 2019-04-14 10:13:32 -07:00
Charlie Gettys e45d120f21 Remove experimental change unintentionally included in commit f001dfc8 2019-03-29 18:43:57 -04:00
Charlie Gettys f001dfc840 * Fix error in previous commit improving imports 2019-03-29 18:36:17 -04:00
Charlie Gettys 5a53fbd65f port/PyAssimp/pyassimp/: Fix new warnings 2019-03-29 18:36:17 -04:00
Charlie Gettys efbb85721c port/PyAssimp/pyassimp/: remove several unised imports 2019-03-29 18:36:17 -04:00
Charlie Gettys 1b9157440f port/PyAssimp/pyassimp/structs.py: remove unused import of c_int 2019-03-29 18:36:17 -04:00
Charlie Gettys 1614b7bea4 port/PyAssimp/pyassimp/core.py: convert_assimp_string now switches on 
version instead of just catching the exception if unicode is not defined
& _init_face uses is None instead of == None
 2019-03-29 18:36:17 -04:00
Charlie Gettys ee79ac0f17 port/PyAssimp/pyassimp/sample.py: rename innerloop variable to clarify intent since it shadowed outer variable 2019-03-29 18:36:17 -04:00
Charlie Gettys 7930de9f37 port/PyAssimp/pyassimp/helper.py: replace from ctypes import POINTER; POINTER(something) with ctypes.POINTER(something) to remove warning about importing ctype twice 2019-03-29 18:36:17 -04:00
Charlie Gettys e849b94f68 port/PyAssimp/pyassimp/core.py & helper.py: catch specific exceptions instead of BaseException 2019-03-29 18:36:17 -04:00
Charlie Gettys 51844b206d port/PyAssimp/pyassimp/formats.py: add missing comma (implicit string concatenation, assumed unintentional) 2019-03-29 18:36:17 -04:00
Charlie Gettys 4e714fce0e port/PyAssimp/pyassimp/core.py: remove unused import & second import of ctypes 2019-03-29 18:36:17 -04:00
Charlie Gettys 49033513ef port/PyAssimp/pyassimp/core.py: remove deprecated unused import & unnecessary from ctype import pointer 2019-03-29 18:36:17 -04:00
Charlie Gettys eb81619e56 Fix core.py raising string instead of correct RuntimeError 2019-03-29 18:36:17 -04:00
Séverin Lemaignan 1ac86476fe [pyassimp] Bumped to 4.1.4 
Main changes:
- Support for metadata fields (Vincent Fazio, Wojciech Matyjewicz)
- added support for aiExportSceneToBlob (Vincent Fazio)
- a few bug fix + code beautification
 2019-01-30 22:41:01 +00:00
Kim Kulling 2432abacc7
Update README.md 
Update doc.
 2019-01-27 21:11:52 +01:00
Marc Kurtz f384d1221a Make this public for JaiDebug and to pass quality checks. 2019-01-08 13:55:07 -05:00
Marc Kurtz d2f6c6d65e Add ProgressHandler support. 2019-01-08 11:19:25 -05:00
Marc Kurtz e06b1d0de2 Change access of getData() to package-private for access in JaiDebug. 
Move private field to fix compile error.
 2019-01-08 11:19:25 -05:00
Kim Kulling 21c162edf1
Merge branch 'master' into patch-1 2018-12-30 21:40:01 +01:00
Kim Kulling ae31be1e23 next try. 2018-12-30 17:06:50 +01:00
Kim Kulling ba80410c48 fix review findings. 2018-12-30 15:56:42 +01:00
Kim Kulling 7c23a6c5ca fix review findings. 2018-12-30 11:41:58 +01:00
carasuca 69ea55d180
Fix: except `SyntaxError` for py3 viewer 
Following https://www.python.org/dev/peps/pep-3110/
 2018-12-30 02:59:49 +01:00
Kim Kulling df8a9450c8 Merge branch 'master' into coverity_scan 2018-12-26 20:43:04 +01:00
Kim Kulling 82cd16ab83 Merge branch 'kimkulling-dev' of https://github.com/assimp/assimp into kimkulling-dev 2018-12-26 09:50:19 +01:00
Kim Kulling b3c2fdc11d python: fix review findings. 2018-12-23 14:28:40 +01:00
Kim Kulling 6631f7877a
Update Jassimp.java 
Fix another misinterpretation from the JNI-interface.
 2018-12-23 13:37:03 +01:00
Kim Kulling 7eee959d55 Review: fix wrong interpretation of methods for JNI. 2018-12-23 13:12:57 +01:00
Kim Kulling e9d1330edd Fix next finding. 2018-12-23 12:01:08 +01:00
Kim Kulling f73dd52956 Fix next finding. 2018-12-23 11:58:48 +01:00
Kim Kulling 3087ebb93a JAssimp: fix simple code analysis issues. 2018-12-23 11:57:32 +01:00
Maxim Petrovsky 7ce8c9778b added arm64e to iOS build script 
added arm64e iOS cmake file
 2018-12-20 16:50:38 +02:00
Nicholas Woodfield dfc38b5e9a
Update AssimpNet redirect 
After the exchange on twitter, I noticed that this readme never actually had a link pointing to the bitbucket repository that I maintain (originally the googlecode one, and then a fork of the googlecode one I didn't know about).

This is very confusing for people who report issues, and I would like them to make sure they can report on a tracker that I keep tabs on.
 2018-10-05 11:34:03 -04:00
Vincent Fazio 8cb0b4ce2b Updated pyassimp function description 2018-09-21 11:02:14 +10:00
Vincent Fazio ef4e317625 Improved some comments 2018-09-21 10:51:38 +10:00
Vincent Fazio 3402cd81c7 Added interface to 'aiExportSceneToBlob()' for pyassimp 2018-09-21 10:31:21 +10:00
Vincent Fazio 0adc032f69 Updated to be in sync with assimp header files 2018-09-14 13:09:44 +10:00
Wojciech Matyjewicz fdf52f3d25 Build Python representation for metadata. 2018-09-02 00:52:24 +02:00
Wojciech Matyjewicz 8bbfac1f04 Factor out Assimp string -> Python string conversion code. 2018-09-02 00:51:14 +02:00
Wojciech Matyjewicz 475ed6fdc3 Fix metadata property type declarations. 2018-09-01 10:15:09 +02:00
Wojciech Matyjewicz 7004066532 Fix inconsistent newlines. 
LF newlines have been changed to CR LF to match the rest of the file.
 2018-09-01 10:11:59 +02:00
Vincent Fazio ecd24a736c Add missing metadata fields 2018-08-24 12:06:24 +10:00
Vincent Fazio 597628f43a Prevent 'AttributeError' when printing object attributes 2018-08-24 12:03:54 +10:00