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

1233 Commits (adc3de3882824f82825933e7d36f372a1672d317)

Author SHA1 Message Date
Séverin Lemaignan adc3de3882 Compute and display FPS in Simple_OpenGL demo application 2012-10-23 14:56:01 +02:00
Séverin Lemaignan 3b1464a6d9 [pyassimp] OpenGL Viewer: improved camera behaviour, simple keyboard control 
While here, lots of cleaning + short docs
 2012-10-23 14:56:01 +02:00
Séverin Lemaignan ab268b9f48 [pyassimp] Added a NullHandler to the logger 
While here, many cleaning in log messages + promote some warning to errors
 2012-10-23 14:55:53 +02:00
Séverin Lemaignan 18825179d0 [pyassimp] Support Python3 
This include the renaming of __init__.py in core.py to solve tricky imports issues

sample.py runs correctly, except that the ctype structure returned is not
complete. The issue is very similar to the one we have with 32bits/64bits
issues

Removed the PyAssimp3 subproject project.

To maintain source compatibility between py2 and py3, python >= 2.6 is now required
 2012-10-23 14:55:53 +02:00
Séverin Lemaignan a6a30233e1 [pyassimp] Added a setup.py 2012-10-23 14:55:53 +02:00
Séverin Lemaignan 79ed83244c [pyassimp] Added an simple OpenGL viewer for pyassimp 
Based on pyOpenGL.

Uses VBO/IBO for reasonable performances.

Support only basic materials (no textures)
 2012-10-23 14:55:53 +02:00
Séverin Lemaignan 36c424bfb2 [pyassimp] Import post-processing constants in pyassimp 2012-10-23 14:55:53 +02:00
Séverin Lemaignan 4e9214c624 [pyassimp] Apply post-processing on ctypes ASSIMP structure 
- bind meshes to their materials
- add transformations to cameras
 2012-10-23 14:55:53 +02:00
Séverin Lemaignan 511f80d047 [pyassimp] Use numpy when possible 
It allows for faster access to data, brings useful methods and is
pyOpenGL-friendly

It eases manipulation of matrices and vectors (many operations like
product, transposition, etc. are available)

numpy.array are also directly usable in many places in pyopengl.

And make sure we store floats as float32 to please OpenGL

Update sample.py to be happy with numpy arrays
 2012-10-23 14:55:52 +02:00
Séverin Lemaignan 0bda286360 [pyassimp] sample.py: only iterate on existing texture coords 2012-10-23 14:55:52 +02:00
Séverin Lemaignan 3518232ddb [pyassimp] Updated the README to reflect recent changes 2012-10-23 14:55:52 +02:00
Séverin Lemaignan 8e9921fe32 [pyassimp] Moved test scripts to scripts/ 2012-10-23 14:55:52 +02:00
Séverin Lemaignan b20b1dfceb [pyassimp] Updated sample.py to match the new API 
While here, added simple node walking
 2012-10-23 14:55:52 +02:00
Séverin Lemaignan 7000ea05c5 [pyassimp] Large rewrite: more generic, easier to use 
Main changes:
- dynamic creation of idiomatic python fields corresponding to ASSIMP ones,
- hidding of pointers,
- use of numpy for transformation and mesh data storage

For instance, to access the list of meshes of a children of the root
node, previously we did:

scene.mRootNode.contents.mChildren[1].contents.mMeshes

Now, it is:
scene.rootnode.children[1].meshes

Arrays are now regular Python list.

Also added a 'post-processing' to access directly to certain objects,
and not through their index. For instance:

Before:

mymesh_id = scene.mRootNode.contents.mChildren[1].contents.mMeshes[2]
mymesh = scene.mMeshes[mymesh_id]

Now:
scene.rootnode.children[1].meshes[2]

Initialization of the Python wrappers is not delayed anymore: everything
is done during the loading (which leads to long start time, but prevent
unexpected slowing at runtime)

This commit also remove several 'ad-hoc' manipulation that should not
be needed anymore.

While here, use Python logging when necessary.
 2012-10-23 14:53:00 +02:00
Séverin Lemaignan bed0e4e83f [pyassimp] Add /usr/lib to the path where to look for libassimp 2012-10-23 14:52:47 +02:00
Séverin Lemaignan 848c875ec2 [pyassimp] Update, fix and beautify structs.py 
structgen.py has been modified to make the resulting structs.py
more readable: comments should now correctly appear next to the
fields in the generated structs.py

Do not discard the size_t type. size_t was wrongly replaced by uint in ctypes
This caused corruptions when running pyassimp with a 64bits assimp library

While here, updated the max size of some meshes attributes (that leads
to corruptions as well)

While here, update paths to find the assimp headers

Updated structs.py to match assimp 2.0.863 (Ubuntu 12.04). It has been
also tested with libassimp as build from the trunk.
 2012-10-23 14:41:52 +02: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
