Commit Graph

2343 Commits (303a6893fc6805e260bea6df816ae7b8fbb65781)

Author SHA1 Message Date
acgessler 72eb2e0c4e Merge branch 'travis' of github.com:assimp/assimp into travis 2014-09-05 21:20:35 -07:00
acgessler 5a0c7058b5 regression tests: ignore pond.0.ply file due to overly long runtime. 2014-09-05 21:20:07 -07:00
Alexander Gessler fd84970596 Regression tests: run.py should not block on user input if used for CI. 2014-09-04 23:18:20 -07:00
Alexander Gessler 11dc89d455 Update .travis.yml 2014-09-04 23:06:47 -07:00
Alexander Gessler 19a50b9a9e Update .travis.yml 2014-09-04 22:56:08 -07:00
acgessler 9e24acb187 Try running regression tests from travis 2014-09-04 22:42:51 -07:00
acgessler 48b138d575 Add cmake install to travis build. 2014-09-04 22:42:00 -07:00
acgessler 1c27d3c565 Regression test suite: look for assimp_cmd binary in current folder first. 2014-09-04 21:04:39 -07:00
acgessler 185f01963f LWO: replace legacy reinterpret_cast based code by memcpy to solve Android SIGBUS problems due to unaligned accesses. Fixes #351 2014-09-04 20:49:48 -07:00
acgessler 1a594b861a Collada: use a counter instead of clock() to generate unique names. Closes #357 2014-09-04 18:50:37 -07:00
Kim Kulling ed9a466c30 update:
- add OpenGEX parser sceleton
- add base datatypes for OpenGEX support.
2014-09-04 19:41:14 +02:00
Kim Kulling b1c80d8eb4 Merge pull request #359 from mikedh/master
Added load from file object functionality to pyassimp.load
2014-09-04 11:29:04 +02:00
Michael Dawson-Haggerty 8d27a27445 fixed docstrings 2014-09-04 01:21:37 -04:00
Michael Dawson-Haggerty 7fff52bf86 cleaned up error message autoreplacement 2014-09-04 01:06:30 -04:00
Michael Dawson-Haggerty 5ae65987c0 added the ability to load from file objects with pyassimp.load, as opposed to only being able to load from paths 2014-09-04 01:04:00 -04:00
Alexander Gessler 7fdcb25516 Merge pull request #355 from VirusFree/master
[FBX] parse upper cased Int/Enum properties
2014-09-01 10:19:20 -07:00
George Papadopoulos 8bf26065de [FBX] parse upper cased Int/Enum properties 2014-09-01 19:06:59 +03:00
Kim Kulling 55a8e59f0d Merge pull request #352 from apetrone/blender_uv_fix
Fix #325; Blender UV unwrap issue
2014-08-30 10:49:14 +02:00
Adam Petrone 625d2b7c4a Fix #325; Blender UV unwrap issue
The BMesh converter might be missing more details, but this should get basic UVs working for now.
2014-08-30 00:50:26 -04:00
Alexander Gessler 201807f733 Merge pull request #350 from Gargaj/ambientlight
Enable ambient lights
2014-08-28 09:20:04 -07:00
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