platform/upstream/assimp.git
7 years agoMerge pull request #1075 from Chainsawkitten/MinGW
Kim Kulling [Thu, 24 Nov 2016 20:34:56 +0000 (21:34 +0100)]
Merge pull request #1075 from Chainsawkitten/MinGW

Fix some MinGW warnings

7 years agocloses https://github.com/assimp/assimp/issues/1076: use ai_assert instead
Kim Kulling [Thu, 24 Nov 2016 20:15:07 +0000 (21:15 +0100)]
closes https://github.com/assimp/assimp/issues/1076: use ai_assert instead
of assert.

7 years agoPut back unused line (in comments)
Albin Bernhardsson [Thu, 24 Nov 2016 14:15:17 +0000 (15:15 +0100)]
Put back unused line (in comments)

7 years agoRemove unnecessary semicolon
Albin Bernhardsson [Thu, 24 Nov 2016 13:53:33 +0000 (14:53 +0100)]
Remove unnecessary semicolon

7 years agoRemove unused variable
Albin Bernhardsson [Thu, 24 Nov 2016 13:15:13 +0000 (14:15 +0100)]
Remove unused variable

7 years agoComment out unused variables
Albin Bernhardsson [Thu, 24 Nov 2016 13:10:24 +0000 (14:10 +0100)]
Comment out unused variables

7 years agoRemove unnecessary semicolons
Albin Bernhardsson [Thu, 24 Nov 2016 12:26:18 +0000 (13:26 +0100)]
Remove unnecessary semicolons

7 years agoanim-header: fix some review findings + andd base tests.
Kim Kulling [Wed, 23 Nov 2016 21:00:52 +0000 (22:00 +0100)]
anim-header: fix some review findings + andd base tests.

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Wed, 23 Nov 2016 19:20:45 +0000 (20:20 +0100)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoFix some findings in animation header.
Kim Kulling [Wed, 23 Nov 2016 19:20:11 +0000 (20:20 +0100)]
Fix some findings in animation header.

7 years agoFix coverity findings.
Kim Kulling [Tue, 22 Nov 2016 21:03:31 +0000 (22:03 +0100)]
Fix coverity findings.

7 years agoMerge pull request #1074 from assimp/testsuite_aiMetadata
Kim Kulling [Tue, 22 Nov 2016 20:20:02 +0000 (21:20 +0100)]
Merge pull request #1074 from assimp/testsuite_aiMetadata

Ue new alloc semantic when using aiMetadata + increase test coverage.

7 years agoFix build: use ai_assert instead of assert.
Kim Kulling [Tue, 22 Nov 2016 20:17:47 +0000 (21:17 +0100)]
Fix build: use ai_assert instead of assert.

7 years agoUe new alloc semantic when using aiMetadata + increase test coverage.
Kim Kulling [Tue, 22 Nov 2016 20:06:14 +0000 (21:06 +0100)]
Ue new alloc semantic when using aiMetadata + increase test coverage.

7 years agoFix coverity findings.
Kim Kulling [Tue, 22 Nov 2016 09:22:15 +0000 (10:22 +0100)]
Fix coverity findings.

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Mon, 21 Nov 2016 22:55:14 +0000 (23:55 +0100)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoAdd unittest fixure for aiMetadata.
Kim Kulling [Mon, 21 Nov 2016 22:54:39 +0000 (23:54 +0100)]
Add unittest fixure for aiMetadata.

7 years agoAppveyor: fix another merge error.
Kim Kulling [Mon, 21 Nov 2016 19:57:15 +0000 (20:57 +0100)]
Appveyor: fix another merge error.

7 years agoTravis config: fix last merge issues + merge coverity check into master branch to...
Kim Kulling [Mon, 21 Nov 2016 19:42:37 +0000 (20:42 +0100)]
Travis config: fix last merge issues + merge coverity check into master branch to avoid merge issues in the future on 

7 years agoDisable android build.
Kim Kulling [Mon, 21 Nov 2016 19:31:35 +0000 (20:31 +0100)]
Disable android build.

