Commit Graph

378 Commits (d83904e3ee8595231a23a3e8bd244621266ca7eb)

Author SHA1 Message Date
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
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
Doron Adler 0adc793eb4 Lipo the debug binaries by appending d to their name 2018-07-01 14:53:05 +03:00
Doron Adler 5b20ad3791 Fixed a mistake I Introduced in the build script where debug and shared-lib parameters were expecting a "="
Revert to default Release build type, but this time only for iOS
Do not attempt to use minizip if you are building for iOS shared dylib
Keep in mind that the "Shared" option only apply to the assimp library and not the other two built libraries
2018-07-01 14:48:20 +03:00
Doron Adler 1b7f3de636 assimp will now be correctly built with -O3 or -Og based on build type 2018-06-27 13:26:01 +03:00
Doron Adler 35871b6c37 Use -g or -O3 based on debug/release 2018-06-27 13:04:49 +03:00
Doron Adler 5428fa6dd5 Norod: Managed to get it past the make file creation phase 2018-06-27 11:39:14 +03:00
Doron Adler eebf549e8e Merge branch 'master' into ios-build-script
* master:
  Fix regression on FBX importer unit test
  Check nb of faces and vertices for FBX unit test
  Update helper.py
  Update helper.py
  Solved pyassimp.errors.AssimpError in conda
  Hide commit signature information when fetching commit hash
2018-06-27 09:59:51 +03:00
Kim Kulling d4c7eb3b67
Update helper.py
Remove deprecated comment.
2018-06-22 16:14:20 +02:00
Kim Kulling 4a720511e4
Update helper.py
Remove dead code.
2018-06-22 16:13:46 +02:00
Ravin Kumar 7b0f100fc3
Solved pyassimp.errors.AssimpError in conda
This error occurred because of error in finding .extension files.
 
os.path.splitext(filename)[-1].lower() not in ext_whitelist:  ### this line had bugs, failed to select files with extensions .so.x  [.so.1  .so.2  .so.3.1] but worked on simple extensions only. like- .so .dll

Added a mechanism to remove this bug.
2018-06-22 12:22:27 +05:30
Doron Adler d86a0e3adb Merge branch 'master' into ios-build-script
* master:
  LWOMaterial: Fix strict aliasing violations
  3DS: Fix strict aliasing violations
  Fix strict aliasing violation in MaterialSystem
  Replace type punning with explicit memcpys
  Update FBXConverter.cpp
  Update Readme.md
  FBX: LayeredTextures now work with embedded texture data
  [pyassimp] README.{md->rst} to please distutils. Bumped to 4.1.3
  [pyassimp] Updated setup.py
  Properly reads in glTF/2.0 sampler address modes.
  does not access undefined memory area anymore.
2018-06-03 14:25:36 +03:00
Kim Kulling 64ba839f47
Update Readme.md
Fix the link to the active repo containing the assimp-net-code.
2018-05-31 20:04:48 +02:00
Doron Adler 6e49d288c3 now only x86_64 builds :( 2018-05-30 09:40:18 +03:00
Doron Adler e3847b7996 Default to release builds, update CC/LD/etc flags 2018-05-30 09:21:28 +03:00
Séverin Lemaignan c12c56d33e [pyassimp] README.{md->rst} to please distutils. Bumped to 4.1.3 2018-05-29 10:47:40 +01:00
Séverin Lemaignan b6888962ed [pyassimp] Updated setup.py 2018-05-28 23:53:28 +01:00
Doron Adler 3023df8f7e Norod: Configurable from script parameters: dynamic libraries and debug/release build type 2018-05-28 17:36:43 +03:00
Doron Adler 27b989fd36 Merge branch 'master' into ios-build-script
* master: (148 commits)
  Update Importer.cpp
  [-] Trace print removed.
  [F] Get return "like true" when error occured.
  [*] qt_assimp_viewer can be built with Qt4 or Qt5. [F] Working in doule precision.
  [F] List of importers can be empty.
  [F] More correct control by a mouse
  [F] React on mouse pressing ig view only.
  [F] One alignment for labels. [-] Unused checkbox.
  [+] QtCreator temporary file.
  [*] Refactoring of "draw axes" procedure. [-] Removed not working part of code for reloading textures. That do nothing, just show checkbox. As Yoda said: "Do. Or do not. There is no try."
  [-] Function "GetExtension" always return lowercase string. Using uppercase extension in desc is not needed.
  glTF/2.0: Pick scene zero as scene to recursively load if no "scene" property is specified.
  Fix GenVertexNormals
  [F] Wrong type in equation.
  [F] Uninitialized variables.
  Fix #1587 : add validation to LWS unit test
  Fix #1970: stl with empty solid
  Add test for issue 1970: STL with empty solid
  Add mesh name to ValidateDataStructure log
  Read and write the KHR_materials_unlit glTF/2.0 extension.
  ...

# Conflicts:
#	CMakeLists.txt
#	port/iOS/build.sh
2018-05-28 16:27:00 +03:00
Kim Kulling dbcffaf4d1
Merge branch 'master' into ios-fat-binaries 2018-05-17 22:41:54 +02:00
Andor Goetzendorff f4fd5840b1 Encode filename using file system encoding instead of ASCII 2018-05-15 15:35:44 +02:00
Lieven Dekeyser d8af63519d Create fat binaries for libIrrXML and libzlibstatic too 2018-05-15 12:38:50 +02:00
Doron Adler 643cf9bea2 Norod: Brought back 32bit archs 2018-03-20 17:09:50 +02:00
Doron Adler c1f6683b20 Partial revert, build only 64bit targets 2018-03-20 14:45:54 +02:00
Doron Adler c2f22be99a Norod: Default build type is set as Release, no shared libraries 2018-03-20 13:46:03 +02:00
Doron Adler e2e09ba2fa Norod: Support building assimp as dylib for iOS (set as default) 2018-03-19 22:51:52 +02:00
Doron Adler 14a1b9980e Norod: Do not attempt to look for Qt5Widgets when building for iOS
Norod: Toolchain files get their SDKVER, DEVROOT and SDKROOT values from build.sh
Norod: Removed deprecated CMAKE_FORCE_
Norod: Build shared libs is now set-able from a flag, so to be more extendable later
Norod: .gitignore updated
2018-03-19 15:49:16 +02:00
Doron Adler 3ca6b10810 Norod: Set IOS_SDK_VERSION to the latest based on xcodebuild sdk version
Norod:Set XCODE_ROOT_DIR based on xcode-select's --print-path
2018-03-19 13:17:18 +02:00
Robert Spencer c036a3b840 Add pyassimp code generation script for materials
In the style of gen/structsgen.py, we construct a similar method for
keeping the constants in materials.py up to date.
2018-01-10 12:33:44 +02:00
Robert Spencer ce5b78f6c0 Remove check for 'assimp' in name of directories to be searched for library in python port 2018-01-06 15:17:29 +02:00
Robert Spencer d3150eedfb Version bump pyassimp 2017-12-29 19:46:16 +02:00
Unknown 12dbbd4ce9 Misc. typos
Some are doxy comments, some are just trivial source comment typos. 
Found using `codespell -q 3 --skip="./contrib" -I ../assimp-whitelist.txt`
whereby whitelist contained:
```
childs
iff
lod
nto
ot
whitespaces
```
2017-11-09 17:19:26 -05:00
Daeyun Shin bf9d319489
Update helper.py
Search for libassimp.so in LD_LIBRARY_PATH if available.
2017-10-31 15:43:39 -07:00
Kim Kulling b0c435a66e Merge branch 'master' into feature/jassimp-classloader-license 2017-10-18 09:58:37 +02:00