Commit Graph

2377 Commits (3e08a47d4f25838dbe8e43a153d100017e7deefb)

Author SHA1 Message Date
Jared Mulconry 3e08a47d4f Fixed build warnings on MSVC14 x64 in some scene optimisations. 2016-11-20 13:04:56 +11:00
Jared Mulconry 48e542d8d4 Fixed build warnings on MSVC14 x64 in the OpenGEX format sources. 2016-11-20 13:02:26 +11:00
Jared Mulconry 4a63f1759c Fixed build warnings on MSVC14 x64 in the Ogre format sources. 2016-11-20 12:49:33 +11:00
Jared Mulconry 0c13322089 Fixed build warnings on MSVC14 x64 in the Obj format sources. 2016-11-20 12:29:26 +11:00
Jared Mulconry 8478b03f22 Fixed build warnings on MSVC14 x64 in the NDO format sources. 2016-11-20 12:27:04 +11:00
Jared Mulconry 2946a7349b Fixed build warnings on MSVC14 x64 in the MS3D format sources. 2016-11-20 02:40:36 +11:00
Jared Mulconry 923b014472 Fixed build warnings on MSVC14 x64 in the MD3 and MD5 format sources. 2016-11-20 02:40:18 +11:00
Jared Mulconry 60cd4605eb Fixed build warnings on MSVC14 x64 in the Material System source. 2016-11-20 02:11:01 +11:00
Jared Mulconry 335003a5a3 Fixed build warnings on MSVC14 x64 in the LWS format sources. 2016-11-20 02:03:53 +11:00
Jared Mulconry 2c93e29dcc Fixed build warnings on MSVC14 x64 in the LWO format sources. 2016-11-20 02:01:57 +11:00
Jared Mulconry 4df18f93ea Fixed build warnings on MSVC14 x64 in the limit bone weights post-process. 2016-11-20 01:53:47 +11:00
Jared Mulconry 1e2c0279b0 Fixed build warnings on MSVC14 x64 in the IRR format sources. 2016-11-20 01:52:04 +11:00
Jared Mulconry c7efb50ad1 Fixed build warnings on MSVC14 x64 in the core Importer. 2016-11-20 01:36:33 +11:00
Jared Mulconry 5f098b2f94 Fixed build warnings on MSVC14 x64 in the IFC format sources. 2016-11-20 01:13:55 +11:00
Jared Mulconry d9b0449e83 Fixed build warnings on MSVC14 x64 in the glTF format sources. One warning
yet to be resolved.
2016-11-20 00:18:29 +11:00
Jared Mulconry 2ac9b0ce45 Fixed build warnings on MSVC14 x64 in the FBX format sources. 2016-11-19 23:50:03 +11:00
Jared Mulconry acad22cc1e Fixed build warnings on MSVC14 x64 in the DXF format sources. 2016-11-19 03:53:28 +11:00
Jared Mulconry 0469a5c2e4 Fixed build warnings on MSVC14 x64 in the debone process. 2016-11-19 03:45:25 +11:00
Jared Mulconry 43ef4ec715 Fixed build warnings on MSVC14 x64 in the D3MF format sources. 2016-11-19 03:34:39 +11:00
Jared Mulconry 9a323d6de3 Fixed build warnings on MSVC14 x64 in the CSM loader. 2016-11-19 03:29:47 +11:00
Jared Mulconry d16b8953b5 Fixed build warnings on MSVC14 x64 in the Collada exporter. 2016-11-19 03:24:55 +11:00
Jared Mulconry 4b6c69c4f8 Fixed an incorrect cast introduced in an earlier commit. 2016-11-19 03:17:39 +11:00
Jared Mulconry 128c27e89c Fixed build warnings on MSVC14 x64 in the Collada loader. 2016-11-19 03:16:06 +11:00
Jared Mulconry 3b63e4af54 Fixed build warnings on MSVC14 x64 in the Collada parser. 2016-11-19 02:42:51 +11:00
Jared Mulconry 2866da1262 Fixed build warnings on MSVC14 x64 in the COB format sources. 2016-11-19 02:35:30 +11:00
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 302b8044c6 Merge pull request #1064 from snowzurfer/master
Fix obj .mtl file loading
2016-11-14 20:17:28 +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 c5d6ac2c30 ObjParser: remove deprecated code. 2016-11-10 21:39:32 +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 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 d4223d1fce closes https://github.com/assimp/assimp/issues/105://github.com/assimp/assimp/issues/1057 2016-11-06 19:36:37 +01:00