b10dc5747b
Revert "Remove experimental change unintentionally included in commit f001dfc8"
...
This reverts commit e45d120f21
2019-05-20 15:35:19 +02:00
8dacbf49f9
Merge branch 'master' into issue-2339
2019-05-01 19:47:36 +02:00
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
9b9b2c8339
Fix typo on README.md
...
changing "fascade" to "facade"
2019-04-14 10:13:32 -07:00
e45d120f21
Remove experimental change unintentionally included in commit f001dfc8
2019-03-29 18:43:57 -04:00
f001dfc840
* Fix error in previous commit improving imports
2019-03-29 18:36:17 -04:00
5a53fbd65f
port/PyAssimp/pyassimp/: Fix new warnings
2019-03-29 18:36:17 -04:00
efbb85721c
port/PyAssimp/pyassimp/: remove several unised imports
2019-03-29 18:36:17 -04:00
1b9157440f
port/PyAssimp/pyassimp/structs.py: remove unused import of c_int
2019-03-29 18:36:17 -04:00
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
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
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
e849b94f68
port/PyAssimp/pyassimp/core.py & helper.py: catch specific exceptions instead of BaseException
2019-03-29 18:36:17 -04:00
51844b206d
port/PyAssimp/pyassimp/formats.py: add missing comma (implicit string concatenation, assumed unintentional)
2019-03-29 18:36:17 -04:00
4e714fce0e
port/PyAssimp/pyassimp/core.py: remove unused import & second import of ctypes
2019-03-29 18:36:17 -04:00
49033513ef
port/PyAssimp/pyassimp/core.py: remove deprecated unused import & unnecessary from ctype import pointer
2019-03-29 18:36:17 -04:00
eb81619e56
Fix core.py raising string instead of correct RuntimeError
2019-03-29 18:36:17 -04:00
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
2432abacc7
Update README.md
...
Update doc.
2019-01-27 21:11:52 +01:00
f384d1221a
Make this public for JaiDebug and to pass quality checks.
2019-01-08 13:55:07 -05:00
d2f6c6d65e
Add ProgressHandler support.
2019-01-08 11:19:25 -05:00
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
21c162edf1
Merge branch 'master' into patch-1
2018-12-30 21:40:01 +01:00
ae31be1e23
next try.
2018-12-30 17:06:50 +01:00
ba80410c48
fix review findings.
2018-12-30 15:56:42 +01:00
7c23a6c5ca
fix review findings.
2018-12-30 11:41:58 +01:00
69ea55d180
Fix: except `SyntaxError` for py3 viewer
...
Following https://www.python.org/dev/peps/pep-3110/
2018-12-30 02:59:49 +01:00
df8a9450c8
Merge branch 'master' into coverity_scan
2018-12-26 20:43:04 +01:00
82cd16ab83
Merge branch 'kimkulling-dev' of https://github.com/assimp/assimp into kimkulling-dev
2018-12-26 09:50:19 +01:00
b3c2fdc11d
python: fix review findings.
2018-12-23 14:28:40 +01:00
6631f7877a
Update Jassimp.java
...
Fix another misinterpretation from the JNI-interface.
2018-12-23 13:37:03 +01:00
7eee959d55
Review: fix wrong interpretation of methods for JNI.
2018-12-23 13:12:57 +01:00
e9d1330edd
Fix next finding.
2018-12-23 12:01:08 +01:00
f73dd52956
Fix next finding.
2018-12-23 11:58:48 +01:00
3087ebb93a
JAssimp: fix simple code analysis issues.
2018-12-23 11:57:32 +01:00
7ce8c9778b
added arm64e to iOS build script
...
added arm64e iOS cmake file
2018-12-20 16:50:38 +02:00
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
8cb0b4ce2b
Updated pyassimp function description
2018-09-21 11:02:14 +10:00
ef4e317625
Improved some comments
2018-09-21 10:51:38 +10:00
3402cd81c7
Added interface to 'aiExportSceneToBlob()' for pyassimp
2018-09-21 10:31:21 +10:00
0adc032f69
Updated to be in sync with assimp header files
2018-09-14 13:09:44 +10:00
fdf52f3d25
Build Python representation for metadata.
2018-09-02 00:52:24 +02:00
8bbfac1f04
Factor out Assimp string -> Python string conversion code.
2018-09-02 00:51:14 +02:00
475ed6fdc3
Fix metadata property type declarations.
2018-09-01 10:15:09 +02:00
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
ecd24a736c
Add missing metadata fields
2018-08-24 12:06:24 +10:00
597628f43a
Prevent 'AttributeError' when printing object attributes
2018-08-24 12:03:54 +10:00
0adc793eb4
Lipo the debug binaries by appending d to their name
2018-07-01 14:53:05 +03:00
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
1b7f3de636
assimp will now be correctly built with -O3 or -Og based on build type
2018-06-27 13:26:01 +03:00
35871b6c37
Use -g or -O3 based on debug/release
2018-06-27 13:04:49 +03:00
5428fa6dd5
Norod: Managed to get it past the make file creation phase
2018-06-27 11:39:14 +03:00
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
d4c7eb3b67
Update helper.py
...
Remove deprecated comment.
2018-06-22 16:14:20 +02:00
4a720511e4
Update helper.py
...
Remove dead code.
2018-06-22 16:13:46 +02:00
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
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
64ba839f47
Update Readme.md
...
Fix the link to the active repo containing the assimp-net-code.
2018-05-31 20:04:48 +02:00
6e49d288c3
now only x86_64 builds :(
2018-05-30 09:40:18 +03:00
e3847b7996
Default to release builds, update CC/LD/etc flags
2018-05-30 09:21:28 +03:00
c12c56d33e
[pyassimp] README.{md->rst} to please distutils. Bumped to 4.1.3
2018-05-29 10:47:40 +01:00
b6888962ed
[pyassimp] Updated setup.py
2018-05-28 23:53:28 +01:00
3023df8f7e
Norod: Configurable from script parameters: dynamic libraries and debug/release build type
2018-05-28 17:36:43 +03:00
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
dbcffaf4d1
Merge branch 'master' into ios-fat-binaries
2018-05-17 22:41:54 +02:00
f4fd5840b1
Encode filename using file system encoding instead of ASCII
2018-05-15 15:35:44 +02:00
d8af63519d
Create fat binaries for libIrrXML and libzlibstatic too
2018-05-15 12:38:50 +02:00
643cf9bea2
Norod: Brought back 32bit archs
2018-03-20 17:09:50 +02:00
c1f6683b20
Partial revert, build only 64bit targets
2018-03-20 14:45:54 +02:00
c2f22be99a
Norod: Default build type is set as Release, no shared libraries
2018-03-20 13:46:03 +02:00
e2e09ba2fa
Norod: Support building assimp as dylib for iOS (set as default)
2018-03-19 22:51:52 +02:00
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
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
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
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
d3150eedfb
Version bump pyassimp
2017-12-29 19:46:16 +02:00
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
bf9d319489
Update helper.py
...
Search for libassimp.so in LD_LIBRARY_PATH if available.
2017-10-31 15:43:39 -07:00
b0c435a66e
Merge branch 'master' into feature/jassimp-classloader-license
2017-10-18 09:58:37 +02:00
42e2c30b4b
Added helper getters for casting metadata payloads
2017-10-17 11:04:51 -05:00
1aa15c8069
Fix header and remove old debug code
2017-10-17 10:35:50 -05:00
100fa76a90
Merge remote-tracking branch 'upstream/master' into feature/collada-up_axis-api-improvements
2017-10-17 10:29:03 -05:00
82debbf54a
Fixed copyright notice for IHMC jassimp improvements to BSD. Updated README
2017-10-16 12:41:50 -05:00
5e00d4d5cb
Populate metadata on Java objects.
2017-10-11 11:07:49 -05:00
a7c1dde56e
Added return statement to Write
2017-10-11 11:04:52 -05:00
0229a3acf3
Added supported for custom IO Systems in Java. Implemented ClassLoader IO System
2017-10-11 11:04:52 -05:00
33a54f021e
Fix small bug in getStaticField
2017-10-11 11:03:29 -05:00
00eb2e401a
Added field and getter for metadata entries to AiNode.java.
2017-10-11 10:56:40 -05:00
3ef1f37a80
Create AiMetadataEntry.java for jassimp port.
2017-10-11 10:54:27 -05:00
042597552a
split setup.py into multiple lines
...
to make it easier for patching in Debian...
2017-09-02 19:46:57 +02:00
37f5619149
created a python3 version of the 3dviewer and fixed the / = float in py3
2017-08-23 20:02:58 +02:00
36425677c7
Merge pull request #1365 from ihmcrobotics/feature/custom-library-loader
...
Feature/custom library loader
2017-07-30 00:14:03 +02:00
ab9dda594d
Added return statement to Write
2017-07-28 15:08:59 -05:00
be787f5c6c
Added supported for custom IO Systems in Java. Implemented ClassLoader IO System
2017-07-27 17:42:01 -05:00
21391b1f74
Added javadoc for the JassimpLibraryLoader
2017-07-26 16:44:37 -05:00
c4d0567a8a
Provided access to the library loading code to allow custom library loaders
2017-07-26 16:41:09 -05:00
8243b01c06
Added missing include to stdlib.h and remove load library call
2017-07-26 15:48:42 -05:00
01a288ff35
Added support for python3
...
When using python3 and running any of the provided scripts I get:
NameError: name 'unicode' is not defined. Python3 does not have unicode. Using try-except method helps to support python3
2017-07-20 22:48:07 -07:00
8648fd223e
update python readme.
2017-07-12 20:35:50 +02:00
947e4389ce
closes https://github.com/assimp/assimp/issues/1335 : use correct path
...
for compilers.
2017-07-10 13:39:29 +02:00
Andor Goetzendorff
Kim Kulling
Huarong Chen
Simon Puente
Charlie Gettys
Séverin Lemaignan
Marc Kurtz
Kim Kulling
carasuca
Maxim Petrovsky
Nicholas Woodfield
Vincent Fazio
Wojciech Matyjewicz
Doron Adler
Ravin Kumar
Séverin Lemaignan
Lieven Dekeyser
Robert Spencer
Unknown
Daeyun Shin
Doug Stephen
Jesper Smith
IOhannes m zmölnig
Mel Massadian
Alexander Gessler
rodrigo figueroa