7 years agoFix another merge issue.
Kim Kulling [Mon, 21 Nov 2016 19:21:26 +0000 (20:21 +0100)]
Fix another merge issue.

7 years agoMerge branch 'coverity_scan' of https://github.com/assimp/assimp into coverity_scan
Kim Kulling [Mon, 21 Nov 2016 18:09:22 +0000 (19:09 +0100)]
Merge branch 'coverity_scan' of https://github.com/assimp/assimp into coverity_scan

7 years agoMerge branch 'master' into coverity_scan
Kim Kulling [Mon, 21 Nov 2016 17:57:56 +0000 (18:57 +0100)]
Merge branch 'master' into coverity_scan

7 years agoFix coverity scan.
Kim Kulling [Mon, 21 Nov 2016 17:55:57 +0000 (18:55 +0100)]
Fix coverity scan.

7 years agoMerge branch 'master' into coverity_scan
Kim Kulling [Mon, 21 Nov 2016 09:18:17 +0000 (10:18 +0100)]
Merge branch 'master' into coverity_scan

7 years agoMerge pull request #1071 from jaredmulconry/master
Kim Kulling [Sun, 20 Nov 2016 16:52:47 +0000 (17:52 +0100)]
Merge pull request #1071 from jaredmulconry/master

AMF Postprocessed Metadata given type bool regardless of original type

7 years agoMerge pull request #1073 from elect86/patch-2
Kim Kulling [Sun, 20 Nov 2016 16:51:16 +0000 (17:51 +0100)]
Merge pull request #1073 from elect86/patch-2

Update STLLoader.cpp

7 years agoUpdate STLLoader.cpp
Giuseppe Barbieri [Sun, 20 Nov 2016 14:14:33 +0000 (15:14 +0100)]
Update STLLoader.cpp

If `faceVertexCounter` does not start equal 3, then at line 291 you will get a warning

7 years agoSet right source encoding for coveralls-lcov.
Kim Kulling [Sat, 19 Nov 2016 14:23:08 +0000 (15:23 +0100)]
Set right source encoding for coveralls-lcov.

7 years agoTravis config: fix typo.
Kim Kulling [Sat, 19 Nov 2016 10:54:39 +0000 (11:54 +0100)]
Travis config: fix typo.

7 years agoTravis: fix typo.
Kim Kulling [Sat, 19 Nov 2016 10:48:39 +0000 (11:48 +0100)]
Travis: fix typo.

7 years agoFixed a bug in the AMF Importer Postprocessing where metadata would be
Jared Mulconry [Fri, 18 Nov 2016 15:07:32 +0000 (02:07 +1100)]
Fixed a bug in the AMF Importer Postprocessing where metadata would be
incorrectly recorded as having type bool for all entries.

7 years agoMerge pull request #1070 from elect86/patch-1
Kim Kulling [Fri, 18 Nov 2016 13:56:22 +0000 (14:56 +0100)]
Merge pull request #1070 from elect86/patch-1

Update material.h

7 years agoUpdate material.h
Giuseppe Barbieri [Fri, 18 Nov 2016 12:08:00 +0000 (13:08 +0100)]
Update material.h

Fixed grammar

7 years agoMerge branch 'master' into coverity_scan
Kim Kulling [Fri, 18 Nov 2016 10:38:45 +0000 (11:38 +0100)]
Merge branch 'master' into coverity_scan

7 years agoEnsure that filelist for assimp lib is not empty for coveralls.
Kim Kulling [Thu, 17 Nov 2016 18:57:24 +0000 (19:57 +0100)]
Ensure that filelist for assimp lib is not empty for coveralls.

7 years agoRemove commented code.
Kim Kulling [Thu, 17 Nov 2016 18:11:28 +0000 (19:11 +0100)]
Remove commented code.

7 years agoRemove unused filter for coveralls.
Kim Kulling [Thu, 17 Nov 2016 14:11:05 +0000 (15:11 +0100)]
Remove unused filter for coveralls.

7 years agoRemove folder test from test coverage.
Kim Kulling [Thu, 17 Nov 2016 13:35:21 +0000 (14:35 +0100)]
Remove folder test from test coverage.

