Commit Graph

4395 Commits (eba06f0c8babbcb2cd013d7408be3be2e4a0883d)

Author SHA1 Message Date
Alberto Taiuti ce4f696312 Revert "Make assimp build cherry-picked importers in CMake"
This reverts commit 70d5bb8c7b.
2016-11-12 02:10:51 +00:00
Alberto Taiuti 70d5bb8c7b Make assimp build cherry-picked importers in CMake
Modify assimp's cmake to exclude the build of all the importers
by default; the user has then to manually select the ones needed
by setting the relative option.

From the explanation as written in the CMakeLists itself:

---
This option allows to select whether to build all the importers and then
manually select which ones not to build (old behaviour), or if to
exclude all importers from build and manually select the ones to actually
build.
By default, exclude all importers and manually select which ones to use.

To have all importers excluded, simply do not set this option in the parent
CmakeLists. Then, set the option for the importer(s) needed in the parent
CMakeLists, e.g.:
   OPTION(ASSIMP_BUILD_OBJ_IMPORTER "" TRUE)

To have assimp build all the importers, set the option to true, then manually
exclude which importers you don't need, e.g.:
   OPTION(ASSIMP_BUILD_OBJ_IMPORTER "" FALSE)

NOTE: In order to use this method of exclusion, the tools build must be disabled;
their code references certain importers/exporters which would be excluded.
If you need the tools, either manually add the importers/exporters the code
references (you will see linkage errors), or just enable the build of all the
importers as explained above.
---

As mentioned there, set the main CMakeLists not to build the tools and
the tests by default, since they use certain exporters and importers
which, with this method, are not necessarily used/built.
2016-11-12 02:04:05 +00:00
Kim Kulling fdd01bda83 BatchImporter: make validation configurable and add unittest for class. 2016-11-12 02:04:05 +00:00
Kim Kulling 631eef49c3 BatchImporter: make validation configurable and add unittest for class. 2016-11-11 12:49:05 +01:00
Alberto Taiuti cf7059f074 Fix obj .mtl file loading
Fix the obj file loader by adding a new method which allows
a name to be read considering the space in the middle between two
words and use that for parsing the "mtlib" line in the .obj file
parsing method.

