Commit Graph

3063 Commits (c6d1fcca746f475c6b7cc5cc5aa4329ae8fd96c4)

Author SHA1 Message Date
Sherief Farouk c59a67ba28 Merge branch 'master' of https://github.com/assimp/assimp 2013-08-15 00:21:44 -04:00
Sherief Farouk d23430c4bd Collada mesh name is copied from id only if there was no name attribute in the <geometry> node. 2013-08-15 00:21:00 -04:00
Sherief Farouk 57e34cc90a Added loading of mesh name from Collada mesh to aiMesh struct. 2013-08-15 00:14:19 -04:00
Sherief Farouk a540c6255c Added parsing of Collada mesh names. 2013-08-15 00:12:58 -04:00
Sherief Farouk a6ddce7758 Added name member to Collada::Mesh. 2013-08-15 00:11:23 -04:00
Kim Kulling 1c7cad00ce update : add initial code convention file.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2013-08-13 23:37:08 +02:00
Alexander Gessler 36a899abcf Merge pull request #70 from YoheiKakiuchi/master
Add binary exporter to STLExporter
2013-08-12 16:40:27 -07:00
Alexander Gessler 9e4776abf7 Merge pull request #76 from assimp/fixes
Fixes
2013-08-12 16:36:14 -07:00
Alexander Gessler 48b47464fd Merge branch 'master' of github.com:assimp/assimp 2013-08-12 23:43:01 +02:00
Alexander Gessler fe248c89ec Exporter.hpp: predeclare IOSystem 2013-08-12 23:42:46 +02:00
Alexander Gessler a2fb2dfb28 Exporter: if the scene data was converted to verbose format to meet the requirements of a preprocessing step, we should un-verbosify it again before the actual exporter is run. 2013-08-12 23:42:30 +02:00
Sherief Farouk 9b591fadb8 Fixes for uninitialized variable warnings. 2013-08-09 19:52:15 -04:00
Sherief Farouk a90e208e6d Fixed parameter type mismatch in StreamReader. 2013-08-09 19:10:56 -04:00
YoheiKakiuchi 60a65aaaeb add AI_SWAP4 for big endian architecture 2013-08-09 17:54:28 +09:00
Sherief Farouk c8428fa67a Added value range assertions to prevent static analysis false-positives on Clang. 2013-08-07 18:43:29 -04:00
Kim Kulling e9b1754306 Merge pull request #73 from paroj/master
fix include/ define in PostStepRegistry
2013-08-07 09:17:04 -07:00
Pavel Rojtberg 8d80f56396 fix include/ define in PostStepRegistry
allow to build without any post processing steps:
* typo in ASSIMP_BUILD_DEBONE_PROCESS -> ASSIMP_BUILD_NO_DEBONE_PROCESS
* needs to include ProcessHelper.h itself
2013-08-07 14:59:16 +02:00
Alexander Gessler bebe13e103 Merge pull request #72 from paroj/master
add missing include to fast_atof.h
2013-08-07 05:44:28 -07:00
Pavel Rojtberg 6920c433fd add missing include to fast_atof.h 2013-08-07 14:29:17 +02:00
Alexander Gessler 9dca64d135 Merge pull request #69 from sherief/master
Fix for potential use of unassigned variable compiler warning.
2013-08-05 02:58:51 -07:00
Sherief Farouk 04b0ea3f9a Initialized stride variable to prevent compiler warnings about potential use of unassigned variable. 2013-08-05 00:02:27 -04:00
Alexander Gessler 5f0bd28b15 Merge pull request #66 from sherief/Robustness
Hints for Clang's static analyzer - preventing false positives.
2013-08-04 17:42:36 -07:00
Sherief Farouk ace5b763c3 Added AI_WONT_RETURN and AI_WONT_RETURN_SUFFIX to DOMError. 2013-08-04 10:11:02 -04:00
Sherief Farouk 32b694d4f6 Added AI_WONT_RETURN_SUFFIX to ReportError(). 2013-08-04 10:10:41 -04:00
Sherief Farouk 0d57e659cb Added AI_WONT_RETURN_SUFFIX mainly for Clang's static analyzer. 2013-08-04 10:10:21 -04:00
Alexander Gessler d99d4dadd3 Update Readme with info on my C4D branch. 2013-08-04 01:34:38 +02:00
Kim Kulling e06cdaac46 Merge pull request #64 from faulesocke/master
Now actually fixed the bug with the normals.
2013-08-01 06:54:14 -07:00
YoheiKakiuchi 4ccb16fe01 add binary exporter to STLExporter 2013-07-31 20:15:59 +09: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
Alexander Gessler 3542bad65d Merge pull request #63 from faulesocke/master 2013-07-28 14:43:05 -07:00
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
tszirr 6c6283e4d8 Merge branch 'master' of https://github.com/tszirr/assimp 2013-07-08 12:30:23 +02:00
tszirr 681d732ef8 fix: pre-compiled header conflicts across different build configurations 2013-07-08 12:29:49 +02: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