7 years agoMerge pull request #1067 from assimp/coverall_support
Kim Kulling [Thu, 17 Nov 2016 10:40:35 +0000 (11:40 +0100)]
Merge pull request #1067 from assimp/coverall_support

Travis: enable coverall support.

7 years agoDisable debou output for lcov call in travis config.
Kim Kulling [Thu, 17 Nov 2016 10:17:53 +0000 (11:17 +0100)]
Disable debou output for lcov call in travis config.

7 years agoRemove deprecated boost workaround flag from travis config.
Kim Kulling [Thu, 17 Nov 2016 10:16:42 +0000 (11:16 +0100)]
Remove deprecated boost workaround flag from travis config.

7 years agoEmbed coverage to readme.
Kim Kulling [Thu, 17 Nov 2016 09:57:53 +0000 (10:57 +0100)]
Embed coverage to readme.

7 years agoNext try: use original directory root.
Kim Kulling [Thu, 17 Nov 2016 09:23:57 +0000 (10:23 +0100)]
Next try: use original directory root.

7 years agoTravis config: use correct env variable to enable coveralls.
Kim Kulling [Thu, 17 Nov 2016 09:06:50 +0000 (10:06 +0100)]
Travis config: use correct env variable to enable coveralls.

7 years agoCheck assimp.dir folder.
Kim Kulling [Wed, 16 Nov 2016 20:43:22 +0000 (21:43 +0100)]
Check assimp.dir folder.

7 years agoMuch more verbose.
Kim Kulling [Wed, 16 Nov 2016 20:35:10 +0000 (21:35 +0100)]
Much more verbose.

7 years agoMore verbose.
Kim Kulling [Wed, 16 Nov 2016 20:28:20 +0000 (21:28 +0100)]
More verbose.

7 years agoMake travis more verbose.
Kim Kulling [Wed, 16 Nov 2016 20:16:50 +0000 (21:16 +0100)]
Make travis more verbose.

7 years agoFix typo.
Kim Kulling [Wed, 16 Nov 2016 19:14:54 +0000 (20:14 +0100)]
Fix typo.

7 years agoNext try.
Kim Kulling [Wed, 16 Nov 2016 19:08:04 +0000 (20:08 +0100)]
Next try.

7 years agoAdd missing cmake mocules
Kim Kulling [Wed, 16 Nov 2016 15:46:54 +0000 (16:46 +0100)]
Add missing cmake mocules

7 years agoadd test source to coveralls again.
Kim Kulling [Wed, 16 Nov 2016 15:36:22 +0000 (16:36 +0100)]
add test source to coveralls again.

7 years agoiEnable coverall for tests.
Kim Kulling [Wed, 16 Nov 2016 15:19:43 +0000 (16:19 +0100)]
iEnable coverall for tests.

7 years agoStill working on config.
Kim Kulling [Wed, 16 Nov 2016 15:11:30 +0000 (16:11 +0100)]
Still working on config.

7 years agoFix travis cmake call to enable coberalls.
Kim Kulling [Wed, 16 Nov 2016 14:54:53 +0000 (15:54 +0100)]
Fix travis cmake call to enable coberalls.

7 years agoTest coverage only in one comp from build matrix.
Kim Kulling [Wed, 16 Nov 2016 14:42:08 +0000 (15:42 +0100)]
Test coverage only in one comp from build matrix.

7 years agoEnable coveralls measurement
Kim Kulling [Wed, 16 Nov 2016 11:24:55 +0000 (12:24 +0100)]
Enable coveralls measurement

7 years agoEnableing test coverage for unittests.
Kim Kulling [Wed, 16 Nov 2016 11:06:21 +0000 (12:06 +0100)]
Enableing test coverage for unittests.

7 years agoTravis: enable coverall support.
Kim Kulling [Wed, 16 Nov 2016 10:39:44 +0000 (11:39 +0100)]
Travis: enable coverall support.

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Mon, 14 Nov 2016 19:34:52 +0000 (20:34 +0100)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoCmakeLists: remove ugly and deprecated hack fo mingw.
Kim Kulling [Mon, 14 Nov 2016 19:20:03 +0000 (20:20 +0100)]
CmakeLists: remove ugly and deprecated hack fo mingw.

