Commit Graph

3158 Commits (48eed0d2c68dfb3565ae0821a93666850424e403)

Author SHA1 Message Date
Kim Kulling ce939b5126 openddl-parser: latest greatest.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-29 11:57:13 +02:00
Léo Terziman ca2e47b205 Fixed some typos 2015-04-29 09:26:11 +02:00
Léo Terziman 825a58803d Removed some warning about const char* used as char* (not our choice, it depends of some external API) 2015-04-28 17:30:15 +02:00
Léo Terziman 07f3f4b487 Updated unit tests to use new SetProperty interface 2015-04-28 17:27:20 +02:00
Léo Terziman d809ca98c1 Fixed compilation issues with mingw 2015-04-28 15:16:53 +02:00
Léo Terziman 91c751a03a Added missing header 2015-04-28 12:29:39 +02:00
Léo Terziman 5b9af11f9b Merge remote-tracking branch 'official/master' into contrib 2015-04-28 12:04:53 +02:00
Alexander Gessler 5c890c1a90 Merge pull request #544 from aru/cygwin-build-fix
Modifying files to let assimp build under cygwin.
2015-04-21 15:56:40 -07:00
Alexander Gessler fea13e22f1 Merge pull request #541 from Ang3lus/master
Fix compilation with libc++
2015-04-21 13:06:24 -07:00
U-ORADEV\albihern 956fde6e66 Renaming ByteSwap.h to ByteSwapper.h to let assimp compile under cygwin. 2015-04-20 17:49:02 -05:00
U-ORADEV\albihern 7043551068 Modifying files to let assimp build under cygwin. 2015-04-20 17:36:47 -05:00
Łukasz Twarduś 55ae853c2e Fix compilation with libc++ 2015-04-19 10:55:58 +02:00
Kim Kulling eb1ee61420 fix code reading findings: use of std::copy
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-18 19:17:48 +02:00
Kim Kulling 68ca2ca427 Merge branch 'master' of https://github.com/assimp/assimp 2015-04-18 19:17:19 +02:00
Kim Kulling 08886e28d7 use <> include bracket style.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-18 19:17:10 +02:00
Alexander Gessler 27c6552ae8 Merge pull request #538 from cubeman99/master
Added NaN check when outputting normals in PLY exporter, to avoid '-1.#IND'
2015-04-18 07:29:37 -07:00
David Jordan b38572d1bc std::fabs from cmath should be right 2015-04-17 23:50:14 -04:00
David Jordan b575acf2b6 std::absf to std::fabsf 2015-04-17 23:38:54 -04:00
David Jordan e86d40e4e2 Added infinity check for outputting PLY normals 2015-04-17 23:29:26 -04:00
Kim Kulling 76dd9467b2 fix win32-build for assimp_viewer .
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-17 20:02:55 +02:00
Alexander Gessler f435712273 Fix Mac build issues (clang 6.0 compiling x86_64) 2015-04-17 06:42:58 +02:00
David Jordan f00101f496 Added include of qnan.h (now that AssimpPCH.h include was taken out) 2015-04-16 21:30:50 -04:00
David Jordan 3545d805d2 Merge branch 'master' of https://github.com/assimp/assimp 2015-04-16 20:40:16 -04:00
David Jordan fa626aa855 Added NaN check when outputting normals in PLY exporter, to avoid outputting '-1.#IND' 2015-04-16 18:01:24 -04:00
Alexander Gessler a1c0be5489 Revert "Introduce regression to see if new Travis regression diff catches it."
This reverts commit d55034351f.
2015-04-16 14:10:59 +02:00
Alexander Gessler d55034351f Introduce regression to see if new Travis regression diff catches it. 2015-04-16 14:00:23 +02:00
Alexander Gessler 11af8d9e60 Forgot semicolon in .travis.yml file. 2015-04-16 12:41:02 +02:00
Alexander Gessler edd4953a55 Merge branch 'master' of https://github.com/assimp/assimp 2015-04-16 12:38:05 +02:00
Alexander Gessler b66e9acd72 Delete old Assimp.NET code and replace by a link to assimp-net, which is now the preferred way of using assimp from .net. 2015-04-16 12:37:49 +02:00
Kim Kulling d12868adc4 use correct type in forward declaration.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 12:32:35 +02:00
Kim Kulling 97946e25c9 fix travis build
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 12:09:06 +02:00
Kim Kulling e4b84ff48a fix mem leak.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 11:47:14 +02:00
Kim Kulling 02ee002878 fix build for vs2013
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 11:38:53 +02:00
Kim Kulling 444a77e170 Merge branch 'master' of https://github.com/assimp/assimp 2015-04-16 11:10:21 +02:00
Kim Kulling ead3e8d275 first version of material handling for opengex
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 11:10:12 +02:00
Kim Kulling 223a5385af openddl-parser latest greatest
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 11:09:54 +02:00
Kim Kulling c61f876090 Merge pull request #536 from abma/master
remove PCH
2015-04-16 11:08:43 +02:00
abma 1c1f3c25f8 awww, merge error 2015-04-16 03:13:19 +02:00
abma 611778045d fix for upstream changes 2015-04-16 02:55:41 +02:00
abma 8c45a4dc3b Merge remote-tracking branch 'origin'
Conflicts:
	code/C4DImporter.cpp
	code/OgreImporter.h
2015-04-16 01:03:00 +02:00
abma bf4913b5c9 remove AssimpPCH.h: fixes #534 2015-04-16 01:00:17 +02:00
abma 83777da98b fix run.py permissions 2015-04-15 21:22:39 +02:00
abma 470ad98281 fix "headercheck":
part of https://github.com/assimp/assimp/issues/534
2015-04-15 21:22:26 +02:00
abma 7e9c48e1ae add option ASSIMP_HEADERCHECK (defaults to off):
when enabled it adds the target "headercheck" to verify if all headers compile
2015-04-15 21:06:40 +02:00
Alexander Gessler c90e209cf2 Add regression diff check to travis. 2015-04-15 01:24:48 +02:00
Alexander Gessler acef8198e0 Add whitelist of expected regression suite failures. 2015-04-15 01:22:29 +02:00
Alexander Gessler 03ea065271 Ignore Example.ogex for regression tests. OpenGEX importer is flaky and outputs nodes in different order each time. 2015-04-15 01:20:58 +02:00
Alexander Gessler 52a5ff2db2 Update IFC entries in regression database. 2015-04-15 01:18:20 +02:00
Alexander Gessler c95d32564c Merge pull request #533 from assimp/acgessler-patch-1
Remove WINDOWS builds.
2015-04-14 12:37:37 +02:00
Kim Kulling 56e8dc5a43 Merge branch 'master' of https://github.com/assimp/assimp 2015-04-14 12:04:47 +02:00