Commit Graph

2458 Commits (f7e5f3ec6b345b0f13bc0170bc7ce7c4c9c34027)

Author SHA1 Message Date
Alexander Gessler fddae20cb7 Merge pull request #338 from jdduke/fast_atof_fix_final
Gracefully handle NaN/inf values in fast_atoreal_move
2014-08-20 19:29:44 -07:00
Jared Duke ed124ccbab Gracefully handle NaN/inf values in fast_atoreal_move
There are legitimate cases where inf/nan values are embeddded in a mesh.
Such values should not cause loading to fail, and indeed, previous versions of
Assimp supported their existence. Update the new fast_atoreal_move method
to gracefully parse such values, allowing case-insensitive checks for "NAN",
"INF" and "INFINITY" as per the atof guidelines found at
http://en.cppreference.com/w/cpp/string/byte/atof.

Note that the inf/nan text parsing is fairly loose, but is fast for the general
case and should handle most legitimate inf/nan values.
2014-08-20 18:42:37 -07:00
Alexander Gessler 7ff7b783ee Merge pull request #335 from abma/master
fix most warnings with -pedantic
2014-08-17 17:49:21 -07:00
abma 6c5f9ecb06 fix most warnings with -pendantic 2014-08-18 02:09:06 +02:00
Alexander Gessler 6636e596ab Merge pull request #334 from jdduke/fbx_binary_fix
Avoid raw reinterpret_casts in the FBX parser
2014-08-17 17:01:10 -07:00
Alexander Gessler 81cfaccedb Merge pull request #333 from abma/master
fix unittests on linux / enable on travis-ci
2014-08-17 16:01:55 -07:00
abma 48a772b20b fix compiler warnings:
- defined but not used
- deprecated conversion from string constant to ‘char*’
2014-08-18 00:46:21 +02:00
abma d795491c48 fix unittests on linux / enable on travis-ci 2014-08-18 00:34:45 +02:00
Alexander Gessler 1e97b00cd2 Merge pull request #332 from abma/master
some minor fixes
2014-08-17 14:59:56 -07:00
abma b2643a3835 fix SimpleOpenGL linking (missing libm) 2014-08-17 23:49:36 +02:00
abma c7ab8383bd fix warning:
equality comparison with extraneous parentheses
2014-08-17 23:39:49 +02:00
abma 56ddb4f4af fix some compile warnings:
- passing NULL to non-pointer
- unused vars
- unused function
- order of init
- parentheses
2014-08-17 23:28:00 +02:00
abma aafc8d5f3f CMake: changed cached bools into "option" 2014-08-17 23:10:06 +02:00
Jared Duke 69810a2a07 Avoid raw reinterpret_casts in the FBX parser
As reinterpret_cast can break strict aliasing rules, causing runtime failure
on Android, replace such usage in FBXParser with memcpy.  Also provide a
utility routine for both performing the copy and asserting the validity of
the buffer length relative to the copied region.
2014-08-17 08:41:45 -07:00
Kim Kulling 0ede630b10 bugfix:
- fix unhandled exception with sample SimpleTexturedOpenGL #308
- remove commented code, which made no sense any more.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-08-16 13:34:35 +02:00
Kim Kulling d2e4dda393 update: add testcase for empty color.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-08-16 11:54:04 +02:00
Kim Kulling 5e265610fb bugfix: add obj-material handling for <color> 0 instead of <color> r g b.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-08-16 11:39:28 +02:00
Alexander Gessler 3d6b1932f9 Update Readme.md 2014-08-13 23:27:22 -07:00
Alexander Gessler 9b5bb6b088 Add assbin file format to readme 2014-08-08 22:47:19 -07:00
Kim Kulling f55ef85578 Merge pull request #328 from Gargaj/assbin-arraywrite
Use specialized writes for arrays
2014-08-08 13:59:30 +02:00
Gargaj 58b78fa265 comment 2014-08-08 13:10:05 +02:00
Gargaj fa99aa0d3a add remaining specializations
hopefully i didnt mess this up too bad
2014-08-08 12:56:11 +02:00
Gargaj b712bf1770 Change to looped writes
to avoid struct packing issues
2014-08-08 12:46:29 +02:00
Gargaj ede0fa4b91 Merge pull request #1 from assimp/master
Merge from master
2014-08-08 10:37:55 +02:00
Kim Kulling 9f795c64d5 Merge pull request #326 from Gargaj/newprogresshandler
More elaborate progress handler
2014-08-07 11:45:29 +02:00
Kim Kulling 63a110468f Merge pull request #327 from Gargaj/assbinintegrate
Integrate import/export for .ASSBIN format
2014-08-07 11:41:35 +02:00
Gargaj 5886154247 tweaks according to the comments of kimkulling 2014-08-07 11:30:44 +02:00
Gargaj c3977bd132 unify data types 2014-08-07 09:32:00 +02:00
Gargaj 61ecff3474 missed one 32/64 type conversion 2014-08-07 09:30:20 +02:00
Gargaj b53a425fe4 make templates gcc compatible 2014-08-07 09:28:50 +02:00
Gargaj 2775141da3 #include should be outside 2014-08-07 09:07:09 +02:00
Gargaj 3c172988bb remove BUG notices (discussed with acgessler) 2014-08-07 08:43:52 +02:00
Gargaj df4b17d145 code style 2014-08-07 08:26:34 +02:00
Gargaj aa5c1a1a23 syntax 2014-08-07 08:26:04 +02:00
Gargaj 7925dcadba avoid NULL, just in case
(loader might just probably crash anyway)
2014-08-07 08:25:10 +02:00
Gargaj 523d87bbe7 use 0..fileSize as progress metric (easier for loaders) 2014-08-07 08:22:47 +02:00
Gargaj 061911bdbf add support for compressed, drop support for shortened 2014-08-07 08:05:07 +02:00
Gargaj fb546b694e code style 2014-08-06 15:25:39 +02:00
Gargaj 1aeaef2037 add lights and cameras 2014-08-06 15:01:04 +02:00
Gargaj 97c9ce1d5b add animations and textures 2014-08-06 14:44:06 +02:00
Gargaj 886a704c17 some notes to self 2014-08-06 14:43:47 +02:00
Gargaj 5048793096 add material import 2014-08-06 14:21:53 +02:00
Gargaj f38dd8e6e2 add mesh loader 2014-08-06 14:06:08 +02:00
Gargaj ad298cd84f fix code style 2014-08-06 13:29:09 +02:00
Gargaj ac5c1f9df1 add to cmake 2014-08-06 13:27:09 +02:00
Gargaj 87dff6a00e start importer, load nodes 2014-08-06 13:26:26 +02:00
Alexander Gessler b2cf7b6f67 Merge pull request #324 from Gargaj/patch-1
Fix wrong nesting
2014-08-05 20:05:54 -07: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