7 years agoMerge pull request #1064 from snowzurfer/master
Kim Kulling [Mon, 14 Nov 2016 19:17:28 +0000 (20:17 +0100)]
Merge pull request #1064 from snowzurfer/master

Fix obj .mtl file loading

7 years agoMerge pull request #1066 from jaredmulconry/master
Kim Kulling [Mon, 14 Nov 2016 18:02:52 +0000 (19:02 +0100)]
Merge pull request #1066 from jaredmulconry/master

MSVC14 x64 /bigobj missing causes compile error

7 years agoFixed a compile error on MSVC14 x64 caused by the /bigobj flag failing to be set
Jared Mulconry [Mon, 14 Nov 2016 11:52:29 +0000 (22:52 +1100)]
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 0a25b076b8968b7ea2aa96d7d1b4381be2d72ce6.

7 years agoRevert "Make assimp build cherry-picked importers in CMake"
Alberto Taiuti [Sat, 12 Nov 2016 02:10:51 +0000 (02:10 +0000)]
Revert "Make assimp build cherry-picked importers in CMake"

This reverts commit 70d5bb8c7b8e0767892326398f3bdec0e2f0c27b.

7 years agoMake assimp build cherry-picked importers in CMake
Alberto Taiuti [Sat, 12 Nov 2016 01:29:46 +0000 (01:29 +0000)]
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.

7 years agoBatchImporter: make validation configurable and add unittest for class.
Kim Kulling [Fri, 11 Nov 2016 11:49:05 +0000 (12:49 +0100)]
BatchImporter: make validation configurable and add unittest for class.

7 years agoBatchImporter: make validation configurable and add unittest for class.
Kim Kulling [Fri, 11 Nov 2016 11:49:05 +0000 (12:49 +0100)]
BatchImporter: make validation configurable and add unittest for class.

7 years agoFix obj .mtl file loading
Alberto Taiuti [Thu, 10 Nov 2016 23:12:36 +0000 (23:12 +0000)]
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.

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Thu, 10 Nov 2016 20:40:05 +0000 (21:40 +0100)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoObjParser: remove deprecated code.
Kim Kulling [Thu, 10 Nov 2016 20:39:32 +0000 (21:39 +0100)]
ObjParser: remove deprecated code.

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Thu, 10 Nov 2016 15:26:57 +0000 (16:26 +0100)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoRemove some whitespaces.
Kim Kulling [Thu, 10 Nov 2016 15:26:17 +0000 (16:26 +0100)]
Remove some whitespaces.

7 years agoMerge pull request #1062 from byteblob/patch-1
Kim Kulling [Thu, 10 Nov 2016 12:47:19 +0000 (13:47 +0100)]
Merge pull request #1062 from byteblob/patch-1

added void to aiGetErrorString's args

7 years agoMake travis build faster.
Kim Kulling [Thu, 10 Nov 2016 09:33:07 +0000 (10:33 +0100)]
Make travis build faster.

7 years agoadded void to aiGetErrorString's args
byteblob [Wed, 9 Nov 2016 21:43:01 +0000 (22:43 +0100)]
added void to aiGetErrorString's args

7 years agoMerge pull request #1061 from assimp/optimized_faces_in_obj
Kim Kulling [Wed, 9 Nov 2016 19:52:22 +0000 (20:52 +0100)]
Merge pull request #1061 from assimp/optimized_faces_in_obj

ObjImporter: remove unnecessary allocations of std::vector

7 years agoFix build
Kim Kulling [Wed, 9 Nov 2016 19:18:26 +0000 (20:18 +0100)]
Fix build

7 years agoFix review findings.
Kim Kulling [Wed, 9 Nov 2016 19:16:45 +0000 (20:16 +0100)]
Fix review findings.

