Commit Graph

288 Commits (6295e4dbc43230999a481d80810453040744cc2d)

Author SHA1 Message Date
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
Doug Stephen 42e2c30b4b Added helper getters for casting metadata payloads 2017-10-17 11:04:51 -05:00
Doug Stephen 1aa15c8069 Fix header and remove old debug code 2017-10-17 10:35:50 -05:00
Doug Stephen 100fa76a90 Merge remote-tracking branch 'upstream/master' into feature/collada-up_axis-api-improvements 2017-10-17 10:29:03 -05:00
Jesper Smith 82debbf54a Fixed copyright notice for IHMC jassimp improvements to BSD. Updated README 2017-10-16 12:41:50 -05:00
Doug Stephen 5e00d4d5cb Populate metadata on Java objects. 2017-10-11 11:07:49 -05:00
Jesper Smith a7c1dde56e Added return statement to Write 2017-10-11 11:04:52 -05:00
Jesper Smith 0229a3acf3 Added supported for custom IO Systems in Java. Implemented ClassLoader IO System 2017-10-11 11:04:52 -05:00
Doug Stephen 33a54f021e Fix small bug in getStaticField 2017-10-11 11:03:29 -05:00
Doug Stephen 00eb2e401a Added field and getter for metadata entries to AiNode.java. 2017-10-11 10:56:40 -05:00
Doug Stephen 3ef1f37a80 Create AiMetadataEntry.java for jassimp port. 2017-10-11 10:54:27 -05:00
IOhannes m zmölnig 042597552a split setup.py into multiple lines
to make it easier for patching in Debian...
2017-09-02 19:46:57 +02:00
Mel Massadian 37f5619149 created a python3 version of the 3dviewer and fixed the / = float in py3 2017-08-23 20:02:58 +02:00
Alexander Gessler 36425677c7 Merge pull request #1365 from ihmcrobotics/feature/custom-library-loader
Feature/custom library loader
2017-07-30 00:14:03 +02:00
Jesper Smith ab9dda594d Added return statement to Write 2017-07-28 15:08:59 -05:00
Jesper Smith be787f5c6c Added supported for custom IO Systems in Java. Implemented ClassLoader IO System 2017-07-27 17:42:01 -05:00
Jesper Smith 21391b1f74 Added javadoc for the JassimpLibraryLoader 2017-07-26 16:44:37 -05:00
Jesper Smith c4d0567a8a Provided access to the library loading code to allow custom library loaders 2017-07-26 16:41:09 -05:00
Doug Stephen 8243b01c06 Added missing include to stdlib.h and remove load library call 2017-07-26 15:48:42 -05:00
rodrigo figueroa 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
Kim Kulling 8648fd223e update python readme. 2017-07-12 20:35:50 +02:00
Kim Kulling 947e4389ce closes https://github.com/assimp/assimp/issues/1335: use correct path
for compilers.
2017-07-10 13:39:29 +02:00
Kim Kulling 7b15ec0b64 pyassimp: update readme. 2017-07-01 11:02:03 +02:00
Robert Spencer c6d888531b Fixes parameters to pyassimp.load
Commit 704e57db4e changed the order
of the parameters to `pyassimp.load`.  The new order groups
`filename` and `file_type` which is preferable, but the samples and
other calls to `load` still point to the old order.  This fixes that
with named arguments where necessary.
2017-06-25 15:18:53 +02:00
Séverin Lemaignan 4d37f90ea5 Revert "Installing assimp library as well"
This reverts commit 33bd5cfcfb.

Installing the assimp library from setup.py is *not* a good idea as
it will break every packaging effort.

