Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,783 Commits 19 Branches 43 Tags
bugfix/fix_copyrights_in_python
Commit Graph

6877 Commits

Author SHA1 Message Date
Gargaj
87dff6a00e start importer, load nodes 2014-08-06 13:26:26 +02:00
Gargaj
5b512dd9dd add info + header check 2014-08-06 00:52:05 +02:00
Gargaj
9cdecc780b Fix wrong nesting 
Otherwise doesn't compile if ASSIMP_BUILD_NO_3DS_IMPORTER is defined because the #endif is inside the namespace block
 2014-08-06 00:44:30 +02:00
Gargaj
0f822d38cd add basic framework for importer 2014-08-06 00:39:54 +02:00
Gargaj
cd86818888 - add compression support 
- remove unneeded code
- change log warning to exception
- document
 2014-08-05 23:18:45 +02:00
Gargaj
fc9b4e2adf follow assimp code style (tabs) 2014-08-05 22:55:20 +02:00
Gargaj
2592ff0796 convert exporter from tools/assimp_cmd 2014-08-05 22:54:45 +02:00
Gargaj
3d5e1b5cbc add basic framework (files, etc) 2014-08-05 20:54:38 +02:00
Gargaj
6b8cbe5c83 this isn't needed anymore 2014-08-05 00:10:23 +02:00
Gargaj
dbc553343c Granulate file loading too 2014-08-05 00:05:18 +02:00
Gargaj
dfe1f03e5b Split off postprocessing progress 2014-08-04 23:57:08 +02:00
acgessler
203d5d6fcc Obj: make mtl importer accept kd, ks etc. as well (Kd, Ks being the correct form). This is for keeping up compatibility with assimp's own Obj exporter, which has been inaccurate about this since inception. 2014-08-02 21:18:21 -07:00
Alexander Gessler
f5b9f5cb50 Merge pull request #321 from Gargaj/patch-1 
Add FieldOfView token type (fixes #245)
 2014-08-02 11:38:23 -07:00
Gargaj
e5ed62581d Handle both types of element names 
MAX seems to add an "s" to "Binormal" and "Tangent" when exporting
 2014-08-02 14:57:43 +02:00
Gargaj
11af0866dc Add FieldOfView token type (fixes #245) 
"FieldOfView" has its own token type (basically just one float), if it's missing the camera will keep reverting to default FOV in ASSIMP.
 2014-08-02 14:47:59 +02:00
Kim Kulling
5d861a8250 bugfix: 
- fix gcc-specific compiler warnings.
 2014-07-31 15:09:49 +02:00
Alexander Gessler
9eba139feb Merge pull request #317 from assimp/export-3ds 
3DS Exporter
 2014-07-23 22:26:58 +02:00
Alexander Gessler
a07cde4a81 3DS Exporter: export scene hierarchy. 2014-07-23 22:08:35 +02:00
Alexander Gessler
026f32733d 3DS Export: fix texture export. 2014-07-23 20:14:32 +02:00
Alexander Gessler
d5db6f39e6 Fix CI build. 2014-07-23 18:54:05 +02:00
Alexander Gessler
6fde07f7e5 Initial implementation of 3DS Exporter. Hierarchy exporting and smoothing groups missing. 2014-07-23 18:27:22 +02:00
Tyson Grant Nottingham
0c5605d07d Don't use isspace() in OBJ file parser. 2014-07-22 21:59:23 -07:00
Tyson Grant Nottingham
79c56adea4 Don't use isdigit() in fast_atof. 2014-07-22 21:58:41 -07:00
Alexander Gessler
0166518132 Extend StreamWriter to write to a buffer and to allow re-positioning of the write cursor within the buffer. 2014-07-22 20:36:16 +02:00
Alexander Gessler
3419fedb3c Add StreamWriter utility (mostly symmetric to StreamReader). 2014-07-22 17:55:37 +02:00
Tyson Grant Nottingham
36c82fe5b0 Allow several spaces between numbers in OBJ files. 2014-07-21 23:03:08 -07:00
Tyson Grant Nottingham
3e9fab3bfc Allow numbers starting with decimal in fast_atof. 2014-07-21 22:43:13 -07:00
Kim Kulling
d655199043 bugfix: fix stupid test introduced by myself. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-07-19 16:22:15 +02:00
Kim Kulling
46ca36cb6f update: 
- remove dead code.
- check for a possible division by zero.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-07-19 14:45:21 +02:00
Alexander Gessler
2edccb7f34 fast_atof: If a literal ends with a trailing dot (.), only parse further if the next character is a digit. In cases where the dot ends the literal (i.e. "1.") this would cause strtoul10_64 to throw an exception. To preserve as much of the old behaviour, we still consume trailing dots though. This "regression" was introduced (exposed) by #261, which added the extra check to strtoul10_64 that triggered here. This commit now fixes #304 (IFC file reading broken due to IFC files containing "(1.,1.,1.)" lists. 2014-07-13 15:08:28 +02:00
Alexander Gessler
7e48c1cce9 FBX: fix memory leak, parsed TokenList never released. See #307. 2014-07-13 14:11:58 +02:00
Alexander Gessler
5ae010028b FBX: fix memory leak. Connection objects in Document never freed. See #307 2014-07-13 14:07:19 +02:00
Andrew Short
a30ea8e92c Fix overflow in STL header colour reading. 
When reading the STL header for a "COLOR=rgb" part, the bytes were treated as signed chars, when in fact they can range from 0-255. This meant that any value greater than 127 would overflow, leading to an incorrect colour.

This change fixes the issue by treating the header as unsigned chars.
 2014-07-13 00:34:08 +10:00
Robin
ce37d3bcad Fixed possible bug with map_emmissive keyword and removed second check for ambient texture keyword 2014-07-11 08:11:54 +02:00
Robin
afa2d3da94 Improved texture map data in mtl exporter (in most cases an upper first character is used) 2014-07-10 08:26:32 +02:00
Robin
47e7667071 Added alpha texture map (map_d) 2014-07-09 15:51:09 +02:00
Kim Kulling
231e4e0cd0 update: commit not saved changes. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-07-04 00:23:02 +02:00
Kim Kulling
c6b516b68b bugfix: handling possible nullptr access. 
update: replace clear be resize( 0 ) at some places to avoid double allocations ( only a micro optimization ).

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-07-04 00:22:13 +02:00
Kim Kulling
b3b732c12b update: some micro improvements, replace post-increment operator with pre-increment operator. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-07-03 20:33:52 +02:00
Léo Terziman
6d16a5a5b7 Merge remote-tracking branch 'official/master' into contrib 2014-07-03 10:25:47 +02:00
Kim Kulling
0856ff9659 update: replace some clear / push-back by resize( 0 ) / push_back to avoid redundat allocations. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-06-29 21:16:37 +02:00
Alexander Gessler
7abfcd1a4d Merge pull request #300 from eyethereal/fix-obj-exporter-vertex-references 
Fixed vertex reference output format in face element for OBJ exporter
 2014-06-21 18:55:51 +02:00
Alexander Gessler
1207f84f7b Merge pull request #298 from Madrich/master 
Collada fixes, adding XFile Exporter
 2014-06-21 18:54:11 +02:00
Madrich
2c34f24497 Fix XFile define 2014-06-21 17:23:30 +02:00
Kim Kulling
9fbc9c4fb7 Merge pull request #301 from eyethereal/obj-exporter-no-name-no-group 
OBJ Exporter: No "g" lines with empty names
 2014-06-21 15:21:27 +02:00
Nathan Morse
77faf04aa3 OBJ Exporter: No "g" lines with empty names 
In the OBJ spec ( http://www.martinreddy.net/gfx/3d/OBJ.spec ), in the section labeled "Grouping" -> "Syntax", the structure of the "g" group statement is defined. Though this statement allows multiple names on a single line, it is unclear whether there must be at least one name on the line. However, the examples don't show any "g" group statements with no names. So, let's be conservative and not write out a "g" group statement that doesn't have a name. These empty "g" statements were prompting an error message from the three.js OBJ loader code.
 2014-06-20 16:06:04 -07:00
Nathan Morse
d10d20f62f Update ObjExporter.cpp 
In the OBJ spec ( http://www.martinreddy.net/gfx/3d/OBJ.spec ), in the section labeled "Referencing groups of vertices", there is no support for allowing a trailing slash with no valid vertex normal reference at the end. This commit modifies the vertex reference output code to prevent this behavior, as it has been causing compatibility issues with other software that parse OBJ files.
 2014-06-20 15:08:29 -07:00
Madrich
1cb01c54a3 Fix IOSFixed 
Fix Author/AuthoringTool in Collada by MetaData
 2014-06-20 00:08:11 +02:00
Alexander Gessler
be5fc42e16 Fix memory corruption in the aiGetExportFormatDescription() API. Clarify Exporter doc. 2014-06-17 16:10:55 +02:00
Alexander Gessler
75fd29ac19 SceneCombiner: implement proper copying of meta data. This entire module will need to be revamped in future as it is highly likely to cause further regressions as assimp data structures are modified. 2014-06-17 15:18:10 +02:00