7 years agoObjImporter: remove unnecessary allocations of std::vector in obj-specific
Kim Kulling [Wed, 9 Nov 2016 19:09:45 +0000 (20:09 +0100)]
ObjImporter: remove unnecessary allocations of std::vector in obj-specific
face.

7 years agoMerge pull request #1060 from assimp/issue_1059
Kim Kulling [Tue, 8 Nov 2016 20:31:47 +0000 (21:31 +0100)]
Merge pull request #1060 from assimp/issue_1059

Issue 1059

7 years agoObjParser: remove dead code.
Kim Kulling [Tue, 8 Nov 2016 19:35:21 +0000 (20:35 +0100)]
ObjParser: remove dead code.

7 years agoObj-Parser: Fix performance issue.
Kim Kulling [Tue, 8 Nov 2016 19:34:55 +0000 (20:34 +0100)]
Obj-Parser: Fix performance issue.

7 years agoQtViewer: some refactorings.
Kim Kulling [Tue, 8 Nov 2016 13:53:52 +0000 (14:53 +0100)]
QtViewer: some refactorings.

7 years agoCode reformatting.
Kim Kulling [Tue, 8 Nov 2016 09:38:57 +0000 (10:38 +0100)]
Code reformatting.

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Mon, 7 Nov 2016 16:20:27 +0000 (17:20 +0100)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoFix BlenderDNA for clang cross compiler.
Kim Kulling [Mon, 7 Nov 2016 16:19:49 +0000 (17:19 +0100)]
Fix BlenderDNA for clang cross compiler.

7 years agoFix build:
Kim Kulling [Sun, 6 Nov 2016 19:39:33 +0000 (20:39 +0100)]
Fix build:

7 years agocloses https://github.com/assimp/assimp/issues/105://github.com/assimp/assimp/issues...
Kim Kulling [Sun, 6 Nov 2016 18:36:37 +0000 (19:36 +0100)]
closes https://github.com/assimp/assimp/issues/105://github.com/assimp/assimp/issues/1057

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Sat, 5 Nov 2016 17:41:52 +0000 (18:41 +0100)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoScenePreprocessor: fix invalid index counter.
Kim Kulling [Sat, 5 Nov 2016 17:41:19 +0000 (18:41 +0100)]
ScenePreprocessor: fix invalid index counter.

7 years agoMerge pull request #1056 from AndrzejKozik/patch-1
Kim Kulling [Fri, 4 Nov 2016 17:51:55 +0000 (18:51 +0100)]
Merge pull request #1056 from AndrzejKozik/patch-1

Keys interpolation fix

7 years agoUpdate FBXConverter.cpp
AndrzejKozik [Fri, 4 Nov 2016 08:20:04 +0000 (09:20 +0100)]
Update FBXConverter.cpp

7 years agoKeys interpolation fix
AndrzejKozik [Fri, 4 Nov 2016 07:48:14 +0000 (08:48 +0100)]
Keys interpolation fix

In line 3073 there was an unproper scope of cast to double.

7 years agoMaterialSystem: fix some findings.
Kim Kulling [Thu, 3 Nov 2016 22:29:03 +0000 (23:29 +0100)]
MaterialSystem: fix some findings.

7 years agoMerge pull request #1055 from assimp/issue_957
Kim Kulling [Thu, 3 Nov 2016 18:11:56 +0000 (19:11 +0100)]
Merge pull request #1055 from assimp/issue_957

Fix compiler warnings related to issue 957.

7 years agoFix compiler warnings related to issue 957.
Kim Kulling [Thu, 3 Nov 2016 17:37:02 +0000 (18:37 +0100)]
Fix compiler warnings related to issue 957.

7 years agoMerge pull request #1054 from mgerhardy/patch-2
Kim Kulling [Thu, 3 Nov 2016 11:35:56 +0000 (12:35 +0100)]
Merge pull request #1054 from mgerhardy/patch-2

Fixes compile issue for 3ds exporter

7 years agoMerge pull request #1053 from rdb/patch-2
Kim Kulling [Wed, 2 Nov 2016 19:12:59 +0000 (20:12 +0100)]
Merge pull request #1053 from rdb/patch-2

Fix compile error with MSVC 2015