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

315 Commits

Author SHA1 Message Date
Kim Kulling
b00923ebcd Update Assimp.cpp 2022-05-31 19:08:29 +02:00
Kim Kulling
472e15c405 Merge branch 'master' into kimkulling/link_stb_image_statically_issue_4467 2022-05-31 17:47:43 +02:00
IOhannes m zmölnig
1d3d5c4bb6 Rename TextureTypeToString() to aiTextureTypeToString() 
Closes: https://github.com/assimp/assimp/issues/4493
 2022-05-01 13:27:42 +02:00
Kim Kulling
7f913c180b Merge branch 'master' into master 2022-04-19 15:23:09 +02:00
hgdagon
518d50d2e6 Fixes for Windows/MSYS2 2022-04-07 03:07:57 -07:00
Kim Kulling
5c438963c0 Disable correct compiler-warning: unused-function. 2022-04-05 19:59:36 +02:00
Kim Kulling
97c7ab3c05 Move stb_image header into its own header file. 2022-04-05 19:53:41 +02:00
Kim Kulling
b8658cefe0 Link std_image statically. 2022-04-05 18:48:45 +02:00
Sergio Acereda
729ab8ae33 Trying to fix reorder error 2022-03-12 08:15:11 +01:00
Sergio Acereda
51e248909f Avoid setting metallic/roughness/sheen/clearcoat properties when they are not found on mtl file. 2022-03-11 22:29:59 +01:00
Kim Kulling
47f004517f Add missing cast. 2022-03-10 10:33:29 +01:00
Jonas Karlsson
c14eccefaf Fix 'i >= 0' always true bug 
If 'disk_filename' does not contain a dot (.) then 'i' would overflow.
Making 'i' an int makes sure the for loop works as intended.
 2022-03-09 23:05:47 +01:00
Kim Kulling
d4527d4e87 Merge branch 'master' into master 2022-03-05 14:00:32 +01:00
Kim Kulling
7c13b16d30 Add missing flush modes supported by zlib 2022-02-14 20:51:06 +01:00
Kim Kulling
416f823866 Merge branch 'kimkulling/introduce_compression' of https://github.com/assimp/assimp into kimkulling/introduce_compression 2022-02-14 20:25:27 +01:00
Kim Kulling
c718500c55 Fix last review findings and finish windows bits 2022-02-14 20:25:18 +01:00
Kim Kulling
9a585d7b3c Merge branch 'master' into kimkulling/introduce_compression 2022-02-13 19:58:22 +01:00
Kim Kulling
52b6c4f7c0 Fix broken importer and add some review findings2 2022-02-13 18:44:22 +01:00
Kim Kulling
3e09d462fa Fix compression for fbx 2022-02-12 09:25:45 +01:00
Kim Kulling
23b43d1825 Fix X-Importer decompress algorithm 2022-02-08 21:43:14 +01:00
Kim Kulling
27bcddfb1a Migrate more importers to compression class 2022-02-08 20:43:47 +01:00
Tomas Maly
acf73659d8 fix missing include for size_t 2022-02-08 00:08:46 +01:00
Kim Kulling
9335cc30ab INtroduce compression class to encapsulate compression via zlib 2022-02-06 20:42:58 +01:00
Kim Kulling
91737f1cc9 Fix copyright: last year 2022-01-23 21:18:31 +01:00
Ben Sewell
3e6fc3a64b Merge remote-tracking branch 'origin/master' into bensewell-fixifcopening4343 2022-01-20 09:43:45 +00:00
Kim Kulling
17d5633a5b Add missing SImpleExtensionCheck 2022-01-19 21:42:14 +01:00
Kim Kulling
efd1d36aa9 Merge branch 'master' into krishty-new-file-detection 2022-01-18 22:17:50 +01:00
Kim Kulling
6e50b04ae0 Merge branch 'master' into IQM 2022-01-17 18:33:37 +01:00
Ben Sewell
65f2353105 IFC Reading: Fix opening reading. 2022-01-17 15:49:11 +00:00
Kim Kulling
6ad7505376 Merge branch 'master' into krishty-new-file-detection 2022-01-16 20:43:57 +01:00
Kim Kulling
05746acb07 Merge branch 'new-file-detection' of https://github.com/krishty/assimp into krishty-new-file-detection 2022-01-16 20:41:24 +01:00
Viktor Kovacs
c8ab39dd04 Merge branch 'master' into common_base64 2022-01-15 23:42:56 +01:00
Kim Kulling
d3e24196c0 Merge branch 'master' into so-unloading 2022-01-13 20:19:23 +01:00
Viktor Kovacs
c71f4bc95a Merge branch 'master' into common_base64 2022-01-11 18:46:08 +01:00
Viktor Kovacs
6b9732721a Merge branch 'assimp:master' into common_base64 2022-01-10 21:15:31 +01:00
Kim Kulling
50c7301a38 Update copyrights 2022-01-10 21:13:43 +01:00
Alex Rebert
310c81aaa2 Add support for spanned archives 
Without it, assimp would crash on some inputs by jumping to a NULL
opendisk function. This commit adds an opendisk implementation, which
required adding a filename member to ZipFile.

Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=38873
Fix #4229
 2022-01-05 15:43:10 -05:00
Alex Rebert
34d8fba100 Fix stack overflow in ZipArchiveIOSystem::MapArchive 
The function allocates a filename buffer of 256, and copies the filename
extracted from the zip file into it. However, a filename might be larger
than 256 characters, in which case the function would write out of bounds.

This commit skips any file whose name is larger than 256 to avoid the
overflow.

Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=38870
Fix #4228
 2022-01-05 10:01:46 -05:00
kovacsv
bbe12240ca Move Base64 encode/decode functionality to the common folder. 2022-01-02 19:47:43 +01:00
Kim Kulling
d44641398f Add console progresshandler 2021-12-26 11:16:02 +01:00
Kim Kulling
2c66d4d3a2 Optimize the check 2021-12-22 20:43:44 +01:00
Kim Kulling
215f4e1f4d Fix typo 2021-12-22 20:02:29 +01:00
Kim Kulling
2eb86d75b8 Make sure no overflow can happen 
- During UTF32 LE with BOM make sure that the byteswap operation will have enough space when iterating through the text buffer, which shall get encoded.
- closes https://github.com/assimp/assimp/issues/4230
 2021-12-22 19:45:19 +01:00
Garux
46f618a6ef add Inter-Quake Model (IQM) Importer 2021-12-18 15:34:58 +03:00
Kim Kulling
efdaf603b0 Merge branch 'master' into so-unloading 2021-12-16 14:52:58 +01:00
Viktor Kovacs
d2c8cb755e Merge branch 'master' into copyscene_fix 2021-12-08 14:29:31 +01:00
Kim Kulling
e51feac2c5 Update PolyTools.h 2021-12-07 21:19:01 +01:00
Kim Kulling
1e4861f86e Fix division by zero in PointInTriangle2D 
- closes https://github.com/assimp/assimp/issues/4240
 2021-12-07 20:45:21 +01:00
kovacsv
2be6bac4b0 Bug: Export crashes when any of the meshes contains texture coordinate names #4243 2021-12-07 20:42:43 +01:00
Kim Kulling
690e558b88 Update IOSystem.cpp 2021-11-25 09:32:52 +01:00