Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,783 Commits 19 Branches 43 Tags
bugfix/fix_copyrights_in_python
Commit Graph

1607 Commits

Author SHA1 Message Date
Ryan Styrczula
6619ec8253 FBXExporter: Use scene metadata for global settings 
Models with non-standard axes and scale are not imported and exported
correctly if the input metadata is ignored.
 2020-07-13 13:56:06 -04:00
Kim Kulling
78d0b81b6c Merge branch 'master' into patch-1 2020-07-12 18:54:34 +02:00
Kim Kulling
eaac92830a Merge branch 'master' of https://github.com/LoicFr/assimp into LoicFr-master 2020-07-12 12:05:34 +02:00
Kim Kulling
b1dd77fbbc Merge branch 'master' into gltf2_sparseAccessor_export 2020-07-11 22:57:31 +02:00
Kim Kulling
306e03d497 Merge branch 'master' into extras_property_callback 2020-07-11 22:46:19 +02:00
Kim Kulling
21678df589 ogre + collada migration. 2020-07-10 22:25:38 +02:00
Robert Reif
628394baec check for invalid vertex 2020-07-07 23:29:54 -04:00
kimkulling
9aa468262f closes https://github.com/assimp/assimp/issues/3252: fix build. 2020-07-07 17:35:03 +02:00
Robert Reif
6c29247180 add triangle strip support to AC file loader 2020-07-06 17:41:14 -04:00
Max Vollmer
abf43eaf74 * Added ASSIMP_BUILD_NO_GLTF1_IMPORTER, ASSIMP_BUILD_NO_GLTF2_IMPORTER, ASSIMP_BUILD_NO_GLTF1_EXPORTER, and ASSIMP_BUILD_NO_GLTF2_EXPORTER to allow disabling GLTF1 and GLTF2 independently. 
* ASSIMP_BUILD_NO_GLTF_IMPORTER and ASSIMP_BUILD_NO_GLTF_EXPORTER remain with same behavior as before
 2020-07-05 19:22:31 +01:00
Kim Kulling
77b705048b fix merge issues. 2020-07-04 13:42:23 +02:00
Kim Kulling
839986ca14 next step of AMF-Migration. 2020-07-04 09:04:06 +02:00
Kim Kulling
d74c10dcb7 Merge branch 'master' into pugi_xml 2020-07-03 17:29:38 +02:00
Kim Kulling
b1369d0912 next steps. 2020-07-02 15:18:59 +02:00
Yingying Wang
97085c1c05 update sync 2020-06-30 11:48:37 -07:00
Yingying Wang
3f2e5518eb update sync 2020-06-30 11:29:08 -07:00
Marc-Antoine Lortie
03340787ec Fixed variable in loop - HL1MDLLoader.cpp 
Commit 7e5a0acc48 made changes to HL1MDLLoader.cpp. Several variables have been renamed. A loop variable 'i' was renamed to faceIdx, but one reference was left unchanged.
 2020-06-29 07:50:51 -04:00
Kim Kulling
eeb4a981bd Merge branch 'master' into patch-2 2020-06-29 09:55:55 +02:00
Kim Kulling
fb20e15163 start to migrate colladat and amf 2020-06-27 15:57:06 +02:00
Evangel
6d85280c8d Added bool, removed unused debug parameter 2020-06-27 12:53:26 +10:00
Evangel
f6b4370f6a Added arbitrary recursive metadata to allow for glTF2's extensions to be properly represented. 
Primary changes are to include/assimp/metadata.h, adding in the aiMetadata GetAiType function,
adding the operator= to allow an aiMetadata type to be assigned, adding a check for the
AI_AIMETADATA type flag as it can't be trivially memcpy'd.

operator= is implemented with a by-value argument as then the copy is made by the copy
constructor and we can just swap everything out and let the destructor handle the mess.

