Commit Graph

64 Commits

Author SHA1 Message Date
Krishty
3d3e856925 Trim Trailing Whitespace 2023-01-16 09:12:35 +01:00
Kim Kulling
c3d15a3f51 Fix minor review findings. 2022-12-16 09:03:40 +01:00
sashashura
917352dd8b Fixes Heap-buffer-overflow READ 1 in Assimp::ObjFileParser::getFace
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=49274
2022-12-11 01:54:57 +01:00
Aaron Gokaslan
ccfb175460 Apply various clang-tidy checks for smartprs and modern C++ types 2022-11-08 11:03:55 -05:00
Kim Kulling
99e515fbfd Fix:Fix possible nullptr dereferencing + refactorings. 2022-10-29 17:08:26 +02:00
HiMemX
4c9d270a5e -Vertex export fix 2022-09-07 23:10:31 +02:00
Aaron Gokaslan
e93fa6699a Manually fix up 100 more instances where it should be defaulted 2022-08-25 12:20:13 -04:00
Aaron Gokaslan
6fa21dcc6e Explicitly default all empty dtors 2022-08-25 11:32:59 -04:00
Aaron Gokaslan
b176061c41 Remove extra space in emplace insertions 2022-08-23 11:46:30 -04:00
Aaron Gokaslan
27edb43600 Apply modernize-use-emplace clang-tidy rule 2022-08-23 11:41:49 -04:00
Turo Lamminen
90d1464405 Remove set but unused variables 2022-08-17 11:42:32 +03:00
Kim Kulling
eac0876c9b Refactoring: Use correct prefix for attributes in ObjImport. 2022-07-31 20:54:58 +02:00
Kim Kulling
dddfb74902 Fix another mem-leak 2022-07-31 13:37:42 +02:00
Kim Kulling
c349035cd1 Fix face memleak. 2022-07-31 12:10:43 +02:00
Kim Kulling
85f86ec076 Revert using face as pod type 2022-07-30 21:52:33 +02:00
Kim Kulling
f6bcb160d0 Improvements of obj-parsers. 2022-07-30 12:58:09 +02:00
Kim Kulling
05ececc387 Merge branch 'master' into patch-4 2022-07-18 14:06:29 +02:00
sashashura
9ddc3a64d7 Fixes Crash in Assimp::ObjFileMtlImporter::getFloatValue 2022-07-16 13:55:08 +01:00
sashashura
772cfdc757 Fixes Heap-buffer-overflow in Assimp::ObjFileParser::getFace 2022-07-16 13:50:54 +01:00
Kim Kulling
6943e59886 Merge branch 'master' into obj-pbr-explicit 2022-04-08 14:36:57 +02:00
xiaohunqupo
cc515746f7 Fix v140 compile errror 2022-03-31 14:58:31 +08:00
Danny许
8e075ce713 Update ObjFileParser.cpp 2022-03-31 14:53:33 +08:00
Danny许
18c4ebaa13 Fix compile in VC140 2022-03-31 14:28:35 +08:00
Kim Kulling
d594e6eea4 Merge branch 'master' into obj-pbr-explicit 2022-03-15 14:30:24 +01:00
Kim Kulling
72888c49f6 Merge branch 'master' into parse_obj_anisotropy 2022-03-15 08:13:35 +01:00
Sergio Acereda
26bb601d8f Fix includes 2022-03-12 08:03:27 +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
youkeyao
9b227fc262 Fix getting anisotropy in obj 2022-03-03 01:01:34 +08:00
Jaroslav Pribyl
62930076af Merge branch 'master' into fix/obj_with_bspline_crash 2022-02-26 04:03:59 +01:00
Terence Russell
4ddacdb5df Expose the original OBJ illum model as a material property. 2022-02-22 17:55:41 -07:00
Jaroslav Přibyl
480d6fee2a cleanup 2022-02-22 01:46:47 +01:00
Jaroslav Přibyl
62c9347985 fixed obj parsing with cstype 2022-02-22 01:32:41 +01:00
Terence Russell
17123ed4a1 Add support for bump -bm (bump/normal multiplier) 2022-02-17 22:10:46 -07: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
Rene Sepulveda
19371af6e6 Support PBR properties/maps in Obj importer 2021-12-20 13:43:46 -05:00
IOhannes m zmölnig
3b8126d26a Fix spelling mistake 2021-10-08 08:48:01 +02:00
Kim Kulling
ac6b8988df Add support for normal maps, the classic way
- get compiant to tinyobjloader and other importers
- closes https://github.com/assimp/assimp/issues/3726
2021-10-01 14:24:40 +02:00
Kim Kulling
95263b2e54 Update ObjTools.h 2021-09-21 11:34:58 +02:00
Kim Kulling
fb5b5e9d40 Fix possible nullptr dereferencing in material parsing
* Return 0.0f for empty buffer
* closes https://github.com/assimp/assimp/issues/3442
2021-09-21 11:06:18 +02:00
Hill Ma
79f3368c85 Merge branch 'master' into static 2021-09-17 09:06:16 -07:00
Kim Kulling
18531e3677 Next iteration for c++11 features. 2021-09-13 22:38:20 +02:00
Hill Ma
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
Kim Kulling
df739f00dd Merge branch 'master' into issue_3398 2021-08-28 13:56:50 +02:00
Kim Kulling
27231c3f52 Merge branch 'master' into bound 2021-08-16 20:48:17 +02: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
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
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
Malcolm Tyrrell
4ec01cfdcd Improve use of logging 2021-05-13 12:05:31 +01:00
Krishty
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
Krishty
b00de10eb3 Simplified importer search and fixed a few bugs
The search for a matching importer had a few issues, see #3791. There were two different mechanisms to determine whether an importer accepts a specific file extension:
1. `aiImporterDesc::mFileExtensions`, which was forwarded to the UI via `BaseImporter::GetExtensionList()`.
2. `BaseImporter::CanRead()` when called with `checkSig == false`, which determines whether to actually use that importer.
Both were redundant and got out of sync repeatedly. I removed 2. completely and replaced it with 1., thereby syncing UI/import and shortening all `BaseImporter::CanRead()` implementations.

Further bugfixes:
- fixed glTF2 importer throwing exceptions when checking whether it can load a file
- removed `BaseImporter::SimpleExtensionCheck()` because it is no longer used and had a bug with case sensitivity

Since the `checkSig` parameter in `BaseImporter::CanRead()` is now useless, it can be removed completely. I’m not sure if this would break ABI compatiblity, so I’ll submit it with a later pull request.
2021-04-24 00:17:50 +02:00