Before, the method used in the obj parsing function would have
returned the string "mtlib NAME_OF_MTL" instead of "mtlib" only,
which resulted in the .mtl file being never parsed.
2016-11-10 23:12:36 +00:00
Kim Kulling 7a578aae46 Merge branch 'master' of https://github.com/assimp/assimp 2016-11-10 21:40:05 +01:00
Kim Kulling c5d6ac2c30 ObjParser: remove deprecated code. 2016-11-10 21:39:32 +01:00
Kim Kulling 1126f8dade Merge branch 'master' of https://github.com/assimp/assimp 2016-11-10 16:26:57 +01:00
Kim Kulling 1c5030c642 Remove some whitespaces. 2016-11-10 16:26:17 +01:00
Kim Kulling b04069b441 Merge pull request #1062 from byteblob/patch-1
added void to aiGetErrorString's args
2016-11-10 13:47:19 +01:00
Kim Kulling 604b4e9723 Make travis build faster. 2016-11-10 10:33:07 +01:00
byteblob c21c70ade6 added void to aiGetErrorString's args 2016-11-09 22:43:01 +01:00
Kim Kulling 888ea72f20 Merge pull request #1061 from assimp/optimized_faces_in_obj
ObjImporter: remove unnecessary allocations of std::vector
2016-11-09 20:52:22 +01:00
Kim Kulling c07aee21b7 Fix build 2016-11-09 20:18:26 +01:00
Kim Kulling 568b459e24 Fix review findings. 2016-11-09 20:16:45 +01:00
Kim Kulling ae956044aa ObjImporter: remove unnecessary allocations of std::vector in obj-specific
face.
2016-11-09 20:09:45 +01:00
Kim Kulling 1d08c9e2e2 Merge pull request #1060 from assimp/issue_1059
Issue 1059
2016-11-08 21:31:47 +01:00
Kim Kulling 9f96126362 ObjParser: remove dead code. 2016-11-08 20:35:21 +01:00
Kim Kulling 5ff1c39e02 Obj-Parser: Fix performance issue. 2016-11-08 20:34:55 +01:00
Kim Kulling 67febc41c6 QtViewer: some refactorings. 2016-11-08 14:53:52 +01:00
Kim Kulling 6d58926046 Code reformatting. 2016-11-08 10:38:57 +01:00
Kim Kulling 1aafe6287c Merge branch 'master' of https://github.com/assimp/assimp 2016-11-07 17:20:27 +01:00
Kim Kulling 8ffd94937e Fix BlenderDNA for clang cross compiler. 2016-11-07 17:19:49 +01:00
Kim Kulling a43634ebd0 Fix build: 2016-11-06 20:39:33 +01:00
Kim Kulling d4223d1fce closes https://github.com/assimp/assimp/issues/105://github.com/assimp/assimp/issues/1057 2016-11-06 19:36:37 +01:00
Kim Kulling cc7b7723c1 Merge branch 'master' of https://github.com/assimp/assimp 2016-11-05 18:41:52 +01:00
Kim Kulling 499886f89e ScenePreprocessor: fix invalid index counter. 2016-11-05 18:41:19 +01:00
Kim Kulling eaa494ed55 Merge pull request #1056 from AndrzejKozik/patch-1
Keys interpolation fix
2016-11-04 18:51:55 +01:00
AndrzejKozik dcb7478785 Update FBXConverter.cpp 2016-11-04 09:20:04 +01:00
AndrzejKozik a074ca58b3 Keys interpolation fix
In line 3073 there was an unproper scope of cast to double.
2016-11-04 08:48:14 +01:00
Kim Kulling dfaea27dfc MaterialSystem: fix some findings. 2016-11-03 23:29:03 +01:00
Kim Kulling c849e0108d Merge pull request #1055 from assimp/issue_957
Fix compiler warnings related to issue 957.
2016-11-03 19:11:56 +01:00
Kim Kulling 02e038bbb6 Fix compiler warnings related to issue 957. 2016-11-03 18:37:02 +01:00
Kim Kulling 6c7accfb3d Merge pull request #1054 from mgerhardy/patch-2
Fixes compile issue for 3ds exporter
2016-11-03 12:35:56 +01:00
Kim Kulling 413116a73b Merge pull request #1053 from rdb/patch-2
Fix compile error with MSVC 2015
2016-11-02 20:12:59 +01:00
Martin Gerhardy b30dc8ffc9 Fixes compile issue for 3ds exporter
... when you have disabled the 3ds importer
2016-11-02 19:54:53 +01:00
rdb b5c7c9c3ac Fix compile error with MSVC 2015
This patch fixes compilation with MSVC 2015.  WIN32 is not a preprocessor symbol that is defined by MSVC, but _WIN32 is.
2016-11-02 18:42:16 +01:00
Kim Kulling 3e05d13827 Merge pull request #1048 from tomacd/keep_materials_names
Keep original materials names in RemoveRedundantMaterials, ColladaExporter
2016-10-31 09:42:45 +01:00
Kim Kulling fcac614ad0 Blender: fix compiler warning: FAIL already defined. 2016-10-30 19:21:38 +01:00
Kim Kulling 8b2f1085c7 Merge pull request #1043 from assimp/new_obj_stream_handling
New obj stream handling
2016-10-30 12:30:52 +01:00
Kim Kulling 337990510c Fix rounding issue in unittest for block calculation. 2016-10-30 11:16:31 +01:00
Kim Kulling 810fc405a8 Fix build. 2016-10-30 09:06:45 +01:00
Kim Kulling 293654fe7c Fix unittest. 2016-10-30 08:55:11 +01:00
Kim Kulling b9261f01a3 Obj-Stream-Handling: fix compiler-errors and warnings. 2016-10-29 21:41:24 +02:00
Kim Kulling 186f3f091f Merge branch 'new_obj_stream_handling' of https://github.com/assimp/assimp into new_obj_stream_handling 2016-10-29 20:07:53 +02:00
Kim Kulling 8bae6ad7b7 Add missing license info. 2016-10-29 19:11:00 +02:00
Kim Kulling b13c30f50e Obj: Fix some small issues 2016-10-29 19:07:30 +02:00
tomacd 8e8757f800 Keep original materials names after RemoveRedundant materials process and export to collada 2016-10-27 19:23:43 +02:00
Kim Kulling 949a27a743 New streaming interface: fix build. 2016-10-22 23:34:56 +02:00
Kim Kulling 54c5acd02d Merge branch 'master' of https://github.com/assimp/assimp 2016-10-22 22:15:00 +02:00