Commit Graph

6877 Commits

Author SHA1 Message Date
Kim Kulling
9e91a33d76 fix review findings. 2020-03-15 10:28:37 +01:00
Kim Kulling
8b6f95ec30 Obj: apply clang format. 2020-03-15 10:21:08 +01:00
Kim Kulling
4210318a34 Merge branch 'master' into enable_vs_warning_all 2020-03-15 10:19:49 +01:00
Kim Kulling
0357333c81 fix all unittests. 2020-03-15 10:17:54 +01:00
kimkulling
255758e6ff fix read for precision-depending data. 2020-03-14 11:16:44 +01:00
kimkulling
dc04759492 fix unittests part 2. 2020-03-13 17:00:14 +01:00
Kim Kulling
3c97447c9c Merge branch 'master' into gltf2_blendshape_export 2020-03-13 13:26:08 +01:00
Yingying Wang
733e5343c8 export blendshape positions/normals in gltf2/glb2 2020-03-12 12:14:17 -07:00
kimkulling
b295fda22c fix unittests part 1. 2020-03-12 17:38:42 +01:00
kimkulling
19b40397a9 fix misor findings. 2020-03-11 17:42:10 +01:00
Max Vollmer
3f75ef68ae Assimp guarantees in its docs that mRootNode is never NULL.
glTF2Importer::ImportNodes therefore must always create a root node, or throw an exception.

A GLTF2 file is invalid without a scene, so the importer should throw in that case. For GLTF2 files with a scene without nodes, it should create an empty root node.
2020-03-11 15:47:05 +00:00
Max Vollmer
1bc7c710d6 Added a check to detect and prevent recursive references in GLTF2 files 2020-03-11 09:54:24 +00:00
Max Vollmer
84e060a816 Change: ExtractData throws exception instead of returning false if data is invalid.
Explanation: The return value of ExtractData is never checked anywhere in code. However if it returns false, outData remains uninitialized. All code using ExtractData assumes outData is initialized and proceeds to using it. I haven't encountered a real-life case where this goes wrong - but the simple fact that it can go wrong is a red flag. Instead of relying on every bit of code checking the return value and handling this properly, I think it makes much more sense to have ExtractData throw an exception. It obviously is an exceptional situation, and throwing makes sure that no code that doesn't explicitly handle such a scenario continues running and potentially causing harm.
2020-03-11 09:40:42 +00:00
kimkulling
69551e81ed Merge branch 'enable_vs_warning_all' of https://github.com/assimp/assimp into enable_vs_warning_all 2020-03-11 10:15:25 +01:00
kkulling
f8757322be fix warnings 2020-03-11 09:43:55 +01:00
Kim Kulling
7e7555a91b fix compiler warnings in tools and test- 2020-03-11 00:43:44 +01:00
Kim Kulling
02e5698a38 fix linker issues. 2020-03-09 22:49:32 +01:00
kimkulling
f3b6b78d4d small refactorings. 2020-03-09 10:55:32 +01:00
Kim Kulling
e8d2b84017 clean all warnings for vs-2019 2020-03-08 21:24:01 +01:00
Sebastian Matusik
8b9abc58e7 ifdef the exporters as specifying harsher linker flags than what's in default CMake causes linking issues. 2020-03-04 17:15:09 -08:00
Yingying Wang
bb62249f0c fix gltf2 exporter memory crash 2020-03-04 14:52:26 -08:00
Kim Kulling
0b227219b7 Merge branch 'master' into gltf2_broken_bones_count 2020-03-03 11:33:56 +01:00
Kim Kulling
920535165d next fixed warnings 2020-03-01 13:15:45 +01:00
Sebastian Matusik
710dbba52d Trimmed trailing whitespaces 2020-02-28 19:19:10 -08:00
Sebastian Matusik
496fcd35c1 Trimmed trailing whitespaces 2020-02-28 19:17:53 -08:00
Sebastian Matusik
5f35d62d61 Fix for #3037 cause glTF2Importer creating bunch of bones with 0 for vertex with index 0 2020-02-28 18:43:47 -08:00
Sebastian Matusik
22311883ce Fix for #3037 [FATAL] SplitByBoneCountProcess::SplitMesh goes into infinite loop 2020-02-28 18:42:22 -08:00
Kim Kulling
03182c21b8 xml-migration amf - next steps. 2020-02-26 22:19:42 +01:00
Adrian Iusca
919ae489fc Merge branch 'master' into master 2020-02-25 23:32:31 +02:00
Paul Arden
ae50c4ebdf Add support for orthographic camera information and use in glTF2 importer. Fixes #3030. 2020-02-25 14:45:00 +11:00
Paul Arden
fb5b01958a Fix to read orthographic camera data. Manual merge for this branch. Fixes #3028 2020-02-25 11:03:07 +11:00
Kim Kulling
e4b2fd246d Merge branch 'master' into remove-else-endif-constructs-cmake-files 2020-02-24 20:08:17 +01:00
Adrian Iusca
28f4b95ff5 Merge branch 'master' into master 2020-02-24 21:05:51 +02:00
Marc-Antoine Lortie
edfaaed56f Removed uneeded expression in else() and endif() constructs.
The following changes were tested against building with a master copy.

