Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,940 Commits 19 Branches 43 Tags
df6707a26234af5880294159aad3f45ede97bf3f
Commit Graph

2352 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
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
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
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
Martin Gerhardy
b30dc8ffc9 Fixes compile issue for 3ds exporter 
... when you have disabled the 3ds importer
 2016-11-02 19:54:53 +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
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
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
cbe2e9af49 Merge branch 'master' into new_obj_stream_handling 2016-10-22 21:04:02 +02:00
Kim Kulling
d3a3bd9c12 BUgfixes regarding filepos setupBUgfixes regarding filepos setup. 2016-10-22 21:03:11 +02:00
Kim Kulling
33e370a8b7 Obj-Stream-Handling: fix readin of linewise import. 2016-10-21 21:14:35 +02:00
Kim Kulling
1724cc9e66 Remove redundant file. 2016-10-21 19:44:31 +02:00
Kim Kulling
50803b897c Merge branch 'master' of https://github.com/assimp/assimp 2016-10-21 19:43:56 +02:00
Kim Kulling
fe0cfc52bc Q3BSP-Loader: reformat include. 2016-10-20 22:25:39 +02:00
Kim Kulling
af54cb8a29 Q3BSP: fix license dates. 2016-10-20 17:04:37 +02:00
Kim Kulling
6a31e3528e Merge branch 'master' of https://github.com/assimp/assimp 2016-10-20 16:43:38 +02:00