70dfdb8f9d
Merge branch 'master' into x3d_pugi_migration_artenuvielle
2021-09-15 14:51:38 +02:00
a8a6aa2bd8
fixed some compiling issues
2021-09-15 14:49:46 +02:00
880a2f25bb
Merge branch 'master' into remove-useless-code
2021-09-14 23:33:34 +02:00
8a975549a9
Add missing override
2021-09-14 20:49:20 +02:00
0fef0e1101
Move duplicate code to glFT common header.
2021-09-14 20:45:36 +02:00
18531e3677
Next iteration for c++11 features.
2021-09-13 22:38:20 +02:00
c7e9c6580a
Merge branch 'master' into x3d_pugi_migration_artenuvielle
2021-09-12 11:45:00 +02:00
3f6a371b64
migrated x3d importer to pugixml reader
2021-09-12 11:37:33 +02:00
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
4cf4e7454f
removed useless code
...
In destructors, zeroing attributes or clearing containers is utterly useless.
2021-09-11 21:51:20 +02:00
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
0dabce2754
Merge branch 'master' into cleanup_public_header
2021-09-09 20:18:01 +02:00
bc0a2762df
Merge branch 'master' into master
2021-09-09 09:16:50 +02:00
f47479aba4
Rework format + introdule missing C++11 features
2021-09-08 23:19:10 +02:00
3001d88172
Merge branch 'master' into x3d_pugi_migration
2021-09-07 15:04:08 +02:00
768024d5a0
Merge branch 'master' into master
2021-09-07 11:39:34 +02:00
74e8a6a366
Merge branch 'master' into xgl-fix
2021-09-07 09:03:40 +02:00
bf8e36ae28
Fixed typo
2021-09-02 10:07:28 +01:00
72ea80b41f
Revert last change (gltf2::Ref type is not a pointer and has a bool() operator)
2021-09-02 10:00:56 +01:00
d710d0700f
Make nullptr test more explicit.
2021-09-02 10:10:42 +02:00
4c86772091
Added another nullptr safety check
2021-09-02 08:27:03 +01:00
9b535d1c15
Fix Double Precision errors/warnings
2021-08-31 12:59:31 +02:00
155db25883
Merge branch 'master' into ms-maxvollmer/code_improvements
2021-08-31 08:55:47 +02:00
96f0787f51
Fix the -Werror=unused-but-set-parameter warning by removing the skipFirst variable.
2021-08-30 18:15:37 -04:00
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
82d8c4e849
Merge branch 'master' into compressed_json
2021-08-30 10:11:03 +02:00
38c611a02c
Update ColladaLoader.cpp
2021-08-30 08:33:35 +02:00
e2c2a60c45
Remove not used attribute
2021-08-29 18:41:07 +02:00
c9d35b6edc
Remove C++14 feature.
2021-08-29 18:35:44 +02:00
ceafa95610
Remove unused header
2021-08-29 10:36:02 +02:00
5ca2cbb7ae
Fix MinGW build
2021-08-28 20:04:37 +03:00
c9b76f5255
Decrease xml-serializer complexity
2021-08-28 14:20:12 +02:00
df739f00dd
Merge branch 'master' into issue_3398
2021-08-28 13:56:50 +02:00
69051bbc2c
Add missing docu
2021-08-28 13:46:41 +02:00
a7bc858698
Fix review finding.
2021-08-28 13:36:57 +02:00
3e090b21f5
Fix setup of embedded texture loading
2021-08-28 13:33:25 +02:00
b9b62d106c
Merge branch 'master' into compressed_json
2021-08-27 18:18:28 +02:00
b39f38b73c
Add export property for assimp json exporter to write compressed json (without whitespaces).
2021-08-27 18:17:27 +02:00
a45878c41a
Fix possible overrun
...
- closes https://github.com/assimp/assimp/issues/3425
2021-08-27 14:04:00 +02:00
eabfc05bbb
Handle empty keys
2021-08-27 10:41:25 +02:00
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
468aa50aed
mingw build fix
2021-08-19 13:50:26 +02:00
f3903e34a4
Merge branch 'master' into master
2021-08-18 07:32:16 +02:00
a486a698e8
Merge branch 'master' into clang13
2021-08-16 21:35:59 +02:00
a850f312ac
Merge branch 'master' into ms-maxvollmer/crash_fixes_08_2021
2021-08-16 21:00:07 +02:00
27231c3f52
Merge branch 'master' into bound
2021-08-16 20:48:17 +02:00
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
de2f5cf021
Crash fixes
2021-08-13 16:26:42 +01:00
4b1ff645e3
closes https://github.com/assimp/assimp/issues/3398 : Add support for embedded textures
2021-08-12 21:13:07 +02:00
26defda671
Merge branch 'master' into master
2021-08-12 08:20:59 +03:00
58cae73401
Disable diagnostic for LogStream comparator
2021-08-11 19:32:26 -04:00
69c152d7c1
Add missing diagnostic push
2021-08-11 18:57:21 -04:00
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
a16cd95b16
Merge branch 'master' into fix-indent
2021-08-10 21:39:13 +02:00
a55518f6fc
Merge branch 'master' into no-empty-string-literals
2021-08-10 20:41:40 +02:00
89eadb934f
Merge branch 'master' into trim-trailing-whitespace
2021-08-09 21:24:22 +02:00
0aa36ee550
Merge branch 'master' into master
2021-08-07 12:06:23 +02:00
f8fe3d1341
Merge branch 'master' into fix-indent
2021-08-06 09:40:34 +02:00
00b22d1397
Merge branch 'master' into no-empty-string-literals
2021-08-06 09:40:31 +02:00
6cb54d1c95
Merge branch 'master' into trim-trailing-whitespace
2021-08-06 09:40:03 +02:00
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
1ee2be8c5c
Merge branch 'master' into trim-trailing-whitespace
2021-07-31 18:01:48 +02:00
00a2cd20f9
Merge branch 'master' into remove-dead-code
2021-07-31 17:00:58 +02:00
bb53961fa9
more range-based for
...
f6b4370f6a7c822f23bd
2021-07-29 14:57:25 +02:00
42a7611f85
style fix: indentation
2021-07-29 14:39:22 +02:00
4991f728c8
style fix – initializing and assigning empty std::string properly
...
for details, see #3764
2021-07-29 14:23:52 +02:00
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
738c31c3ea
removed useless code
...
Found while reviewing #3880
2021-07-28 16:48:53 +02:00
d065513e27
Merge branch 'master' into master
2021-07-28 17:02:28 +08:00
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
8ee2c721d9
StepExporter support polygon mesh
...
StepExporter support polygon mesh
2021-07-28 16:32:27 +08:00
aeae2cf242
Update M3DWrapper.h
2021-07-26 14:44:26 +02:00
e8e720d584
Update M3DWrapper.h
2021-07-26 13:41:54 +02:00
291c0a4faa
Fix build failure
...
- Fix the failure
- Put inlined stuff out of declaration
- Add some docu
2021-07-26 13:13:21 +02:00
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
b7f88f3063
closes https://github.com/assimp/assimp/issues/3957 : checkj for empty positions.
2021-07-26 10:51:16 +02:00
4e28a3072f
Merge branch 'master' into gltf_fixes
2021-07-23 20:37:25 +02:00
e07af07311
Merge branch 'master' into double
2021-07-22 10:07:40 +02:00
d0885af634
Merge branch 'master' into gltf_export_id_issue_3978
2021-07-21 13:47:47 +02:00
30d342534a
Fix issues encountered during integration atempt
2021-07-16 14:29:28 -07:00
5171aa52d1
Remove dead code
2021-07-16 11:47:38 +02:00
aa883eda19
FBX: fix double precision build.
2021-07-15 11:54:55 -07:00
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
0c6c238956
Merge branch 'master' into collada_makehuman_issue_3984
2021-07-14 11:33:43 +01:00
9c207cd865
Merge branch 'master' into rbsheth_fix_hunter
2021-07-13 20:45:22 +02:00
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
206b2436d4
Apply clangformat
2021-07-13 16:47:31 +01:00
15bbab2d9e
Merge branch 'master' into PLY_RN_LINE
2021-07-12 10:53:00 +02:00
1b37b74f9e
Hunter fixes for stb_image
2021-07-07 17:01:19 -04:00
0a5e49252d
Merge remote-tracking branch 'origin/master' into HEAD
2021-07-07 16:35:29 -04:00
90c115cb3f
Merge branch 'master' into promit/gltf-extras
2021-07-02 00:38:00 -04:00
240eb36980
Merge branch 'master' into master
2021-07-01 19:23:52 +02:00
3cbd31900c
Manage /R/N lines ends correctly on binary files, tested with solidworks PLY export
2021-07-01 17:23:21 +02:00
01930101c7
Merge branch 'master' into master
2021-06-29 20:45:09 +02:00
59ab791a47
Merge branch 'master' into clang-tidy-perf-fixes
2021-06-29 20:24:23 +02:00
7c822f23bd
Added support for custom properties ("extras") in glTF2
2021-06-27 00:53:40 -04:00
e3d54860ec
Merge branch 'master' into master
2021-06-25 18:50:33 -04:00
72075f984e
Merge branch 'master' into master
2021-06-25 19:48:12 +05:30
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
f435ce8c2c
Merge branch 'master' into clang-tidy-perf-fixes
2021-06-24 11:54:56 -04:00
b38b65ff49
Add const
2021-06-24 17:03:00 +02:00
012ce30577
Merge branch 'master' into zero
2021-06-24 17:00:43 +02:00
d18d838812
Fix formatting
2021-06-24 16:18:11 +02:00
8e3a159141
Merge branch 'master' into clang-tidy-perf-fixes
2021-06-23 10:10:28 -04:00
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
e736538df3
Merge branch 'master' into master
2021-06-23 13:45:23 +10:00
24d4be958d
Merge branch 'master' into clang-tidy-perf-fixes
2021-06-22 14:42:51 -04:00
544148a626
Fix code insertion duplication
2021-06-22 14:28:46 -04:00
760953c834
Merge branch 'master' into clean_gltf_pbr_brdf
2021-06-22 20:10:03 +02:00
36815b014b
Update FBXExporter.h
2021-06-22 20:05:16 +02:00
b17c2f29e9
Replace noexcept with proper macro
2021-06-22 12:44:36 -04:00
1650868701
Remove redundant include
2021-06-22 12:32:58 -04:00
94c3abd841
Apply various performance fixes from clang-tidy
2021-06-22 12:27:15 -04:00
951d5158c5
Merge branch 'master' into patch-1
2021-06-22 09:42:30 +02:00
9512e9ac1e
Merge branch 'master' into safe
2021-06-21 17:53:17 +02:00
fe8c4ebd8c
Merge branch 'master' into zero
2021-06-16 10:18:41 -07:00
e27074594f
Replace swear words in IFCBoolean.cpp
...
Add a more gentle comment.
2021-06-16 18:58:41 +02:00
a34b9d1c95
Fix review findings
2021-06-16 11:21:31 +02:00
148b8c66a8
glTF2: zero out extra space created by padding.
...
This makes resulting GLB deterministic.
2021-06-15 15:18:20 -07:00
af748755e1
Fix issue #2873
2021-06-15 13:20:12 -07:00
f412595887
Fix typo
...
Thank you clang!
2021-06-14 15:11:41 +01:00
985f3ee665
Fix glTFv2 texcoord/uv mapping
...
Use the standard property to indicate the UV map index
2021-06-14 15:11:41 +01:00
fb039bb9eb
Add glTFv2 Clearcoat import/export tests
...
Uses Clearcoat model from Khronos
2021-06-14 15:11:41 +01:00
4a66ec25d0
Standardise Clearcoat, Sheen and Transmission
...
Also cleanup glTFv2 defaults, don't import/export if disabled
2021-06-14 15:11:41 +01:00
4476352882
First pass at simplifying glTFv2 PBR
...
Removed 'core' set of GLTF-specific properties
2021-06-14 15:11:41 +01:00
9a851cac7b
Merge branch 'master' into Fix_SceneCombiner_Texture_Reindexing
2021-06-14 14:47:15 +02:00
3de20af3cc
Renamed glTF2::Object::extensions to customExtensions to avoid shadowing in other subclasses.
2021-06-12 13:16:53 +10:00
a7a30baf27
Renamed local variable to avoid shadowing member variable.
2021-06-12 13:08:14 +10:00
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
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
6d413444b5
Merge branch 'master' of https://github.com/Evangel63/assimp
2021-06-12 11:46:20 +10:00
36c8cdf3de
Add scene metadata for glTF2 files as allowed by the glTF2 specification.
2021-06-12 11:44:28 +10:00
6db142ee51
Merge branch 'x3d_pugi_migration' of https://github.com/assimp/assimp into x3d_pugi_migration
2021-06-10 23:36:47 +02:00
ebb9b1b2af
Next iteration
2021-06-10 23:36:07 +02:00
391d3195df
Merge branch 'master' into fbx-lights-export
2021-06-10 12:27:14 +02:00
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
ca1ab8b11b
Merge branch 'master' into Fix_SceneCombiner_Texture_Reindexing
2021-06-08 08:18:15 -05:00
8039351a67
Merge branch 'master' into Fix_SceneCombiner_Texture_Reindexing
2021-06-07 11:44:10 -05:00
a8ddc74426
Merge branch 'master' into fix-fbx-exporter2
2021-06-07 18:26:59 +02:00
d33cf1dc0c
Merge branch 'master' into x3d_pugi_migration
2021-06-06 16:06:08 +02:00
444fc9c373
Increasing length of mDataLength if rewriting the texture index increases magnitutde of index.
2021-06-04 16:32:46 -05:00
84db4d3a08
Update CMakeLists.txt
2021-06-03 23:56:52 +02:00
742250c5fb
Update CMakeLists.txt
2021-06-03 23:42:07 +02:00
a716f741d8
fix the include
2021-06-03 23:35:12 +02:00
e0d1a36523
Merge branch 'master' into stb-image-updated
2021-06-03 23:07:38 +02:00
d600b45cd2
Merge branch 'x3d_pugi_migration' of https://github.com/assimp/assimp into x3d_pugi_migration
2021-06-03 22:21:10 +02:00
3a32612b71
Add skipping of unused nodes.
2021-06-03 20:55:31 +02:00
c8510a1a82
Merge branch 'master' into fix-fbx-exporter2
2021-06-03 11:05:07 +02:00
77ce4080b6
fix viewer in case of unknown primitives.
2021-05-30 21:54:04 +02:00
3b565444c3
Merge branch 'Q1MDLgroup' of https://github.com/Garux/assimp into Q1MDLgroup
2021-05-30 11:55:45 +03:00
c776924adf
fix -Waddress-of-packed-member
2021-05-30 11:45:50 +03:00
09bb79c68a
Merge branch 'master' into issue_3711
2021-05-29 08:39:18 +02:00
7534b149cf
fix non skipped CR in header parsing
2021-05-28 15:28:35 +02:00
70cc1630fa
Merge branch 'master' into fix-gcc4.9-compilation
2021-05-27 15:25:01 +02:00
0905252833
Merge branch 'master' into master
2021-05-27 09:45:17 +02:00
aa8d746dc3
Merge branch 'master' into patch-1
2021-05-27 08:35:29 +02:00
29e5f5fed1
Merge branch 'master' into master
2021-05-26 13:18:04 +02:00
b59db55b8c
Merge branch 'master' into less-string-bloat
2021-05-26 12:14:08 +02:00
6b8a00dfa1
Merge branch 'master' into wangyi_basisu
2021-05-25 17:17:07 +02:00
b5e54e4d3b
Merge branch 'master' into wangyi_basisu
2021-05-25 16:17:29 +02:00
faeae27923
Merge branch 'master' into importer_fixes_followup
2021-05-25 16:15:09 +02:00
f13515a391
Adding basic support for lights in FBX exporter
2021-05-23 19:12:21 +02:00
6c104e096e
Merge branch 'master' into fix-gcc4.9-compilation
2021-05-23 19:06:28 +02:00
aeaa22cbbd
Merge branch 'master' into UVStreamNames
2021-05-23 14:37:28 +02:00
ac54fe41e2
Merge branch 'master' into PBRsupport
2021-05-23 13:23:06 +02:00
799384f2b8
Adding the required c flag to compile zip files using gcc 4.9
2021-05-22 17:36:39 +02:00
f96e3cde2d
Fix transform chain is applied twice
2021-05-23 00:06:05 +09:00
b7b3c6db7e
Fixing GCC 4.9 compilation issues
2021-05-22 16:57:07 +02:00
28e34878cb
Fix fbx exporter bug if root node contains meshes.
2021-05-22 23:20:34 +09:00
ee85ebbd00
Merge branch 'master' into md3Tuning
2021-05-20 20:25:30 +02:00
4f801a104e
Merge branch 'master' into fix-sib-string-waste
2021-05-20 19:58:11 +02:00
3fa45e6a8c
Merge branch 'master' into sml_doc
2021-05-18 21:18:02 +02:00
e01a6b4276
Add xml doc.
2021-05-18 21:15:48 +02:00
54a27f4514
Merge branch 'master' into MalcolmTyrrell/loggingImprovements
2021-05-17 13:32:02 +01:00
084dc73b91
Fast path for unformatted calls.
2021-05-17 11:27:21 +01:00
fd5d1211f9
Recover comment which got dropped
2021-05-17 10:33:00 +01:00
6e4b9d267b
Remove TODO. Typo fix.
2021-05-17 10:29:06 +01:00
43e1e4d3d3
Merge branch 'master' into master
2021-05-17 07:56:41 +02:00
4ec01cfdcd
Improve use of logging
2021-05-13 12:05:31 +01:00
22340469f4
Merge branch 'master' into jc3-dnase
2021-05-13 11:51:42 +02:00
ad6f300b1d
Other LogAux functions
2021-05-13 10:43:28 +01:00
7abfd134b6
LogAux warn
2021-05-13 10:33:16 +01:00
5cd3bdd5c2
No need to distinguish formatting log functions.
2021-05-13 10:25:27 +01:00
78145f1425
log verboseDebug
2021-05-13 10:08:59 +01:00
89584c167a
Log debug
2021-05-13 09:56:42 +01:00
ca698c3e49
Log error
2021-05-13 09:36:42 +01:00
a700285c64
Merge branch 'master' into master
2021-05-13 08:37:59 +02:00
b70f195805
Merge branch 'master' into M3DasciiByDefault
2021-05-12 15:31:01 +02:00
58bc4bcb63
log info
2021-05-12 12:55:21 +01:00
813d0aecdd
Adjust warn
2021-05-12 12:43:24 +01:00
7a3c8e5504
Merge branch 'master' into md2orient
2021-05-12 13:07:27 +02:00
f127144f71
Merge branch 'master' into c4d-cineware
2021-05-12 10:57:17 +02:00
8013c5011c
Merge branch 'master' into hl1mdlOrient
2021-05-12 08:21:40 +02:00
ad4ca71e4c
Merge branch 'master' into jc3-dnase
2021-05-12 00:56:46 +02:00
75af93aaa4
Merge branch 'master' into patch-2
2021-05-11 12:12:07 -04:00
4ee2f5f69d
Merge branch 'master' into aseHack
2021-05-11 11:40:24 +02:00
a54cd432cd
Merge branch 'master' into master
2021-05-11 07:58:05 +02:00
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#3890 , but was lost in a merge.
2021-05-10 19:06:39 -04:00
cb7d3ac598
Merge branch 'master' into jc3-spam-killa
2021-05-10 22:21:13 +02:00
e1a0e16a4e
Merge branch 'master' into jc3-importer-open-error-handling
2021-05-10 22:07:25 +02:00
4807853f09
Merge branch 'master' into mdcOrient
2021-05-10 21:06:15 +02:00
433620350e
Merge branch 'master' into stb-image-updated
2021-05-10 11:30:45 +02:00
f87b180147
Merge branch 'master' into jc3-importer-open-error-handling
2021-05-09 17:02:04 -04:00
b30cbcf117
Merge branch 'master' into jc3-spam-killa
2021-05-09 21:47:17 +02:00
0f85990fe3
Merge branch 'master' into jc3-importer-open-error-handling
2021-05-09 14:42:17 -04:00
5cc05c26a7
Merge branch 'master' into jc3-spam-killa
2021-05-09 14:41:39 -04:00
319770db9d
Merge branch 'master' into jc3-cctype-fixes
2021-05-09 20:37:21 +02:00
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
a19b708144
support both ktx and ktx2
2021-05-07 16:27:23 -07:00
9a2a0384f4
Merge branch 'master' into patch-3
2021-05-07 17:53:18 -04:00
279e9a186f
Merge branch 'master' into jc3-dnase
2021-05-07 14:49:22 -04:00
6eb15080ec
Merge branch 'master' into jc3-importer-open-error-handling
2021-05-07 14:49:00 -04:00
2fd6102573
Merge branch 'master' into jc3-spam-killa
2021-05-07 14:48:24 -04:00
7b404788a6
Merge branch 'master' into jc3-cctype-fixes
2021-05-07 14:48:01 -04:00
8ff52c0f89
Pass base name from export properties to the IO system.
2021-05-07 17:31:30 +02:00
25a0eb0d67
Merge branch 'master' into mdcOrient
2021-05-07 13:03:08 +02:00
8cae8c5461
Fix static code analysis findings
2021-05-07 11:52:16 +02:00
56bfa1ce5c
Make constructros with one arg explicit
2021-05-07 11:36:21 +02:00
2b9d88c943
support basis universal
2021-05-06 15:10:06 -07:00
25cf5dd487
Merge branch 'master' into mRootNode_mTransformation
2021-05-06 21:40:03 +02:00
350f2ea1d3
Fix build and merged master.
2021-05-06 21:36:25 +02:00
52228a93f8
Fix X3DGeohelper.
2021-05-06 21:07:38 +02:00
e120544978
Merge branch 'master' into fixGenNormals
2021-05-06 17:28:37 +02:00
bc7551b778
Merge branch 'master' into add-step-extension
2021-05-06 14:19:53 +02:00
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
c08ad2e5c2
Merge branch 'master' into jc3-cctype-fixes
2021-05-05 19:04:47 -04:00
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
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
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
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
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
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
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
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
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
816da9b677
merge and update all copies of stb_image.h
2021-05-05 23:15:41 +02:00
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
f5a31b70f5
Merge branch 'master' into patch-3
2021-05-05 16:24:46 -04:00
992f10e7bf
Merge branch 'master' into remove-useless-scaling-prototype
2021-05-05 21:54:31 +02:00
7ae8a52d9f
Merge branch 'master' into jc3-spam-killa
2021-05-05 10:33:29 -04:00
b82d9f4bc7
Merge branch 'master' into new-file-detection
2021-05-05 15:59:25 +02:00
5325b327c3
Merge branch 'master' into optimize_3mf_strings
2021-05-05 15:12:06 +02:00
153b890b02
Prevent accessing nullpointers
2021-05-05 14:09:43 +01:00
d5cde96fbd
Merge branch 'new-file-detection' of https://github.com/krishty/assimp into new-file-detection
2021-05-05 13:14:35 +02:00
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
f15dcfa981
- Fix model parsing
2021-05-05 13:10:52 +02:00
cbce6d3dad
Merge branch 'optimize_3mf_strings' of https://github.com/assimp/assimp into optimize_3mf_strings
2021-05-05 10:46:54 +02:00
6dcbd0d566
Merge branch 'master' into new-file-detection
2021-05-05 09:37:52 +02:00
ccd1a4455e
[ply] Fix minor typo in error message.
2021-05-04 21:57:00 -04:00
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
Artenuvielle
Kim Kulling
Kim Kulling
Krishty
Hill Ma
Max Vollmer (Microsoft Havok)
Madrich
Doug Roeper
Viktor Kovacs
kirillsurkov
Mykhailo Smoliakov
Robert Ubiñas
krishty
xiaohunqupo
Adrian Perez
RichardTea
Rahul Sheth
Promit Roy
arkeon
Jerome St-Louis
Pankaj003
Aaron Gokaslan
Pankaj Tyagi
Evangel63
Hill Ma
Andreas Buhr
Scott Baldric
Garux
Matthias Möller
Carsten Rudolph
Jean-François Verdon
Jean-François Verdon
Jagoon
Malcolm Tyrrell
Malcolm Tyrrell
Jason C
ywang
Jason C
Krishty
kkulling