Implemented parsing of the "extensions" flag on all glTF2 Nodes. Doesn't use the ReadValue
helper function on numbers as it did not seem to fill out the Nullable structure properly.
 2020-06-26 14:28:41 +10:00
Kim Kulling
b7b38c2282 Merge branch 'master' into patch-2 2020-06-25 16:52:40 +02:00
Kim Kulling
1466bbacf8 fix unittests. 2020-06-24 20:30:02 +02:00
Kim Kulling
ae05dbb252 define CheckValidFacesIndices also in release builds. 2020-06-23 21:11:18 +02:00
Kim Kulling
6205af4efb replace NULL and avoid ai_assert with more than 2 tests. 2020-06-23 21:05:42 +02:00
Filip Lundgren
2006286528 Fix Maya PBR & stingray texture detection 2020-06-22 23:14:16 +02:00
Filip Lundgren
ba09e1ef94 Fix Blender .fbx metalness detection 2020-06-21 23:56:11 +02:00
Kim Kulling
b3af5c5a14 closes https://github.com/assimp/assimp/issues/3253 : remove useless code 2020-06-17 20:37:39 +02:00
Kim Kulling
31b8d4710f Merge branch 'master' into issue_3165 2020-06-15 20:32:00 +02:00
Kim Kulling
15f11aec93 Merge branch 'master' into gltf2_targetNames_export 2020-06-14 09:43:09 +02:00
kimkulling
f938a6b744 fix leak: just ignore broken texture coordinates. 2020-06-12 14:52:02 +02:00
kimkulling
1e0c5f26b4 Merge branch 'migenius-migenius-fix-texcoord' of https://github.com/assimp/assimp into migenius-migenius-fix-texcoord 2020-06-12 12:30:11 +02:00
kimkulling
ad62e6e863 fix unittest check - cannot work, just crash shall not occurr any more. 2020-06-12 12:29:51 +02:00
Kim Kulling
f67c71d5c7 Merge branch 'master' into fbx_blendshape_channelName 2020-06-12 10:55:32 +02:00
ywang
e65434bf82 extra callback 2020-06-11 17:37:06 -07:00
ywang
f57e7221c0 temp 2020-06-10 13:23:29 -07:00
Kim Kulling
ffaa634c48 Merge branch 'master' into issue_3165 2020-06-09 10:48:27 +02:00
Kim Kulling
620bebb999 diable warning only for gcc 8.0 or greater 2020-06-09 10:14:57 +02:00
Kim Kulling
42afc40d16 Disable warning only for gcc 8.0 or greater 2020-06-09 10:13:43 +02:00
Kim Kulling
35fb4c9370 Remove dead code 2020-06-09 10:07:25 +02:00
Kim Kulling
5c7bed01f1 remove dead code. 2020-06-09 10:06:50 +02:00
Paul Arden
9e46f9751f Check for invalid texture coordinate accessor. Fixes #3269. 2020-06-09 15:49:38 +10:00
Yingying Wang
8fed101432 avoid all zero 2020-06-08 16:18:11 -07:00
Yingying Wang
f18f1a35f6 accommodate linux build 2020-06-08 14:49:50 -07:00
Yingying Wang
2065512470 remove comments 2020-06-08 14:41:53 -07:00
Yingying Wang
12dc736d94 Merge branch 'master' of https://github.com/thomasbiang/assimp into gltf2_sparseAccessor_export 2020-06-08 14:32:23 -07:00
Yingying Wang
26421aebc9 support channel name in blendshape name 2020-06-08 13:33:16 -07:00
Kim Kulling
b37d42f6b5 Perform sanity check only in debug 
closes https://github.com/assimp/assimp/issues/3255
 2020-06-07 18:03:47 +02:00
Kim Kulling
e6446e1e68 Merge branch 'master' into issue_3258 2020-06-07 08:23:04 +02:00
Alec
2c0df39ef3 Added rapidjson define to avoid warnings in c++17 2020-06-06 14:33:41 +02:00