Commit Graph

228 Commits (8be196f77de94e42456b2fa39511b037181e0a77)

Author SHA1 Message Date
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
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