Davide Pizzolotto
ae951fbef9
Fix aiString length in aiProcess_EmbedTextures
2021-10-03 00:41:09 +02:00
Kim Kulling
ac6b8988df
Add support for normal maps, the classic way
...
- get compiant to tinyobjloader and other importers
- closes https://github.com/assimp/assimp/issues/3726
2021-10-01 14:24:40 +02:00
Kim Kulling
1f76b2e6b9
Merge branch 'master' into Q1MDLgroup
2021-10-01 13:36:55 +02:00
diharaw
addd541251
Added gltf2 KHR_materials_ior support.
2021-09-30 08:47:53 +01:00
diharaw
d3276de47d
Added gltf2 KHR_materials_volume write support.
2021-09-30 08:10:02 +01:00
diharaw
200bf8df7a
Added gltf2 KHR_materials_volume import support.
2021-09-29 17:05:17 +01:00
Kim Kulling
6cb6a6acdd
Merge branch 'master' into const-tokens
2021-09-24 13:37:57 +02:00
Kim Kulling
95263b2e54
Update ObjTools.h
2021-09-21 11:34:58 +02:00
Kim Kulling
fb5b5e9d40
Fix possible nullptr dereferencing in material parsing
...
* Return 0.0f for empty buffer
* closes https://github.com/assimp/assimp/issues/3442
2021-09-21 11:06:18 +02:00
Hill Ma
79f3368c85
Merge branch 'master' into static
2021-09-17 09:06:16 -07:00
René Martin
e92177cb99
changed use and def attribute check for x3d importer to upper case
...
This is how it is specified in the standard.
2021-09-17 14:24:57 +02:00
Kim Kulling
d0f7200196
Update X3DImporter_Geometry3D.cpp
2021-09-16 21:01:44 +02:00
krishty
8c84afaff0
Merge branch 'master' into const-tokens
2021-09-15 23:31:00 +02:00
Artenuvielle
70dfdb8f9d
Merge branch 'master' into x3d_pugi_migration_artenuvielle
2021-09-15 14:51:38 +02:00
René Martin
a8a6aa2bd8
fixed some compiling issues
2021-09-15 14:49:46 +02:00
Kim Kulling
880a2f25bb
Merge branch 'master' into remove-useless-code
2021-09-14 23:33:34 +02:00
Kim Kulling
8a975549a9
Add missing override
2021-09-14 20:49:20 +02:00
Kim Kulling
0fef0e1101
Move duplicate code to glFT common header.
2021-09-14 20:45:36 +02:00
Kim Kulling
18531e3677
Next iteration for c++11 features.
2021-09-13 22:38:20 +02:00
Artenuvielle
c7e9c6580a
Merge branch 'master' into x3d_pugi_migration_artenuvielle
2021-09-12 11:45:00 +02:00
René Martin
3f6a371b64
migrated x3d importer to pugixml reader
2021-09-12 11:37:33 +02:00
Krishty
5895c0c22c
more const in format detection
...
BaseImporter::SearchFileHeaderForToken() expected a pointer to a non-const token list. This was probably an oversight, as nobody would realistically expect the function to change the list. Furthermore, it prevented token lists from being compiled to read-only memory, in some cases even causing the compiler to generate thread-safe initialization.
The list is now const and all callers declare their token lists static const, thus compiling them to read-only memory.
2021-09-11 23:23:05 +02:00
Krishty
4cf4e7454f
removed useless code
...
In destructors, zeroing attributes or clearing containers is utterly useless.
2021-09-11 21:51:20 +02:00
Hill Ma
93edbe883f
Use Safe Constants Idioms for ObjFileParser::DEFAULT_MATERIAL.
...
Reference: "A static Class Member" in https://abseil.io/tips/140
2021-09-10 11:56:37 -07:00
Kim Kulling
0dabce2754
Merge branch 'master' into cleanup_public_header
2021-09-09 20:18:01 +02:00
Kim Kulling
bc0a2762df
Merge branch 'master' into master
2021-09-09 09:16:50 +02:00
Kim Kulling
f47479aba4
Rework format + introdule missing C++11 features
2021-09-08 23:19:10 +02:00
René Martin
3001d88172
Merge branch 'master' into x3d_pugi_migration
2021-09-07 15:04:08 +02:00
Kim Kulling
768024d5a0
Merge branch 'master' into master
2021-09-07 11:39:34 +02:00
Kim Kulling
74e8a6a366
Merge branch 'master' into xgl-fix
2021-09-07 09:03:40 +02:00
Max Vollmer (Microsoft Havok)
bf8e36ae28
Fixed typo
2021-09-02 10:07:28 +01:00
Max Vollmer (Microsoft Havok)
72ea80b41f
Revert last change (gltf2::Ref type is not a pointer and has a bool() operator)
2021-09-02 10:00:56 +01:00
Kim Kulling
d710d0700f
Make nullptr test more explicit.
2021-09-02 10:10:42 +02:00
Max Vollmer (Microsoft Havok)
4c86772091
Added another nullptr safety check
2021-09-02 08:27:03 +01:00
Madrich
9b535d1c15
Fix Double Precision errors/warnings
2021-08-31 12:59:31 +02:00
Kim Kulling
155db25883
Merge branch 'master' into ms-maxvollmer/code_improvements
2021-08-31 08:55:47 +02:00
Doug Roeper
96f0787f51
Fix the -Werror=unused-but-set-parameter warning by removing the skipFirst variable.
2021-08-30 18:15:37 -04:00
Max Vollmer (Microsoft Havok)
51f294c587
Fixes issues our internal compliance and code quality tool found:
...
* Adds nullptr checks and asserts to protect certain code paths
* Fixes wrong integer type in a printf call
* Adds const to const values
* Prevents integer overflow with explicit casts
2021-08-30 14:59:17 +01:00
Viktor Kovacs
82d8c4e849
Merge branch 'master' into compressed_json
2021-08-30 10:11:03 +02:00
Kim Kulling
38c611a02c
Update ColladaLoader.cpp
2021-08-30 08:33:35 +02:00
Kim Kulling
e2c2a60c45
Remove not used attribute
2021-08-29 18:41:07 +02:00
Kim Kulling
c9d35b6edc
Remove C++14 feature.
2021-08-29 18:35:44 +02:00
Kim Kulling
ceafa95610
Remove unused header
2021-08-29 10:36:02 +02:00
kirillsurkov
5ca2cbb7ae
Fix MinGW build
2021-08-28 20:04:37 +03:00
Kim Kulling
c9b76f5255
Decrease xml-serializer complexity
2021-08-28 14:20:12 +02:00
Kim Kulling
df739f00dd
Merge branch 'master' into issue_3398
2021-08-28 13:56:50 +02:00
Kim Kulling
69051bbc2c
Add missing docu
2021-08-28 13:46:41 +02:00
Kim Kulling
a7bc858698
Fix review finding.
2021-08-28 13:36:57 +02:00
Kim Kulling
3e090b21f5
Fix setup of embedded texture loading
2021-08-28 13:33:25 +02:00
Viktor Kovacs
b9b62d106c
Merge branch 'master' into compressed_json
2021-08-27 18:18:28 +02:00
kovacsv
b39f38b73c
Add export property for assimp json exporter to write compressed json (without whitespaces).
2021-08-27 18:17:27 +02:00
Kim Kulling
a45878c41a
Fix possible overrun
...
- closes https://github.com/assimp/assimp/issues/3425
2021-08-27 14:04:00 +02:00
Kim Kulling
eabfc05bbb
Handle empty keys
2021-08-27 10:41:25 +02:00
Kim Kulling
6439305379
Remove dead code
2021-08-24 20:53:55 +02:00
Kim Kulling
61ba320a04
Merge branch 'master' into master
2021-08-24 20:53:04 +02:00
kovacsv
0590a39159
Fix M3D import crash and memory leak.
...
The same default material pointer was assigned to all the materials in the scene, so poor destructor tried to free the same pointer multiple times.
2021-08-24 07:26:20 +02:00
kovacsv
468aa50aed
mingw build fix
2021-08-19 13:50:26 +02:00
Kim Kulling
f3903e34a4
Merge branch 'master' into master
2021-08-18 07:32:16 +02:00
Kim Kulling
a486a698e8
Merge branch 'master' into clang13
2021-08-16 21:35:59 +02:00
Kim Kulling
a850f312ac
Merge branch 'master' into ms-maxvollmer/crash_fixes_08_2021
2021-08-16 21:00:07 +02:00
Kim Kulling
27231c3f52
Merge branch 'master' into bound
2021-08-16 20:48:17 +02:00
Max Vollmer (Microsoft Havok)
c1e830cf3b
The GLTF2 specs aren't very specific about the restrictions of the number of keyframes in sampler input and output. It seems logical that they should be the same, but there is an official sample model from Khronos where output has more keyframes. I thus assume that the GLTF2 standard allows more keyframes in output, but not in input. Fixed the check accordingly.
2021-08-13 17:46:10 +01:00
Max Vollmer (Microsoft Havok)
de2f5cf021
Crash fixes
2021-08-13 16:26:42 +01:00
Kim Kulling
4b1ff645e3
closes https://github.com/assimp/assimp/issues/3398 : Add support for embedded textures
2021-08-12 21:13:07 +02:00
Mykhailo Smoliakov
26defda671
Merge branch 'master' into master
2021-08-12 08:20:59 +03:00
Robert Ubiñas
58cae73401
Disable diagnostic for LogStream comparator
2021-08-11 19:32:26 -04:00
Robert Ubiñas
69c152d7c1
Add missing diagnostic push
2021-08-11 18:57:21 -04:00
Mykhailo Smoliakov
c3fcbfd2c1
Fix issue of incorrect reading of PBR properties such as base and emissive color in FBX
2021-08-11 08:54:34 +03:00
Kim Kulling
a16cd95b16
Merge branch 'master' into fix-indent
2021-08-10 21:39:13 +02:00
Kim Kulling
a55518f6fc
Merge branch 'master' into no-empty-string-literals
2021-08-10 20:41:40 +02:00
Kim Kulling
89eadb934f
Merge branch 'master' into trim-trailing-whitespace
2021-08-09 21:24:22 +02:00
Kim Kulling
0aa36ee550
Merge branch 'master' into master
2021-08-07 12:06:23 +02:00
krishty
f8fe3d1341
Merge branch 'master' into fix-indent
2021-08-06 09:40:34 +02:00
krishty
00b22d1397
Merge branch 'master' into no-empty-string-literals
2021-08-06 09:40:31 +02:00
krishty
6cb54d1c95
Merge branch 'master' into trim-trailing-whitespace
2021-08-06 09:40:03 +02:00
bearbit
408b5053a4
update LWO importer(available lwo3)
2021-08-03 20:18:14 +03:00
Hill Ma
8d6d6b48c3
Obj: make a predicate more robust.
...
Since we might encounter invalid input it is a good idea to check the actual
size of the array.
2021-08-02 12:04:15 -07:00
krishty
1ee2be8c5c
Merge branch 'master' into trim-trailing-whitespace
2021-07-31 18:01:48 +02:00
Kim Kulling
00a2cd20f9
Merge branch 'master' into remove-dead-code
2021-07-31 17:00:58 +02:00
Krishty
bb53961fa9
more range-based for
...
f6b4370f6a
and 7c822f23bd
introduced raw loops on data types with heavy nesting; range-based for suits better here
2021-07-29 14:57:25 +02:00
Krishty
42a7611f85
style fix: indentation
2021-07-29 14:39:22 +02:00
Krishty
4991f728c8
style fix – initializing and assigning empty std::string properly
...
for details, see #3764
2021-07-29 14:23:52 +02:00
Krishty
758116b083
removed trailing spaces and tabs from source and text
...
This commit ignores the “contrib” folder in order to prevent merge conflicts in dependencies, should these be updated via git.
2021-07-29 13:28:51 +02:00
Krishty
738c31c3ea
removed useless code
...
Found while reviewing #3880
2021-07-28 16:48:53 +02:00
xiaohunqupo
d065513e27
Merge branch 'master' into master
2021-07-28 17:02:28 +08:00
Kim Kulling
f87550fdbc
Fix Issue3760
...
- Convert left-handed coordinate system to right-handed coordinate system
- Rescale model by 0.01
- closes https://github.com/assimp/assimp/issues/3760
2021-07-28 10:39:39 +02:00
xiaohunqupo
8ee2c721d9
StepExporter support polygon mesh
...
StepExporter support polygon mesh
2021-07-28 16:32:27 +08:00
Kim Kulling
aeae2cf242
Update M3DWrapper.h
2021-07-26 14:44:26 +02:00
Kim Kulling
e8e720d584
Update M3DWrapper.h
2021-07-26 13:41:54 +02:00
Kim Kulling
291c0a4faa
Fix build failure
...
- Fix the failure
- Put inlined stuff out of declaration
- Add some docu
2021-07-26 13:13:21 +02:00
Kim Kulling
df2e7208fb
Fix fuzzer issue in m3d-importer
...
- closes https://github.com/assimp/assimp/issues/3974
- Check for nullptr before dereferencing name in m3d-data-instance.
2021-07-26 11:56:26 +02:00
Kim Kulling
b7f88f3063
closes https://github.com/assimp/assimp/issues/3957 : checkj for empty positions.
2021-07-26 10:51:16 +02:00
Kim Kulling
4e28a3072f
Merge branch 'master' into gltf_fixes
2021-07-23 20:37:25 +02:00
Kim Kulling
e07af07311
Merge branch 'master' into double
2021-07-22 10:07:40 +02:00
Kim Kulling
d0885af634
Merge branch 'master' into gltf_export_id_issue_3978
2021-07-21 13:47:47 +02:00
Adrian Perez
30d342534a
Fix issues encountered during integration atempt
2021-07-16 14:29:28 -07:00
Kim Kulling
5171aa52d1
Remove dead code
2021-07-16 11:47:38 +02:00
Hill Ma
aa883eda19
FBX: fix double precision build.
2021-07-15 11:54:55 -07:00
RichardTea
632b2db97c
Ensure glTFv2 scene name is unique
...
Use the provided scene name if extant
Fixes issue #3978
2021-07-14 13:39:41 +01:00
RichardTea
0c6c238956
Merge branch 'master' into collada_makehuman_issue_3984
2021-07-14 11:33:43 +01:00
Kim Kulling
9c207cd865
Merge branch 'master' into rbsheth_fix_hunter
2021-07-13 20:45:22 +02:00
RichardTea
bff1d012bd
Read matrix and input (shared) correctly
...
<matrix> may have leading and trailing whitespace
<input/> set attribute is unsigned. It is also optional, default 0
2021-07-13 16:50:09 +01:00
RichardTea
206b2436d4
Apply clangformat
2021-07-13 16:47:31 +01:00
Kim Kulling
15bbab2d9e
Merge branch 'master' into PLY_RN_LINE
2021-07-12 10:53:00 +02:00
Rahul Sheth
1b37b74f9e
Hunter fixes for stb_image
2021-07-07 17:01:19 -04:00
Rahul Sheth
0a5e49252d
Merge remote-tracking branch 'origin/master' into HEAD
2021-07-07 16:35:29 -04:00
Promit Roy
90c115cb3f
Merge branch 'master' into promit/gltf-extras
2021-07-02 00:38:00 -04:00
Kim Kulling
240eb36980
Merge branch 'master' into master
2021-07-01 19:23:52 +02:00
arkeon
3cbd31900c
Manage /R/N lines ends correctly on binary files, tested with solidworks PLY export
2021-07-01 17:23:21 +02:00
Kim Kulling
01930101c7
Merge branch 'master' into master
2021-06-29 20:45:09 +02:00
Kim Kulling
59ab791a47
Merge branch 'master' into clang-tidy-perf-fixes
2021-06-29 20:24:23 +02:00
Promit Roy
7c822f23bd
Added support for custom properties ("extras") in glTF2
2021-06-27 00:53:40 -04:00
Jerome St-Louis
e3d54860ec
Merge branch 'master' into master
2021-06-25 18:50:33 -04:00
Pankaj003
72075f984e
Merge branch 'master' into master
2021-06-25 19:48:12 +05:30
Jerome St-Louis
0e41efb050
glTF2: Improved support for AI_MATKEY_OPACITY
...
- Exporter: Writing opacity to pbrMetallicRoughness.baseColorFactor[3] even when alphaMode is set
- Importer: Setting AI_MATKEY_OPACITY from pbrMetallicRoughness.baseColorFactor[3]
2021-06-24 13:27:29 -04:00
Aaron Gokaslan
f435ce8c2c
Merge branch 'master' into clang-tidy-perf-fixes
2021-06-24 11:54:56 -04:00
Kim Kulling
b38b65ff49
Add const
2021-06-24 17:03:00 +02:00
Kim Kulling
012ce30577
Merge branch 'master' into zero
2021-06-24 17:00:43 +02:00
Kim Kulling
d18d838812
Fix formatting
2021-06-24 16:18:11 +02:00
Aaron Gokaslan
8e3a159141
Merge branch 'master' into clang-tidy-perf-fixes
2021-06-23 10:10:28 -04:00
Pankaj Tyagi
6170c49155
Fixed:
...
1. FBX import is unable to read the texture UV rotation angle.
2. FBX export is unable to write the texture UV rotation angle.
2021-06-23 16:49:09 +05:30
Evangel63
e736538df3
Merge branch 'master' into master
2021-06-23 13:45:23 +10:00
Aaron Gokaslan
24d4be958d
Merge branch 'master' into clang-tidy-perf-fixes
2021-06-22 14:42:51 -04:00
Aaron Gokaslan
544148a626
Fix code insertion duplication
2021-06-22 14:28:46 -04:00
Kim Kulling
760953c834
Merge branch 'master' into clean_gltf_pbr_brdf
2021-06-22 20:10:03 +02:00
Kim Kulling
36815b014b
Update FBXExporter.h
2021-06-22 20:05:16 +02:00
Aaron Gokaslan
b17c2f29e9
Replace noexcept with proper macro
2021-06-22 12:44:36 -04:00
Aaron Gokaslan
1650868701
Remove redundant include
2021-06-22 12:32:58 -04:00
Aaron Gokaslan
94c3abd841
Apply various performance fixes from clang-tidy
2021-06-22 12:27:15 -04:00
Kim Kulling
951d5158c5
Merge branch 'master' into patch-1
2021-06-22 09:42:30 +02:00
Kim Kulling
9512e9ac1e
Merge branch 'master' into safe
2021-06-21 17:53:17 +02:00
Hill Ma
fe8c4ebd8c
Merge branch 'master' into zero
2021-06-16 10:18:41 -07:00
Andreas Buhr
e27074594f
Replace swear words in IFCBoolean.cpp
...
Add a more gentle comment.
2021-06-16 18:58:41 +02:00
Kim Kulling
a34b9d1c95
Fix review findings
2021-06-16 11:21:31 +02:00
Hill Ma
148b8c66a8
glTF2: zero out extra space created by padding.
...
This makes resulting GLB deterministic.
2021-06-15 15:18:20 -07:00
Hill Ma
af748755e1
Fix issue #2873
2021-06-15 13:20:12 -07:00
RichardTea
f412595887
Fix typo
...
Thank you clang!
2021-06-14 15:11:41 +01:00
RichardTea
985f3ee665
Fix glTFv2 texcoord/uv mapping
...
Use the standard property to indicate the UV map index
2021-06-14 15:11:41 +01:00
RichardTea
fb039bb9eb
Add glTFv2 Clearcoat import/export tests
...
Uses Clearcoat model from Khronos
2021-06-14 15:11:41 +01:00
RichardTea
4a66ec25d0
Standardise Clearcoat, Sheen and Transmission
...
Also cleanup glTFv2 defaults, don't import/export if disabled
2021-06-14 15:11:41 +01:00
RichardTea
4476352882
First pass at simplifying glTFv2 PBR
...
Removed 'core' set of GLTF-specific properties
2021-06-14 15:11:41 +01:00
Kim Kulling
9a851cac7b
Merge branch 'master' into Fix_SceneCombiner_Texture_Reindexing
2021-06-14 14:47:15 +02:00
Evangel
3de20af3cc
Renamed glTF2::Object::extensions to customExtensions to avoid shadowing in other subclasses.
2021-06-12 13:16:53 +10:00
Evangel
a7a30baf27
Renamed local variable to avoid shadowing member variable.
2021-06-12 13:08:14 +10:00
Evangel
7f0efa0866
Added ReadExtensions to glTF2::Object, so all objects now have their extensions read.
...
Importer is the only place that needs to be modified to make them available on the Assimp side now.
2021-06-12 12:50:44 +10:00
Evangel
5be2330fbb
Added CustomExtension to glTF2::Object so that all subclasses have it instead of doing it piecemeal.
2021-06-12 12:20:40 +10:00
Evangel
6d413444b5
Merge branch 'master' of https://github.com/Evangel63/assimp
2021-06-12 11:46:20 +10:00
Evangel
36c8cdf3de
Add scene metadata for glTF2 files as allowed by the glTF2 specification.
2021-06-12 11:44:28 +10:00
Kim Kulling
6db142ee51
Merge branch 'x3d_pugi_migration' of https://github.com/assimp/assimp into x3d_pugi_migration
2021-06-10 23:36:47 +02:00
Kim Kulling
ebb9b1b2af
Next iteration
2021-06-10 23:36:07 +02:00
Kim Kulling
391d3195df
Merge branch 'master' into fbx-lights-export
2021-06-10 12:27:14 +02:00
Hill Ma
ef739c1703
glTF2: Make handling of embedded textures safer.
...
Previous code does not check whether the embedded texture exists.
2021-06-08 12:53:18 -07:00
Scott Baldric
ca1ab8b11b
Merge branch 'master' into Fix_SceneCombiner_Texture_Reindexing
2021-06-08 08:18:15 -05:00
Scott Baldric
8039351a67
Merge branch 'master' into Fix_SceneCombiner_Texture_Reindexing
2021-06-07 11:44:10 -05:00
Kim Kulling
a8ddc74426
Merge branch 'master' into fix-fbx-exporter2
2021-06-07 18:26:59 +02:00
Kim Kulling
d33cf1dc0c
Merge branch 'master' into x3d_pugi_migration
2021-06-06 16:06:08 +02:00
Scott Baldric
444fc9c373
Increasing length of mDataLength if rewriting the texture index increases magnitutde of index.
2021-06-04 16:32:46 -05:00
Kim Kulling
84db4d3a08
Update CMakeLists.txt
2021-06-03 23:56:52 +02:00
Kim Kulling
742250c5fb
Update CMakeLists.txt
2021-06-03 23:42:07 +02:00
Kim Kulling
a716f741d8
fix the include
2021-06-03 23:35:12 +02:00
Kim Kulling
e0d1a36523
Merge branch 'master' into stb-image-updated
2021-06-03 23:07:38 +02:00
Kim Kulling
d600b45cd2
Merge branch 'x3d_pugi_migration' of https://github.com/assimp/assimp into x3d_pugi_migration
2021-06-03 22:21:10 +02:00
Kim Kulling
3a32612b71
Add skipping of unused nodes.
2021-06-03 20:55:31 +02:00
Kim Kulling
c8510a1a82
Merge branch 'master' into fix-fbx-exporter2
2021-06-03 11:05:07 +02:00
Kim Kulling
77ce4080b6
fix viewer in case of unknown primitives.
2021-05-30 21:54:04 +02:00
Garux
3b565444c3
Merge branch 'Q1MDLgroup' of https://github.com/Garux/assimp into Q1MDLgroup
2021-05-30 11:55:45 +03:00
Garux
c776924adf
fix -Waddress-of-packed-member
2021-05-30 11:45:50 +03:00
Kim Kulling
09bb79c68a
Merge branch 'master' into issue_3711
2021-05-29 08:39:18 +02:00
Matthias Möller
7534b149cf
fix non skipped CR in header parsing
2021-05-28 15:28:35 +02:00
Kim Kulling
70cc1630fa
Merge branch 'master' into fix-gcc4.9-compilation
2021-05-27 15:25:01 +02:00
Carsten Rudolph
0905252833
Merge branch 'master' into master
2021-05-27 09:45:17 +02:00
Kim Kulling
aa8d746dc3
Merge branch 'master' into patch-1
2021-05-27 08:35:29 +02:00
Kim Kulling
29e5f5fed1
Merge branch 'master' into master
2021-05-26 13:18:04 +02:00
Kim Kulling
b59db55b8c
Merge branch 'master' into less-string-bloat
2021-05-26 12:14:08 +02:00
Kim Kulling
6b8a00dfa1
Merge branch 'master' into wangyi_basisu
2021-05-25 17:17:07 +02:00
Kim Kulling
b5e54e4d3b
Merge branch 'master' into wangyi_basisu
2021-05-25 16:17:29 +02:00
Kim Kulling
faeae27923
Merge branch 'master' into importer_fixes_followup
2021-05-25 16:15:09 +02:00
Jean-François Verdon
f13515a391
Adding basic support for lights in FBX exporter
2021-05-23 19:12:21 +02:00
Jean-François Verdon
6c104e096e
Merge branch 'master' into fix-gcc4.9-compilation
2021-05-23 19:06:28 +02:00
Kim Kulling
aeaa22cbbd
Merge branch 'master' into UVStreamNames
2021-05-23 14:37:28 +02:00
Kim Kulling
ac54fe41e2
Merge branch 'master' into PBRsupport
2021-05-23 13:23:06 +02:00
Jean-François Verdon
799384f2b8
Adding the required c flag to compile zip files using gcc 4.9
2021-05-22 17:36:39 +02:00
Jagoon
f96e3cde2d
Fix transform chain is applied twice
2021-05-23 00:06:05 +09:00
Jean-François Verdon
b7b3c6db7e
Fixing GCC 4.9 compilation issues
2021-05-22 16:57:07 +02:00
Jagoon
28e34878cb
Fix fbx exporter bug if root node contains meshes.
2021-05-22 23:20:34 +09:00
Kim Kulling
ee85ebbd00
Merge branch 'master' into md3Tuning
2021-05-20 20:25:30 +02:00
Kim Kulling
4f801a104e
Merge branch 'master' into fix-sib-string-waste
2021-05-20 19:58:11 +02:00
Kim Kulling
3fa45e6a8c
Merge branch 'master' into sml_doc
2021-05-18 21:18:02 +02:00
Kim Kulling
e01a6b4276
Add xml doc.
2021-05-18 21:15:48 +02:00
Malcolm Tyrrell
54a27f4514
Merge branch 'master' into MalcolmTyrrell/loggingImprovements
2021-05-17 13:32:02 +01:00
Malcolm Tyrrell
084dc73b91
Fast path for unformatted calls.
2021-05-17 11:27:21 +01:00
Malcolm Tyrrell
fd5d1211f9
Recover comment which got dropped
2021-05-17 10:33:00 +01:00
Malcolm Tyrrell
6e4b9d267b
Remove TODO. Typo fix.
2021-05-17 10:29:06 +01:00
Carsten Rudolph
43e1e4d3d3
Merge branch 'master' into master
2021-05-17 07:56:41 +02:00
Malcolm Tyrrell
4ec01cfdcd
Improve use of logging
2021-05-13 12:05:31 +01:00
Kim Kulling
22340469f4
Merge branch 'master' into jc3-dnase
2021-05-13 11:51:42 +02:00
Malcolm Tyrrell
ad6f300b1d
Other LogAux functions
2021-05-13 10:43:28 +01:00
Malcolm Tyrrell
7abfd134b6
LogAux warn
2021-05-13 10:33:16 +01:00
Malcolm Tyrrell
5cd3bdd5c2
No need to distinguish formatting log functions.
2021-05-13 10:25:27 +01:00
Malcolm Tyrrell
78145f1425
log verboseDebug
2021-05-13 10:08:59 +01:00
Malcolm Tyrrell
89584c167a
Log debug
2021-05-13 09:56:42 +01:00
Malcolm Tyrrell
ca698c3e49
Log error
2021-05-13 09:36:42 +01:00
Carsten Rudolph
a700285c64
Merge branch 'master' into master
2021-05-13 08:37:59 +02:00
Kim Kulling
b70f195805
Merge branch 'master' into M3DasciiByDefault
2021-05-12 15:31:01 +02:00
Malcolm Tyrrell
58bc4bcb63
log info
2021-05-12 12:55:21 +01:00
Malcolm Tyrrell
813d0aecdd
Adjust warn
2021-05-12 12:43:24 +01:00
Kim Kulling
7a3c8e5504
Merge branch 'master' into md2orient
2021-05-12 13:07:27 +02:00
Kim Kulling
f127144f71
Merge branch 'master' into c4d-cineware
2021-05-12 10:57:17 +02:00
Kim Kulling
8013c5011c
Merge branch 'master' into hl1mdlOrient
2021-05-12 08:21:40 +02:00
Kim Kulling
ad4ca71e4c
Merge branch 'master' into jc3-dnase
2021-05-12 00:56:46 +02:00
Jason C
75af93aaa4
Merge branch 'master' into patch-2
2021-05-11 12:12:07 -04:00
Kim Kulling
4ee2f5f69d
Merge branch 'master' into aseHack
2021-05-11 11:40:24 +02:00
Carsten Rudolph
a54cd432cd
Merge branch 'master' into master
2021-05-11 07:58:05 +02:00
Jason C
00b625a2ae
[amf] Fix crash when file could not be parsed.
...
Fix double free of mXmlParser (deleted but not reset in ParseFile, then deleted again in ~AMFImporter).
Should probably use a smart pointer instead, though.
---
This change was previously made in 785cca1bb4
, as part of PR #3890 , but was lost in a merge.
2021-05-10 19:06:39 -04:00
Kim Kulling
cb7d3ac598
Merge branch 'master' into jc3-spam-killa
2021-05-10 22:21:13 +02:00
Kim Kulling
e1a0e16a4e
Merge branch 'master' into jc3-importer-open-error-handling
2021-05-10 22:07:25 +02:00
Kim Kulling
4807853f09
Merge branch 'master' into mdcOrient
2021-05-10 21:06:15 +02:00
Kim Kulling
433620350e
Merge branch 'master' into stb-image-updated
2021-05-10 11:30:45 +02:00
Jason C
f87b180147
Merge branch 'master' into jc3-importer-open-error-handling
2021-05-09 17:02:04 -04:00
Kim Kulling
b30cbcf117
Merge branch 'master' into jc3-spam-killa
2021-05-09 21:47:17 +02:00
Jason C
0f85990fe3
Merge branch 'master' into jc3-importer-open-error-handling
2021-05-09 14:42:17 -04:00
Jason C
5cc05c26a7
Merge branch 'master' into jc3-spam-killa
2021-05-09 14:41:39 -04:00
Kim Kulling
319770db9d
Merge branch 'master' into jc3-cctype-fixes
2021-05-09 20:37:21 +02:00
Jason C
859b32c045
[Logger] Log a notification instead of silently dropping long log messages.
...
Logs a notification instead of silently dropping long log messages, which can complicate debugging.
This way, if you don't see a message you expect to see, you'll immediately know why.
The *correct* approach would be to eliminate length filtering here entirely and use `snprintf` appropriately (also there's a tiny -- probably negligible -- performance hit here in calling `strlen` regardless of whether or not the verbosity level matches). Failing that, the second best option is to copy and truncate messages here. However, for now, this should be OK.
2021-05-07 22:32:32 -04:00
ywang
a19b708144
support both ktx and ktx2
2021-05-07 16:27:23 -07:00
Jason C
9a2a0384f4
Merge branch 'master' into patch-3
2021-05-07 17:53:18 -04:00
Jason C
279e9a186f
Merge branch 'master' into jc3-dnase
2021-05-07 14:49:22 -04:00
Jason C
6eb15080ec
Merge branch 'master' into jc3-importer-open-error-handling
2021-05-07 14:49:00 -04:00
Jason C
2fd6102573
Merge branch 'master' into jc3-spam-killa
2021-05-07 14:48:24 -04:00
Jason C
7b404788a6
Merge branch 'master' into jc3-cctype-fixes
2021-05-07 14:48:01 -04:00
Carsten Rudolph
8ff52c0f89
Pass base name from export properties to the IO system.
2021-05-07 17:31:30 +02:00
Kim Kulling
25a0eb0d67
Merge branch 'master' into mdcOrient
2021-05-07 13:03:08 +02:00
Kim Kulling
8cae8c5461
Fix static code analysis findings
2021-05-07 11:52:16 +02:00
Kim Kulling
56bfa1ce5c
Make constructros with one arg explicit
2021-05-07 11:36:21 +02:00
ywang
2b9d88c943
support basis universal
2021-05-06 15:10:06 -07:00
Kim Kulling
25cf5dd487
Merge branch 'master' into mRootNode_mTransformation
2021-05-06 21:40:03 +02:00
Kim Kulling
350f2ea1d3
Fix build and merged master.
2021-05-06 21:36:25 +02:00
Kim Kulling
52228a93f8
Fix X3DGeohelper.
2021-05-06 21:07:38 +02:00
Kim Kulling
e120544978
Merge branch 'master' into fixGenNormals
2021-05-06 17:28:37 +02:00
Kim Kulling
bc7551b778
Merge branch 'master' into add-step-extension
2021-05-06 14:19:53 +02:00
Jason C
7da9c42c81
[blender] Disable creation of "dna.txt"
...
Developers who want to enable it can either:
- *Temporarily* set ASSIMP_BUILD_BLENDER_DEBUG_DNA=1 in BlenderDNA.h, or
- *Temporarily* define ASSIMP_BUILD_BLENDER_DEBUG_DNA=1 on the build command line.
Addresses #3886 .
2021-05-05 19:30:29 -04:00
Jason C
c08ad2e5c2
Merge branch 'master' into jc3-cctype-fixes
2021-05-05 19:04:47 -04:00
Jason C
de5c8ece6f
[xgl] Fail if file could not be parsed.
...
Fail instead of returning empty scene.
Partially addresses #3888 .
TODO: Propagate XML error detail through exception (depends on #3881 ).
2021-05-05 17:49:10 -04:00
Jason C
98f586c8d4
[irr] Fail if file could not be parsed.
...
Fail instead of returning empty scene.
Partially addresses #3888 .
TODO: Propagate XML error detail through exception (depends on #3881 ).
2021-05-05 17:48:44 -04:00
Jason C
470913bf27
[assbin] Fail if file could not be opened
...
Fail instead of returning empty scene.
Partially addresses #3888 .
2021-05-05 17:46:24 -04:00
Jason C
0d3e8b52be
[sib] Fix assertion failure when file could not be opened.
...
Check result of IOSystem::Open before constructing stream.
Partially addresses #3888 .
2021-05-05 17:32:10 -04:00
Jason C
a80b3b25eb
[quick3d] Fix assertion failure when file could not be opened.
...
Check result of IOSystem::Open before constructing stream.
Partially addresses #3888 .
2021-05-05 17:31:50 -04:00
Jason C
e52c297284
[nendo] Fix assertion failure when file could not be opened.
...
Check result of IOSystem::Open before constructing stream.
Partially addresses #3888 .
2021-05-05 17:31:24 -04:00
Jason C
1cd3752ec6
[ms3d] Fix assertion failure when file could not be opened.
...
Check result of IOSystem::Open before constructing stream.
Partially addresses #3888 .
2021-05-05 17:31:06 -04:00
Jason C
7f13387487
[cob] Fix assertion failure when file could not be opened.
...
Check result of IOSystem::Open before constructing stream.
Partially addresses #3888 .
2021-05-05 17:30:29 -04:00
Jason C
116ebf6e10
[3ds] Fix assertion failure when file could not be opened
...
Check result of IOSystem::Open before constructing stream.
Partially addresses #3888 .
2021-05-05 17:30:05 -04:00
Krishty
816da9b677
merge and update all copies of stb_image.h
2021-05-05 23:15:41 +02:00
Jason C
785cca1bb4
[amf] Fix crash when file could not be parsed.
...
Fix double free of mXmlParser (deleted but not reset in ParseFile, then deleted again in ~AMFImporter).
Should probably use a smart pointer instead, though.
Partially addresses https://github.com/assimp/assimp/issues/3888 .
2021-05-05 17:13:10 -04:00
Jason C
f5a31b70f5
Merge branch 'master' into patch-3
2021-05-05 16:24:46 -04:00
Kim Kulling
992f10e7bf
Merge branch 'master' into remove-useless-scaling-prototype
2021-05-05 21:54:31 +02:00
Jason C
7ae8a52d9f
Merge branch 'master' into jc3-spam-killa
2021-05-05 10:33:29 -04:00
Kim Kulling
b82d9f4bc7
Merge branch 'master' into new-file-detection
2021-05-05 15:59:25 +02:00
Kim Kulling
5325b327c3
Merge branch 'master' into optimize_3mf_strings
2021-05-05 15:12:06 +02:00
Max Vollmer (Microsoft Havok)
153b890b02
Prevent accessing nullpointers
2021-05-05 14:09:43 +01:00
Krishty
d5cde96fbd
Merge branch 'new-file-detection' of https://github.com/krishty/assimp into new-file-detection
2021-05-05 13:14:35 +02:00
Krishty
b546dfccc7
fix for 0f3e6e2941
...
Visual Studio’s Search All Files ignores ObjFileImporter.cpp and now I’m sure that’s a bug
2021-05-05 13:14:25 +02:00
kkulling
f15dcfa981
- Fix model parsing
2021-05-05 13:10:52 +02:00
kkulling
cbce6d3dad
Merge branch 'optimize_3mf_strings' of https://github.com/assimp/assimp into optimize_3mf_strings
2021-05-05 10:46:54 +02:00
Kim Kulling
6dcbd0d566
Merge branch 'master' into new-file-detection
2021-05-05 09:37:52 +02:00
Jason C
ccd1a4455e
[ply] Fix minor typo in error message.
2021-05-04 21:57:00 -04:00
Jason C
a03dc4edaa
[amf] Fix minor typo in error message.
...
Added missing space to detail string on parse failure.
2021-05-04 21:56:49 -04:00
Jason C
f8609c2c2d
[opengex] Direct OpenDDLParser log messages to assimp logger
...
Also filter unprintable characters. Addresses second part of #3862 .
2021-05-04 21:54:14 -04:00
Jason C
9a04f5d4b0
Fix garbage messages in SIB, MD2, and MDC loaders.
2021-05-04 21:53:16 -04:00
Jason C
a9fb1e56ae
Add ai_str_toprintable; fixed garbage messages in HMP, MDL, Q3D loaders.
...
- ai_str_toprintable: See docs in StringUtils.h.
- HMP, MDL, Q3D: In particular, newlines in binary data were complicating logging.
2021-05-04 20:33:16 -04:00
Jason C
c8ad8c6017
[mmd] Remove stderr spam.
...
Removed stderr spam and cleaned up exception text.
Addresses #3865 .
2021-05-04 20:33:16 -04:00
Krishty
ae93f53b51
fixed signature-based detection on unknown extensions
2021-05-05 00:57:43 +02:00
Krishty
b79b84d34e
Merge branch 'master' into new-file-detection
2021-05-05 00:09:42 +02:00
Krishty
0f3e6e2941
replaced std::size() with AI_COUNT_OF for pre-C++20 compilers
2021-05-05 00:08:54 +02:00
Jason C
2925592c64
[assimp] Make sure ctype calls use unsigned char.
...
Cast to unsigned char as required by C++ (see C++ **[cctype.cyn]** -> ISO C99 section 7.4, [see also](https://en.cppreference.com/w/cpp/string/byte/isspace )).
Addresses https://github.com/assimp/assimp/issues/3867 and then some.
2021-05-04 17:31:13 -04:00
Kim Kulling
072aee7cbe
Merge branch 'master' into add-step-extension
2021-05-04 22:35:21 +02:00
Krishty
b57ce004f8
reduced FBX string bloat
...
The FBX importer used two std::strings where string literals would have been sufficient.
2021-05-04 22:01:01 +02:00
Krishty
f3c18556d1
reduced OpenGEX string bloat
...
The OpenGEX importer defined a few global std::string constants, only to convert them back to C strings on use. This commit defines them as C strings from the beginning.
strncmp() was used to compare these strings to other strings, but the length limit was set to string length, which made it equivalent to strcmp(), just slower. Fixed that as well.
2021-05-04 22:01:01 +02:00
Krishty
7b6dab5e20
reduced DXF string bloat
...
The DXF importer defined a global std::string constant, only to convert it back to a C string on use.
This commit defines the constant as a C string right away, thus saving 340 B of code and data.
2021-05-04 22:01:00 +02:00
Krishty
2a126f9f62
reduced Ogre string bloat
...
The Ogre importer used std::string where a string literal would have been sufficient. Saves another 600 B of code and data.
2021-05-04 22:01:00 +02:00
Kim Kulling
875acc5166
Merge branch 'master' into patch-4
2021-05-04 20:59:06 +02:00
Kim Kulling
e85a69a960
Update D3MFImporter.cpp
2021-05-04 15:31:07 +02:00
vfxgordon
4231a86ad8
Merge branch 'master' into fbxBlendshapes
2021-05-04 06:22:22 -07:00
kimkulling
7690f92c81
Fix version of strnlen
2021-05-04 14:48:39 +02:00
kimkulling
ee5170c18a
- fix security issue
2021-05-04 14:40:25 +02:00
Kim Kulling
9c44c0ab2b
Merge branch 'master' into remove-useless-scaling-prototype
2021-05-04 13:02:00 +02:00
kimkulling
0e17939e8d
Use const char* const
2021-05-04 12:09:38 +02:00
Kim Kulling
33a85e280f
Merge branch 'master' into optimize_3mf_strings
2021-05-04 11:47:11 +02:00
kkulling
55fd820ed7
use const chars
2021-05-04 10:57:30 +02:00
Kim Kulling
39522178aa
Merge branch 'master' into fix-scale-msg
2021-05-04 08:13:12 +02:00
Tom spot Callaway
f91b439f79
preserve UV Stream names in FBX files
2021-05-03 13:40:31 -04:00
Tom spot Callaway
e7211790fb
PBR material support
2021-05-03 13:27:52 -04:00
Krishty
fe5a23e110
fixed bloat in SIB importer
...
The SIB importer, upon needing an empty aiString, did not create a new one but rather copied a predefined global empty string.
Since aiStrings contain large buffers, Assimp copied 1028 B of zeros instead of setting five bytes (at least when compiled with Visual C++). Since aiString is a user-defined type without a constexpr constructor, Visual C++ had to generate a thread-safe run-time initializer as well.
Now it’s just two instructions.
2021-05-03 17:01:59 +02:00
vfxgordon
9ae3e88f6c
Merge branch 'master' into fbxBlendshapes
2021-05-03 07:40:25 -07:00
Kim Kulling
f29828f657
Merge branch 'master' into fix-file-detection
2021-05-02 19:41:33 +02:00
Kim Kulling
e278673fe7
Merge branch 'master' into 3ds-namespace
2021-05-02 15:08:11 +02:00
Krishty
e73a2ed5e0
style fix: namespace instead of class with public static members
2021-05-01 23:20:37 +02:00
Krishty
65a2b98b86
updated C4D importer to use the Cineware SDK
...
Maxon’s Melange SDK has been renamed Cineware SDK as of 21.004, and with it all namespaces and types. This commit
- makes CMake use contrib/Cineware instead of contrib/Melange;
- renames Assimp’s namespace melange to namespace cineware;
- removes useless functions and formatter references from class C4DImporter;
- removes duplicate conversion of cineware::String to aiString in the importer;
- updates comments accordingly;
- updates copyright info.
2021-05-01 18:46:23 +02:00
Jason C
c2d3d22271
Fix crash in CanRead when file can not be opened.
...
Addresses #3849
2021-05-01 10:58:29 -04:00
Kim Kulling
78132d666f
Merge branch 'master' into fix-3ds-matrix
2021-05-01 11:34:33 +02:00
Kim Kulling
7843b24e03
Merge branch 'master' into SceneCombiner_Memory_Leaks
2021-05-01 09:16:06 +02:00
Garux
eab1c9c3c0
add `AI_CONFIG_IMPORT_MD3_LOAD_SHADERS` bool option
...
the purpose is use of this loader with idtech3 FS
this requires full original material name, which euqals to Q3 shader path
result of deduction is not usable inside Q3 FS at all
option in general is "do not tinker with the path"
2021-05-01 08:14:44 +03:00
contriteobserver
813b64ef52
corrected M3D_EXP_NOFACE test
2021-04-30 21:51:02 -07:00
contriteobserver
e51bb1e77e
fixed signed/unsigned mismatch warning
2021-04-30 21:26:57 -07:00
contriteobserver
694f4c2e34
Merge branch 'master' into M3DasciiByDefault
2021-04-30 21:12:48 -07:00
contriteobserver
af0aca796e
now compiling M3D ASCII support by default
...
addresses issue #3777
2021-04-30 21:07:01 -07:00
Jason C
07257f4c66
Merge branch 'master' into patch-4
2021-04-30 22:23:23 -04:00
Garux
55abc49d6d
improve md3::Q3 shader::cull keyword support
...
only use nonstandard winding order with `cull back`; might be excess too, since engine doesn't support this
2021-04-30 22:59:05 +03:00
Garux
0b7ebef497
fix path separator in md3 shader loading
2021-04-30 22:51:21 +03:00
Kim Kulling
2feda5b4b2
Merge branch 'master' into md2-mdc-const
2021-04-30 20:10:45 +02:00
Garux
149224091f
support missing closing brace in material list after Ascii Scene Exporter v2.51
2021-04-30 10:37:06 +03:00
Kim Kulling
57091d761e
Merge branch 'master' into md2-mdc-const
2021-04-30 00:56:50 +02:00
Kim Kulling
0b92abe9b4
Merge branch 'master' into empty-string-style
2021-04-30 00:54:57 +02:00
vfxgordon
5298ed8f9e
Merge branch 'master' into fbxBlendshapes
2021-04-29 15:21:16 -07:00
Kim Kulling
73e05ab6d3
Merge branch 'master' into add-step-extension
2021-04-30 00:13:32 +02:00
Garux
edf12bd357
fix md2 orientation
2021-04-30 00:02:37 +03:00
Krishty
666b5eff76
added .step extension to IFC loader
...
The extension .step is at least as common as .stp, so both should be supported.
2021-04-29 21:29:10 +02:00
Garux
3717e66fae
consider aiProcess_FlipWindingOrder in aiProcess_GenNormals & aiProcess_GenSmoothNormals
2021-04-29 20:52:06 +03:00
Garux
4798ff3882
fix hl1 mdl orientation, tex coords, face windings order
2021-04-29 20:50:50 +03:00
Garux
ebf5ef9a4b
consider pScene->mRootNode->mTransformation set by some importers while using AI_CONFIG_PP_PTV_ROOT_TRANSFORMATION
2021-04-29 20:43:37 +03:00
Garux
db142da571
orient mdc correctly
2021-04-29 20:41:10 +03:00
Scott Baldric
f523b1e0d7
Merge branch 'master' into SceneCombiner_Memory_Leaks
2021-04-29 08:52:51 -05:00
Jason C
975de81ab6
Merge branch 'master' into patch-4
2021-04-28 22:23:17 -04:00
Kim Kulling
41e5acf060
Merge branch 'master' into ms-maxvollmer/importer_fixes
2021-04-28 20:26:38 +02:00
Kim Kulling
9a0b703db1
Merge branch 'master' into ms-maxvollmer/importer_fixes
2021-04-28 20:25:10 +02:00
Jason C
cf498c979a
ASSIMP_ENABLE_DEV_IMPORTERS env var to control registration of wip importers; applied to X3D
...
- GetImporterInstanceList reads ASSIMP_ENABLE_DEV_IMPORTERS env var. Development importers are enabled if the env var is set and is not equal to the literal string "0".
- X3D importer will not be registered unless ASSIMP_ENABLE_DEV_IMPORTERS is set; addresses #3647 .
TODO: If this change is incorporated, it should be documented.
NOTE: Effective git branch structure is a better solution. This is an alternate for #3825 .
2021-04-28 11:16:49 -04:00
Kim Kulling
6abdd0cd3e
Fix crash when reading 0 bytes
...
- This is a valid option so crash shall not happen
2021-04-28 16:38:22 +02:00
Scott Baldric
8e3fe6b30b
Merge branch 'master' into SceneCombiner_Memory_Leaks
2021-04-28 09:16:02 -05:00
Krishty
260cc6bd26
reverted regression in 3DS transformation (issue #3802 )
...
The regression was introduced to align 3DS export and import, but in fact it broke the transformation matrices on import. This commit reverts the relevant lines. Furthermore, matrix layout was double-checked with two other 3DS importers. Export was not considered.
2021-04-28 01:02:24 +02:00
Jason C
3acd42c22e
Remove newline from name of Blender importer.
...
Addresses #3797 .
Re-submitting this as a quick fix to the immediate issue while I think about the website field.
2021-04-26 20:27:28 -04:00
Gordon Chapman
64da2a4315
Merge remote-tracking branch 'upstream/master' into fbxBlendshapes
2021-04-26 13:51:22 -07:00
Gordon Chapman
a5d0e99548
Fixed error in blendShapeChannel Weighting
2021-04-26 12:19:20 -07:00
Max Vollmer (Microsoft Havok)
e1d6e1f377
Merge branch 'master' into ms-maxvollmer/importer_fixes
2021-04-26 14:53:32 +01:00
Krishty
e6a47d93c2
removed dead code from 0d29203e24
2021-04-24 13:29:15 +02:00
Krishty
afe947d5db
fixed malformatted message
2021-04-24 12:38:31 +02:00
Krishty
628cba9490
fixed warning
2021-04-24 00:44:50 +02:00
Krishty
b00de10eb3
Simplified importer search and fixed a few bugs
...
The search for a matching importer had a few issues, see #3791 . There were two different mechanisms to determine whether an importer accepts a specific file extension:
1. `aiImporterDesc::mFileExtensions`, which was forwarded to the UI via `BaseImporter::GetExtensionList()`.
2. `BaseImporter::CanRead()` when called with `checkSig == false`, which determines whether to actually use that importer.
Both were redundant and got out of sync repeatedly. I removed 2. completely and replaced it with 1., thereby syncing UI/import and shortening all `BaseImporter::CanRead()` implementations.
Further bugfixes:
- fixed glTF2 importer throwing exceptions when checking whether it can load a file
- removed `BaseImporter::SimpleExtensionCheck()` because it is no longer used and had a bug with case sensitivity
Since the `checkSig` parameter in `BaseImporter::CanRead()` is now useless, it can be removed completely. I’m not sure if this would break ABI compatiblity, so I’ll submit it with a later pull request.
2021-04-24 00:17:50 +02:00
Krishty
9dc66b0003
removed dead code
...
BaseImporter::GetExtensionList() is not a virtual function; overriding it is useless. This probably stemmed from a misunderstanding.
2021-04-23 15:15:21 +02:00
Krishty
196deea7ce
added missing file extensions to aiImporterDesc::mFileExtensions
2021-04-23 15:05:09 +02:00
Scott Baldric
4b47b7a552
Merge branch 'master' into SceneCombiner_Memory_Leaks
2021-04-23 07:42:32 -05:00
Scott Baldric
aae3788247
Fix: Removing double delete of texture items.
...
Textures were being double deleted after a merge scene because the
texture array wasn't being properly deleted at the end of merging.
Furthermore, the texture array was being sized to the number of
materials instead of the number of textures.
2021-04-22 08:49:47 -05:00
Kim Kulling
8881e65d62
Merge branch 'master' into strip-useless-gltf-write
2021-04-22 09:55:00 +02:00
Max Vollmer (Microsoft Havok)
44dc08f128
Remove GLTF tag, postprocessing is format independent
2021-04-21 16:20:58 +01:00
Max Vollmer (Microsoft Havok)
746d5cf964
* Throw instead of assert on invalid file input
...
* Check JSON object type before accessing members
* Ensure samplers input and output references are set before accessing them
2021-04-21 16:17:03 +01:00
Kim Kulling
873c6ffabe
Merge branch 'master' into fix-import-export-confusion
2021-04-19 21:08:52 +02:00
Krishty
55dd5faafb
fixed export exceptions on import
...
Ogre and 3MF imports threw DeadlyExportErrors under some circumstances. Bad for people who assumed that they only needed to catch DeadlyImportErrors. Changed them to DeadlyImportErrors.
2021-04-19 19:33:41 +02:00
Krishty
3fead344ad
updated version string (if anyone cares)
2021-04-19 07:37:12 +02:00
Krishty
a19299d501
moved MD2/MDC tables from BSS to const data
...
Visual C++ is unable to identify them as constant data during optimization, so explicitly declare them const.
2021-04-17 00:32:04 +02:00
Krishty
f761dc72f4
style fix - initializing and assigning empty std::string properly
...
std::string s(""); s = ""; calls the copy constructor, which in turn calls strlen(), … assigning a default-constructed string generates fewer instructions and is therefore preferred.
With C++11 uniform initialization, you’d simply write s = { } instead.
2021-04-16 23:43:56 +02:00
Krishty
6cbeca5518
fixed glTF export stuff being pulled into the EXE even if building with ASSIMP_BUILD_NO_EXPORT
...
“LazyDictBase::WriteObjects()” in the two glTF implementations is only used for export. Since it’s a virtual method, and many compilers have trouble removing unreferenced virtual methods, glTF export stuff is pulled into the binary even if compiling without exports.
This commit removes said virtual function if only compiling for import.
This removes 75 KiB of useless code when compiled with Visual Studio for x64.
2021-04-16 20:44:40 +02:00
Kim Kulling
21b56b0058
Merge branch 'master' into tr1
2021-04-14 12:46:59 +02:00
Kim Kulling
83c0dce075
Merge branch 'master' into Q1MDLgroup
2021-04-14 10:48:26 +02:00
Kim Kulling
0b61a8875a
Merge branch 'master' into patch-1
2021-04-14 10:22:42 +02:00
Hill Ma
4aa52b3af8
Flip the check on _MSC_VER for using TR1 containers.
2021-04-13 11:15:52 -07:00
Kim Kulling
263d450300
Merge branch 'master' into master
2021-04-12 09:35:03 +02:00
Kim Kulling
a3ee377af7
Merge branch 'master' into ms3d-fixes
2021-04-11 19:12:06 +02:00
Kim Kulling
cf4ef04a80
Merge branch 'master' into master
2021-04-07 20:58:40 +02:00
Clement JACOB
e66232d8c3
Merge branch 'master' into feature/gltf_fb_ngon_encoding
2021-04-07 13:54:31 +02:00
Patrick Walton
a44ba41413
Fix incorrect indices in the MilkShape 3D loader
2021-04-05 19:14:48 -07:00
Kim Kulling
7fee914776
Fix direct leak
...
closes https://github.com/assimp/assimp/issues/3747
2021-04-05 21:24:54 +02:00
Garux
856547be23
Fix Q1 MDL group frame loading, e.g. Q1 progs/flame2.mdl
2021-04-05 17:18:06 +03:00
Garux
437d7bf8b8
Fix MDC loader
...
placement new was clearing input buffer by constructor, which was nothing to do with adequate parsing
changes are not analyzed in depth, but at least test model and models of Wolf:ET are loading and not crashing
2021-04-05 16:39:41 +03:00
Kim Kulling
22413d85ad
Merge branch 'master' into MalcolmTyrrell/tangentCheck
2021-04-03 17:42:44 +02:00
Kim Kulling
80fc8538be
Update AMFImporter_Material.cpp
2021-04-03 10:29:16 +02:00
Kim Kulling
d62c89557b
Remove dead code
2021-04-03 10:28:19 +02:00
Kim Kulling
46e49d0b83
Update AMFImporter_Geometry.cpp
2021-04-03 10:27:54 +02:00
Kim Kulling
cdb6a62cdb
Merge branch 'master' into issue_3678
2021-04-03 10:27:07 +02:00
Kim Kulling
da0543972b
Fix parsing for AMF-Files.
2021-04-03 10:25:03 +02:00
Kim Kulling
89a8f87dae
AMF: Remove unused macros
2021-04-02 13:10:24 +02:00
Clement Jacob
fc2c12ad6a
Fixing encoding when lines and points are encountered
2021-03-30 09:58:28 +02:00
Clement Jacob
fc0cf2ea8d
NGON encoding triangles only
2021-03-30 09:19:50 +02:00
Clement Jacob
2e90fed527
Refactoring and fixing remaining issues in triangulation process
2021-03-30 09:10:50 +02:00
Clement Jacob
596001c89c
Refactoring the extension
2021-03-30 09:10:50 +02:00
Clement Jacob
81019d5e58
Fixing quad encoding
2021-03-30 09:10:50 +02:00
Clement Jacob
6d1a0c6054
Adding quad proper handling
2021-03-30 09:10:50 +02:00
Clement Jacob
8e589221d7
[gltf2-exporter] Adding FB_ngon_encoding support
2021-03-30 09:10:50 +02:00
Kim Kulling
f61a41bdd9
Merge branch 'master' into fbxBlendshapes
2021-03-29 21:48:51 +02:00
Bernold Kraft
09d3266250
Fixing 3DS import for CHUNK_TRMATRIX translation vector.
2021-03-29 15:31:08 +02:00
urschanselmann
5755530bab
Merge branch 'master' into master
2021-03-28 17:40:17 +02:00
Kim Kulling
e5862c18be
Merge branch 'master' into fbxBlendshapes
2021-03-28 13:02:35 +02:00
Bernold Kraft
348c34811f
Fixing CHUNK_TRMATRIX translation sub chunk
...
and therefore omitting the transform aggregation in the CHUNK_VERTLIST.
2021-03-26 22:21:45 +01:00
Gordon Chapman
3fd865b4bf
Added Blendshape Support to FBX Export
2021-03-24 18:10:03 -07:00
Malcolm Tyrrell
d94ddd32b1
Extra check. Better logging.
2021-03-24 11:04:39 +00:00
Malcolm Tyrrell
add165c4a1
Check target sizes to avoid reading beyond allocation
2021-03-24 10:55:40 +00:00
urschanselmann
0a1efe5d58
Merge branch 'master' into master
2021-03-21 17:19:43 +01:00
urschanselmann
86c05a1154
Merge branch 'master' into master
2021-03-19 18:15:15 +01:00
Kim Kulling
5f652feb75
Merge branch 'master' into MalcolmTyrrell/gltfCrashes
2021-03-19 13:35:13 +01:00
Hill Ma
3e99385f44
Fix a memory leak in glTF2.
...
The destructor of LazyDict uses `delete` but `delete` was not used for objects removed by LazyDict::Remove.
2021-03-17 15:12:54 -07:00
Urs Hanselmann
d9cd07f0d9
Merge branch 'master' of https://github.com/assimp/assimp
2021-03-17 18:26:11 +01:00
Malcolm Tyrrell
3503252e12
Strict check for accessor "count"
2021-03-16 11:47:19 +00:00
Malcolm Tyrrell
e4983aa16e
Fix code issue
2021-03-15 16:46:41 +00:00
Malcolm Tyrrell
57652a9084
Version is strictly a string
2021-03-15 16:27:50 +00:00
Malcolm Tyrrell
053c0f5e0a
Catch type errors in gltf and try to print out useful context.
2021-03-15 13:06:11 +00:00
Kim Kulling
f5ed217409
Merge branch 'master' into msvc2019fix
2021-03-12 15:49:41 +01:00
Kim Kulling
84cd1d95c7
Merge branch 'master' into FixClangCL
2021-03-12 15:26:49 +01:00
Urs Hanselmann
c0c7e6a0de
trim uvIndices to fix import of Cheetah3D generated fbx files
2021-03-12 14:48:38 +01:00
Urs Hanselmann
cc7e229c3c
disable size check
2021-03-12 08:55:11 +01:00
Kim Kulling
51ad88afb6
Merge branch 'master' into master
2021-03-10 20:35:37 +01:00
Kim Kulling
806b12dc8b
Merge branch 'master' into issue_3678
2021-03-10 19:51:04 +01:00
Kim Kulling
732e9386aa
Merge branch 'master' into master
2021-03-10 11:49:13 +01:00
Kim Kulling
6c89631581
closes https://github.com/assimp/assimp/issues/3678 : ensure lowercase
2021-03-09 21:08:28 +01:00
Andy Shaw
2576c8c3a6
Compile fix for MSVC 2019
...
Small is seen as a type with some options so this fixes the errors starting with:
code\PostProcessing\ComputeUVMappingProcess.cpp(125): error C2632: 'int' followed by 'char' is illegal
2021-03-04 08:04:19 +01:00
Minmin Gong
c6c0f141f1
Fix compiling issues in clang-cl
2021-03-03 22:30:36 -08:00
Kim Kulling
ff769ecce2
Merge branch 'master' into sparse_minmax
2021-03-02 12:30:01 +01:00
Kim Kulling
75210576cf
Merge branch 'master' into sparse_minmax
2021-03-01 21:34:24 +01:00
contriteobserver
111752cff0
workaround for ASSIMP_DOUBLE_PRECISION compile errors
...
changed float types to ai_real types as needed
addresses issue #3682
2021-02-28 14:45:39 -08:00
Kim Kulling
c669c8f1eb
Merge branch 'master' into update_copyrights
2021-02-28 12:18:41 +01:00
Kim Kulling
9e8dbd0ca5
Update copyrights to 2021.
2021-02-28 12:17:54 +01:00
Kim Kulling
5b78e3fb5d
Merge branch 'master' into user/mavollme/GLTF2_CheckNormalCount
2021-02-25 21:29:03 +01:00
Kim Kulling
aa6f983920
Remove buggy assert
...
- Remove assertion test for empty nodestacks when no meshes are in the node. Just return from the function.
- closes https://github.com/assimp/assimp/issues/3664
2021-02-25 14:01:18 +01:00
Max Vollmer (Microsoft Havok)
eef03c1f17
Improved warnings
2021-02-24 14:28:18 +00:00
Max Vollmer (Microsoft Havok)
facb7da701
Check that normal count and tangent count matches vertex count. Ignore data and warn if counts don't match.
2021-02-24 14:19:29 +00:00
Turo Lamminen
3e1c785d31
[3MF] Silence uninitialized variable warning
...
This is a false positive but the compiler can't see it
2021-02-24 10:59:59 +02:00
thomasbiang
5429475339
Merge branch 'master' into sparse_minmax
2021-02-23 12:30:53 -08:00
ywang
72efb4354a
Merge branch 'master' of https://github.com/thomasbiang/assimp into sparse_minmax
2021-02-23 12:12:36 -08:00
Kim Kulling
247fd0ce17
Merge branch 'master' into FixAnimName
2021-02-22 20:38:16 +01:00
Kim Kulling
616d924d29
Merge branch 'master' into master
2021-02-20 19:35:31 +01:00
Kim Kulling
6094da3493
Update glTF2Asset.inl
2021-02-18 09:32:37 +01:00
Minmin Gong
d57b78bc98
Export the animation name to gltf2
2021-02-16 20:22:08 -08:00
RichardTea
f1d225c18d
Merge branch 'master' into issue_2195_draco
2021-02-15 18:05:22 +00:00
Kim Kulling
047b45d172
Fix apha value
...
- The alpha value in materials using the Tr format must be inverted
- closes https://github.com/assimp/assimp/issues/3645
2021-02-15 11:51:20 +01:00
Guangmo Lin
ba7f945f99
Eliminate MSVC warning C4819 caused by source files encoded in UTF-8 without BOM
2021-02-14 10:28:14 +08:00
Kim Kulling
426c1a340f
Merge branch 'master' into issue_2195_draco
2021-02-10 15:28:39 +01:00
Guangmo Lin
2d4bc2d04e
Eliminate maybe-uninitialized warnings which are treated as errors when use -DCMAKE_BUILD_TYPE=Release
2021-02-09 14:10:44 +08:00
Kim Kulling
c9ca921d09
Merge branch 'master' into ColladaAnimationFix
2021-02-08 20:46:18 +01:00
Kim Kulling
888415246e
Merge branch 'master' into issue_2195_draco
2021-02-08 11:52:54 +01:00
Gargaj
8ae8b165ca
fix compile warning-turned-error on x86
2021-02-08 00:37:06 +01:00
Kim Kulling
cb15a0d8b0
Merge branch 'master' into ColladaAnimationFix
2021-02-07 17:45:10 +01:00
Kim Kulling
6c3593eda0
Merge branch 'master' into master
2021-02-06 09:54:51 +01:00
ywang
9bab475302
export min max for sparse accessor
2021-02-03 15:05:58 -08:00
Kim Kulling
bb21ec9423
trigger build
2021-02-03 21:17:57 +01:00
Kim Kulling
2391432523
fix overflow
2021-02-03 21:07:28 +01:00
Kim Kulling
e6b8ae44cb
Fix unittests: skip newline at begin of matrix token.
2021-02-03 20:54:48 +01:00
xiaohunqupo
c43a1ed886
Fix Step Expoter Error.
...
Fix Step Expoter Error.
2021-02-03 16:26:02 +08:00
thomasbiang
d08acb85e7
Merge branch 'master' into master
2021-02-02 14:48:41 -08:00
Kim Kulling
faf53b8e0f
Fix broken autocorrect fix
2021-02-02 23:33:02 +01:00
Kim Kulling
6ee1a32fb2
fix compile issue: replace std::make_unique
2021-02-02 22:54:20 +01:00
Kim Kulling
50fd5127ef
Some review findings.
2021-02-02 22:34:30 +01:00
ywang
793bd44cee
fix issue: 3482: invalid gltf2 properties
2021-02-02 13:19:57 -08:00
Kim Kulling
fa2354ebc3
Fix incorrect xml-parsing in collada importer.
2021-02-02 22:06:33 +01:00
contriteobserver
65bc86e181
Merge branch 'master' into ColladaAnimationFix
2021-02-01 16:58:01 -08:00
RichardTea
aa10b56bc2
Fix draco linking for Hunter/Normal
2021-02-01 14:29:24 +00:00
Kim Kulling
5fbbba2fac
Merge branch 'master' into issue_2195_draco
2021-01-31 16:02:57 +01:00
Kim Kulling
f2543ee608
Merge branch 'master' into ColladaSubmeshFix
2021-01-29 22:11:07 +01:00
Kim Kulling
de827b2fec
Merge branch 'master' into develop
2021-01-29 21:46:42 +01:00
Kim Kulling
79eb9ecc86
Update all minimum cmake req to 3.10
2021-01-29 21:05:46 +01:00
Kim Kulling
db8e9eb556
Merge branch 'master' into develop
2021-01-29 19:20:38 +01:00
Kim Kulling
8d4b816dfe
Merge branch 'master' into master
2021-01-29 18:16:04 +01:00
contriteobserver
e33b69a428
Collada importer now identifies animations
...
addresses issue #3584
2021-01-28 13:06:02 -08:00
Kim Kulling
706d636c63
Merge branch 'master' into master
2021-01-28 18:25:39 +01:00
RichardTea
48bcbbefdd
use nullptr and float constants
2021-01-27 10:56:57 +00:00
RichardTea
150514fc8b
Move draco warning suppression
...
Should be around the include for portability, not template instantiation
Fix clang pragma typos
2021-01-27 10:42:28 +00:00
RichardTea
5e7281dac6
Merge branch 'master' into issue_2195_draco
2021-01-27 10:26:16 +00:00
RichardTea
6ec32b6b78
Apply clangformat
2021-01-27 09:55:03 +00:00
RichardTea
c6fd1ce996
glTF2 Minor cleanup
2021-01-27 09:42:49 +00:00
RichardTea
5b9d06c2fc
Disable draco clang/gcc warnings via pragma
...
draco templated functions also throw warnings
2021-01-27 09:19:35 +00:00
Kim Kulling
1e38f84c3a
fix typo
2021-01-27 09:40:19 +01:00
Kim Kulling
ac0f1f2cab
Update FBXMaterial.cpp
2021-01-27 09:37:35 +01:00
Kim Kulling
c02ad323a5
Fix VS compiler warning: convertig int to char
2021-01-27 09:22:59 +01:00
thomasbiang
4ed9f3c2f4
Merge branch 'master' into master
2021-01-26 13:55:40 -08:00
Kim Kulling
4471c36c08
Fix compiler bug for VS2019
...
- Check https://developercommunity.visualstudio.com/content/problem/1223143/visual-studio-2019-c-program-crash-with-stdstring.html for more details
- closes https://github.com/assimp/assimp/issues/3572
2021-01-26 20:59:21 +01:00
RichardTea
d79e0c0ba9
Avoid std::make_unique
...
Assimp is still C++11
2021-01-26 17:33:10 +00:00
RichardTea
fe97ff6474
Draco platform libraries have different names
...
On Windows it's draco.dll/lib
On Linux/macOS draco_shared.dylib & draco_static.lib
2021-01-26 17:19:41 +00:00
RichardTea
c917e6513f
Merge branch 'master' into issue_2195_draco
2021-01-26 16:43:46 +00:00
RichardTea
f39ba8ddb2
Add compile error for bad error draco config
...
KHR_draco_mesh_compression requires
DRACO_MESH_COMPRESSION_SUPPORTED
2021-01-26 16:24:18 +00:00
RichardTea
dde7605158
Implement draco decoding
2021-01-26 16:08:12 +00:00
RichardTea
3a7d0f5656
Add Draco to cmakelists
...
Initial pass. Not yet used.
Add Draco library to assimp build and link
2021-01-26 15:58:14 +00:00
contriteobserver
d7bf513250
renaming iterator to avoid any possibility of scop collisions
2021-01-26 01:36:12 -08:00
contriteobserver
69fc809307
size_t is not the same as unsigned int on some systems
2021-01-26 01:01:59 -08:00
contriteobserver
f92a34e0b7
Merge branch 'master' into ColladaSubmeshFix
2021-01-26 00:38:37 -08:00
Kim Kulling
243d017463
Add missing skip
...
- closes https://github.com/assimp/assimp/issues/3601
- Fix some format issues
2021-01-24 18:47:50 +01:00
Kim Kulling
a2b889ab09
Fix typo in collada parser
...
closes https://github.com/assimp/assimp/issues/3599
2021-01-24 18:21:46 +01:00
Ville Voutilainen
6ebae5e67c
GCC 11 build fixes
2021-01-24 11:04:46 +02:00
contriteobserver
338abded12
ColladaLoader now assigns individual materials to submeshes as needed
...
Optional assignment of individual materials to submeshes, addresses #3606
2021-01-23 02:20:58 -08:00
Bart Sekura
5f50e42535
added missing return
2021-01-23 09:56:35 +09:00
Bart Sekura
f8c512acd7
changed morph anim error to warning when validating
2021-01-23 09:52:46 +09:00
thomasbiang
91dc904ed1
Merge branch 'master' into master
2021-01-22 13:25:31 -08:00
Kim Kulling
e792455d66
Remove redundant statement in if
...
- closes https://github.com/assimp/assimp/issues/3180
2021-01-22 14:22:34 +01:00
Kim Kulling
dc4514de82
Update COBLoader.cpp
...
Fix cppcheck finding
2021-01-22 13:23:39 +01:00
Kim Kulling
0dcd72d420
Update IFCOpenings.cpp
2021-01-22 13:18:43 +01:00
Kim Kulling
f44572157a
Update 3DSLoader.cpp
2021-01-22 13:14:59 +01:00
Kim Kulling
f2d3f0dbe6
Merge branch 'master' into master
2021-01-22 12:35:44 +01:00
thomasbiang
b3a35364ad
Merge branch 'master' into master
2021-01-21 13:38:21 -08:00
Kim Kulling
2bcf08370d
Merge branch 'master' into fix-gltf-vertex-colors
2021-01-21 11:54:02 +01:00
thomasbiang
d7cf7847ba
Merge branch 'master' into master
2021-01-20 18:47:39 -08:00
ywang
01e61c8b9f
customized node transformation format
2021-01-20 18:42:56 -08:00
Kim Kulling
4e0c4d7bb7
Update PbrtExporter.h
2021-01-20 21:11:14 +01:00
Kim Kulling
11a17ebfe6
Merge branch 'master' into tdb/pbrt3_exporter
2021-01-20 20:03:30 +01:00
xiaohunqupo
8ba1d38dea
Fix STL Expoter error.
2021-01-20 16:29:30 +08:00
Kim Kulling
f8dd3a9aa6
Update DefaultIOSystem.cpp
2021-01-20 08:05:43 +01:00
Kim Kulling
ed3e745752
Update DefaultIOSystem.cpp
2021-01-19 21:58:04 +01:00
Kim Kulling
f05a57560b
Remove buggy method.
2021-01-19 21:27:50 +01:00
Kim Kulling
22f632d8d0
Merge branch 'master' into kimkulling-oss_fuzz29168
2021-01-19 21:21:28 +01:00
Kim Kulling
5b325af79f
Fix typo.
2021-01-19 21:19:42 +01:00
Kim Kulling
5a6498af92
Fix nullptr access
2021-01-19 21:14:38 +01:00
Kim Kulling
4008862a35
Merge branch 'master' into ihsinme-patch-210
2021-01-19 21:05:43 +01:00
Matt Pharr
8f5148f108
Merge branch 'master' into tdb/pbrt3_exporter
2021-01-18 17:15:40 -08:00
Dan Church
0bc5cf9fd3
Fix build failure on Linux
2021-01-18 16:17:28 -06:00
Kim Kulling
5a7f212162
Merge branch 'master' into ihsinme-patch-210
2021-01-18 21:55:42 +01:00
Kim Kulling
f24c042925
Fix typo
2021-01-18 20:28:38 +01:00
Kim Kulling
0803e5e6f3
Fix nullptr dereference in scenepreprocessor
2021-01-18 20:25:33 +01:00
Matt Pharr
17c79bcb94
Merge branch 'master' into tdb/pbrt3_exporter
2021-01-15 13:47:21 -08:00
Maki
6d13fd6aa2
Fix glTF vertex colors with types other than float
2021-01-15 02:56:45 +00:00
Kim Kulling
a9705e346a
Merge branch 'master' into ihsinme-patch-210
2021-01-14 17:21:44 +01:00
Kim Kulling
87a6305cf0
Merge branch 'master' into gltf2_buffer_fixes
2021-01-12 18:32:17 +01:00
Matt Pharr
ff8d50c8d0
Fix MSVC compiler warnings
2021-01-12 08:23:53 -08:00
Matt Pharr
09c5564d5b
More compiler warnings
2021-01-12 08:16:08 -08:00
Matt Pharr
1fd8646b7a
Fix compiler warnings
2021-01-12 08:03:16 -08:00
ihsinme
070072370d
Update AMFImporter_Material.cpp
2021-01-12 15:43:40 +03:00
ihsinme
2e96366d04
Update AMFImporter_Geometry.cpp
2021-01-12 15:40:19 +03:00
kkulling
9174bca3f7
closes https://github.com/assimp/assimp/issues/3517 : use const instead of constexpr
2021-01-12 10:01:53 +01:00
Matt Pharr
1042845414
Merge branch 'master' of https://github.com/assimp/assimp into tdb/pbrt3_exporter
2021-01-11 19:57:10 -08:00
Matt Pharr
71cfd8e0cf
Merge branch 'master' into tdb/pbrt3_exporter
2021-01-11 19:54:11 -08:00
Matt Pharr
2bc074e35a
Additional PBRT exporter cleanups
2021-01-11 19:42:23 -08:00
Max Vollmer
d49aed4585
* Check that buffer view has buffer
...
* Handle integer overflow when calculating byte length
* Minor code cleanup for exception messages
2021-01-11 08:45:47 +00:00
Matt Pharr
938537c884
Checkpoint improvements to pbrt exporter
2021-01-08 16:57:22 -08:00
Kim Kulling
cf78781fa8
Merge branch 'master' into 3mf-improvements
2021-01-02 13:14:13 +01:00
Kim Kulling
3298082a96
Merge branch 'master' into update-unzip
2021-01-02 12:06:53 +01:00
Danny-Kint
07aace0fdd
Merge branch 'master' into dev/gltf-KHR_materials
2020-12-31 07:08:31 +01:00
Kim Kulling
465220b26a
Merge branch 'master' into 3mf-improvements
2020-12-30 18:12:26 +01:00
Kim Kulling
e0803b3ec2
Merge branch 'master' into fix-gltf-bin-from-memory
2020-12-30 11:17:31 +01:00
Danny-Kint
b8d947299a
Merge branch 'master' into dev/gltf-KHR_materials
2020-12-29 17:09:15 +01:00
Jean-Louis
37df38f951
[3MF] Improves node naming
2020-12-29 15:46:28 +01:00
Jean-Louis
4025c57fd0
[3MF] Parse the transform of the components
2020-12-28 15:47:20 +01:00
Jean-Louis
eda967bd02
Parse the <build> node + refactoring
2020-12-28 12:31:54 +01:00
Danny-Kint
07b59f539d
Merge branch 'master' into dev/gltf-KHR_materials
2020-12-28 08:48:54 +01:00
Maki
ca653e0c6a
Fix glTF from memory loading .bin with a custom IOHandler
2020-12-28 07:18:50 +00:00
Jean-Louis
eed75aaf2c
Remove debug print
2020-12-26 14:57:52 +01:00
Jean-Louis
0ec8d6e285
[3MF] Missing file in previous commit + parse object material in the importer
2020-12-26 14:04:45 +01:00
Jean-Louis
0952038461
Small refactoring on 3MF export
2020-12-26 03:02:18 +01:00
Jean-Louis
c10d592b79
Fix material parsing in the 3MF importer
2020-12-26 02:36:24 +01:00
Kim Kulling
77f9c2854a
Merge branch 'master' into fbx_tokenizer_fix
2020-12-25 21:44:26 +01:00
Kim Kulling
3f5238d7c1
Merge branch 'master' into gltf2_fixes
2020-12-24 16:48:36 +01:00
Jean-Louis
effe52368c
No need to allocate a full size buffer for small files
2020-12-24 12:18:07 +01:00
Jean-Louis
895137c7d7
Fix unzip max buffer length error
2020-12-24 11:39:59 +01:00
Jean-Louis
54be7ac582
Update unzip contrib
2020-12-24 01:53:40 +01:00
Danny-Kint
dbffe25c9d
Merge branch 'master' into dev/gltf-KHR_materials
2020-12-23 11:33:04 +01:00
Danny Kabrane
383c97e380
Add KHR_materials_transmission during export
2020-12-23 10:43:21 +01:00
Danny Kabrane
2b097c1e73
Add KHR_materials_transmission during import
2020-12-23 10:43:01 +01:00
Danny Kabrane
197bf1e617
Add KHR_materials_clearcoat during export
2020-12-23 09:56:15 +01:00
Danny Kabrane
f8c63d874b
support KHR_materials_clearcoat during import
2020-12-23 08:12:09 +01:00
Kim Kulling
b4b011e764
Merge branch 'master' into master
2020-12-22 11:11:45 +01:00
Kim Kulling
50f9fb28b6
Merge branch 'master' into fix-casting-mingw
2020-12-21 18:29:18 +01:00
Danny Kabrane
aa9d6ce7b7
add support for khr_materials_sheen during export
2020-12-21 14:34:16 +01:00
Danny Kabrane
0fdda99ea1
add underscore (MATERIAL_SHEEN instead of MATERIALSHEEN)
2020-12-21 14:33:35 +01:00
Danny Kabrane
63b0a97369
import KHR_materials_sheen
2020-12-20 07:59:12 +01:00
Kim Kulling
981923821a
Merge branch 'master' into gltf2-exporter-crash
2020-12-18 16:27:06 +01:00
Inho Lee
4e5b25cd81
Keep AnimMesh data during the SortByPTypeProcess
...
A Postprocessing step, SortByPTypeProcess, can rebuild Mesh data,
but it does not handle AnimMesh.
This patch helps to rebuild appropriate AnimMeshes for the Mesh.
2020-12-16 19:19:30 +01:00
Inho Lee
b8bf1eac04
FBXConverter : Fix timescales of FBX animations
...
FBX animations were recorded by framenumber, not by time.
This patch will change it as a base of milliseconds.
2020-12-16 15:02:46 +01:00
Max Vollmer
a15adc9fbc
Fixed copypaste error
2020-12-14 17:01:42 +00:00
Max Vollmer
9d3c0081eb
Throw if property length is out of bounds
2020-12-14 16:49:04 +00:00
Max Vollmer
1db51503d8
Throw instead of assert on invalid file input
2020-12-14 16:44:56 +00:00
Max Vollmer
5436e16802
* Fix memory leak in GLTF2 Importer that occurs when an exception gets thrown while constructing a scene
...
* Fix crash in GLTF2 Importer when a scene with dangling/uninitialized pointers gets deleted after an exception was thrown
* Fix crash in GLTF2 Importer when channel sampler is not set (negative index)
2020-12-14 16:37:02 +00:00
wasd845
4e9176d2cd
_dest may be destructed twice if _dest is not null in MergeScenes()
2020-12-14 19:16:29 +08:00
Jean-Louis Boudrand
922f874e78
Merge branch 'gltf2-exporter-crash' of https://github.com/JLouis-B/assimp into gltf2-exporter-crash
2020-12-13 17:03:09 +01:00
Jean-Louis Boudrand
d18fce3f06
Fix https://github.com/assimp/assimp/issues/3054
...
Corrected the animation of each bone of an animation were exported in different animations (+tabs fixes)
2020-12-13 17:02:50 +01:00
Jean-Louis Boudrand
33e7e2366c
Merge branch 'master' into gltf2-exporter-crash
2020-12-13 16:48:40 +01:00
Biswapriyo Nath
c65f2cb3fb
Remove extra semicolon while GCC being pedantic.
2020-12-13 00:12:44 +05:30
Biswapriyo Nath
e2af015a57
Common: Fix GCC error invalid conversion in MINGW.
2020-12-11 21:43:09 +05:30
Kim Kulling
7dd0596010
Merge branch 'master' into 3dsMax2021PbrMaterials
2020-12-11 14:31:00 +01:00
Kim Kulling
a2adef8726
Merge branch 'master' into add-msvc-check
2020-12-11 14:11:10 +01:00
Jean-Louis Boudrand
8701a86c9d
Fixed a crash of the Gltf 2 exporter in the case of an animation without a translation, rotation or scale animation key.
2020-12-10 23:47:54 +01:00
Kim Kulling
e4a1fb171e
Merge branch 'master' into master
2020-12-09 17:58:18 +01:00
tellypresence
6db5b7046f
Provide option for rapidjson no-member-iterator define
...
Originally added to fix warning on MSVC but breaks android build
2020-12-09 20:21:43 +09:00
Kim Kulling
816bbc852c
Merge branch 'master' into master
2020-12-08 19:54:04 +01:00
Kim Kulling
c0d7ea981a
Merge branch 'master' into gltf_fixes
2020-12-04 16:02:16 +01:00
Kim Kulling
eccdc6dc96
Merge branch 'master' into master
2020-12-04 15:30:56 +01:00
Kim Kulling
5020a0aa33
Merge branch 'master' into fbxExceptionSafety
2020-12-04 11:01:56 +01:00
Max Vollmer (Microsoft Havok)
e737adde50
Merge branch 'master' into gltf_fixes
2020-12-04 08:58:52 +00:00
Kim Kulling
f67a9f253f
Merge branch 'master' into 3dsMax2021PbrMaterials
2020-12-03 22:20:01 +01:00
Kim Kulling
c7aeb882e6
Update ScenePreprocessor.cpp
2020-12-03 17:28:51 +01:00
Malcolm Tyrrell
471d2acc92
Improvements & style
2020-12-03 11:17:45 +00:00
Kim Kulling
c5f45e26bd
Merge branch 'master' into scenepreprocessor-memoryleak
2020-12-03 10:08:05 +01:00
Malcolm Tyrrell
19af3f0d31
Swap the meaning using the out_mat property.
2020-12-02 16:59:29 +00:00
Biswapriyo Nath
8d8ba521e2
Check _MSC_VER for MSVC specific pragma directives.
...
This fixes build issues when compiled with compiles like Clang or GCC.
2020-12-02 02:05:14 +05:30
Malcolm Tyrrell
f7be3048de
New 3ds Max PBR Materials in FBX
2020-12-01 12:05:42 +00:00
FRICOTEAUX
b47c5c8c27
glTF2Exporter: fix crash when exporting a scene with several meshes per node (regression coming from commit e8d2b84
on 08/03/2020 "clean all warnings for vs-2019")
2020-11-30 20:11:41 +01:00
Max Vollmer
53ff0702ce
Fixed check for base64 char values
2020-11-30 16:21:29 +00:00
Max Vollmer
7d72c78c8e
Some improvements
2020-11-30 15:20:51 +00:00
Max Vollmer
6ed1488e6e
* Improved error messages
...
* Throw instead of asserts on invalid file input
2020-11-30 15:04:06 +00:00
Oleg Bogdanov
4d4a3c42f6
Fix for 3489 | Preserve morph targets when splitting by bone count
2020-11-28 10:01:50 -08:00
Kim Kulling
88be8ec698
Merge branch 'master' into fbxExceptionSafety
2020-11-27 21:49:58 +01:00
Malcolm Tyrrell
149b8d1fd1
Don't need operator< either.
2020-11-27 14:26:51 +00:00
Malcolm Tyrrell
14f79caf41
textures_converted keys can just be pointers
2020-11-26 16:29:37 +00:00
Neil Clifford
ea60563822
Merge branch 'master' into scenepreprocessor-memoryleak
2020-11-26 08:57:57 +00:00
Kim Kulling
4590f06756
Merge branch 'master' into master
2020-11-25 16:57:49 +01:00
Kim Kulling
c059e58c5e
Merge branch 'master' into fbxparser-overead
2020-11-24 08:36:15 +01:00
Kim Kulling
fe78310486
Merge branch 'master' into fbxExceptionSafety
2020-11-23 10:08:23 +01:00
Evangel
98e42e22b8
Added check around setting pScene->mName from asset.scene.
2020-11-22 15:49:41 +10:00
Evangel
30584c1ec1
Replaced name with scene_name to avoid shadowing.
2020-11-22 15:36:08 +10:00
Evangel
67abcb10ba
Added mName to aiScene. Primarily to provide access to the "name" member of glTF2 scenes.
2020-11-22 15:33:31 +10:00
Malcolm Tyrrell
885a196c74
Unsigned
2020-11-19 16:30:44 +00:00
Kim Kulling
8108338215
Merge branch 'master' into master
2020-11-19 16:34:15 +01:00
Neil Clifford
fc842a0f97
Sceneprecessor potential memory leak
2020-11-19 13:20:43 +00:00
Neil Clifford
7b59cc297e
FBXParser.cpp - handle buffer over-read cases correctly
2020-11-19 12:20:06 +00:00
Kim Kulling
d10bf9a0d3
Merge branch 'master' into master
2020-11-18 21:30:58 +01:00
Inho Lee
e3083c21f0
glTF2: import correct animation values for CUBICSPLINE
...
CUBICSPLINE interpolation has tangent values with the animation data.
Current import don't care this interpolation type but it will help not
to fetch tangent values instead of animation data.
Note: Assimp cannot support interpolation types yet.
2020-11-17 17:21:07 +01:00
Malcolm Tyrrell
c00153089a
Neater construction
2020-11-17 10:45:10 +00:00
Malcolm Tyrrell
213a9f9d55
First pass at PotentialNode
2020-11-17 10:39:03 +00:00
Malcolm Tyrrell
c4573a6d5c
Merge branch 'master' into findDegeneratesOptimization
2020-11-17 09:44:13 +00:00
Kim Kulling
c4ba5eeeea
Merge branch 'master' into issue_3500
2020-11-16 21:52:14 +01:00
Malcolm Tyrrell
3221522f95
Prevent crash with malformed texture reference
2020-11-16 17:29:19 +00:00
Malcolm Tyrrell
d9b90f714a
Fix typo
2020-11-16 11:06:39 +00:00
Malcolm Tyrrell
3ce0958b98
Merge branch 'master' into findDegeneratesOptimization
2020-11-16 09:13:13 +00:00
Jean-François Verdon
09ca11d063
Fixing issue 3500, invalid outer cone angle readed from gltf2 file on machines which defines M_PI as a double value
2020-11-16 09:19:13 +01:00
Kim Kulling
647cef8a8b
Merge branch 'master' into nullBufferviewFix
2020-11-15 19:02:09 +01:00
Kim Kulling
0d5e5790cb
Fix findings.
2020-11-14 12:44:49 +01:00
Kim Kulling
db7e594221
Merge branch 'master' into findDegeneratesOptimization
2020-11-14 12:32:57 +01:00
Inho Lee
8845d7eed3
Prevent to generate redundant morph targets for glTF2
2020-11-11 20:49:22 +01:00
Kim Kulling
fa0951012f
closes https://github.com/assimp/assimp/issues/1044 : fix envelope handling in lightintensity.
2020-11-11 20:32:55 +01:00
Kim Kulling
707ad68fba
Merge branch 'master' into findDegeneratesOptimization
2020-11-11 09:54:08 +01:00
Kim Kulling
ab34b25a03
Merge branch 'master' into kimkulling-patch-8
2020-11-10 15:32:04 +01:00
Kim Kulling
8c91d1a3cd
closes https://github.com/assimp/assimp/issues/3198 : make aiMaterial::GetName const.
2020-11-10 12:50:17 +01:00
Kim Kulling
a8381113eb
Update ObjFileMtlImporter.cpp
2020-11-10 10:23:28 +01:00
Kim Kulling
856d4c016e
closes https://github.com/assimp/assimp/issues/3448
...
Add transmission alpha value. if any.
2020-11-10 10:03:09 +01:00
Malcolm Tyrrell
0f246edb97
Prevent GetValue from corrupting memory
2020-11-06 13:43:16 +00:00
Malcolm Tyrrell
34e3e6293a
Style
2020-11-06 09:57:48 +00:00
Malcolm Tyrrell
0af05e7a60
Better message
2020-11-05 15:10:52 +00:00
Malcolm Tyrrell
01b2088dd3
A missing bufferview was causing a crash.
2020-11-05 15:02:41 +00:00
Kim Kulling
6873d79505
Delete AMFImporter_Postprocess.cpp
2020-11-03 13:00:28 +01:00
Malcolm Tyrrell
3deae8760c
Optimize FindDegenerates so it doesn't explode
2020-11-02 14:43:35 +00:00
Kim Kulling
206f28b8ad
Merge branch 'master' into fix/3365
2020-10-29 13:40:00 +01:00
Kim Kulling
72bc41b50f
Merge branch 'master' into fix/xcode-compile-20201018
2020-10-28 22:00:08 +01:00
Kim Kulling
8c135f779e
Merge branch 'master' into readFbxWeightsInConfig
2020-10-28 20:38:29 +01:00
Kim Kulling
3fd95aff4e
Merge branch 'master' into fix/3365
2020-10-27 17:43:28 +01:00
Kim Kulling
df768bdd99
Merge branch 'master' into patch-1
2020-10-27 16:20:33 +01:00
Kim Kulling
7e1a8f09c5
more openddl-fixes
2020-10-26 21:35:44 +01:00
Kim Kulling
aee2e9a87d
Merge branch 'master' into patch-1
2020-10-25 20:35:06 +01:00
Kim Kulling
57e691e28e
openddl: latest greatest.
2020-10-25 10:34:43 +01:00
Kim Kulling
55feb0cb78
Merge branch 'master' into fix/xcode-compile-20201018
2020-10-23 22:06:49 +02:00
Max Vollmer
4006bb71f4
Fixes for crashes in GLTF2 Importer
2020-10-23 12:01:43 +01:00
John Mai
cea54d1ac5
Merge branch 'master' into fix/xcode-compile-20201018
2020-10-23 14:06:25 +08:00
Kim Kulling
6ee5e248ee
Fix typo
2020-10-22 22:26:29 +02:00
#Momo
b168d8f441
replaced data with taking address of first element
...
oops, seems like `data()` returns `char*` only since C++17. Replaced with taking address of first string element
2020-10-21 23:41:33 +03:00
#Momo
7781fe5781
MSVC crash workaround
...
I do not know why, but the following line causes crash if assimp was compiled using MSVC with RelWithDebInfo configuration:
`std::transform(shading.begin(), shading.end(), shading.begin(), Assimp::ToLower<char>);`
replacing `shading.begin()` with `shading.data()` fixes this issue.
2020-10-21 23:21:50 +03:00
Kim Kulling
b842b4a3c1
Merge branch 'master' into fbxReportAssetIssuesProperly
2020-10-21 20:02:48 +02:00
Kim Kulling
bbac168ced
Merge branch 'master' into collada_cleanup
2020-10-19 23:56:52 +02:00
Kim Kulling
69143ed149
fix unittests.
2020-10-19 23:53:27 +02:00
Kim Kulling
080322b9e2
cleanup collada xml migration.
2020-10-19 19:06:11 +02:00
Malcolm Tyrrell
a2cd5619b4
Merge branch 'master' into readFbxWeightsInConfig
2020-10-19 10:16:02 +01:00
john
d48ac9d0a4
fix xcode compile bug
2020-10-18 10:54:04 +08:00
Inho Lee
ad7f8910e9
Rollback the method to handle empty bones for GLTF2
...
A patch made the assimp to ignore empty bones.
However, some assets can have bones which don't have weights
but are connected to other bones.
2020-10-16 17:09:17 +02:00
Inho Lee
9f880e2214
Fix glTF1 orthographic camera
2020-10-16 08:56:55 +02:00
Malcolm Tyrrell
0363c18f1f
Read weights
2020-10-15 10:07:24 +01:00
Silvio Traversaro
3b5212067c
Fix CMake config generation
...
Use standard CMake function to generate the CMake config files.
2020-10-14 23:55:28 +02:00
Kim Kulling
7660070aa4
Merge branch 'master' into master
2020-10-14 21:01:35 +02:00
Kim Kulling
857f62cde0
closes pParam.mReference = source;
2020-10-14 20:34:46 +02:00
Jukka Maatta
6848a18999
Fix for issue #3445
...
Add const to avoid creating a temporary copy.
This should fix the cmake compilation error on XGLLoader.cpp shown in bug #3445
The fix is similar to commit bbe6f7f213
2020-10-13 21:56:43 +03:00
Kim Kulling
84ef3dc0fc
Merge branch 'master' into fbxReportAssetIssuesProperly
2020-10-13 18:37:03 +02:00
Rahul Sheth
f12e6eb6f4
Update Hunter for pugixml
2020-10-12 16:30:03 -04:00
Kim Kulling
636f28965f
Merge branch 'master' into fbxReportAssetIssuesProperly
2020-10-11 18:13:43 +02:00
Sahin Serdar Kocdemir
eb9928e029
fix for fbx files using stringray materials;
2020-10-09 07:28:15 +01:00
Malcolm Tyrrell
20733537d7
Merge branch 'master' into fbxReportAssetIssuesProperly
2020-10-08 09:54:04 +01:00
Optimizer0
152343b186
Merge branch 'master' into master
2020-10-06 08:35:26 +05:30
Kim Kulling
52826a03f8
remove all hunter-dependencies for pugixml.
2020-10-05 18:53:42 +02:00
Kim Kulling
23f144a7b7
pugixml: use pugixml in headeronly mode.
2020-10-05 18:44:59 +02:00
Malcolm Tyrrell
4bdaf20b70
Add comment.
2020-10-05 14:23:42 +01:00
Isuru2000psn
f2b3ec2e0c
strict-aliasing level 3 warnings fix
2020-10-05 15:29:09 +05:30
Malcolm Tyrrell
585fb89154
Make an assert a DeadlyImportError.
2020-10-02 15:25:16 +01:00
Malcolm Tyrrell
6b9c477763
The floar parsing routines are now DeadlyErrors.
2020-10-02 13:58:55 +01:00
kimkulling
b6dde74155
adaptions to support hunter
2020-10-01 16:35:34 +02:00
kimkulling
d75fa2bb4b
fix invalid path.
2020-10-01 10:43:48 +02:00
kimkulling
c740f61f97
hunter integration: pugixml
2020-10-01 10:29:52 +02:00
Kim Kulling
c7f7ed8901
Update ColladaLoader.cpp
2020-09-30 20:51:54 +02:00
Kim Kulling
0191c661b5
fix division by zero.
2020-09-30 20:39:26 +02:00
Kim Kulling
177426185e
Fix invalid cast
2020-09-30 16:38:13 +02:00
Kim Kulling
50d21e08f3
fix memoy leak.
2020-09-30 12:05:32 +02:00
Kim Kulling
788099a223
Merge branch 'master' into pugi_xml
2020-09-29 21:29:37 +02:00
Kim Kulling
c591f7de2f
make xml parsing more verbose.
2020-09-29 21:01:10 +02:00
Kim Kulling
db49a541c3
remove unused attributes.
2020-09-28 20:35:30 +02:00
Kim Kulling
ef9a78b49d
remove unused attributes.
2020-09-28 20:34:44 +02:00
Kim Kulling
effccfe2e6
Remove dead code.
2020-09-28 15:23:26 +02:00
Kim Kulling
bf4ad2837f
Remove dead code.
2020-09-28 15:20:59 +02:00
Kim Kulling
69822fd5e6
remove pugixml from hunter
2020-09-28 10:23:25 +02:00
Kim Kulling
c598a12340
Remove unused variable.
2020-09-28 09:15:56 +02:00
Kim Kulling
89ac168014
ogre: fix warning: not inited variable.
2020-09-27 21:23:55 +02:00
Kim Kulling
1c85676a9c
collada: fix warning: not inited variable.
2020-09-27 21:19:23 +02:00
Kim Kulling
052cc2e070
collada: fix warning: not inited variable.
2020-09-27 21:16:51 +02:00
Kim Kulling
5038f21d06
collada: fix warning: not inited variable.
2020-09-27 21:14:21 +02:00
Kim Kulling
202907d471
collada: fix warning: unused variable.
2020-09-27 21:11:42 +02:00
Kim Kulling
3f97a1df2c
collada: fix warning: unused variable.
2020-09-27 21:09:06 +02:00
Kim Kulling
bdd3c96eee
amf: fix warning: unused variable.
2020-09-27 21:06:14 +02:00
Kim Kulling
5877f81419
amf: fix warning: unused variable.
2020-09-27 21:03:59 +02:00
Kim Kulling
5230b91611
amf: fix warning: unused variable.
2020-09-27 21:01:48 +02:00
Kim Kulling
8143ea5aec
amf: fix warning: unused variable.
2020-09-27 20:58:08 +02:00
Kim Kulling
9a19a4723b
amf: fix warning: unused variable.
2020-09-27 20:54:21 +02:00
Kim Kulling
5653a82a87
fix the unittests.
2020-09-27 20:20:44 +02:00
Kim Kulling
9234fee35e
Ogre: fix xml migration.
2020-09-27 09:36:38 +02:00
Sherief Farouk
a3c8cfc0ff
Fix for build break due to warnings-as-errors when not building M3D exporter.
2020-09-26 23:21:23 -07:00
Kim Kulling
d6892b3f58
Merge branch 'master' into pugi_xml
2020-09-25 21:00:09 +02:00
Kim Kulling
557273818d
collada: next iteration.
2020-09-23 21:23:12 +02:00
Kim Kulling
34351b3cb9
fix collada material parsing.
2020-09-23 00:20:06 +02:00
Kim Kulling
c0e58c1895
Merge branch 'master' into gltfBufferViewSizeFix
2020-09-22 20:02:16 +02:00
kimkulling
71f20eaa8a
next fixes
2020-09-22 15:51:21 +02:00
kimkulling
dee8e5bee1
Merge branch 'pugi_xml' of https://github.com/assimp/assimp into pugi_xml
2020-09-22 15:20:35 +02:00
Kim Kulling
c4039d5cf0
fix collada data parsing.
2020-09-21 20:05:16 +02:00
kimkulling
8c88526da8
fix collada unittests.
2020-09-21 16:39:24 +02:00
Max Vollmer (Microsoft Havok)
c9fb21661f
Merge branch 'master' into gltfBufferViewSizeFix
2020-09-18 08:01:24 +01:00
rahulshethsc
354e09e785
Merge branch 'master' into rbsheth_hunter_rapidjson
2020-09-17 14:39:04 -04:00
Fabian Schmidt
338c0b753c
Merge branch 'master' into collada_animation_ticks_per_sec_issue_3162
2020-09-16 21:43:35 +02:00
Max Vollmer (Microsoft Havok)
9c1edaee96
Merge branch 'master' into gltfBufferViewSizeFix
2020-09-16 10:08:47 +01:00
Kim Kulling
14d6141f69
Collada: fix scenenode parsing.
2020-09-14 21:35:36 +02:00
Kim Kulling
9e2c4e0cf4
Merge branch 'master' into rbsheth_hunter_rapidjson
2020-09-14 09:00:11 +02:00
Kim Kulling
0e9621012c
Adapt code style - finally :-).
2020-09-14 08:43:31 +02:00
Kim Kulling
1ff9e2b522
Adapt code style.
2020-09-14 08:40:21 +02:00
Kim Kulling
23defc275a
Merge branch 'master' into makeInternalErrorsAccessible
2020-09-14 08:36:13 +02:00
kimkulling
d0932c405f
fix duplicated node parsing.
2020-09-11 15:46:46 +02:00
Kim Kulling
c1f50e116a
fix next unittests.
2020-09-11 00:46:29 +02:00
Kim Kulling
31f3812241
XGL: fix import of node values.
2020-09-10 21:03:02 +02:00
kimkulling
6ec07e4dc7
XGL: next steps.
2020-09-10 17:31:30 +02:00
kimkulling
cca9eddb1c
Fix material-base AMF-unittest.
2020-09-10 13:56:04 +02:00
Max Vollmer
615ffdf93f
What: Throw instead of assert when input file is invalid.
...
Why: Assimp shouldn't crash on invalid files. Asserts are disabled on Release builds.
2020-09-10 10:47:58 +01:00
Kim Kulling
d854f3b842
AMF: fix adding for child-nodes.
2020-09-10 00:05:53 +02:00
Kim Kulling
bd91033172
Merge branch 'master' into collada_animation_ticks_per_sec_issue_3162
2020-09-08 20:53:00 +02:00
Kim Kulling
0618db1f99
AMF: some smaller refactorings to improve readability.
2020-09-07 20:52:46 +02:00
Denis Blank
f3b25b999b
Fix an unreferenced formal parameter warning on MSVC when no exporter is built
2020-09-05 23:20:31 +02:00
Kim Kulling
ef6b93a949
Merge branch 'master' into collada_animation_ticks_per_sec_issue_3162
2020-09-04 16:27:47 +02:00
Kim Kulling
689406fbda
Fix Colladat import.
2020-09-04 07:33:10 +02:00
Rahul Sheth
78b30d1752
Merge branch 'master' into rbsheth_hunter_rapidjson
2020-09-03 09:51:32 -04:00
Kim Kulling
be5089ae40
Collada: correct parsing of float data in xml nodes.
2020-09-02 22:38:19 +02:00
Kim Kulling
075540e15a
AMF: fixes.
2020-09-02 22:37:57 +02:00
Kim Kulling
0b8ed5c03a
fix crash when x3d is empty
2020-09-02 21:49:40 +02:00
Kim Kulling
34f343233e
3ml: fix xml parsing.
2020-09-02 21:49:20 +02:00
kkulling
87d2580aad
fix 3mf rel-parsing
2020-09-02 17:45:37 +02:00
Gargaj
9053dfea05
add missing define to glTF importer
2020-09-02 16:28:12 +02:00
Kim Kulling
73fa2cbe88
Fix memory handling of xml-nodes in the parser.
2020-09-01 21:48:50 +02:00
Joshua Hyatt
638499a278
Replace unique_ptr and add custom deleter
2020-09-01 10:30:31 -06:00
Kim Kulling
3c2133a3b9
fix node collection for collada xml parsing
2020-09-01 07:51:17 +02:00
kimkulling
e62b4e5cce
next iteration.
2020-08-31 16:10:38 +02:00
Kim Kulling
6d5c388780
Introduce node iterator.
2020-08-30 21:10:04 +02:00
Joshua Hyatt
dcf9a7b2d8
Conform variable names to code standards
2020-08-29 23:58:31 -06:00
Joshua Hyatt
953e976de6
Close stream when finished
2020-08-29 23:56:50 -06:00
Joshua Hyatt
cc2613f264
Replace unique_ptr with raw pointer
2020-08-29 23:06:33 -06:00
Joshua Hyatt
c769f8d4ad
Replace unique_ptr with raw pointer to avoid destructing stream
2020-08-29 22:21:34 -06:00
kimkulling
30a4eae17f
simplify some ttributes access in loaded xml.
2020-08-28 16:25:22 +02:00
kimkulling
0730eebe6f
fix collada handling of xml nodes.
2020-08-28 16:17:56 +02:00
crocdialer
3c98197be0
set aiAnimation->mTicksPerSecond to 1000.0. this is analog to the behaviour of gltf2-importer
2020-08-28 16:09:15 +02:00
Kim Kulling
b7e9595e54
fix loop of xml-files.
2020-08-28 00:09:51 +02:00
Rahul Sheth
59c8b4ed84
Move RapidJSON definitions to CMake
2020-08-27 16:51:06 -04:00
kimkulling
582a8b1887
Fix xml-migration bild.
2020-08-27 17:05:09 +02:00
Kim Kulling
c359b973bb
finish migration of collada.
2020-08-26 22:31:46 +02:00
Kim Kulling
904f17f29f
next collada-iteration
2020-08-24 07:44:54 +02:00
Kim Kulling
7adfe1f2d8
Xml: introduce helper for attribute parsing.
2020-08-21 06:45:30 +02:00
Malcolm Tyrrell
8f893e3653
Actually, just keep the old behaviour for now.
2020-08-20 14:32:15 +01:00
Kim Kulling
cb631517a7
next iteration.
2020-08-19 22:44:13 +02:00
Malcolm Tyrrell
9b5e758bdd
Even simpler DeadlyErrorBase
2020-08-19 17:59:13 +01:00
Malcolm Tyrrell
6f9c61e157
Use case which matches surrounding code.
2020-08-19 17:57:25 +01:00
Malcolm Tyrrell
6c2ceb55f8
Simplify some FBX error code.
2020-08-19 17:20:57 +01:00
kimkulling
d393f677ce
Collada: next methods migrated.
2020-08-19 17:10:30 +02:00
Kim Kulling
56381241c5
move hasAttribute to XmlParser scope.
2020-08-19 00:19:56 +02:00
Kim Kulling
554ed1bf91
next step.s
2020-08-18 20:44:06 +02:00
Malcolm Tyrrell
0f6127e90e
No need to build strings.
2020-08-18 18:21:20 +01:00
Malcolm Tyrrell
e1a0163e7e
Make all exceptions available.
2020-08-18 18:14:51 +01:00
Malcolm Tyrrell
b7c789da67
Stop concatenating std::strings. Use formatter.
2020-08-18 17:35:08 +01:00
kimkulling
6a8edb21f8
fix merge issues
2020-08-18 17:41:37 +02:00
Malcolm Tyrrell
0ffcdf160e
Build formatting into DeadlyImportError
2020-08-18 16:32:34 +01:00
kimkulling
7e93ae4428
3MF: Migration.
2020-08-18 16:54:29 +02:00
Malcolm Tyrrell
829ff1adf0
Maybe this will help.
2020-08-18 10:33:47 +01:00
Malcolm Tyrrell
b1ed751b83
Provide an API for accessing internal errors.
2020-08-18 10:33:42 +01:00
lsliegeo
0d00ff7043
use ai_real instead of float
2020-08-15 14:57:49 +02:00
Kim Kulling
729882debb
Fix incorrect index
...
closes https://github.com/assimp/assimp/issues/3364
2020-08-11 19:57:36 +02:00
Kim Kulling
394651e640
x3d: migration of goups.
2020-08-10 22:13:45 +02:00
Marc-Antoine Lortie
11daed69d3
Fixed overwriting of CMake global output directory variables.
2020-08-07 16:04:39 -04:00
kimkulling
13d7fad7f7
closes https://github.com/assimp/assimp/issues/2992 : add single or double precision + missing compilers.
2020-08-07 14:23:07 +02:00
Kim Kulling
58bf23be55
Merge branch 'master' into issue_3353
2020-08-05 18:03:26 +02:00
Kim Kulling
b94183376c
Fix possible overflow in new.
2020-08-05 17:56:44 +02:00
Kim Kulling
1f348c5fc0
Remove redundant float f
2020-08-04 20:55:29 +02:00
Kim Kulling
aabf12827b
fix typo
2020-08-04 17:52:43 +02:00
Kim Kulling
855b47452e
Export opacity is 3DS
...
closes https://github.com/assimp/assimp/issues/3291
2020-08-04 17:41:28 +02:00
Kim Kulling
e7ae576614
undo change
2020-08-03 15:54:19 +02:00
Kim Kulling
435bba30dd
Move functions into the correct preprocessor branch
2020-08-03 09:30:02 +02:00
Kim Kulling
008e551f8e
Merge branch 'master' into fbxVersionCheck
2020-07-31 14:33:21 +02:00
Malcolm Tyrrell
0282f358a4
Remove unneeded check.
2020-07-31 12:40:17 +01:00
Malcolm Tyrrell
301bae3967
Improve message
2020-07-30 16:37:41 +01:00
Malcolm Tyrrell
eaf0587dd8
FBX Version/Size Check
2020-07-30 14:56:01 +01:00
Ryan Styrczula
3170c3d15c
FBXExport: Fix crash if scene->mMetaData is null
2020-07-30 09:21:43 -04:00
Kim Kulling
58b81a2590
start migrating X3D.
2020-07-26 10:17:21 +02:00
Rahul Sheth
ad18e365e5
Fixing more warnings
2020-07-24 16:33:36 -04:00
Kim Kulling
c7a9ef30cc
Merge branch 'master' into fix-mingw-priumax
2020-07-24 11:14:15 +02:00
Kim Kulling
0f442b1ff2
Merge branch 'master' into gltfIndexOutOfRangeFix
2020-07-23 11:27:34 +02:00
Kim Kulling
a33557be71
Merge branch 'master' into acloader_enums
2020-07-22 23:50:51 +02:00
Kim Kulling
76a6bb36f6
Merge branch 'master' into issue-3332_msvc2017
2020-07-20 22:04:35 +02:00
MeyerFabian
51e592123a
Fix two deletions.
2020-07-20 18:42:57 +02:00
MeyerFabian
a19e4e4112
Make clang with msvc abi work.
2020-07-20 18:28:50 +02:00
MeyerFabian
13ee2306c3
build/clang-cl-windows
2020-07-20 17:04:11 +02:00
RichardTea
9cad10a995
Disable MSVC warnings on all MSVC
...
Fixes the build on MSVC 2017 (and probably MSVC 2015)
2020-07-17 14:58:51 +01:00
RichardTea
f2e3e43fbc
Merge branch 'master' into acloader_enums
2020-07-17 11:30:50 +01:00
RichardTea
17b9403b7a
ACLoader: Use enum for Surface flags
2020-07-17 11:23:50 +01:00
Kim Kulling
b2e53783de
Merge branch 'master' into fix-mingw-priumax
2020-07-17 12:07:46 +02:00
Kim Kulling
fa486240d5
Merge branch 'master' into rbsheth_update_hunter
2020-07-17 11:39:55 +02:00
RichardTea
719cc82a1f
Apply clangformat
2020-07-17 10:29:44 +01:00
Kim Kulling
516bdc2a4b
Merge branch 'master' into master
2020-07-16 22:48:02 +02:00
Kim Kulling
deddaf49df
finish migrate ogrexmlserializer.
2020-07-16 11:33:28 +02:00
Kim Kulling
df8792d24b
Merge branch 'master' into gltf1_gltf2_split
2020-07-16 10:45:55 +02:00
Kota Iguchi
84e68eaf24
fix invalid pointer for bone animation
2020-07-16 15:26:02 +09:00
Malcolm Tyrrell
04df5f8b1e
Don't use make_unique
2020-07-15 15:47:25 +01:00
Malcolm Tyrrell
e1bab44e19
Exception safety
2020-07-15 15:02:27 +01:00
Malcolm Tyrrell
37e1fb9cd7
Fix message
2020-07-15 14:19:13 +01:00
Malcolm Tyrrell
f3170a96ba
Ensure data does not depend on faces we may not have created.
2020-07-15 12:36:48 +01:00
Malcolm Tyrrell
fff6396e3c
Rename to avoid overloading problems.
2020-07-15 12:22:28 +01:00
Malcolm Tyrrell
212903e935
Unit test for all indices out of range, and fix.
2020-07-15 12:19:00 +01:00
Malcolm Tyrrell
c0d978786e
Fix warning
2020-07-15 09:12:52 +01:00
Malcolm Tyrrell
a56134ba33
Drop faces when indices are out of range.
2020-07-15 09:05:09 +01:00
awr1
638369e995
Try to fix lexing issue with preproc w/r/t __has_warning
2020-07-14 21:58:36 -05:00
awr1
cc8cd88d7a
Preproc conditional should be &&, not ||
2020-07-14 21:50:22 -05:00
awr1
bad0df9a1a
Remove unnecessary inversion in preproc
2020-07-14 21:48:46 -05:00
awr1
b3f61f8759
Fix error where -Wunused-but-set-variable might not be available
2020-07-14 21:44:33 -05:00
awr1
3bf6963d20
Use a better divider for import error
2020-07-14 21:34:30 -05:00
awr1
93d567e3b1
Fix sprintf format string
2020-07-14 21:32:22 -05:00
awr1
700d8e6614
Fix MinGW builds (issues related to pragmas and format strings)
2020-07-14 21:19:07 -05:00
Rahul Sheth
abc6b9ce4c
ifdef fixes to fix MSVC warnings
2020-07-14 19:00:38 -04:00
Rahul Sheth
209a61d0e7
Update hunter and utf8cpp inclusion
2020-07-14 19:00:23 -04:00
Ryan Styrczula
84e342acd7
DefaultIOStream: Remove assert on empty count
...
fwrite() is valid to call with a 0 count, and will simply return 0.
See:
https://en.cppreference.com/w/cpp/io/c/fwrite
http://www.cplusplus.com/reference/cstdio/fwrite/
There are code paths where StreamWriter will call Tell(), which calls
Flush(), which calls Write(buffer.data(), 1, buffer.size()). This can
happen when nothing has yet been written to the buffer, so size is 0.
2020-07-14 10:39:18 -04:00
Kim Kulling
b19ebf5d54
Fix merge conflicts.
2020-07-14 09:02:14 +02:00
Kim Kulling
8cfd2a4cc1
Migrate OgreSerializer.
2020-07-14 09:00:06 +02:00
Kim Kulling
f5d5d7c5ed
Merge branch 'master' into master
2020-07-13 20:35:24 +02:00
Ryan Styrczula
0c2f7a119c
FBXExporter: Forgot WritePropColor defaultValue
2020-07-13 13:56:06 -04:00
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 (Microsoft Havok)
fb11705dd0
Merge branch 'master' into gltf1_gltf2_split
2020-07-06 09:11:06 +01: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
d04f8b3174
Merge branch 'master' into defsIncludeFix
2020-07-05 18:59:37 +02: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
Hill Ma
3fb7747429
Improve ToBinary() for double precision.
...
The constant 0x80000000 is specific to 32 bit types. Make the bit mask
according to the size of types.
2020-07-03 18:14:45 -07:00
Kim Kulling
d74c10dcb7
Merge branch 'master' into pugi_xml
2020-07-03 17:29:38 +02:00
Malcolm Tyrrell
51150cb3df
Ensure asserts are defined where expected.
2020-07-02 14:53:29 +01:00
Kim Kulling
693da43095
closes https://github.com/assimp/assimp/issues/3305 : remove merge issue.
2020-07-02 15:22:06 +02:00
Kim Kulling
b1369d0912
next steps.
2020-07-02 15:18:59 +02:00
Kim Kulling
7fda533484
Merge branch 'master' into double
2020-06-30 21:12:02 +02:00
Yingying Wang
97085c1c05
update sync
2020-06-30 11:48:37 -07:00
Yingying Wang
36f899bf09
sync update
2020-06-30 11:45:11 -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
Hill Ma
30f09e9fc0
Fix build when ASSIMP_DOUBLE_PRECISION is on.
...
Tested:
$ cmake -DASSIMP_DOUBLE_PRECISION=1 -DASSIMP_BUILD_MDL_IMPORTER=0 ..; make
The MDL importer is disabled due to the fact that there is some float-only code
in MDL. This also means bin/assimp and bin/unit would not link successfully with
the above build flags.
2020-06-28 17:36:21 -07: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
ba6af9ff98
Merge branch 'master' into FindInvalidData
2020-06-25 16:41:24 +02:00
Kim Kulling
95e822a6ec
Merge branch 'master' into aiAssertHandler
2020-06-24 20:47:10 +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
Malcolm Tyrrell
9188f56839
Allow assert handling to be replaced.
2020-06-23 11:55:51 +01:00
Ryan Styrczula
5717ea466f
FindInvalidDataProcess: Mark removed meshes as "out"
...
There's a code path where an input scene only has a single mesh.
In this case, if ProcessMesh returns 2, we delete the mesh and move on
with the postprocessing. UpdateMeshReferences is not called and so the
deleted mesh is left dangling in nodes.
In a later step (SplitMesh in my testing), it then tries to deference a
null pointer and we explode.
With `out = true`, we can now hit the DeadlyImportError instead of a
segfault.
2020-06-22 17:24:16 -04: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
6397bfbf90
replace NULL by nullptr on loadFile.
2020-06-21 12:03:38 +02:00
Kota Iguchi
6acaaee80f
Check invalid vertex id for bone weight
2020-06-20 15:27:28 +09:00
Kim Kulling
b3af5c5a14
closes https://github.com/assimp/assimp/issues/3253 : remove useless code
2020-06-17 20:37:39 +02:00
kimkulling
524e2e4728
fix warning, hopefully ...
2020-06-15 21:34:49 +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
Yingying Wang
578a7ac502
add Callback API in ExporterProperties
2020-06-09 11:20:48 -07:00
Kim Kulling
ffaa634c48
Merge branch 'master' into issue_3165
2020-06-09 10:48:27 +02:00
Kim Kulling
88c1509d69
Remove dead code
2020-06-09 10:15:35 +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
Kim Kulling
62273b63e5
closes https://github.com/assimp/assimp/issues/3256 : Remove redundand code
2020-06-06 12:22:01 +02:00
Yingying Wang
4e34853ac7
gltf2 export target names for blendshapes
2020-06-05 12:17:27 -07:00
Kim Kulling
6d04e16c7e
Merge branch 'master' into issue_3165
2020-05-28 21:51:58 +02:00
kimkulling
d40a3026db
closes https://github.com/assimp/assimp/issues/3165 : fix gcc build.
2020-05-28 21:02:13 +02:00
FRICOTEAUX
87584eb007
glTF2: fix "file size doesn't match" issue when importing GLB in Blender
2020-05-28 11:05:38 +02:00
Yingying Wang
98767cbb08
pull master
2020-05-27 10:23:28 -07:00
Kim Kulling
2c9cfefe67
Merge branch 'master' into gltf2_sparseAccessor_import
2020-05-26 21:30:51 +02:00
Kim Kulling
e33ed9e7a1
File is duplicated
...
closes https://github.com/assimp/assimp/issues/3238
2020-05-25 20:30:18 +02:00
Kim Kulling
78c9ac2889
Merge branch 'master' into gltf2_sparseAccessor_import
2020-05-25 16:11:01 +02:00
Kim Kulling
2be731d1bf
Merge branch 'master' into pugi_xml
2020-05-22 10:09:46 +02:00
Kim Kulling
a97e4c15b3
Merge branch 'master' into master
2020-05-21 21:15:50 +02:00
Kim Kulling
ecfca1d5c5
Merge branch 'master' into verboseLogging
2020-05-21 18:30:52 +02:00
Yingying Wang
50f0a86798
conditional export
2020-05-19 16:10:41 -07:00
Ryan Styrczula
c4055d04b4
Fix double free caused in FindInvalidDataProcess
...
In debug builds, there's no issues, but in release, an invalid mesh that
is deleted in FindInvalidDataProcess will be double free'd when the
parent scene is destroyed.
2020-05-19 14:38:10 -04:00
Yingying Wang
c10e409a5d
merge
2020-05-18 12:16:45 -07:00
Yingying Wang
193deb3441
cleanup
2020-05-18 12:01:09 -07:00
Yingying Wang
e39c632809
cleanup
2020-05-18 11:50:51 -07:00
Yingying Wang
0897c4c7be
merge
2020-05-18 11:31:44 -07:00
Yingying Wang
02cbd36271
pull master
2020-05-18 11:15:18 -07:00
Kevin Shepherd
e9a3cc2c8a
Fixed rotation order bug in BVH Loader
...
This bug has been present since after the 4.10 release.
It fixes the issue "play the bvh error" #2187
Almost all bvh files are affected, such as any of the CMU library.
The bug is caused by the introduction of channelMap in the BVHLoader.cpp - function void BVHLoader::CreateAnimation(aiScene *pScene). The channelMap loses the rotation order present oin the BVH file, and always applies the rotations in X,Y,Z order.
2020-05-18 16:07:46 +01:00
Malcolm Tyrrell
14692368d5
Same for LogDebug -> LogVerboseDebug
2020-05-18 11:55:14 +01:00
Malcolm Tyrrell
87a7662bee
More thinks using VERBOSE_DEBUG
2020-05-18 11:45:00 +01:00
Kim Kulling
2438e1b52e
Merge branch 'master' into gltf2_fix_skin_recursion
2020-05-18 09:05:28 +02:00
Kim Kulling
4b0a3305b1
Merge branch 'master' into master
2020-05-17 13:54:10 +02:00
Kim Kulling
4f24b3dac2
Merge branch 'added_check_before_using' of https://github.com/qarmin/assimp into qarmin-added_check_before_using
2020-05-17 11:48:24 +02:00
Kim Kulling
cfbdacb02a
Merge branch 'master' into bug-3201-collada_root_meshes
2020-05-16 20:50:34 +02:00
Yingying Wang
b8e39b58d1
clean up
2020-05-15 12:32:58 -07:00
Yingying Wang
f6720271cb
sparce accessor exporter
2020-05-15 12:20:31 -07:00
Malcolm Tyrrell
d70685d37f
Fix typo
2020-05-15 17:50:48 +01:00
Malcolm Tyrrell
90cdbd9d9a
Fix ups
2020-05-15 17:46:50 +01:00
Malcolm Tyrrell
434c5e3d37
More verbose logging
2020-05-15 17:29:49 +01:00
Malcolm Tyrrell
e11d78596f
Use verbose debug logging in certain places
2020-05-15 17:26:17 +01:00
Malcolm Tyrrell
5e0136d737
Add concept of verboseDebug
2020-05-15 17:23:07 +01:00
Malcolm Tyrrell
2ffd1cb8db
nits
2020-05-15 17:22:15 +01:00
Malcolm Tyrrell
bcca3a0d79
No need for bespoke macros
2020-05-15 17:22:02 +01:00
Malcolm Tyrrell
6be0ce1ec9
Initial pass at adding logging
2020-05-15 17:21:45 +01:00
Matias Kangasjärvelä
7a16a7a7e4
Fix infinite recursion in gltf2 skin parsing
...
Previously parsing a node caused the skin that was attached to it
to be parsed, which caused the skins node joints to be parsed,
which could cause the skin to be re-parsed leading to infinite or
at the very least exponential recursion.
The fix is to just get a reference to a temporarily uninitialized
skin as they were being parsed after the scene graph just to be safe
anyway. This way we avoid the recursion problem and all the references
will be valid in the end.
2020-05-15 16:48:41 +03:00
kimkulling
464d4cf99a
Merge branch 'master' of https://github.com/inhosens/assimp into inhosens-master
2020-05-15 15:08:30 +02:00
kimkulling
246ec2b0dc
Merge branch 'migenius-fix-ortho' of https://github.com/migenius/assimp into migenius-migenius-fix-ortho
2020-05-15 13:37:03 +02:00
kimkulling
a6b5abd698
Merge branch 'master' of https://github.com/zyndor/assimp into zyndor-master
2020-05-15 08:51:46 +02:00
Kim Kulling
2571b47a28
Merge branch 'master' into bug-3177-dae-geo-id
2020-05-13 20:24:53 +02:00
Yingying Wang
e9b67cdb89
gltf2 import sparse accessor
2020-05-11 14:34:35 -07:00
Jeremy Cytryn
c3a21666da
Make gltf2 export normal normalization safe
...
This avoids introducing NaNs e.g. when the input mesh has 0-length normals
2020-05-11 12:02:38 -07:00
Jeremy Cytryn
c5a9fbd47f
Gracefully handle NaNs and Infs in gltf2 accessor bound computation
2020-05-11 12:02:38 -07:00
Jeremy Cytryn
aef4ecada5
Fail gltf/gltf2 export whenever invalid / incomplete JSON is generated
...
This can happen currently for example if NaNs are introduced in accessor bounds as rapidjson cannot write NaN/inf floats (see subsequent commit for fix there) and will halt writing to buffer at this point. Fix here ensures that whenever anything like this happens we throw an exception so this ends up as a registered export failure case, rather than silently exporting the incomplete JSON
2020-05-11 12:02:38 -07:00
hoshiryu
3fdcd0861f
Fix fbx rotation ;
2020-05-11 10:28:05 +02:00
kimkulling
a1bcca2c99
remove step prototype: does not work this way.
2020-05-07 14:00:40 +02:00
Kim Kulling
89a865ce19
Merge branch 'master' into master
2020-05-06 22:07:39 +02:00
Sercan Degirmenci
201347700f
fix incorrect header path on framework build
2020-05-06 16:15:23 +03:00
Yingying Wang
60e8146b9f
fix wrong target idx when importing
2020-05-05 12:51:40 -07:00
RichardTea
56a4e61533
Collada: Don't copy the scene when exporting
...
This was purely to add a virtual top-level node
Use a flag instead.
Also add more const
2020-05-05 10:16:13 +01:00
RichardTea
6e447b2c44
Merge branch 'bug-3177-dae-geo-id' into bug-3201-collada_root_meshes
2020-05-05 09:52:08 +01:00
RichardTea
d1ae6ac77a
Fix typo in <visual_scene>
...
Swapped Id and Name
2020-05-05 09:51:41 +01:00
RichardTea
fa1d2f09db
Merge branch 'master' into bug-3177-dae-geo-id
2020-05-05 09:33:48 +01:00
Kim Kulling
ddee1b1ddb
Merge branch 'master' into aaronfranke-file-formatting
2020-05-05 10:21:46 +02:00
kkulling
4e16716924
Merge branch 'file-formatting' of https://github.com/aaronfranke/assimp into aaronfranke-file-formatting
2020-05-05 10:17:52 +02:00
Kim Kulling
bf95d1da7c
fix conversion
2020-05-04 21:48:46 +02:00
RichardTea
8e73984a11
Collada Root Nodes aren't allowed to have meshes
...
Create a null parent node instead
2020-05-04 17:47:09 +01:00
RichardTea
6e200cb0d3
Merge branch 'master' into bug-3177-dae-geo-id
...
Impossible merge, have discarded upstream
2020-05-04 13:59:09 +01:00
RichardTea
ea917bd4ae
Move Collada into AssetLib folder
...
Should make the merge easier
2020-05-04 13:54:49 +01:00
Kim Kulling
91fa9a102b
closes https://github.com/assimp/assimp/issues/3181 : fix typo for light type.
2020-05-03 12:17:32 +02:00
Kim Kulling
3b06f57150
add missing inclde +
2020-05-02 21:11:47 +02:00
Kim Kulling
514593548d
add assert-test for nullptr.
2020-05-02 21:07:41 +02:00
Kim Kulling
3329e76263
closes https://github.com/assimp/assimp/issues/3178 : throw exception in case of invalid export stream.
2020-05-02 21:06:55 +02:00
Kim Kulling
f8e6512a63
Move format importer and exporter into its won folder.
2020-05-02 15:14:38 +02:00
Trevor David Black
a0aa067b5f
Moved Texture writing into its own function
2020-05-01 08:35:04 -07:00
RichardTea
1dabb1a094
Collada: Fix crash with AI_CONFIG_IMPORT_COLLADA_USE_COLLADA_NAMES
...
Add unit test for this
2020-05-01 14:59:09 +01:00
RichardTea
3e2dd186d1
Merge branch 'master' into bug-3177-dae-geo-id
2020-05-01 12:08:12 +01:00
RichardTea
5b9f207f1f
ColladaExporter cleanup
...
Namespace, NULL and includes
2020-05-01 11:54:34 +01:00
RichardTea
ee16d2c4c9
Fix camera, light and bone unique ids
...
Bones don't have a unit test yet
2020-05-01 11:13:38 +01:00
Trevor David Black
2c9d3bea64
Printing out unique textures
2020-04-30 14:01:09 -07:00
RichardTea
083ebdbc2e
Collada Export: More unique Ids
...
Nodes, Materials, Animations, Lights, Cameras, Bones
2020-04-30 18:28:06 +01:00
Kim Kulling
2d9d112015
fix warning
2020-04-29 21:35:42 +02:00
Kim Kulling
1c30b7bf8e
tryout: check if leak is coupled to type double.
2020-04-29 21:31:01 +02:00
Kim Kulling
e0bc0f7fad
try to fix double memleak.
2020-04-29 21:19:15 +02:00
Kim Kulling
da2bf5c7a4
fix wrong size
2020-04-29 21:13:46 +02:00
Kim Kulling
f808ed9fb5
fbxconverter: fix memoryleak.
2020-04-29 20:52:49 +02:00
Kim Kulling
c6131ce38a
scenecombiner: fix leak.
2020-04-29 20:43:23 +02:00
RichardTea
ff9f3b8608
Collada: Ensure <geometry> has unique id
...
Use the "id" for mesh names by default.
Set option AI_CONFIG_IMPORT_COLLADA_USE_COLLADA_NAMES to use the mesh "name" instead
2020-04-29 17:17:46 +01:00
RichardTea
2c6ac23a4e
Apply Assimp clangformat to touched Collada files
2020-04-29 14:21:17 +01:00
Rafał Mikrut
6967a02fcb
Merge branch 'master' into added_check_before_using
2020-04-28 18:33:29 +00:00
qarmin
4dfdbbf171
Check index before using
2020-04-28 20:31:59 +02:00
Kim Kulling
efa046366e
Retrigger build
2020-04-28 09:14:53 +02:00
luca
4488e3e745
build on Linux with gcc and clang; warning as error only for 'assimp' target
2020-04-27 23:38:33 -07:00
Paul Arden
81abd90ee1
Fix reading of orthographic camera data. Fixes #3028 .
2020-04-28 10:07:56 +10:00
Kim Kulling
b0c9711894
Small format finding
2020-04-27 15:16:57 +02:00
Inho Lee
629320a3a0
Add timescale for collada
2020-04-27 11:52:04 +02:00
luca
d98787f35b
CI: use clang on Unix, msvc on Windows;Remove explicit flags in CMakeLists.txt;
2020-04-26 12:50:42 -07:00
Kim Kulling
6c1e21d754
fix formatting.
2020-04-26 19:14:30 +02:00
Kim Kulling
bafb8e3189
closes https://github.com/assimp/assimp/issues/3165 : remove deprecated code whch causes compiler warning.
2020-04-26 08:59:52 +02:00
Kim Kulling
638df2ceac
Merge branch 'master' into master
2020-04-25 12:07:06 +02:00
Trevor David Black
3dc550a9b2
Got a working geometry prototype, sponza renders correctly when camera and light is added
2020-04-25 00:10:31 -07:00
Trevor David Black
07065e2235
Working first proof of concept. Renders ambient term in pbrt
2020-04-22 13:38:06 -07:00
Kim Kulling
9b1759dcc2
Merge branch 'master' into migenius-migenius-rsws53-mig-2
2020-04-22 19:59:53 +02:00
Kim Kulling
ca70b44e44
Merge branch 'migenius-rsws53-mig-2' of https://github.com/migenius/assimp into migenius-migenius-rsws53-mig-2
2020-04-22 19:58:41 +02:00
Kim Kulling
c36b028412
fix type error for template deduction.
2020-04-21 16:39:18 +02:00
Kim Kulling
c91d3764ca
Merge branch 'master' into optimized_bonelimits
2020-04-21 08:45:50 +02:00
Trevor David Black
cb88210c62
Completed scene wide rendering output
2020-04-20 12:23:22 -07:00
Trevor David Black
1045fb7798
Got 90 percent solution for exporting camera data
2020-04-20 11:55:46 -07:00
Kim Kulling
f71b332ed1
Update glTF2Asset.inl
...
fix VS-compiler warning.
2020-04-19 21:14:47 +02:00
Kim Kulling
e3563212d7
Merge branch 'master' into master
2020-04-19 21:13:12 +02:00
Kim Kulling
e0f6eb09e6
Merge branch 'master' into optimized_bonelimits
2020-04-17 20:37:28 +02:00
Trevor David Black
f9f2d617a2
Added a very basic camera. Still work to do
2020-04-17 10:42:13 -07:00
Hehongyuanlove
9c52fd7633
Update D3MFExporter.cpp
2020-04-17 12:58:41 +08:00
Hehongyuanlove
e9a72a5053
repair formate 3MF
2020-04-17 12:38:07 +08:00
Hehongyuanlove
3bbc8e76bd
Rgba2Hex to repair rgba(1,1,1,1)
2020-04-17 12:34:05 +08:00
Kim Kulling
c0dc26de8e
Merge branch 'master' into GLTF2_recursive_references_fix
2020-04-16 11:29:37 +02:00
Kim Kulling
996abd3fbe
Merge branch 'master' into GLTF2_invalid_buffer_fix
2020-04-16 11:08:29 +02:00
Kim Kulling
d12e938a70
Merge branch 'master' into ifdef_export_defines
2020-04-16 10:24:23 +02:00
Kim Kulling
e341eadfd9
Fix typo
2020-04-16 10:23:50 +02:00
Timur Umayev
69f8d47941
glTF2 support targetNames
2020-04-15 09:39:46 +01:00
György Straub
e4ceccb42d
Merge branch 'master' into master
2020-04-12 15:58:25 +01:00
Max Vollmer (Microsoft Havok)
a14b5fb06f
Merge branch 'master' into GLTF2_invalid_buffer_fix
2020-04-10 08:44:19 +01:00
Max Vollmer (Microsoft Havok)
485d7ab52e
Merge branch 'master' into GLTF2_recursive_references_fix
2020-04-10 08:44:18 +01:00
Kim Kulling
79af2b1a5c
Merge branch 'master' into kimkulling_dev
2020-04-09 19:55:45 +02:00
Trevor David Black
3ad53ab630
Printing file metadata
2020-04-08 13:29:03 -07:00
György Straub
755f3748f1
Merge branch 'master' into master
2020-04-07 11:46:14 +01:00
Trevor David Black
8c3b374486
Pbrt file exporter hello world
2020-04-06 12:12:37 -07:00
Kim Kulling
9a11d91cb8
code reformattings.
2020-04-06 13:33:03 +02:00
Kim Kulling
131aed73b0
closes https://github.com/assimp/assimp/issues/2166 : add missing setter for metadata.
2020-04-06 11:16:16 +02:00
Kim Kulling
132ecae6f4
Merge branch 'master' into kimkulling_dev
2020-04-04 18:28:50 +02:00
György Straub
956c57f18e
Merge branch 'master' into master
2020-04-03 13:42:59 +01: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
Alexey Medvedev
53990ffa42
Check for existed bone
2020-03-31 14:18:51 -07:00
György Straub
87e2d3a54d
Added support for glTF2 sparse accessors.
...
Refactored Accessors, pulling out reusable bits between those
and sparse accessors' indices / values.
2020-03-31 11:28:26 +01: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)
806d81c919
Merge branch 'master' into GLTF2_recursive_references_fix
2020-03-31 09:54:01 +01:00
Alexey Medvedev
3ef46b0edd
Weights and bones count checks
2020-03-30 16:56:33 -07:00
Alexey Medvedev
5e93b9ea8b
Fixed bone splitting with excessive amount of bones with 0 weight
2020-03-30 12:42:32 -07:00
Kim Kulling
6973aea6da
fix compiler warnings.
2020-03-30 20:41:39 +02:00
Kim Kulling
4c177ad72e
fix possible warnings
2020-03-30 20:33:43 +02:00
Kim Kulling
d51b89f3ce
trigger build
2020-03-29 13:44:14 +02:00
Kim Kulling
b1165cff28
Merge branch 'master' into kimkulling_dev
2020-03-29 12:07:20 +02:00
Ville Ruusutie
222b145307
Merge branch 'master' into optimized_bonelimits
2020-03-29 12:54:07 +03:00
Kim Kulling
9b83d74830
apply code-conventions to unrealloader
2020-03-28 09:48:55 +01:00
Kim Kulling
27e1a20efe
Update 3DSConverter.cpp
...
Trigger build.
2020-03-27 20:46:32 +01:00
Kim Kulling
3a206a424d
Merge branch 'master' into kimkulling_dev
2020-03-27 18:25:13 +01:00
Kim Kulling
e543a58dfb
Update m3d.h
...
fix more alignment errors.
2020-03-27 18:23:22 +01:00
Kim Kulling
2cfdbe2d50
Update m3d.h
...
Fix alignment bug.
2020-03-27 16:27:07 +01:00
Kim Kulling
7a01061c3e
Update m3d.h
...
Try to fix build error.
2020-03-27 15:39:49 +01:00
Kim Kulling
60750161d5
Update m3d.h
...
replace assignment by memcpy.
2020-03-27 15:28:32 +01:00
Ville Ruusutie
855452831c
Merge branch 'master' into fbx_rotation_fix
2020-03-27 14:36:00 +02:00
Kim Kulling
32c59643f2
Update m3d.h
...
fix alignment issue.
2020-03-27 11:38:38 +01:00
Kim Kulling
80323b57bc
Update UnrealLoader.cpp
...
Fix static code analysis findings.
2020-03-27 11:30:40 +01:00
Ville Ruusutie
7a2bc5f8f3
Merge branch 'master' into optimized_bonelimits
2020-03-27 07:12:25 +02:00
Ville Ruusutie
69176ad425
Merge branch 'master' into optimized_bonelimits
2020-03-26 21:28:47 +02:00
Ville Ruusutie
7f521b4eb4
Merge branch 'master' into fbx_rotation_fix
2020-03-26 21:28:03 +02:00
Marc-Antoine Lortie
609632c6a5
Added missing functionalities to C API.
...
The C API functions that have been added are the following:
Vector2:
- aiVector2AreEqual
- aiVector2AreEqualEpsilon
- aiVector2Add
- aiVector2Subtract
- aiVector2Scale
- aiVector2SymMul
- aiVector2DivideByScalar
- aiVector2DivideByVector
- aiVector2Length
- aiVector2SquareLength
- aiVector2Negate
- aiVector2DotProduct
- aiVector2Normalize
Vector3:
- aiVector3AreEqual
- aiVector3AreEqualEpsilon
- aiVector3LessThan
- aiVector3Add
- aiVector3Subtract
- aiVector3Scale
- aiVector3SymMul
- aiVector3DivideByScalar
- aiVector3DivideByVector
- aiVector3Length
- aiVector3SquareLength
- aiVector3Negate
- aiVector3DotProduct
- aiVector3CrossProduct
- aiVector3Normalize
- aiVector3NormalizeSafe
- aiVector3RotateByQuaternion
Matrix3x3:
- aiMatrix3FromMatrix4
- aiMatrix3FromQuaternion
- aiMatrix3AreEqual
- aiMatrix3AreEqualEpsilon
- aiMatrix3Inverse
- aiMatrix3Determinant
- aiMatrix3RotationZ
- aiMatrix3FromRotationAroundAxis
- aiMatrix3Translation
- aiMatrix3FromTo
Matrix4x4:
- aiMatrix4FromMatrix3
- aiMatrix4FromScalingQuaternionPosition
- aiMatrix4Add
- aiMatrix4AreEqual
- aiMatrix4AreEqualEpsilon
- aiMatrix4Inverse
- aiMatrix4Determinant
- aiMatrix4IsIdentity
- aiMatrix4DecomposeIntoScalingEulerAnglesPosition
- aiMatrix4DecomposeIntoScalingAxisAnglePosition
- aiMatrix4DecomposeNoScaling
- aiMatrix4FromEulerAngles
- aiMatrix4RotationX
- aiMatrix4RotationY
- aiMatrix4RotationZ
- aiMatrix4FromRotationAroundAxis
- aiMatrix4Translation
- aiMatrix4Scaling
- aiMatrix4FromTo
Quaternion:
- aiQuaternionFromEulerAngles
- aiQuaternionFromAxisAngle
- aiQuaternionFromNormalizedQuaternion
- aiQuaternionAreEqual
- aiQuaternionAreEqualEpsilon
- aiQuaternionNormalize
- aiQuaternionConjugate
- aiQuaternionMultiply
- aiQuaternionInterpolate
In addition, a const qualifier has been added to aiQuaterniont::Rotate to allow call to this method via a const aiQuaterniont pointer.
2020-03-26 13:08:40 -04:00
Kim Kulling
96c7c567e6
Merge branch 'master' into kimkulling_dev
2020-03-26 11:56:45 +01:00
Max Vollmer (Microsoft Havok)
3c9751ce0c
Merge branch 'master' into GLTF2_recursive_references_fix
2020-03-26 10:16:58 +00:00
kimkulling
ccd13436da
fix memory leak during export
2020-03-25 16:37:43 +01:00
napina
14b8d1242b
Added pre and post rotation handling to FBXConverter::GenerateSimpleNodeAnim. Fixed quaternion interpolation flip. Cleaned code.
2020-03-25 08:20:31 +02:00
napina
b962af93fc
Merge branch 'master' of https://github.com/assimp/assimp
2020-03-24 21:35:22 +02:00
Max Vollmer (Microsoft Havok)
ec17aff6d6
Merge branch 'master' into GLTF2_invalid_buffer_fix
2020-03-24 11:56:44 +00:00
Max Vollmer (Microsoft Havok)
ef20cdc430
Merge branch 'master' into GLTF2_guarantee_rootnode_fix
2020-03-24 11:56:42 +00:00
Max Vollmer (Microsoft Havok)
2820edee54
Merge branch 'master' into GLTF2_recursive_references_fix
2020-03-24 11:56:38 +00:00
simon chen
891b1d4b3f
Merge branch 'master' into fix_FBX_no_preservePivots_bug
2020-03-24 14:38:23 +08:00
Andy Maloney
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
napina
bb4bcb442a
Merge branch 'master' of https://github.com/assimp/assimp
2020-03-23 10:35:06 +02: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
Kim Kulling
6f8d96b57e
Merge branch 'master' into kimkulling_dev
2020-03-23 09:00:41 +01:00
Max Vollmer (Microsoft Havok)
973e38ad97
Merge branch 'master' into GLTF2_guarantee_rootnode_fix
2020-03-23 07:57:38 +00:00
napina
f0243cc7f3
Changed AI_LMW_MAX_WEIGHTS*2 to 8 which is same thing.
2020-03-22 15:58:12 +02:00