Commit Graph

139 Commits (460566197bb03e9ac042e2c850c3f44bf5896d11)

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