3c9751ce0c
Merge branch 'master' into GLTF2_recursive_references_fix
2020-03-26 10:16:58 +00:00
ccd13436da
fix memory leak during export
2020-03-25 16:37:43 +01:00
14b8d1242b
Added pre and post rotation handling to FBXConverter::GenerateSimpleNodeAnim. Fixed quaternion interpolation flip. Cleaned code.
2020-03-25 08:20:31 +02:00
b962af93fc
Merge branch 'master' of https://github.com/assimp/assimp
2020-03-24 21:35:22 +02:00
ec17aff6d6
Merge branch 'master' into GLTF2_invalid_buffer_fix
2020-03-24 11:56:44 +00:00
ef20cdc430
Merge branch 'master' into GLTF2_guarantee_rootnode_fix
2020-03-24 11:56:42 +00:00
2820edee54
Merge branch 'master' into GLTF2_recursive_references_fix
2020-03-24 11:56:38 +00:00
891b1d4b3f
Merge branch 'master' into fix_FBX_no_preservePivots_bug
2020-03-24 14:38:23 +08:00
046f50880f
{cmake} Prefix assimp options with "ASSIMP_" to avoid pollution when included as a submodule
...
When libraries are included as submodules in large projects, having an option with a generic name like "BUILD_DOCS" is not very helpful. (e.g. one project I work on includes many libraries as submodules)
It can also clash with options from other libraries which can break things.
2020-03-23 12:35:32 -04:00
bb4bcb442a
Merge branch 'master' of https://github.com/assimp/assimp
2020-03-23 10:35:06 +02:00
2006eeed85
Merge branch 'master' into GLTF2_recursive_references_fix
2020-03-23 08:07:25 +00:00
94da6d61a4
Merge branch 'master' into GLTF2_invalid_buffer_fix
2020-03-23 08:03:29 +00:00
6f8d96b57e
Merge branch 'master' into kimkulling_dev
2020-03-23 09:00:41 +01:00
973e38ad97
Merge branch 'master' into GLTF2_guarantee_rootnode_fix
2020-03-23 07:57:38 +00:00
f0243cc7f3
Changed AI_LMW_MAX_WEIGHTS*2 to 8 which is same thing.
2020-03-22 15:58:12 +02:00
c0ae9b6040
fix invalid check
2020-03-22 14:21:24 +01:00
68a9fa2df3
reformat unittests.
2020-03-22 12:13:09 +01:00
d5d30c898b
Optimized LimitBoneWeightsProcess. Added SmallVector to reduce heap allocations. Simplified algorithm and removed unnecessary copying.
2020-03-22 12:47:42 +02:00
4283e61189
fix clang-compiler warning: wrong move constructor.
2020-03-21 18:25:49 +01:00
089ab0693a
fix static-code-analysis check.
2020-03-21 18:03:35 +01:00
7d624e7f60
obj: add missing init.
2020-03-21 09:00:29 +01:00
9f7d9becb2
fix the linux build.
2020-03-21 08:56:49 +01:00
b40769c395
try to fix linux build.2
2020-03-20 13:18:49 +01:00
7c3fd351d3
fix no preservePivots bug
2020-03-20 17:19:27 +08:00
ac3f08a4d8
fix 3rdparty warnings.
2020-03-20 09:49:36 +01:00
2ee948eb84
fix missing parthesis.
2020-03-19 17:07:21 +01:00
5b8e6832c3
add mssing move constructor.
2020-03-19 16:53:05 +01:00
de06c860ea
add missing constructor.
2020-03-19 16:20:55 +01:00
9ba014739a
fix compiler warning.
2020-03-19 15:25:34 +01:00
4d917c97bd
fix warnings detected in vs2017.
2020-03-19 12:58:41 +01:00
68f7f545a9
fix typo.
2020-03-19 11:09:20 +01:00
9aa5e3e04f
fix new vs2013 warnings.
2020-03-18 21:32:17 +01:00
097d2faeea
fix vs2013 specific warnings.
2020-03-18 19:31:30 +01:00
d1afd97ec2
fix 2 more warnings for vs2013.
2020-03-18 16:48:32 +01:00
017b3238ba
Update IFCReaderGen_2x3.h
...
Fix a typo
2020-03-18 16:20:38 +01:00
959446e416
Update IFCReaderGen_2x3.h
...
Disable warning
2020-03-18 15:52:16 +01:00
f17b04168f
Merge branch 'master' into GLTF2_recursive_references_fix
2020-03-18 13:58:35 +01:00
f68c60c7c6
Update StepReaderGen.h
...
disable warning
2020-03-17 20:32:23 +01:00
a2fa19aa78
Merge branch 'master' into enable_vs_warning_all
2020-03-17 19:19:29 +01:00
a9e8f65941
fix the build - add misisng forward declaration for aiVector3t.
2020-03-16 10:50:07 +01:00
27c125ef4d
Add 2013-spcific compiler warning disabling statements.
2020-03-15 18:22:49 +01:00
856ca9f2dd
Fix static-code findings,
2020-03-15 12:16:17 +01:00
976091a6f6
ix compiler warning for pragma statements.
2020-03-15 11:47:05 +01:00
9e91a33d76
fix review findings.
2020-03-15 10:28:37 +01:00
8b6f95ec30
Obj: apply clang format.
2020-03-15 10:21:08 +01:00
4210318a34
Merge branch 'master' into enable_vs_warning_all
2020-03-15 10:19:49 +01:00
0357333c81
fix all unittests.
2020-03-15 10:17:54 +01:00
255758e6ff
fix read for precision-depending data.
2020-03-14 11:16:44 +01:00
dc04759492
fix unittests part 2.
2020-03-13 17:00:14 +01:00
3c97447c9c
Merge branch 'master' into gltf2_blendshape_export
2020-03-13 13:26:08 +01:00
733e5343c8
export blendshape positions/normals in gltf2/glb2
2020-03-12 12:14:17 -07:00
b295fda22c
fix unittests part 1.
2020-03-12 17:38:42 +01:00
19b40397a9
fix misor findings.
2020-03-11 17:42:10 +01:00
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
1bc7c710d6
Added a check to detect and prevent recursive references in GLTF2 files
2020-03-11 09:54:24 +00:00
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
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
f8757322be
fix warnings
2020-03-11 09:43:55 +01:00
7e7555a91b
fix compiler warnings in tools and test-
2020-03-11 00:43:44 +01:00
02e5698a38
fix linker issues.
2020-03-09 22:49:32 +01:00
f3b6b78d4d
small refactorings.
2020-03-09 10:55:32 +01:00
e8d2b84017
clean all warnings for vs-2019
2020-03-08 21:24:01 +01:00
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
bb62249f0c
fix gltf2 exporter memory crash
2020-03-04 14:52:26 -08:00
0b227219b7
Merge branch 'master' into gltf2_broken_bones_count
2020-03-03 11:33:56 +01:00
920535165d
next fixed warnings
2020-03-01 13:15:45 +01:00
710dbba52d
Trimmed trailing whitespaces
2020-02-28 19:19:10 -08:00
496fcd35c1
Trimmed trailing whitespaces
2020-02-28 19:17:53 -08:00
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
22311883ce
Fix for #3037 [FATAL] SplitByBoneCountProcess::SplitMesh goes into infinite loop
2020-02-28 18:42:22 -08:00
919ae489fc
Merge branch 'master' into master
2020-02-25 23:32:31 +02:00
ae50c4ebdf
Add support for orthographic camera information and use in glTF2 importer. Fixes #3030 .
2020-02-25 14:45:00 +11:00
fb5b01958a
Fix to read orthographic camera data. Manual merge for this branch. Fixes #3028
2020-02-25 11:03:07 +11:00
e4b2fd246d
Merge branch 'master' into remove-else-endif-constructs-cmake-files
2020-02-24 20:08:17 +01:00
28f4b95ff5
Merge branch 'master' into master
2020-02-24 21:05:51 +02:00
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
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
3f5136b7b2
Merge branch 'master' into master
2020-02-19 21:52:57 +01:00
4de0237167
small fix
2020-02-18 21:55:35 +02:00
a5524ffcd9
more changes
2020-02-18 19:02:14 +02:00
ad52c5c5f6
.clear in destructor is redundant
2020-02-18 18:56:09 +02:00
bf85fc1386
small changes
2020-02-18 18:50:48 +02:00
016c0a8665
small changes
2020-02-18 18:42:59 +02:00
d0922230a9
fixed the = default on the destructor
2020-02-18 18:24:52 +02:00
a65bac27e9
fixed the make_unique
2020-02-18 18:01:53 +02:00
6e13381bdb
next warnings.
2020-02-18 14:41:19 +01:00
22118dff1d
Merge branch 'master' into enable_vs_warning_all
2020-02-16 15:37:48 +01:00
c2bfbdacf4
fix more warnings.
2020-02-16 15:37:20 +01:00
ec3a5620d0
Update AssxmlExporter.cpp
...
Fix the build.
2020-02-16 15:04:18 +01:00
ada4f51d5b
Merge branch 'master' into kimkulling_dev
2020-02-16 13:10:41 +01:00
024b5e60bc
Merge remote-tracking branch 'origin/master'
2020-02-15 23:29:26 +02:00
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
00a104efde
Merge branch 'master' into master
2020-02-14 20:58:13 +01:00
bdd5e52176
Merge branch 'master' into search-invalid-textures-missing-texture-types
2020-02-14 18:04:30 +01:00
1473c6616b
Merge branch 'master' into master
2020-02-14 12:56:14 +01:00
d662b25b17
Merge branch 'master' into master
2020-02-14 13:40:15 +02:00
d04df3e7c5
A bug when importing multiple gltf files
...
meshOffsets are not cleared when importing multiple gltf files
2020-02-14 08:41:55 +01:00
523e6c9f73
Merge branch 'master' into gltf-camera-pos
2020-02-14 08:21:54 +01:00
b62bd38c71
Fix: GLTF animation works on RTS not matrix; fix matrix related bug.
2020-02-14 02:11:12 +00:00
56a71f22e1
Merge branch 'master' into master
2020-02-14 01:04:46 +02:00
Max Vollmer (Microsoft Havok)
kimkulling
napina
simon chen
Andy Maloney
Kim Kulling
kkulling
chenmou.cm
Yingying Wang
Max Vollmer
Sebastian Matusik
Adrian Iusca
Paul Arden
Marc-Antoine Lortie
iamAdrianIusca
Inho Lee
Hui.Du