Commit Graph

2826 Commits (dc28746269976bfd39835bb68bd6bf6d2107eea9)

Author SHA1 Message Date
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
Kim Kulling 14e65f5325 openddl-parser: latest greatest:
fix invalid handling of float values stored a hexadecimal literals.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-14 12:04:39 +02:00
Kim Kulling 1899de6ea9 remove dead code.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-14 12:03:51 +02:00
Alexander Gessler 072e39470b Disable WINDOWS builds.
- Currently, the mingw linker crashes linking unit.exe
- Significant increase in build time for testing an exotic platform - Mingw crosscompile on linux. Assimp does not have many system dependencies so I feel we can omit this.
- Confusion since 2 build combinations appear in Travis but are disabled.
2015-04-14 10:31:15 +02:00
Alexander Gessler fb45e4d512 Make command line parameters in gen_db script more predictable. 2015-04-14 10:22:33 +02:00
Alexander Gessler 5a8d5605a5 Update README for regression test suite. 2015-04-13 22:24:43 +02:00
Alexander Gessler 0cee21ce3c COB: code cleanup. 2015-04-13 21:52:09 +02:00
Alexander Gessler b3a3558da3 Re-gen IFC parsing code with alphabetic order of types. This hopefully gives a stable diff base for the future. 2015-04-13 21:42:50 +02:00
Alexander Gessler 6e5ca257de Merge branch 'master' of https://github.com/assimp/assimp 2015-04-13 21:39:25 +02:00
Alexander Gessler 55ca72e1c8 Make order of classes in generated IFC parsing code deterministic. 2015-04-13 21:38:36 +02:00
ulf 28de609a56 Merge branch 'master' of https://github.com/assimp/assimp 2015-04-13 16:02:02 +02:00
ulf 806d3ac8e1 - IFC reader regenerated from schema to include IfcArbitraryProfileDefWithVoids
- implemented IfcArbitraryProfileDefWithVoids to fix solar panel covers in test\models-nonbsd\IFC\rac_basic_sample_project.ifc
- warning: another dirty hack on top of dirty hacks - one day all these CSG implementations will blow up in our faces. Mark my words.
2015-04-13 16:01:33 +02:00
Kim Kulling 53681b10ea Merge pull request #532 from arris69/Travis_mingw
Travis mingw
2015-04-12 20:11:16 +02:00
Alexander Gessler e2f234707a Fix possible crash in SceneCombiner when the destinations scene has mPrivate==null. Fixes #401. 2015-04-12 19:53:24 +02:00
Ser Lev Arris 5f58188de5 mingwin headers are a bit 'outdated' 2015-04-12 19:12:48 +02:00
Ser Lev Arris 20e23fbd0a i see no reason to check it with clang too. 2015-04-12 19:10:10 +02:00
Alexander Gessler 13b5b01032 Merge pull request #531 from arris69/cmake_cleanup
double definition, i'd better open my eyes...
2015-04-12 19:08:54 +02:00
Ser Lev Arris 2f372c0ac5 add the mingw compile step 2015-04-12 19:05:27 +02:00
Ser Lev Arris cdeb95611d double definition, should better open my eyes... 2015-04-12 18:16:49 +02:00
Alexander Gessler d1ea4405ed Merge pull request #528 from arris69/Fix_static_and_shared_builds
add static flag for exe build if no shared build is requested
2015-04-08 21:08:56 +02:00
Kim Kulling ed57fac879 create node tree
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-08 20:43:55 +02:00
Ser Lev Arris 7a6c00ca11 looks like cmake is per design not for building static executables, clang too. =%-| 2015-04-08 12:34:54 +02:00
arris69 297e1d2117 it's a difference if it's set to OFF or it's undefined... 2015-04-07 16:07:29 +02:00
Ser Lev Arris fb7661c430 add static flag for exe build if no shared build is requested 2015-04-07 08:20:27 +02:00