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

1330 Commits

Author SHA1 Message Date
Marco Feuerstein
a2bdfdd05a Improve binary check for gltf and gltf2. 
By checking the magic token we don't depend on the extension any more
and follow the official way to detect a gltf file as binary, see also
https://github.com/KhronosGroup/glTF/blob/main/extensions/1.0/Khronos/KHR_binary_glTF/README.md#header
and https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html#binary-header.
 2023-06-29 08:20:50 +02:00
Kim Kulling
1ec3dbd11a Merge branch 'master' into 5093294573486080 2023-06-27 17:04:58 +02:00
Kim Kulling
f24224fdc5 Merge branch 'master' into SupportOBJSpecifiedOnlyAPartOfVertexColors 2023-06-27 13:44:31 +02:00
Kim Kulling
db6c1a8b1c Merge branch 'master' into 5921493454815232 2023-06-27 11:03:50 +02:00
Kim Kulling
ef6bf03acd Merge branch 'master' into 5143879191494656 2023-06-27 10:23:36 +02:00
Kim Kulling
141e278e1f Merge branch 'master' into 5407417422970880 2023-06-27 10:07:21 +02:00
Kim Kulling
b1181b1086 Merge branch 'master' into 4508318827937792 2023-06-25 21:20:02 +02:00
Kim Kulling
7005a9caa2 Merge branch 'master' into 6520123362508800 2023-06-25 21:07:34 +02:00
Kim Kulling
3545aab937 Merge branch 'master' into 5781186265350144 2023-06-25 17:51:01 +02:00
Kim Kulling
bd65af0d44 Merge branch 'master' into SupportOBJSpecifiedOnlyAPartOfVertexColors 2023-06-20 09:38:53 +02:00
Kim Kulling
6502b97d3e Fix: Put unused var into comments to later use. 2023-06-19 23:38:57 +02:00
Kim Kulling
7f0c388ad8 Fix: Put unused var into comments to later use. 2023-06-19 23:27:32 +02:00
Kim Kulling
10059e6431 Add handling for negative indices. 2023-06-19 23:21:35 +02:00
emaame
22c8d97b54 Support OBJ specified only a part of vertex colors 
The omitted vertex colors are treated as (0, 0, 0, 1).

e.g

v  0.0  0.0  0.0
v  0.0  0.0  1.0  0.0  0.0  0.0
v  0.0  1.0  0.0
v  1.0  0.0  0.0  1.0  0.6  0.3
v  1.0  1.0  0.0
 2023-06-17 16:31:04 +09:00
Alex
36dfa3bed3 Fix UNKNOWN WRITE in Assimp::SortByPTypeProcess::Execute 2023-06-14 15:50:50 +00:00
Alex
9ef71fe231 Merge branch 'master' into 5781186265350144 2023-06-14 07:40:47 +02:00
Alex
646d3591b6 Fix memory leak 2023-06-14 07:40:21 +02:00
Alex
496a4bf156 Fix unknown write in Assimp::ObjFileMtlImporter::getFloatValue 2023-06-14 07:40:21 +02:00
Alex
8012657169 Fix Heap-buffer-overflow READ in Assimp::MD5::MD5Parser::ParseSection 2023-06-14 07:38:57 +02:00
Alex
dbd15fd351 Fix UNKNOWN WRITE in std::__1::list<Assimp::LWO::Envelope, std::__1::allocator<Assimp::LWO::Envelope> 2023-06-14 07:38:47 +02:00
Alex
86aecf395e Fix Bad-cast to Assimp::D3DS::Material from invalid vptr in Assimp::ASE::Parser::ParseLV2MaterialBlock 2023-06-14 07:38:38 +02:00
Alex
c6c95b69f6 Use SizeCheck 2023-06-14 07:38:02 +02:00
Alex
54b0c00418 Fix UNKNOWN READ in Assimp::MDLImporter::ParseSkinLump_3DGS_MDL7 2023-06-14 07:38:02 +02:00
Alex
f897b0c461 Merge branch 'master' into 6520123362508800 2023-06-13 22:06:08 +02:00
Kim Kulling
3ccf242bdb Merge branch 'master' into memleak 2023-06-13 19:46:56 +02:00
Kim Kulling
bef66deeda Update glTF2Importer.h 2023-06-08 20:56:14 +02:00
Kim Kulling
1ab4161cd7 Update glTF2Importer.cpp 2023-06-08 20:55:48 +02:00
Kim Kulling
186d7fd606 Merge branch 'master' into FixSkinnedWeightsAfterVertexRemappingOptimization 2023-06-08 13:16:08 +02:00
Kim Kulling
11dede8fc4 Merge branch 'master' into 4890437695700992 2023-06-08 13:02:15 +02:00
Alex
4c16a6a16b Fix memory leak 2023-06-07 07:02:50 +00:00
Alex
f5683b6f3a Update MDLMaterialLoader.cpp 
Add parentheses
 2023-06-05 14:27:21 +02:00