For a more detailed report, please read the followings below:

The flags that were checked were the ones checked by default + the following:

ASSIMP_BUILD_ASSIMP_VIEW
ASSIMP_BUILD_SAMPLES

The list of compilable projects in Visual Studio were the following:

- assimp
- assimp_cmd
- assimp_simpleogl
- assimp_simpletextureddirectx11
- assimp_simpletexturedogl
- assimp_viewer
- INSTALL
- IrrXML
- uninstall
- unit
- UpdateAssimpLibsDebugSymbolsAndDLLs
- ZERO_CHECK
- zlib
- zlibstatic

The solution that was generated with the new changes comprised the same number of projects as the one from the master, unmodified. All projects except UpdateAssimpLibsDebugSymbolsAndDLLs were built without any error. All tests were run.

UpdateAssimpLibsDebugSymbolsAndDLLs could not be built because of the reasons explained in issue #3004.
2020-02-23 07:09:35 -05:00
iamAdrianIusca
f28b087d16 small improvements in the CMakeLists.txt file
If ASSIMP_NO_EXPORT is not defined:
- don't add the macro for the exporters
- don't include the files for all the exporter
- don't display any messages about what exporters are enabled or not
2020-02-21 20:17:38 +02:00
Kim Kulling
3f5136b7b2 Merge branch 'master' into master 2020-02-19 21:52:57 +01:00
iamAdrianIusca
4de0237167 small fix 2020-02-18 21:55:35 +02:00
iamAdrianIusca
a5524ffcd9 more changes 2020-02-18 19:02:14 +02:00
iamAdrianIusca
ad52c5c5f6 .clear in destructor is redundant 2020-02-18 18:56:09 +02:00
iamAdrianIusca
bf85fc1386 small changes 2020-02-18 18:50:48 +02:00
iamAdrianIusca
016c0a8665 small changes 2020-02-18 18:42:59 +02:00
iamAdrianIusca
d0922230a9 fixed the = default on the destructor 2020-02-18 18:24:52 +02:00
iamAdrianIusca
a65bac27e9 fixed the make_unique 2020-02-18 18:01:53 +02:00
Kim Kulling
6e13381bdb next warnings. 2020-02-18 14:41:19 +01:00
Kim Kulling
22118dff1d Merge branch 'master' into enable_vs_warning_all 2020-02-16 15:37:48 +01:00
Kim Kulling
c2bfbdacf4 fix more warnings. 2020-02-16 15:37:20 +01:00
Kim Kulling
ec3a5620d0 Update AssxmlExporter.cpp
Fix the build.
2020-02-16 15:04:18 +01:00
Kim Kulling
ada4f51d5b Merge branch 'master' into kimkulling_dev 2020-02-16 13:10:41 +01:00
iamAdrianIusca
024b5e60bc Merge remote-tracking branch 'origin/master' 2020-02-15 23:29:26 +02:00
iamAdrianIusca
5c99d6a864 very small changes
- FIND_PACKAGE(DirectX) is already used in the samples and assimp tool cmake files - so is not needed in the main cmake fil
- other small changes
2020-02-15 23:29:04 +02:00