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
Alexander Gessler
cd88ea745d
Merge pull request #313 from ajshort/patch-1
...
Fix overflow in STL header colour reading.
2014-07-12 16:47:57 +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
Kim Kulling
9036c6a380
Merge pull request #311 from rob100/feature
...
Fixed possible bug with map_emissive keyword
2014-07-11 01:02:48 -07: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
Kim Kulling
becb36d1ac
Merge pull request #310 from rob100/feature
...
Recommended improvement for the Object/MTL-Exporter
2014-07-10 00:23:11 -07: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
Alexander Gessler
7648ca21c9
Merge pull request #309 from rob100/feature
...
Added alpha texture map to object exporter
2014-07-09 16:28:29 +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
3bb815097f
Forgot to mention Ogre skeleton format in CHANGES
2014-06-23 15:26:07 +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
76d39973cb
Add link to open3mod to readme.
2014-06-19 21:09:38 +02:00
Alexander Gessler
330e76eb46
Update CHANGES for 3.1.1 (forgot before)
2014-06-18 01:30:01 +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
Alexander Gessler
d044ce7a62
FBXConverter: avoid creating an empty metadata slot (UDP3DSMAX was erased from list _after_ its size was taken)/
2014-06-17 14:31:14 +02:00
Alexander Gessler
1d0e2685d5
Merge branch 'master' of github.com:assimp/assimp
2014-06-17 14:20:06 +02:00
Alexander Gessler
244f981f6a
ObjExporter: cleanup code. Fix bug writing normal: normals would not be transformed by world transform.
2014-06-17 14:15:48 +02:00
Alexander Gessler
8b75bf43cb
Merge pull request #299 from filipwasil/builder_fix
...
Assimp can now be built as a subproject in CMake based projects
2014-06-17 13:00:20 +02:00
Filip Wasil
139790f963
Assimp can now be built as a subproject in CMake based projects
...
Signed-off-by: Filip Wasil <filip.wasil@gmail.com>
2014-06-17 12:05:23 +02:00
Alexander Gessler
247f5cee3a
Assimp_cmd: Drop malformed version spec from rc file.
2014-06-14 22:47:18 +02:00
Alexander Gessler
1c4a8e9017
Update doxygen documentation. Drop custom stylesheet.
2014-06-14 19:00:09 +02:00
Alexander Gessler
8328f79b1e
Drop VC solutions. Fixes #292 .
2014-06-14 17:14:12 +02:00
Kim Kulling
7bab8cd4d9
workaround: disable config for boost.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-06-14 09:47:01 +02:00
Kim Kulling
01057f6ef0
bugfix: assimp now deals with boost 1.55.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-06-13 17:33:58 +02:00
Alexander Gessler
69570f675e
Merge pull request #297 from gjaegy/master
...
fixed collada import bug + added obj importer '\' newline feature
2014-06-13 12:56:48 +02:00
Gregory Jaegy
5efc0207f3
Merge branch 'master' of https://github.com/assimp/assimp
2014-06-13 10:59:16 +02:00
Gregory Jaegy
16ae05eeeb
obj loader: added multiline support
...
collada loaded: bug fixed when importing several files, whith one containing animation
2014-06-13 10:56:10 +02:00
Madrich
edc7a950c4
ReFix the stuff before
...
Fix XFileExporter Normal
Fix Collada (Triangle->Poly)
2014-06-11 00:41:18 +02:00
Alexander Gessler
bd0c2835f8
Merge pull request #294 from treiguts/master
...
fixed OgreImporter compilation error with boost scoped_ptr
2014-06-10 22:24:08 +02:00
EdgarsT
8549e4b1b1
fixed OgreImporter compilation error with boost scoped_ptr
2014-06-10 19:58:02 +03:00
Madrich
272a59cd36
Fix convertToLH for uv coordinates
...
Fix Collada export
Fix XFile export
2014-06-10 13:14:41 +02:00
Madrich
c4021fbaaf
Fix Collada export validated by Schema
2014-06-09 15:17:45 +02:00