v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,572 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

233 Commits (e75f7a596497b16a0e2be6f33ee8ef6d6cfb1e58)

Author SHA1 Message Date
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
Michael Dawson-Haggerty 7fff52bf86 cleaned up error message autoreplacement 2014-09-04 01:06:30 -04:00
Michael Dawson-Haggerty 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
jmas-ogawa da1c9e8434 Fixed half-width from the full-width double quotes. 2014-04-14 23:04:36 +09:00
shaded enmity 050b38a69f Readme and cosmetics 
Signed-off-by: shaded enmity <arul@shadeds-Mac.local>
 2014-03-20 17:25:35 -07:00
shaded enmity aa8bdba920 Merge branch 'master' of https://github.com/Seed-Of-Hate/assimp 
Mistake
 2014-03-20 17:15:38 -07:00
shaded enmity 73c482a293 iOS Path Update 
Signed-off-by: shaded enmity <arul@shadeds-Mac.local>
 2014-03-20 17:15:09 -07:00
Seed-Of-Hate 81cc2c5de3 Update README.md 2014-03-20 17:11:46 -07:00
shaded enmity dd6a624f15 iOS Toolchain Readme 
Signed-off-by: shaded enmity <arul@shadeds-Mac.local>
 2014-03-20 16:27:49 -07:00
shaded enmity 2dc5a46e99 Zombie Removal 
Signed-off-by: shaded enmity <arul@shadeds-Mac.local>
 2014-03-20 16:25:07 -07:00
shaded enmity 9f4623bec7 iOS Toolchain Update 
Signed-off-by: shaded enmity <arul@shadeds-Mac.local>
 2014-03-20 16:21:28 -07:00
autosquid fd4f7f4572 for python binding to work on mac 
add dylib to ext_whitelist for posix system
 2014-03-11 00:34:49 +08:00
Michael Dawson-Haggerty f1e43f560a added additional search paths for dll on windows 2013-11-12 22:06:42 -05:00
Eximius e0935c7ec5 PyAssimp optimize: load Armadillo: 33.8s -> 6.7s 2013-11-03 08:53:58 +00:00
Faule Socke 945231ba94 Now actually fixed the bug with the normals. 
pyassimp returned a list instead of a numpy array when the normals were
empty. This also applies to texture coordinates and other stuff which is
explicitly converted in _finalize_mesh.
 2013-07-29 01:24:22 +02:00
Faule Socke 43ff04a53b Fixed a bug in the bugfix -.- 2013-07-28 22:22:49 +02:00
Faule Socke 3c02d24bf0 Fixed a bug returning not all material properties when accessing them. 
Also fixed another bug occouring when no normals are provided in sample.py (lists do not have a any() method).
 2013-07-28 02:10:49 +02:00
Bill Roeske 2494608927 [pyassimp] Fix py3.3 + 64bits issues 
64-bit Compatibility:

The first four characters of a String material property would be cut
off. A String's length is defined in structs.py as a c_size_t
variable, which is 8 bytes wide on 64-bit Python. However, when an
aiString is used as an aiMaterial property in C/C++, the length is
truncated down to a 4-byte value on 64-bit machines (see
MaterialSystem.cpp aiMaterial::AddProperty() for details). A new
struct was declared in structs.py (MaterialPropertyString) and used
in core._get_properties().

Python 3.3 Compatibility:

