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

106 Commits

Author SHA1 Message Date
Kim Kulling
c0dc26de8e Merge branch 'master' into GLTF2_recursive_references_fix 2020-04-16 11:29:37 +02:00
Max Vollmer (Microsoft Havok)
a07bf8b26f Merge branch 'master' into GLTF2_recursive_references_fix 2020-04-03 08:40:32 +01:00
Max Vollmer (Microsoft Havok)
d966f3394b Merge branch 'master' into GLTF2_invalid_buffer_fix 2020-04-03 08:40:29 +01:00
Kim Kulling
c21a1ffffa Remove comments to increase readability 2020-04-01 11:16:39 +02:00
Kim Kulling
a7208b02e0 Merge branch 'master' into assimp_gltf2_exporter 2020-04-01 08:42:48 +02:00
Max Vollmer (Microsoft Havok)
54419eb9a0 Merge branch 'master' into GLTF2_invalid_buffer_fix 2020-03-31 09:54:12 +01:00
Max Vollmer (Microsoft Havok)
3c9751ce0c Merge branch 'master' into GLTF2_recursive_references_fix 2020-03-26 10:16:58 +00:00
Max Vollmer (Microsoft Havok)
2006eeed85 Merge branch 'master' into GLTF2_recursive_references_fix 2020-03-23 08:07:25 +00:00
Max Vollmer (Microsoft Havok)
94da6d61a4 Merge branch 'master' into GLTF2_invalid_buffer_fix 2020-03-23 08:03:29 +00:00
Max Vollmer (Microsoft Havok)
973e38ad97 Merge branch 'master' into GLTF2_guarantee_rootnode_fix 2020-03-23 07:57:38 +00:00
kimkulling
4d917c97bd fix warnings detected in vs2017. 2020-03-19 12:58:41 +01:00
Kim Kulling
f17b04168f Merge branch 'master' into GLTF2_recursive_references_fix 2020-03-18 13:58:35 +01:00
Kim Kulling
a2fa19aa78 Merge branch 'master' into enable_vs_warning_all 2020-03-17 19:19:29 +01:00
Kim Kulling
976091a6f6 ix compiler warning for pragma statements. 2020-03-15 11:47:05 +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
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
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
Kim Kulling
7e7555a91b fix compiler warnings in tools and test- 2020-03-11 00:43:44 +01:00
Kim Kulling
e8d2b84017 clean all warnings for vs-2019 2020-03-08 21:24:01 +01:00
Yingying Wang
bb62249f0c fix gltf2 exporter memory crash 2020-03-04 14:52:26 -08:00
Sebastian Matusik
710dbba52d Trimmed trailing whitespaces 2020-02-28 19:19:10 -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
Kim Kulling
3f5136b7b2 Merge branch 'master' into master 2020-02-19 21:52:57 +01:00
Inho Lee
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
Kim Kulling
523e6c9f73 Merge branch 'master' into gltf-camera-pos 2020-02-14 08:21:54 +01:00
Hui.Du
b62bd38c71 Fix: GLTF animation works on RTS not matrix; fix matrix related bug. 2020-02-14 02:11:12 +00:00
Luke Lau
18c01a023c Use the translation matrix in gltf2 cameras for aiCamera.mPosition 2020-02-05 21:24:54 +00:00
Kim Kulling
0269000884 Update glTF2Exporter.cpp 
Replacing tabs by spaces.
 2020-01-31 19:11:36 +01:00
Loïc
194d31002d Import/export of embedded texture names for the glTF/glTF2 format 2020-01-29 14:04:41 +01:00
Kim Kulling
57c735cdca Merge branch 'master' into master 2020-01-24 11:30:59 +01:00
Loïc
2ebafe0693 Fix version revision formatting in glTF metadata 2020-01-22 12:40:57 +01:00
Marc-Antoine Lortie
4e7e47bd43 Updated copyright dates. 
Changed copyright end year to 2020 in every reference "Copyright (c) 2006-XXXX, assimp team".

Changed copyright end year to 2020 in every reference "Copyright (c) 2006-XXXX, ASSIMP Development Team".

Changed copyright end year to 2020 in LICENCE.rtf.

Changed copyright end year in CMakeFiles.txt files and any other places referencing Assimp with a copyright start and end year.
 2020-01-20 08:53:12 -05:00
Hui.Du
1cae51615f Fix: gltf exporting memory leak 2020-01-16 12:09:31 +13:00
Kim Kulling
88bb0bad6a Merge branch 'master' into kimkulling-patch-1 2020-01-08 10:31:44 +01:00
Kim Kulling
9b8f2970c8 Update glTF2Importer.cpp 
- fix compiler error: invalid == operator
- Fix compiler warning: conversion from double to ai_real
 2020-01-07 21:22:41 +01:00
Kim Kulling
f04573984a Update glTF2Importer.cpp 
Remove dead code
 2020-01-07 20:41:37 +01:00
Loïc
e3988cc066 Fix possible null pointer exception on scene metadata when exporting a glTF2 file 2020-01-07 16:20:33 +01:00
RichardTea
ae7a0aa6ef Merge branch 'master' into collada_modeller_metadata 2020-01-02 13:25:04 +00:00
bill.shan
d2ed36756c fix bug:Using custom IO logic in Android platform, importing from 'assets' dir,there comes to be one more '/', which makes the '.bin' file loads failed. 2019-12-27 11:21:05 +08:00
Malcolm Tyrrell
3b7e2bc3fa Fix typos 2019-12-18 16:13:23 +00:00
Kim Kulling
9ef2d7fb7d Merge branch 'master' into collada_modeller_metadata 2019-12-13 08:28:50 +01:00
Malcolm Tyrrell
b6553b8a78 Merge branch 'master' into fixTexcoord 2019-12-12 12:19:02 +00:00
Malcolm Tyrrell
b70c05b4e0 Fix texcoords. 2019-12-12 09:38:50 +00:00
RichardTea
986b67801d Add Copyright common metadata to glTF importer/exporter 
Technically this only exists in glTF v2 but may as well include in both
 2019-12-09 14:30:12 +00:00
Malcolm Tyrrell
fabfcf3cb0 More checking 2019-12-05 12:33:00 +00:00