Kim Kulling
258afb3e43
Merge pull request #349 from Gargaj/assxml-export
...
Native Assxml export
2014-08-28 16:41:49 +02:00
Gargaj
ae7aba3647
+ comment
2014-08-28 16:34:39 +02:00
Gargaj
d333e08343
add ambient light type, allow collada to load it
2014-08-28 16:27:29 +02:00
Gargaj
e2401c8b58
fix va_end call
2014-08-28 15:51:01 +02:00
Gargaj
6f828087f9
add stdarg.h
2014-08-28 15:45:48 +02:00
Gargaj
19de24a442
...and some more assbin leftovers
2014-08-28 15:42:22 +02:00
Gargaj
8f0208e5a8
whoops, still some residue from ASSBIN
2014-08-28 15:41:17 +02:00
Gargaj
c47dc2802e
convert assxml exporter
2014-08-28 15:38:57 +02:00
Gargaj
2e9195819a
start assxml exporter basics
2014-08-28 15:17:53 +02:00
Kim Kulling
7f45f5fc95
bugfix: fix license.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-08-27 23:01:35 +02:00
Kim Kulling
8126dce94d
update: add sceleton for OpenGEX importer.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-08-27 23:00:19 +02:00
Alexander Gessler
dbf001b81c
Merge pull request #347 from vloppin/master
...
Collada : Add missing parsing <image> into <effect><profile> markup
2014-08-27 01:33:32 -07:00
unknown
9d04a45088
Collada : Add missing parsing <image> into <effect><profile> markup
2014-08-27 10:15:13 +02:00
Alexander Gessler
5a6bcf7882
Merge pull request #344 from assimp/collada_export_escape
...
Collada Export: escape user-defined strings in XML output.
2014-08-26 20:58:34 -07:00
acgessler
33ffb0003e
Collada Export: escape user-defined strings in XML output.
2014-08-23 15:42:47 -07:00
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