scholza 26dbeeb6e0 created jassimp folder 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1296 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-07-24 19:04:32 +00:00
aramis_acg 8eb6e077d3 - fix typo on test/CMakeLists.txt 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1295 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-07-24 01:04:45 +00:00
aramis_acg aaf0be0bbf - CMake overhaul. Add proper FindXXX scripts for PkgMacros, ZLIB, DirectX. Isolate MSVC-specific defines. Add newer boost versions to boost whitelist. Many thanks to Mr. S. for the patch! (see http://zfx.info/viewtopic.php?f=9&t=334&p=32190#p32190) 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1293 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-07-17 22:56:15 +00:00
aramis_acg 1378579224 - remove aiProcess_Debone from aiProcessPreset_TargetRealtime_MaxQuality as it seems to be causing issues (read: is buggy, consider kicking it out again). See http://zfx.info/viewtopic.php?f=5&t=2439&p=32278#p32223 for more info. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1292 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-07-17 22:25:45 +00:00
aramis_acg d8c2295962 - blend: compute parent inverses on your own instead of trusting the blend input. Thanks to Kalmár Dániel for the patch. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1291 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-07-17 22:18:10 +00:00
kimmi 3f47ac3fe2 Bugfix : Fix an invalid getName function. Thanks to cyrilchampier. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1290 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-07-17 21:48:03 +00:00
aramis_acg 56bf755c4b - Ifc: fix handling of curves with RADIAN parameters. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1289 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-07-12 00:20:28 +00:00
aramis_acg d7fe61c255 - Ifc: improved subsampling of curves for IfcSweptDiskSolid entities. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1288 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-07-11 23:08:44 +00:00
aramis_acg d7410e6f08 - Ifc: implement basic support for IfcSweptDiskSolid elements. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1287 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-07-11 22:11:16 +00:00
aramis_acg c70646912c - add IFCZIP support to IFC loader. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1286 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-07-11 19:18:51 +00:00
aramis_acg f849f6d9bd - merge 3.0 up to r1281 in trunk 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1283 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-07-11 12:53:04 +00:00
aramis_acg 21a0a222b8 - apply https://github.com/assimp/assimp/pull/5 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1273 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-07-08 01:32:29 +00:00
jonathanklein e658a7f98f Added Animationoverview diagram to documentation 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1270 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-06-26 19:46:18 +00:00
aramis_acg 79711b018a - blend: patch for material importer, read emissive color. Thanks to Laurent Belcour for the patch! 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1269 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-06-26 19:16:09 +00:00
kimmi 4413006cbf update revision 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1261 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-06-18 21:31:59 +00:00
kimmi eb3fd360f4 - Bugfix : Fix invalid variable ASSIMP_LIBRARY_DIRS. 
- Update : Introduce a subversion-revision variable for the right patch version.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1260 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-06-18 19:33:17 +00:00
aramis_acg 141104f3f5 - start linklist for good IFC test file sources. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1259 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-06-17 12:18:37 +00:00
aramis_acg 1d7018c826 # fix bug in STEPFileReader, loader fails if string literals contain more than one ". Thanks to Juha Vesanen for the patch. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1258 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-06-17 12:15:49 +00:00
kimmi 48e2132f38 Bugfix: Add a missing CMake-config file. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1257 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-06-15 19:36:24 +00:00
kimmi 526150a8e3 Update: Debian-related cmake changes ( I changed the revision to 1256 instead of 1251 ). 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1256 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-06-11 11:49:08 +00:00
kimmi 97995e41f4 Debian-specific adapting cmake. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1255 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-06-05 19:30:45 +00:00
jonathanklein 29243071fa Ogre: Importerproperty to set Texture Mode from Filename (bla_n.png -> Normalmap etc.) 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1254 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-06-03 18:01:32 +00:00
jonathanklein 5b462d484b Ogre: small tweaks 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1253 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-06-03 11:06:47 +00:00
kimmi 7384ce4005 Bugfix: Fix gcc 4.4 compilation error on r1251, thanks to Rosen Diankov for that. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1252 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-06-03 06:10:26 +00:00
kimmi 9d00c18761 Feature : Prepare FindPackage feature. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1251 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-05-28 19:20:56 +00:00
kimmi 8441ecf6bf Bugfix : Fix a compiler issue with OSX and Linux. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1250 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-05-28 10:19:50 +00:00
ulfjorensen 0693df00c5 - Bugfix: catched a null pointer crash when post processing removed everything from an invalid scene 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1249 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-05-23 09:25:40 +00:00
jonathanklein d9d57804fa Ogre: Support for multiple texcoords 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1248 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-05-23 09:23:34 +00:00
kimmi 1ac5a47c5d Bugfix : Fix a compiler bug for iOS arm, thanks to Brian Miller. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1247 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-05-20 20:41:06 +00:00
ulfjorensen 6d2857ed4a Bugfix: collada loader now preserves empty data arrays to work around stupid exporters writing empty animation channels 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1246 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-05-05 07:38:14 +00:00
kimmi 7cb9438522 Refactoring : Move sources into one source variable to avoid redundant code. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1245 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-05-01 10:33:55 +00:00
kimmi f9cd8845b1 - Bugfix : Bug 3511751 closed, handling no defined material name. 
- Update : Add a model for the regression test.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1244 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-05-01 09:39:51 +00:00
aramis_acg 425c929aaa Update Xcode Project ([3520119] by Andy Maloney) 
This patch updates the Xcode project from git 93c3723da5.

It does the following:

- add/remove include files to the project since they moved
- add/remove the OGRE files to the project since they changed
- removes the _GLIBCXX defines since they are no longer used
- sets the compiler to LLVM GCC 4.2
- sets the SDK to Mac OS X 10.5 so it will build on 10.5 and 10.6
- removes the PPC-related VALID_ARCHS

This means it's set up for Mac OS X 10.5 and higher and will build a 32/64-bit universal lib by default.

I didn't touch any Boost-related stuff since I'm not using it, but it should be just a matter of updating the included libs with whatever version you have installed.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1242 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-22 23:26:49 +00:00