Commit Graph

2724 Commits (99e45b995b0469cf261bdfd83eb00717d1e4f5ba)

Author SHA1 Message Date
Alexander Gessler 696407f6c5 Merge pull request #552 from abma/master
allow to compile only enabled importers
2015-05-07 11:49:19 +02:00
abma b4f5c57b3e allow to compile only enabled loaders 2015-05-06 23:15:15 +02:00
Kim Kulling 70722ad318 Merge branch 'master' of https://github.com/assimp/assimp 2015-05-05 22:27:13 +02:00
Kim Kulling fd3a0d4a9d fix name handling of geoemtryobjectname nodes
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-05-05 22:27:05 +02:00
Kim Kulling 2c60da38f3 openddl-parser: V0.2.0
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-05-05 22:26:40 +02:00
Alexander Gessler 01bd198a55 Merge pull request #549 from Madrich/master
Step (stp) Exporter
2015-05-02 19:28:28 +02:00
Madrich b6d91ec11a Fix Path functions
Fix XFilePrefix for mesh name
Add Color for faces in Step Export
2015-05-02 12:19:20 +02:00
Madrich 2dde962f0d FilePath Functions in DefaultIOSystems
Replacements in Exporters
2015-05-02 01:56:20 +02:00
Alexander Gessler 437706f20d Merge pull request #535 from assimp/regression-whitelist-travis-diff
Regression whitelist, add regression diff test to Travis CI
2015-05-02 01:30:52 +02:00
Alexander Gessler 67fb135ce8 Fix syntax errors. 2015-05-02 01:00:04 +02:00
Alexander Gessler 068778953a Updated regression db for Collada. 2015-05-02 00:48:04 +02:00
Alexander Gessler 1851bf3acc Merge branch 'master' of https://github.com/assimp/assimp 2015-05-02 00:39:28 +02:00
Alexander Gessler 7eb5586c05 Output files in alphabetical order. 2015-05-02 00:33:29 +02:00
Alexander Gessler 8fb9e84aea Cleanup old messages. 2015-05-02 00:10:51 +02:00
Alexander Gessler 09d1e53955 Forgot semicolon. 2015-05-02 00:10:00 +02:00
Alexander Gessler 3ded2d9123 Add script to determine if regression suite failures are considered acceptable as per the whitelist or not. 2015-05-01 23:24:25 +02:00
Madrich 148207a073 Fix removed AssimpPCH 2015-05-01 23:16:44 +02:00
Madrich 71ae322e7b Merge pull request #5 from assimp/master
Update Fork
2015-05-01 23:01:33 +02:00
Madrich 58a72d9302 Fix Warnings
Add Time in Step File
2015-05-01 22:19:40 +02:00
Madrich ca8a3909be Add StepExporter.cpp(stp) Export
Fix XFile
2015-05-01 21:40:51 +02:00
Alexander Gessler 93bb63fdb4 Merge pull request #548 from Highlife1911/master
Removed FORCE attribute from CMake variable LIBRARY_SUFFIX
2015-05-01 17:14:22 +02:00
Highlife1911 4acb1d4c92 Removed FORCE attribute from CMake variable LIBRARY_SUFFIX 2015-05-01 14:13:28 +02:00
Alexander Gessler 2a7e49423a Merge pull request #547 from assimp/acgessler-patch-2
Fix one-off in STEPFileEncoding causing UTF32 character decoding to fail.
2015-04-30 15:19:01 +02:00
Kim Kulling 5357772cf5 fix build.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-30 14:31:23 +02:00
Kim Kulling d5699cc89f fox build: add missing include for ai_assert.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-30 13:47:33 +02:00
Kim Kulling 31cce98680 fix color handling in opengex importer.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-30 12:54:59 +02:00
Alexander Gessler 78faabf0fa Fix one-off in STEPFileEncoding causing UTF32 character decoding to fail. 2015-04-30 02:37:35 +02:00
Alexander Gessler 880cb473b0 Merge pull request #546 from terziman/master
Minor improvments & bug fixes
2015-04-30 02:35:52 +02:00
Léo Terziman c99bd9825a Fixed bug introduced by misleading names in materials properties between "type" parameters of function referring to the "semantic" field of properties (and NOT the type field...) 2015-04-29 18:13:16 +02:00
Kim Kulling 380d4f53a0 fix build
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-29 17:34:30 +02:00
Kim Kulling 2f8f0b1b02 Merge branch 'master' of https://github.com/assimp/assimp
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>

Conflicts:
	code/ObjFileParser.cpp
2015-04-29 13:18:51 +02:00
Kim Kulling 995bc41d57 color node handling opengex
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-29 11:57:39 +02:00
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