c0e141a6a9
Update StbCommon.h
2022-05-31 19:08:46 +02:00
b00923ebcd
Update Assimp.cpp
2022-05-31 19:08:29 +02:00
472e15c405
Merge branch 'master' into kimkulling/link_stb_image_statically_issue_4467
2022-05-31 17:47:43 +02:00
234e55fbb1
Use size_t
2022-05-31 07:29:54 +02:00
f612865f22
fix msvc warnings-as-errors
2022-05-29 01:35:48 +02:00
efbcdccac9
Fix GNUC check on Windows (2nd attempt)
2022-05-25 09:18:42 -07:00
affa85a36b
Fix GNUC check on Windows
2022-05-25 07:59:01 -07:00
ed3e218550
Bugfix: fix not initialized member attributes
2022-05-21 19:08:43 +02:00
1d3d5c4bb6
Rename TextureTypeToString() to aiTextureTypeToString()
...
Closes: https://github.com/assimp/assimp/issues/4493
2022-05-01 13:27:42 +02:00
d5c798f325
Fix leak
2022-04-30 21:02:48 +02:00
7f913c180b
Merge branch 'master' into master
2022-04-19 15:23:09 +02:00
518d50d2e6
Fixes for Windows/MSYS2
2022-04-07 03:07:57 -07:00
e5747dad9b
First concepts
2022-04-05 20:07:22 +02:00
5c438963c0
Disable correct compiler-warning: unused-function.
2022-04-05 19:59:36 +02:00
97c7ab3c05
Move stb_image header into its own header file.
2022-04-05 19:53:41 +02:00
b8658cefe0
Link std_image statically.
2022-04-05 18:48:45 +02:00
729ab8ae33
Trying to fix reorder error
2022-03-12 08:15:11 +01:00
51e248909f
Avoid setting metallic/roughness/sheen/clearcoat properties when they are not found on mtl file.
2022-03-11 22:29:59 +01:00
47f004517f
Add missing cast.
2022-03-10 10:33:29 +01:00
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
d4527d4e87
Merge branch 'master' into master
2022-03-05 14:00:32 +01:00
7c13b16d30
Add missing flush modes supported by zlib
2022-02-14 20:51:06 +01:00
416f823866
Merge branch 'kimkulling/introduce_compression' of https://github.com/assimp/assimp into kimkulling/introduce_compression
2022-02-14 20:25:27 +01:00
c718500c55
Fix last review findings and finish windows bits
2022-02-14 20:25:18 +01:00
9a585d7b3c
Merge branch 'master' into kimkulling/introduce_compression
2022-02-13 19:58:22 +01:00
52b6c4f7c0
Fix broken importer and add some review findings2
2022-02-13 18:44:22 +01:00
3e09d462fa
Fix compression for fbx
2022-02-12 09:25:45 +01:00
23b43d1825
Fix X-Importer decompress algorithm
2022-02-08 21:43:14 +01:00
27bcddfb1a
Migrate more importers to compression class
2022-02-08 20:43:47 +01:00
acf73659d8
fix missing include for size_t
2022-02-08 00:08:46 +01:00
9335cc30ab
INtroduce compression class to encapsulate compression via zlib
2022-02-06 20:42:58 +01:00
91737f1cc9
Fix copyright: last year
2022-01-23 21:18:31 +01:00
3e6fc3a64b
Merge remote-tracking branch 'origin/master' into bensewell-fixifcopening4343
2022-01-20 09:43:45 +00:00
17d5633a5b
Add missing SImpleExtensionCheck
2022-01-19 21:42:14 +01:00
efd1d36aa9
Merge branch 'master' into krishty-new-file-detection
2022-01-18 22:17:50 +01:00
6e50b04ae0
Merge branch 'master' into IQM
2022-01-17 18:33:37 +01:00
65f2353105
IFC Reading: Fix opening reading.
2022-01-17 15:49:11 +00:00
6ad7505376
Merge branch 'master' into krishty-new-file-detection
2022-01-16 20:43:57 +01:00
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
c8ab39dd04
Merge branch 'master' into common_base64
2022-01-15 23:42:56 +01:00
d3e24196c0
Merge branch 'master' into so-unloading
2022-01-13 20:19:23 +01:00
c71f4bc95a
Merge branch 'master' into common_base64
2022-01-11 18:46:08 +01:00
6b9732721a
Merge branch 'assimp:master' into common_base64
2022-01-10 21:15:31 +01:00
50c7301a38
Update copyrights
2022-01-10 21:13:43 +01:00
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
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
bbe12240ca
Move Base64 encode/decode functionality to the common folder.
2022-01-02 19:47:43 +01:00
d44641398f
Add console progresshandler
2021-12-26 11:16:02 +01:00
2c66d4d3a2
Optimize the check
2021-12-22 20:43:44 +01:00
215f4e1f4d
Fix typo
2021-12-22 20:02:29 +01:00
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
46f618a6ef
add Inter-Quake Model (IQM) Importer
2021-12-18 15:34:58 +03:00
efdaf603b0
Merge branch 'master' into so-unloading
2021-12-16 14:52:58 +01:00
d2c8cb755e
Merge branch 'master' into copyscene_fix
2021-12-08 14:29:31 +01:00
e51feac2c5
Update PolyTools.h
2021-12-07 21:19:01 +01:00
1e4861f86e
Fix division by zero in PointInTriangle2D
...
- closes https://github.com/assimp/assimp/issues/4240
2021-12-07 20:45:21 +01:00
2be6bac4b0
Bug: Export crashes when any of the meshes contains texture coordinate names #4243
2021-12-07 20:42:43 +01:00
690e558b88
Update IOSystem.cpp
2021-11-25 09:32:52 +01:00
8b78a63b50
Allow dlclose of so library by avoiding unique symbols.
2021-11-23 20:39:48 +01:00
37c81e7a28
Merge branch 'master' into MalcolmTyrrell/jsonSchemaSupport
2021-11-12 10:37:19 +01:00
c22524351a
Merge branch 'master' into master
2021-11-12 09:56:56 +01:00
97b8e41997
Fix formatting
2021-11-12 09:56:45 +01:00
9f28ef4c25
Merge branch 'master' into Artenuvielle-x3d_pugi_migration_artenuvielle
2021-11-10 20:43:39 +01:00
30143e9626
Merge branch 'master' into MalcolmTyrrell/jsonSchemaSupport
2021-11-09 10:53:58 +01:00
145f972d76
Fix out-of-bounds read in RemoveLineComments
...
Follow up to 6f07e89fdfhttps://bugs.chromium.org/p/oss-fuzz/issues/detail?id=24553
2021-10-30 13:43:41 -04:00
e900617796
Fix out-of-bounds read in FileSystemFilter::Cleanup
...
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=33238
2021-10-29 09:17:40 -04:00
6f07e89fdf
Fix out-of-bounds read in RemoveLineComments
...
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=24553
2021-10-28 23:50:16 -04:00
8c0b869998
Merge branch 'master' into MalcolmTyrrell/jsonSchemaSupport
2021-10-28 13:38:41 +02:00
db0127859a
CalculateDistance method
2021-10-21 08:39:44 +01:00
791cb195be
Merge branch 'master' into x3d_pugi_migration_artenuvielle
2021-10-20 21:14:43 +02:00
c644f9d719
Subtract the centroid
2021-10-20 15:08:08 +01:00
4d10f5d133
Move distance initialization to Finalize.
2021-10-20 12:47:44 +01:00
5b13b97f27
Ensure the usage pattern of SpatialSort.
2021-10-19 14:22:28 +01:00
36c937cc19
Merge branch 'master' into debian-fixes
2021-10-18 09:07:47 +02:00
a82dc887fc
Merge branch 'master' into x3d_pugi_migration_artenuvielle
2021-10-14 09:27:07 +02:00
a01a5b4e3a
Added missing include
2021-10-09 20:12:29 +03:00
3b8126d26a
Fix spelling mistake
2021-10-08 08:48:01 +02:00
a283a255a5
Allow schema checking of glTF2 file.
2021-10-07 10:01:32 +01:00
8c84afaff0
Merge branch 'master' into const-tokens
2021-09-15 23:31:00 +02:00
70dfdb8f9d
Merge branch 'master' into x3d_pugi_migration_artenuvielle
2021-09-15 14:51:38 +02:00
880a2f25bb
Merge branch 'master' into remove-useless-code
2021-09-14 23:33:34 +02:00
18531e3677
Next iteration for c++11 features.
2021-09-13 22:38:20 +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
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
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
a45878c41a
Fix possible overrun
...
- closes https://github.com/assimp/assimp/issues/3425
2021-08-27 14:04:00 +02:00
61ba320a04
Merge branch 'master' into master
2021-08-24 20:53:04 +02:00
58cae73401
Disable diagnostic for LogStream comparator
2021-08-11 19:32:26 -04:00
408b5053a4
update LWO importer(available lwo3)
2021-08-03 20:18:14 +03: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
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
4a66ec25d0
Standardise Clearcoat, Sheen and Transmission
...
Also cleanup glTFv2 defaults, don't import/export if disabled
2021-06-14 15:11:41 +01: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
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
Kim Kulling
Gargaj
hgdagon
Kim Kulling
IOhannes m zmölnig
Sergio Acereda
Jonas Karlsson
Tomas Maly
Ben Sewell
Viktor Kovacs
Alex Rebert
Garux
Thomas Nicky Thulesen
Malcolm Tyrrell
Lassi Helynranta
IOhannes m zmölnig
krishty
Artenuvielle
Krishty
Max Vollmer (Microsoft Havok)
Robert Ubiñas
bearbit
Rahul Sheth
RichardTea
Scott Baldric