Commit Graph

1631 Commits (853a5f9bbc8cdde1d6f3e99bd97a2f2b8d11ed4e)

Author SHA1 Message Date
Faule Socke 853a5f9bbc Merge branch 'master' of github.com:assimp/assimp 2013-07-28 22:30:22 +02:00
Faule Socke 43ff04a53b Fixed a bug in the bugfix -.- 2013-07-28 22:22:49 +02:00
Alexander Gessler b65b380455 Merge pull request #62 from faulesocke/master
Fixed a bug returning not all material properties when accessing them.
2013-07-28 02:15:19 -07: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
Alexander Gessler fca079d614 Merge pull request #60 from YoheiKakiuchi/master
IGNORE_UP_DIRECTION for not transforming point of vertices
2013-07-27 07:53:50 -07:00
YoheiKakiuchi 5470f5fb28 add AI_CONFIG_IMPORT_COLLADA_IGNORE_UP_DIRECTION for not transforming position of vertices 2013-07-27 10:34:48 +09:00
Alexander Gessler 561260384c Merge branch 'master' of github.com:assimp/assimp into fixes 2013-06-30 16:26:24 +02:00
Alexander Gessler 506d3fa154 Forward declare IOSystem in Exporter.hpp 2013-06-30 16:25:46 +02:00
Alexander Gessler 07c1b2a68f Merge branch 'master' of github.com:assimp/assimp 2013-06-25 16:40:18 +02:00
Alexander Gessler b597ebbe43 Change spec of obj exporter. 2013-06-25 16:39:40 +02:00
Alexander Gessler 34d2bdd178 Exporters: raise errors if output files cannot be opened. 2013-06-25 14:09:28 +02:00
Alexander Gessler b5e916a646 Merge branch 'master' of github.com:assimp/assimp into fixes 2013-06-25 00:22:59 +02:00
Alexander Gessler 31311bdb3b IFC: support reading from IFCZip archives that don't use the same name for the embedded IFC file as the ZIP itself. 2013-06-25 00:22:47 +02:00
Alexander Gessler b392322454 Remove M3Importer from vc9 solution. 2013-06-25 00:12:03 +02:00
Alexander Gessler fd2f1ca3a8 Merge pull request #56 from asmaloney/init_stuff
Make sure members are initialized properly
2013-06-21 09:53:41 -07:00
Andy Maloney 1da281c1f8 Make sure members are initialized properly
Prefer initialization lists
Assignment operator should not return a const ref
2013-06-21 10:56:11 -04:00
Alexander Gessler f91abbc0fb Merge pull request #55 from asmaloney/OBJ_spaces
{OBJ} Allow spaces in group names
2013-06-20 05:50:53 -07:00
Andy Maloney d7c6cd9ece {OBJ} Allow spaces in group names 2013-06-20 08:40:08 -04:00
Alexander Gessler ca8f923a8b Merge pull request #53 from asmaloney/collada_warnings
{COLLADA} Add detail to some errors/warnings
2013-06-16 06:59:24 -07:00
Andy Maloney a03cb84d0c {COLLADA} Add detail to some errors/warnings & prefer '<>' for elements for readability 2013-06-15 18:00:40 -04:00
Alexander Gessler 88da17a246 Drop M3 Importer. 2013-06-13 11:22:23 +02:00
Alexander Gessler 27c578675a Merge pull request #51 from asmaloney/init_fixes
Prefer init list and add missing initializations
2013-06-12 08:16:14 -07:00
Alexander Gessler 84e3bf50ba Merge pull request #52 from asmaloney/minor_changes
Fix a logging message and a comment
2013-06-12 08:15:52 -07:00
Andy Maloney c6d1a73854 Fix a logging message and a comment 2013-06-12 09:01:05 -04:00
Andy Maloney 0e54b87b1e Prefer init list and add missing initializations 2013-06-12 08:59:47 -04:00
Kim Kulling 9040724fc0 Merge pull request #49 from severin-lemaignan/master
[pyassimp] Fixes for python 3.3 and 64bits
2013-06-03 02:17:52 -07: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
Alexander Gessler 08e078e20d Merge pull request #44 from thetrime/master
Collada importer should respect units in file
2013-05-24 07:37:04 -07:00
Matt Lilley d411cbfbf4 Make use of unit tag in asset info to scale the whole model 2013-05-23 12:15:14 +12:00
Alexander Gessler be457757a5 Merge pull request #39 from devurandom/fix/pedantic-c99
Fixes errors with -pedantic -std=c99 and GCC 4.7.2
2013-05-16 06:53:52 -07:00
Dennis Schridde 2bdbcd78e7 Amend dd1a18149cac29a69a0242a5efc467498f5f05cd: Visibility attribute is needed for MSVC/C++ 2013-05-16 13:08:05 +02:00
Dennis Schridde a65a69fdc9 Fixes a bunch of errors with -pedantic -std=c99 and GCC 4.7.2: ISO C restricts enumerator values to range of ‘int’ 2013-05-16 13:08:05 +02:00
Dennis Schridde bcc311515a Fixes an error with -pedantic -std=c99 and GCC 4.7.2: ‘visibility’ attribute ignored on types 2013-05-16 13:08:05 +02:00
Alexander Gessler 5205ee06da Merge pull request #40 from devurandom/feature/gitignore
Add gitignore file
2013-05-14 04:50:39 -07:00
Dennis Schridde 8535ebd730 Add gitignore file 2013-05-14 10:48:37 +02:00
acgessler b8ed6fbcef Fix Heap corruption in BlenderImporter::ConvertMesh function. closes #36 2013-05-03 23:16:56 +02:00
Alexander Gessler 24daead8cb Merge branch 'master' of github.com:assimp/assimp into msvc-pch 2013-04-30 00:48:35 +02:00
Alexander Gessler 98aec0955d - remove web shortcuts from root. 2013-04-30 00:48:07 +02:00
Alexander Gessler 48591e17b1 Merge pull request #34 from assimp/msvc-pch
- LWO: fix crash when computing normals for meshes that contain line or point faces.
2013-04-26 07:54:59 -07:00
Alexander Gessler 51d7bf8266 Merge branch 'master' of github.com:assimp/assimp into msvc-pch 2013-04-26 16:51:43 +02:00
Alexander Gessler 7efb94580f - LWO: fix crash when computing normals for meshes that contain line or point faces. Thanks to Thomas Sevaldrud for the patch. 2013-04-26 16:49:24 +02:00
Alexander Gessler 8b7fdb3a39 Merge pull request #33 from assimp/msvc-pch
- CMake: enable multicore compilation with vc.
2013-04-21 06:05:06 -07:00
Alexander Gessler 758e470a49 Merge branch 'master' of github.com:assimp/assimp into msvc-pch 2013-04-21 15:04:04 +02:00
Alexander Gessler b786d6e375 - CMake: enable multicore compilation with msvc. 2013-04-21 15:03:16 +02:00
Alexander Gessler 680c8e31d9 Merge pull request #32 from assimp/msvc-pch
- CMake: use precompiled headers when compiling with msvc,
2013-04-20 14:22:19 -07:00
Alexander Gessler 61b1cf7be1 Merge branch 'master' of github.com:assimp/assimp into msvc-pch 2013-04-20 23:17:16 +02:00
Alexander Gessler 4b748c2442 - CMake: use precompiled headers when compiling for msvc. This makes compilation about 40% faster. 2013-04-20 23:15:59 +02:00
Alexander Gessler a2541a8984 Update .travis.yml 2013-04-19 01:41:45 +03:00