The built-in function hasattr() changed in Python 3.2 to not
trap exceptions, which means a NULL pointer ValueException now
escaped when checking if a pointer was valid (hasattr(obj,
'contents') in core.call_init()) (see
http://bugs.python.org/issue9666 for details). A new helper
function was defined that preserves the legacy functionality of
trapping the exceptions (helper.hasattr_silent()) and used
throughout the code as a replacement for hasattr().

String objects would import as "bytes" rather than as a
string. This was most noticeable in the key names for
material properties, where the trailing ' of a bytes object
would remain after it was converted to a string. The
solution was to call decode() on the bytes object using
utf-8 decoding. This applies to various parts of core.py.

Closes #35
 2013-06-03 10:38:30 +02:00
Séverin Lemaignan 43dd6fb3bc [pyassimp] Check cmd line args in sample.py 2013-06-03 10:37:48 +02:00
Séverin Lemaignan 024bd4c470 [pyassimp] Handle diffuse/ambient values stored as vec3 instead of vec4 2013-06-03 10:22:39 +02:00
Séverin Lemaignan da140f2a05 [pyassimp] Minor tuning in 3d_viewer.py 2013-03-30 14:35:50 +01:00
Séverin Lemaignan fa7ff915c1 [pyassimp] Renamed the 3d for better clarity + added a short README 2013-03-30 14:35:21 +01:00
Séverin Lemaignan 3574b6973c [pyassimp] Make sure sample.py and quicktest.py work 2013-03-30 14:35:21 +01:00
Séverin Lemaignan fb280d7cf5 [pyassimp] Make it easier to import pyassimp 
'import pyassimp' (instead of 'from pyassimp import core') is now sufficient
 2013-03-30 14:35:21 +01:00
Séverin Lemaignan b00ee8b24a [pyassimp] Minor fixes to the simplified open_gl viwer 2013-03-30 14:35:21 +01:00
Séverin Lemaignan bf7d39280e [pyassimp] Simplified and beautify simple_opengl_viewer.py 
Since the new SDL based viewer is much better suited to interactive exploration, simplify
the basic OpenGL viewer to make it an easy introductive read.
 2013-03-30 14:35:21 +01:00
Alexander Gessler c50926b43b Merge pull request #10 from severin-lemaignan/for-upstream 
[pyassimp] New sample application based on SDL/pygame + various fixes
 2013-01-19 17:48:22 -08:00
Rodrigo Benenson c883967735 Fixed pyassimp core.py 2012-11-29 19:07:56 +01:00
Rodrigo Benenson 24927ff4cc fixed sample.py 2012-11-29 19:06:26 +01:00
Séverin Lemaignan 6bcc5db350 [pyassimp] Minor formatting in README.md 2012-11-10 23:55:52 +01:00
Séverin Lemaignan d3dbde02d6 [pyassimp] Simplified and beautify simple_opengl_viewer.py 
Since the new SDL based viewer is much better suited to interactive exploration, simplify
the basic OpenGL viewer to make it an easy introductive read.
 2012-11-10 23:55:39 +01:00
Séverin Lemaignan 2cdda51455 [pyassimp] Added a new pygame/sdl based OpenGL viewer 
This viwer uses a shader-based pipeline and has working keyboard/mouse
controls.

Makes a starting point for 'modern' OpenGL apps.
 2012-11-10 23:52:42 +01:00
Séverin Lemaignan f1bf843b55 [pyassimp] Remove obsolete code 2012-11-10 23:02:11 +01:00
Séverin Lemaignan 76d2eb7057 [pyassimp] Rework material dict 
- Normalize the names
- Do not create numpy arrays for the properties
 2012-11-10 22:57:07 +01:00
Séverin Lemaignan bfbcdfbae1 [pyassimp] Fixed transformations in bounding box computation 2012-11-10 22:44:15 +01:00
aramis_acg 6d3cedc0b1 - add missing files from the last commit 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1334 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-11-10 16:01:55 +00:00
aramis_acg 4286c72e60 merge severin-lemaignan:for-upstream from github. This is a full rewrite of pyassimp, rendering it much easier to use. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1332 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-11-09 11:39:34 +00:00
aramis_acg 54040901f0 - update Assimp.NET 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1330 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-11-03 02:49:19 +00:00
scholza 9687531b20 jassimp initial import 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1297 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-07-24 19:11:04 +00:00
aramis_acg f7c232cfe8 merge git://github.com/gellule/assimp.git 
Before, neither the texture index nor its semantic were kept in the
returned output. Now GetMaterialProperties returns a (name, color,
material, texture) tuple. Name is the name of the material. Color is a
dictionary of color properties. Material is a dictionary of material
properties. Textures is a triply nested dictionary addressed by the
following: textures[index][semantic][key]. See assimp documentation for
the meaning of index, semantic, and keys in general.



git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1106 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-01-11 00:27:49 +00:00
aramis_acg 380737c4c4 merge git://github.com/gellule/assimp.git 
the strings used in materials and elsewhere in assimp. Because of this,
in PyAssimp3 strings in materials don't work properly on 64 bits
platforms. This commit adds a StringUInt32 ctypes structure and use it
in GetMaterialProperties as a workaround.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1105 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-01-11 00:26:54 +00:00
aramis_acg 3548127f02 # PyAssimp3: add dynlib to dll search path. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1093 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-11-30 13:15:12 +00:00
aramis_acg 6dc3bc1c88 # PyAssimp: fix data type for aiString::length. Thanks to Gellule for the patch. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1091 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-11-29 13:34:48 +00:00
mmathias01 7b14ea616e Update iOS README.txt, improve iOS build script and toolchain files. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1090 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-11-24 11:58:24 +00:00
mmathias01 9a4386ad16 Initial iOS build script and CMake toolchain files. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1089 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-11-24 11:01:19 +00:00
mmathias01 213c6c95c3 Creating initial iOS port folder and README, real iOS build scripts to follow 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1087 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-11-24 07:28:22 +00:00
aramis_acg dc2bf5d6bd + add rudimentary Python3 version of PyAssimp. Conversion using 2to3 plus some manual tweaks. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1057 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-07-20 00:36:26 +00:00
aramis_acg 969c2ccf9f - PyAssimp: move structsgen.py script away from /scripts and place it in a sub-folder of port/PyAssimp. This is consistent with the way how SWIG-dependent bindings handle such files. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1049 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-07-17 01:55:58 +00:00
aramis_acg 1decdf999c + really add rudimentary test script to batch-load all test files using pyassimp 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@952 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-04-19 20:51:59 +00:00
aramis_acg 9350d0e1a6 - update pyassimp genstructs script to work with the latest headers, add rudimentary test script to batch-load all test files using pyassimp 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@951 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-04-19 20:48:33 +00:00
aramis_acg 473dae7876 + add Delphi Units to access the C DLL interface to /port. Thansk to Ed Diana for the patch. This relates to tracker id [3212646] (https://sourceforge.net/tracker/?func=detail&aid=3212646&group_id=226462&atid=1067634) 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@945 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-04-08 16:05:46 +00:00
aramis_acg d54a841f06 - remove unneeded Assimp.net post build event. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@866 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-11-23 19:01:15 +00:00
aramis_acg 03e6ab451d - update Assimp.NET. Fix SWIG output folder & add missing ProgressHandler.h %include. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@865 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-11-23 08:45:32 +00:00
klickverbot 3bf11785c8 Whitespace cleanup. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@859 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-11-21 19:57:34 +00:00
klickverbot 6744cb32bc Updated D bindings to the new API. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@858 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-11-21 19:52:11 +00:00
aramis_acg 05546ec7b6 really update C# Readme. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@849 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-11-21 16:43:41 +00:00