Commit Graph

356 Commits

Author SHA1 Message Date
Daniel-Genkin
f28500dd0f Fixed building of Android port 2021-10-29 09:03:55 -04:00
Kim Kulling
e5cd5733e1 Update AndroidJNIIOSystem.cpp 2021-10-28 17:50:25 +02:00
Daniel-Genkin
6e5600a9a5 Added another constructor to avoid requiring a full ANativeActivity 2021-10-28 10:26:14 -04:00
Krishty
758116b083 removed trailing spaces and tabs from source and text
This commit ignores the “contrib” folder in order to prevent merge conflicts in dependencies, should these be updated via git.
2021-07-29 13:28:51 +02:00
Manuel López Antequera
e49ee6cfb2 PyAssimp fix: don't always search anaconda paths
The helper was erroneously adding the Anaconda paths to the search.
2021-07-08 09:51:05 +02:00
Kim Kulling
b4fc41bc09 Use corret attribute name
- closes https://github.com/assimp/assimp/issues/3887
2021-06-03 22:52:10 +02:00
Chuck Claunch
18beae988c Add support for arm 64 bit 2021-05-12 21:57:24 +00:00
Eric Olson
f17d58cadd Use POINTER(c_char) for binary data with pyassimp
"For a general character pointer that may also point to binary data,
POINTER(c_char) must be used." c_char_p is for a zero-terminated string.

Reference: https://docs.python.org/3/library/ctypes.html#ctypes.c_char_p

Applying this change to the 4.1.4 released python module fixes #2339 for
me in Ubuntu.
2021-05-04 13:38:38 -05:00
Matthew Wallace
0ebab47ca2 updated MIN_IOS_VERSION to 10.0 2021-03-08 07:11:39 -06:00
Alex
2fd6666477 Update CMakeLists.txt
Add android_jniiosystem to export set, for cmake to find and link with
2021-02-17 23:16:22 -08:00
Kim Kulling
242e9c21a9 Update BundledAssetIOSystem.cpp 2021-02-15 13:44:07 +01:00
contriteobserver
74b70cad79 fixed a typo 2021-02-01 23:44:57 -08:00
contriteobserver
800d5c23c3 implements a DefaultIOSystem that provides access to files bundled with Android Applications
addresses issue  #3633
2021-02-01 23:33:55 -08:00
Kim Kulling
79eb9ecc86 Update all minimum cmake req to 3.10 2021-01-29 21:05:46 +01:00
Kim Kulling
75204dfe7f Update README.md 2020-12-01 08:58:45 +01:00
Natanael Rabello
813f171493 Update Android port README.md with ABI doc 2020-11-16 21:45:01 -03:00
Chananya Freiman
542d784457 Update Jassimp's AiTextureType.java
The newer PBR enums are missing, making it impossible to import many models.
2020-09-02 02:52:56 +03:00
David
b84dbb68ec Update READMEs 2020-06-09 08:33:09 +02:00
David
efbabf3b0d Implement contextmanager for load 2020-06-09 08:32:59 +02:00
Kim Kulling
d7e8fefed7 Merge branch 'master' into master 2020-05-16 20:41:05 +02:00
David Golembiowski
57e837092e populated module level files 2020-05-01 18:23:14 -04:00
David Golembiowski
778c3afbbb Rust's import system dictates that we must make directories rather than use individual files to provide a clean public interface 2020-05-01 18:11:44 -04:00
David Golembiowski
2d43a24475 memory info struct 2020-05-01 17:41:16 -04:00
David Golembiowski
a286506c23 fixed a couple of things. Adding MaterialPropertyString 2020-05-01 17:32:55 -04:00
David Golembiowski
e6837f7394 Need to consider different implementations of String kinds in Rust, and additionally how we may want to impl Copy for Str, i.e. std::mem::swap with placeholders to keep performance up. 2020-05-01 17:25:02 -04:00
David Golembiowski
38b80f6c6b populating plane struct 2020-05-01 16:58:32 -04:00
David Golembiowski
ba633f95bb populating colors 2020-05-01 16:54:56 -04:00
David Golembiowski
4f8eb0f79c populating Texel struct definition for textures 2020-05-01 16:50:31 -04:00
David Golembiowski
c338c5ca02 Populating 3d and 4d matrix struct definitions 2020-05-01 16:47:35 -04:00
David Golembiowski
c6f2196f60 vector definitions 2020-05-01 16:32:25 -04:00
David Golembiowski
e438310d8c should have added these earlier 2020-04-25 00:12:58 -04:00
David Golembiowski
060c45fcf3 initial layout for anim.rs 2020-04-24 22:15:32 -04:00
David Golembiowski
2108e08c90 adding structs 2020-04-24 18:15:51 -04:00
David Golembiowski
6363bf34c0 see git commit message rust-port 5d05c536 2020-04-24 17:03:41 -04:00
David Golembiowski
5d05c536e7 updated gitignore and made port library name compliant with cargo 2020-04-24 17:02:36 -04:00
David Golembiowski
df57ee6cb6 laying out the submodules 2020-04-24 16:49:38 -04:00
David Golembiowski
45e33ce1bf first commit 2020-04-24 16:36:44 -04:00
Aaron Franke
1529f9518f Make file formatting comply with POSIX and Unix standards
UTF-8, LF, no BOM, and newlines at the end of files
2020-03-21 02:34:12 -04:00
Shawn Presser
f305f10551 Only try to initialize members whose name starts with 'm' followed by an uppercase character 2020-03-09 00:05:17 -07:00
Marc-Antoine Lortie
4e7e47bd43 Updated copyright dates.
Changed copyright end year to 2020 in every reference "Copyright (c) 2006-XXXX, assimp team".

Changed copyright end year to 2020 in every reference "Copyright (c) 2006-XXXX, ASSIMP Development Team".

Changed copyright end year to 2020 in LICENCE.rtf.

Changed copyright end year in CMakeFiles.txt files and any other places referencing Assimp with a copyright start and end year.
2020-01-20 08:53:12 -05:00
IOhannes m zmölnig
660f3571d8 added AnimMesh.mName member
Closes: https://github.com/assimp/assimp/issues/2822
2019-12-09 17:25:20 +01:00
IOhannes m zmölnig
630f013a5e fix field name "Mesh.mAnimMesh" -> "Mesh.mAnimMeshes"
to match the name in mesh.h: aiMesh.mAnimMeshes
2019-12-07 22:10:26 +01:00
IOhannes m zmölnig
d24adbd32c aiString.length is really of type "ai_uint32" which corresponds to "c_uint32"
and not to "c_size_t" (which is different on 64bit systems and 32bit systems!)

Closes: https://github.com/assimp/assimp/issues/2788
2019-12-07 22:09:03 +01:00
IOhannes m zmölnig
298a89b4ee remove trailing whitespace 2019-12-07 22:06:14 +01:00
IOhannes m zmölnig
71cac7ab8d lower-case PEP263 encoding declaration
so emacs likes it...
2019-12-07 22:04:04 +01:00
Robert Spencer
e1322f9178 Fix indentation error in python bindings 2019-09-10 20:38:31 +01:00
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