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
7b15ec0b64
pyassimp: update readme.
2017-07-01 11:02:03 +02:00
c6d888531b
Fixes parameters to pyassimp.load
...
Commit 704e57db4e
2017-06-25 15:18:53 +02:00
4d37f90ea5
Revert "Installing assimp library as well"
...
This reverts commit 33bd5cfcfb
2017-06-06 15:14:18 +01:00
28da8c643d
Adds texture type enum to pyassimp
...
Keeping the same style of `postprocess.py`, this is a port of the aiTextureType enum in [`material.h`](https://github.com/assimp/assimp/blob/master/include/assimp/material.h ).
2017-04-26 15:05:45 +02:00
910e0ddc5a
Adding a fallback to shader version 120 when version 130 failed to compile
2017-04-08 12:14:30 +02:00
33bd5cfcfb
Installing assimp library as well
2017-04-08 12:14:30 +02:00
1ca54c0b2f
closes https://github.com/assimp/assimp/issues/1211 : defensice handling
...
of utf-8 decode issues.
2017-03-23 17:11:52 +01:00
1c6145b39e
Merge branch 'fix-include-api' of https://github.com/Lugdunum3D/assimp into Lugdunum3D-fix-include-api
2017-03-11 18:19:36 +01:00
5dd1bb9d6c
Export DefaultIOSystem and move it with DefaultIOStream to include/ instead of code/
2017-02-28 11:44:04 +09:00
cf68e03b21
Creates the directory for the asset's extraction on Android
2017-02-27 18:26:44 -05:00
81741628a8
Fix cpp std version at least c++11
...
There's list loop enumeration and incompatible template codes which may cause compile errors due to different compilers.
2017-01-25 15:38:20 +08:00
06fc901b7e
[pyassimp] Updated README
2016-12-19 21:19:55 +00:00
87b3959614
[pyassimp] Added missing transformations.py library
2016-12-19 21:19:01 +00:00
3d22d06a2a
Merge pull request #1113 from severin-lemaignan/master
...
[pyassimp] Minor changes (x64 lib path, version number, deps)
2016-12-19 21:38:53 +01:00
e0534268d5
[pyassimp] New version of the pyASSIMP 3D viewer, with much improved 3D controls
2016-12-16 11:02:42 +00:00
72371d2fa7
[pyassimp] Added missing requirement on numpy to setup.py
2016-12-16 10:33:29 +00:00
3a43e0082a
[pyassimp] Set version number to match Assimp's
2016-12-15 16:55:26 +00:00
9aee9d6966
[pyassimp] Look as well for the assimp library using std 64bit path
2016-12-15 16:49:44 +00:00
867063d8c3
Fix compilation of iOS static libraries.
...
1. Building for any targets using clang-703.0.31 failed with multiple errors. Using c++11 or c++14 as -std builds successfully.
2. Building for arm64 failed compilation due to duplicate constructors in rapidjson's document.h.
2016-06-24 02:24:11 -07:00
bc0393669b
Update setup.py
...
Update url of asset importer lib repo home.
2016-05-27 10:56:37 +02:00
f1a984bd3b
only check a library folder if it actually exists
...
otherwise this breaks for no reason if /usr/local/lib is missing.
2016-04-22 11:35:44 +02:00
001eede34c
Merge pull request #847 from stevenjt/python-scene-export
...
Added ability to export scenes with PyAssimp
2016-04-03 17:43:05 +02:00
06e262f892
Added ability to export scenes with PyAssimp
2016-04-03 13:03:16 +01:00
87e7cf00a2
Fix spelling mistakes
2016-04-03 01:38:00 +01:00
2c3bbe041a
Set xrange to range for Python 3.0 and above
2016-03-27 20:12:22 +01:00
aff932cd9c
Fix license date.
2016-02-03 20:19:59 +01:00
b77228c7ea
Android build doc: reformatting.
2016-02-02 11:00:28 +01:00
219bf32efe
Rename android renameRename android rename.
2016-02-02 10:59:07 +01:00
72d720ecfb
Doc: use markup format for android build instructions.
2016-02-02 10:52:28 +01:00
b0148641e9
Make SmartLocalRef non-copyable
2015-12-19 09:13:28 -08:00
2e831604e9
Use SmartLocalRef to automatically release localrefs in jassimp.cpp
...
- Add SmartLocalRef class
- Use it to automatically delete localrefs of Java objects, generated
by FindClass, createInstance, getField, NewStringUTF, etc.
- Tested with models with more than 512 nodes.
2015-12-19 01:30:02 -08:00
40ee575322
Add new light type 'ambient' to match light.h
2015-11-15 16:49:39 -08:00
709f19e5ab
Merge pull request #664 from Tcll/master
...
Added auto-detection of numpy
2015-10-04 16:59:24 +02:00
5ce968c67f
Added auto-detection of numpy
2015-09-28 14:18:22 -04:00
2e725c0dc5
Added auto-detection of numpy
...
If numpy is not installed, pyassimp returns lists to allow the user to manage the data type.
2015-09-28 14:15:06 -04:00
524834c307
Fix line endings.
2015-08-08 18:02:37 +02:00
e5b61e5553
Python 3d_viewer: init glut manually for windows ( https://github.com/assimp/assimp/issues/622 ).
2015-08-08 17:05:29 +02:00
85c8d7b89b
PyViewer: Add local path search path for ssimp lib.
2015-08-08 17:04:46 +02:00
bcb0ca3efa
Include correct headers, fix string length bug
...
- AssimpPCH.h appears to have been removed in #536
- There was a bug where if your model data had a null terminator, AndroidJNIIOSystem would incorrectly calculate the number of bytes it needed to write to the file (since it reads a compressed file from the Android assets, and then writes it to the internalDataPath directory for later importing)
2015-07-20 22:21:17 -04:00
b66e9acd72
Delete old Assimp.NET code and replace by a link to assimp-net, which is now the preferred way of using assimp from .net.
2015-04-16 12:37:49 +02:00
38a1abc908
... method name ...
2015-03-28 15:01:01 +01:00
19d9b31d56
makro »lprintf« substitution gcc warnings cleanup
2015-03-28 14:45:21 +01:00
311c1ecadb
typo in method name fixed
2015-03-28 14:32:06 +01:00
79768ddc14
prepare for removal of hardcoded struct and primitive sizes.
...
added getter to determine struct and primitive sizes.
(cleanup in the java code can be done later.)
2015-03-28 14:21:47 +01:00
d2d41a8aee
jni header update due new function
2015-03-27 19:03:58 +01:00
bdf813ecf0
new function to get aiVectorKey size
2015-03-27 18:09:39 +01:00
9e4a499383
Fixes assimp/assimp#509
2015-03-27 11:04:23 +01:00
f3ed79ab41
make use of travis languages, build java jar too.
...
https://github.com/assimp/assimp/pull/505#issuecomment-84198261
2015-03-21 10:32:15 +01:00
1ddcbf49da
use ant to compile jassimp
2015-03-20 21:11:08 +01:00
9094770d38
fixed light and camera access.
2015-03-13 12:52:03 +01:00
8b22ba25ba
removed debug function and add buildfile for android ndk-build command
2015-03-12 21:24:49 +01:00
ead3b26ea9
no one ever tried this java stuff???
...
(crashes if the model has a lot of meshes...)
2015-03-12 20:37:33 +01:00
25012f7b8a
added list of supported formats, pulled from webpage and test/models
2015-01-27 22:53:31 -05:00
704e57db4e
changed default postprocessing option to triangulate quad meshes
2015-01-27 22:47:05 -05:00
b6cc8d6da9
Add link to AssimpPascal headers
...
See https://github.com/ev1313/Pascal-Assimp-Headers
2014-12-12 02:43:15 +01:00
da93f5eb78
Update README.md for the iOS port
...
Just a small update to reflect the current state of the iOS port.
2014-12-10 19:37:18 +01:00
fdf78fc13b
README: Add a few lines on how to compile jassimp-native
2014-12-06 15:53:56 +01:00
6b4cbeea40
Fix outright compiler error in jassimp.cpp
2014-12-06 15:52:44 +01:00
6829af0dd6
Fix broken ant build
2014-12-06 15:52:26 +01:00
06f80024cb
Merge pull request #418 from xantares/patch-1
...
remove useless ASSIMP_BUILD_STATIC_LIB option
2014-12-04 17:20:38 +01:00
4050f42ef1
Default to latest installed iOS SDK by default
...
The iOS 7.1 SDK isn't available anymore in the current version of Xcode, so the script doesn't work without modification.
By setting IOS_SDK_VERSION to an empty value, the script will default to a symlink* which always points to the latest installed SDK.
* /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk
2014-11-27 14:37:46 +01:00
d13b51b467
Update build.sh
2014-11-27 09:27:46 +01:00
1e9f3a802d
PEP8 and updated docu strings.
2014-11-23 15:42:19 +11:00
3721b19a61
pyassimp/quicktest now runs without installing pyassimp first.
2014-11-23 15:42:11 +11:00
fc039ee0e2
pyassimp/quicktest is now Python 3 compatible.
2014-11-23 15:23:31 +11:00
f12a0a3b1c
Replaced 'xrange' by 'range' to maintain Python 3.x compatibility.
2014-11-22 16:24:32 +11:00
7224476ee1
Android JNI asset extraction support (API 9+)
...
Signed-off-by: Filip Wasil <filip.wasil@tieto.com>
2014-10-07 16:33:43 +02:00
af4c30bc77
small typo fix
...
renamed getNumVertives to getNumVertices.
2014-09-12 01:48:41 +12:00
8d27a27445
fixed docstrings
2014-09-04 01:21:37 -04:00
7fff52bf86
cleaned up error message autoreplacement
2014-09-04 01:06:30 -04:00
5ae65987c0
added the ability to load from file objects with pyassimp.load, as opposed to only being able to load from paths
2014-09-04 01:04:00 -04:00
da1c9e8434
Fixed half-width from the full-width double quotes.
2014-04-14 23:04:36 +09:00
050b38a69f
Readme and cosmetics
...
Signed-off-by: shaded enmity <arul@shadeds-Mac.local>
2014-03-20 17:25:35 -07:00
aa8bdba920
Merge branch 'master' of https://github.com/Seed-Of-Hate/assimp
...
Mistake
2014-03-20 17:15:38 -07:00
73c482a293
iOS Path Update
...
Signed-off-by: shaded enmity <arul@shadeds-Mac.local>
2014-03-20 17:15:09 -07:00
81cc2c5de3
Update README.md
2014-03-20 17:11:46 -07:00
dd6a624f15
iOS Toolchain Readme
...
Signed-off-by: shaded enmity <arul@shadeds-Mac.local>
2014-03-20 16:27:49 -07:00
Kim Kulling
Kim Kulling
Maxim Petrovsky
Nicholas Woodfield
Vincent Fazio
Wojciech Matyjewicz
Doron Adler
Ravin Kumar
Séverin Lemaignan
Séverin Lemaignan
Andor Goetzendorff
Lieven Dekeyser
Robert Spencer
Unknown
Daeyun Shin
Doug Stephen
Jesper Smith
IOhannes m zmölnig
Mel Massadian
Alexander Gessler
rodrigo figueroa
Séverin Lemaignan
Guillaume Bittoun
Kim Kulling
Antoine Bolvy
Quentin01
AntiMoron
Thiago Goulart
Michael Görner
Steven Thompson
Eric Engestrom
Danke Xie
Tcll
Brian Schwind
Alexander Gessler
Ser Lev Arris
Michael Dawson-Haggerty
sth
enkore
xantares
Oliver Nagy
Filip Wasil
Ryan Cole
jmas-ogawa
shaded enmity
Seed-Of-Hate