Commit Graph

205 Commits (aaa476cb104b974676d55d6fbee529a4ee2cf79a)

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