Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,474 Commits 19 Branches 43 Tags
d710d0700fbfaf7c20153e4d89aa1eccc2aa232e
Commit Graph

5646 Commits

Author SHA1 Message Date
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
Kim Kulling
155db25883 Merge branch 'master' into ms-maxvollmer/code_improvements 2021-08-31 08:55:47 +02: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
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
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
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