Alex
23f9990b22 Fix UNKNOWN READ in aiTexture::~aiTexture 2023-06-04 07:50:00 +00:00
Alex
5cc4a61d66 Fix Heap-buffer-overflow READ in Assimp::MD5::MD5MeshParser::MD5MeshParser 2023-06-03 16:30:50 +02:00
Alex
57a55aa4d4 Fix memory leaks 2023-06-03 16:28:55 +02:00
Alex
f4d3b6e862 Fix Stack-buffer-overflow READ in aiMaterial::AddBinaryProperty 2023-06-03 16:28:55 +02:00
Alex
d3506c24e7 Update ObjFileParser.cpp 2023-06-02 18:57:53 +02:00
Kim Kulling
e30823fb1d Merge branch 'master' into 5781186265350144 2023-06-01 16:40:46 +02:00
Alex
4cc70cb73c Optimize 2023-05-31 14:10:57 +00:00
Alex
54f5d01190 Fix Heap-buffer-overflow WRITE in Assimp::ObjFileImporter::createVertexArray 2023-05-31 11:37:15 +00:00
Alex
c3e69b5b82 Fix Heap-buffer-overflow READ in Assimp::ObjFileParser::getFace 2023-05-31 08:01:41 +00:00
Kim Kulling
466f6960ac Merge branch 'gltf2_metadata_export' of https://github.com/C-Tech-Development-Corp/assimp into C-Tech-Development-Corp-gltf2_metadata_export 2023-05-30 08:14:49 +02:00
Kim Kulling
17c1a9125f Merge branch 'master' into FixSkinnedWeightsAfterVertexRemappingOptimization 2023-05-24 23:36:59 +02:00
Kim Kulling
b7a8c4ba75 Update glTF2Asset.inl 2023-05-23 10:33:14 +02:00
Kim Kulling
e947471549 Merge branch 'master' into refactor/KHR_material_specular 2023-05-22 09:49:01 +02:00
Kim Kulling
03163a1dda Merge branch 'master' into master 2023-05-21 18:26:56 +02:00
Kim Kulling
7e16d4046e Merge branch 'master' into FixSkinnedWeightsAfterVertexRemappingOptimization 2023-05-21 18:14:29 +02:00
Kim Kulling
9c45f727e3 Update ASELoader.cpp 2023-05-20 14:27:57 +02:00
Kim Kulling
aed43878ef Merge branch 'master' into FlorianBorn71-SmallAllocationFixInFBXLoader 2023-05-15 14:28:46 +02:00
Kim Kulling
121f09b62a Fix: Fix the build. 2023-05-15 11:02:58 +02:00
Kim Kulling
e627f691a8 Merge branch 'SmallAllocationFixInFBXLoader' of https://github.com/FlorianBorn71/assimp into FlorianBorn71-SmallAllocationFixInFBXLoader 2023-05-15 09:30:57 +02:00