Besides, the original commit relies on an hard-coded path to find the
library that may not exist.
2017-06-06 15:14:18 +01:00
Robert Spencer 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
Guillaume Bittoun 910e0ddc5a Adding a fallback to shader version 120 when version 130 failed to compile 2017-04-08 12:14:30 +02:00
Guillaume Bittoun 33bd5cfcfb Installing assimp library as well 2017-04-08 12:14:30 +02:00
Kim Kulling 1ca54c0b2f closes https://github.com/assimp/assimp/issues/1211: defensice handling
of utf-8 decode issues.
2017-03-23 17:11:52 +01:00
Kim Kulling 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
Antoine Bolvy 5dd1bb9d6c Export DefaultIOSystem and move it with DefaultIOStream to include/ instead of code/ 2017-02-28 11:44:04 +09:00
Quentin01 cf68e03b21 Creates the directory for the asset's extraction on Android 2017-02-27 18:26:44 -05:00
AntiMoron 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
Séverin Lemaignan 06fc901b7e
[pyassimp] Updated README 2016-12-19 21:19:55 +00:00
Séverin Lemaignan 87b3959614
[pyassimp] Added missing transformations.py library 2016-12-19 21:19:01 +00:00
Kim Kulling 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
Séverin Lemaignan e0534268d5 [pyassimp] New version of the pyASSIMP 3D viewer, with much improved 3D controls 2016-12-16 11:02:42 +00:00
Séverin Lemaignan 72371d2fa7 [pyassimp] Added missing requirement on numpy to setup.py 2016-12-16 10:33:29 +00:00
Séverin Lemaignan 3a43e0082a [pyassimp] Set version number to match Assimp's 2016-12-15 16:55:26 +00:00
Séverin Lemaignan 9aee9d6966 [pyassimp] Look as well for the assimp library using std 64bit path 2016-12-15 16:49:44 +00:00
Thiago Goulart 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
Kim Kulling bc0393669b Update setup.py
Update url of asset importer lib repo home.
2016-05-27 10:56:37 +02:00
Michael Görner 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
Kim Kulling 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
Steven Thompson 06e262f892 Added ability to export scenes with PyAssimp 2016-04-03 13:03:16 +01:00
Eric Engestrom 87e7cf00a2 Fix spelling mistakes 2016-04-03 01:38:00 +01:00
Steven Thompson 2c3bbe041a Set xrange to range for Python 3.0 and above 2016-03-27 20:12:22 +01:00
Kim Kulling aff932cd9c Fix license date. 2016-02-03 20:19:59 +01:00
Kim Kulling b77228c7ea Android build doc: reformatting. 2016-02-02 11:00:28 +01:00
Kim Kulling 219bf32efe Rename android renameRename android rename. 2016-02-02 10:59:07 +01:00
Kim Kulling 72d720ecfb Doc: use markup format for android build instructions. 2016-02-02 10:52:28 +01:00
Danke Xie b0148641e9 Make SmartLocalRef non-copyable 2015-12-19 09:13:28 -08:00
Danke Xie 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
Danke Xie 40ee575322 Add new light type 'ambient' to match light.h 2015-11-15 16:49:39 -08:00
Alexander Gessler 709f19e5ab Merge pull request #664 from Tcll/master
Added auto-detection of numpy
2015-10-04 16:59:24 +02:00
Tcll 5ce968c67f Added auto-detection of numpy 2015-09-28 14:18:22 -04:00
Tcll 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
Kim Kulling 524834c307 Fix line endings. 2015-08-08 18:02:37 +02:00
Kim Kulling e5b61e5553 Python 3d_viewer: init glut manually for windows ( https://github.com/assimp/assimp/issues/622 ). 2015-08-08 17:05:29 +02:00
Kim Kulling 85c8d7b89b PyViewer: Add local path search path for ssimp lib. 2015-08-08 17:04:46 +02:00
Brian Schwind 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
Alexander Gessler 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
Ser Lev Arris 38a1abc908 ... method name ... 2015-03-28 15:01:01 +01:00
Ser Lev Arris 19d9b31d56 makro »lprintf« substitution gcc warnings cleanup 2015-03-28 14:45:21 +01:00
Ser Lev Arris 311c1ecadb typo in method name fixed 2015-03-28 14:32:06 +01:00
Ser Lev Arris 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
Ser Lev Arris d2d41a8aee jni header update due new function 2015-03-27 19:03:58 +01:00
Ser Lev Arris bdf813ecf0 new function to get aiVectorKey size 2015-03-27 18:09:39 +01:00
Ser Lev Arris 9e4a499383 Fixes assimp/assimp#509 2015-03-27 11:04:23 +01:00
Ser Lev Arris 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
Ser Lev Arris 1ddcbf49da use ant to compile jassimp 2015-03-20 21:11:08 +01:00
arris69 9094770d38 fixed light and camera access. 2015-03-13 12:52:03 +01:00
arris69 8b22ba25ba removed debug function and add buildfile for android ndk-build command 2015-03-12 21:24:49 +01:00
arris69 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
Michael Dawson-Haggerty 25012f7b8a added list of supported formats, pulled from webpage and test/models 2015-01-27 22:53:31 -05:00
Michael Dawson-Haggerty 704e57db4e changed default postprocessing option to triangulate quad meshes 2015-01-27 22:47:05 -05:00
Alexander Gessler b6cc8d6da9 Add link to AssimpPascal headers
See https://github.com/ev1313/Pascal-Assimp-Headers
2014-12-12 02:43:15 +01:00
sth 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
enkore fdf78fc13b README: Add a few lines on how to compile jassimp-native 2014-12-06 15:53:56 +01:00
enkore 6b4cbeea40 Fix outright compiler error in jassimp.cpp 2014-12-06 15:52:44 +01:00
enkore 6829af0dd6 Fix broken ant build 2014-12-06 15:52:26 +01:00
Kim Kulling 06f80024cb Merge pull request #418 from xantares/patch-1
remove useless ASSIMP_BUILD_STATIC_LIB option
2014-12-04 17:20:38 +01:00
sth519 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
xantares d13b51b467 Update build.sh 2014-11-27 09:27:46 +01:00
Oliver Nagy 1e9f3a802d PEP8 and updated docu strings. 2014-11-23 15:42:19 +11:00
Oliver Nagy 3721b19a61 pyassimp/quicktest now runs without installing pyassimp first. 2014-11-23 15:42:11 +11:00
Oliver Nagy fc039ee0e2 pyassimp/quicktest is now Python 3 compatible. 2014-11-23 15:23:31 +11:00
Oliver Nagy f12a0a3b1c Replaced 'xrange' by 'range' to maintain Python 3.x compatibility. 2014-11-22 16:24:32 +11:00
Filip Wasil 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
Ryan Cole af4c30bc77 small typo fix
renamed getNumVertives to getNumVertices.
2014-09-12 01:48:41 +12:00
Michael Dawson-Haggerty 8d27a27445 fixed docstrings 2014-09-04 01:21:37 -04:00