Commit Graph

3940 Commits

Author SHA1 Message Date
Jared Mulconry
df6707a262 Fixed build warnings on MSVC14 x64 in the BVH format sources. 2016-11-19 02:33:58 +11:00
Jared Mulconry
06beb50391 Fixed build warnings on MSVC14 x64 in the Blender format sources, as well as
build warnings in tests.
2016-11-19 01:54:27 +11:00
Jared Mulconry
bf5fc593eb Fixed build warnings on MSVC14 x64 in the B3D format sources. 2016-11-19 01:21:59 +11:00
Jared Mulconry
a2dadbbe52 Fixed build warnings on MSVC14 x64 in the AssBin sources. 2016-11-19 00:39:11 +11:00
Jared Mulconry
6ba2dc4db3 Fixed build warnings on MSVC14 x64 in the postprocessing of AMF format. 2016-11-19 00:31:32 +11:00
Jared Mulconry
505928cc02 Fixed build warnings on MSVC14 x64 in the 3DS format sources. 2016-11-19 00:20:53 +11:00
Kim Kulling
a9c5b6f1be Ensure that filelist for assimp lib is not empty for coveralls. 2016-11-17 19:57:24 +01:00
Kim Kulling
46a022520f Remove commented code. 2016-11-17 19:11:28 +01:00
Kim Kulling
0f2ed2c449 Remove unused filter for coveralls. 2016-11-17 15:11:05 +01:00
Kim Kulling
01135855e0 Remove folder test from test coverage. 2016-11-17 14:35:21 +01:00
Kim Kulling
b990e93b9f Merge pull request #1067 from assimp/coverall_support
Travis: enable coverall support.
2016-11-17 11:40:35 +01:00
Kim Kulling
9b63015626 Disable debou output for lcov call in travis config. 2016-11-17 11:17:53 +01:00
Kim Kulling
7a7f7b851b Remove deprecated boost workaround flag from travis config. 2016-11-17 11:16:42 +01:00
Kim Kulling
2fdc6a51d2 Embed coverage to readme. 2016-11-17 10:57:53 +01:00
Kim Kulling
6daa464378 Next try: use original directory root. 2016-11-17 10:23:57 +01:00
Kim Kulling
8b1f382a0e Travis config: use correct env variable to enable coveralls. 2016-11-17 10:06:50 +01:00
Kim Kulling
8bd9fadeea Check assimp.dir folder. 2016-11-16 21:43:22 +01:00
Kim Kulling
c695c74a60 Much more verbose. 2016-11-16 21:35:10 +01:00
Kim Kulling
8d4633510f More verbose. 2016-11-16 21:28:20 +01:00
Kim Kulling
1dd8148e81 Make travis more verbose. 2016-11-16 21:16:50 +01:00
Kim Kulling
4d47e47815 Fix typo. 2016-11-16 20:14:54 +01:00
Kim Kulling
c399981dbe Next try. 2016-11-16 20:08:04 +01:00
Kim Kulling
7307c07623 Add missing cmake mocules 2016-11-16 16:46:54 +01:00
Kim Kulling
284b755cf9 add test source to coveralls again. 2016-11-16 16:36:22 +01:00
Kim Kulling
4ac3a0af8f iEnable coverall for tests. 2016-11-16 16:19:43 +01:00
Kim Kulling
6c5e475d14 Still working on config. 2016-11-16 16:11:30 +01:00
Kim Kulling
09df4b0299 Fix travis cmake call to enable coberalls. 2016-11-16 15:54:53 +01:00
Kim Kulling
e95ccee97e Test coverage only in one comp from build matrix. 2016-11-16 15:42:08 +01:00
Kim Kulling
53d6adeb53 Enable coveralls measurement 2016-11-16 12:24:55 +01:00
Kim Kulling
76794f4aa7 Enableing test coverage for unittests. 2016-11-16 12:06:21 +01:00
Kim Kulling
a6c86c79f1 Travis: enable coverall support. 2016-11-16 11:39:44 +01:00
Kim Kulling
a1f773c305 Merge branch 'master' of https://github.com/assimp/assimp 2016-11-14 20:34:52 +01:00
Kim Kulling
855031d37c CmakeLists: remove ugly and deprecated hack fo mingw. 2016-11-14 20:20:03 +01:00
Kim Kulling
302b8044c6 Merge pull request #1064 from snowzurfer/master
Fix obj .mtl file loading
2016-11-14 20:17:28 +01:00
Kim Kulling
afad31acab Merge pull request #1066 from jaredmulconry/master
MSVC14 x64 /bigobj missing causes compile error
2016-11-14 19:02:52 +01:00
Jared Mulconry
eceb61b854 Fixed a compile error on MSVC14 x64 caused by the /bigobj flag failing to be set
for the 1 and 2-suffixed versions introduced in
commit 0a25b076b8.
2016-11-14 22:52:29 +11:00
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