Commit Graph

100 Commits (accbcb575bf1eac119aaf5b8f7d184839f395825)

Author SHA1 Message Date
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
aramis_acg 3b35d2216b - update Assimp.net viewer application to take the model file to be loaded from the command line.
- add a screenshot to proof that it works ;-)
- update Readme.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@848 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-21 16:41:36 +00:00
aramis_acg 5ded0698e1 - update dreadful note in /port/swig
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@847 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-21 16:14:43 +00:00
klickverbot c4b8389d6e Mark the std::vector wrappers for the C-style arrays as const.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@838 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-10 19:34:06 +00:00
rave3d 4ad0d569f3 Ingnore an error producing SetProperty method on AssimpSwigPort.i
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@789 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-06 18:41:05 +00:00
adamdavidson 1f68e8c6f3 Update Assimp.NET project files to always build x86 (32 bit) to support Managed Direct X even on 64 bit Windows for Debug and Release targets.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@788 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-23 20:51:05 +00:00
adamdavidson 1c0e25288b Update of C#/.NET bindings plus working Managed DirectX Viewer that displays standard DirectX Fixed Function Materials (Ambient, Diffuse, Specular, Emissive) and the first set of texture coordinates if contained in the model.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@782 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-12 13:13:43 +00:00
klickverbot e6516329b9 SWIG: Even more output parameter handling.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@776 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-09 18:00:34 +00:00
klickverbot edb2fca8d6 SWIG: More output parameter handling using <typemaps.i>.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@770 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-08 20:09:50 +00:00
klickverbot 646357bfc2 Added missing member array handling (via the ASSIMP_*_ARRAY macros) in the SWIG port.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@769 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-07 22:01:51 +00:00
rave3d e34671e6b3 adding some missing files
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@742 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-27 18:29:18 +00:00
rave3d d91f661082 commit new try of c# bindings
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@741 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-27 18:28:02 +00:00
rave3d 6079125444 some fixes in assimp.net
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@724 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-13 17:08:35 +00:00
rave3d 7d03ef514e git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@711 67173fc5-114c-0410-ac8e-9d2fd5bffc1f 2010-04-27 16:52:24 +00:00
rave3d b4f5d42094 correct some compile errors
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@710 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-27 16:51:22 +00:00
rave3d fcc9642ac7 git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@709 67173fc5-114c-0410-ac8e-9d2fd5bffc1f 2010-04-27 16:41:21 +00:00
rave3d e05bc231e1 git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@708 67173fc5-114c-0410-ac8e-9d2fd5bffc1f 2010-04-27 16:36:23 +00:00
klickverbot ea2bbc37d1 [dAssimp] Added note that the D bindings have yet to be adapted for 64 bit builds of Assimp.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@687 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-16 21:15:51 +00:00
aramis_acg 29935e2138 Set overall version to 1.1.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@644 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-04 14:19:33 +00:00
klickverbot 1d0e6b73fe [D] Folded in minor aiAnimation documentation update.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@641 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-03 15:50:36 +00:00
klickverbot 11aa5c339d On request, merged current state of the SWIG bindings for the D programming language.
The interface files are by no means complete yet and only work with the not-yet-released D SWIG backend, although adding support for other languages should not be too much of problem via #ifdefs.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@596 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-12 17:26:57 +00:00
rave3d bdcbdc3080 Adding forgotten AssemblyInfo.cs
Removing obsolente PreBuildStep

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@573 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-03 15:27:48 +00:00
aramis_acg 8ef1e5b4ba Add README to PyAssimp. Mention install procedure and give a basic usage sample.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@566 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-02 15:15:09 +00:00
aramis_acg 9d2eacfdb2 Fix call to assimp.aiReleaseImport(), scene pointer was passed in incorrectly
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@565 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-02 14:49:35 +00:00
aramis_acg cc489f30e7 Change pyAssimps library detection routine to work on Linux as well
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@564 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-02 13:48:17 +00:00
rave3d ba4ca61dbd Adding first SWIG generated version of Assimp.NET
NOT REALLY TESTED YET

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@561 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-01 20:57:09 +00:00
rave3d 2a540119c5 Removing Old Assimp.NET folder in order to relace by a SWIG generated version
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@560 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-01 20:53:37 +00:00
aramis_acg 722dc4a9c2 Fix PyAssimp complaining on 'builtin_function_or_method' object has no attribute '_init'. Thanks to pekuja for the patch!
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@552 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-25 20:11:57 +00:00
aramis_acg 11e666fb90 Remove current jAssimp port branch. Will be rewritten using SWIG, the previous attempt is unmaintainable.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@551 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-24 22:45:29 +00:00
klickverbot 552c64bf4d [D] Use non-templated loading code to slightly reduce binary size.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@547 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-16 21:23:12 +00:00
rave3d 52228add3a add some #ifdefs for SWIG
fixed a compile error in DefaultIOSystem
add swig-script


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@546 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-15 18:28:32 +00:00
klickverbot de9a56b245 [D] Completely bind the C API now that the aiGetMaterialProperty issue is resolved.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@544 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-15 13:34:54 +00:00
rave3d 071010b4ee implementing more public properties
arrays of simple datatypes are complete

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@511 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-12-09 07:42:45 +00:00
rave3d 1b73346c5b implementing public properties in wrapper classes
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@510 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-12-08 17:03:33 +00:00