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

45 Commits

Author SHA1 Message Date
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
Kim Kulling
047b45d172 Fix apha value 
- The alpha value in materials using the Tr format must be inverted
- closes https://github.com/assimp/assimp/issues/3645
 2021-02-15 11:51:20 +01:00
Kim Kulling
a8381113eb Update ObjFileMtlImporter.cpp 2020-11-10 10:23:28 +01:00
Kim Kulling
856d4c016e closes https://github.com/assimp/assimp/issues/3448 
Add transmission alpha value. if any.
 2020-11-10 10:03:09 +01:00
Kim Kulling
d6892b3f58 Merge branch 'master' into pugi_xml 2020-09-25 21:00:09 +02:00
Kim Kulling
23defc275a Merge branch 'master' into makeInternalErrorsAccessible 2020-09-14 08:36:13 +02:00
Joshua Hyatt
638499a278 Replace unique_ptr and add custom deleter 2020-09-01 10:30:31 -06:00
Joshua Hyatt
dcf9a7b2d8 Conform variable names to code standards 2020-08-29 23:58:31 -06:00
Joshua Hyatt
c769f8d4ad Replace unique_ptr with raw pointer to avoid destructing stream 2020-08-29 22:21:34 -06:00
kimkulling
582a8b1887 Fix xml-migration bild. 2020-08-27 17:05:09 +02:00
Malcolm Tyrrell
b7c789da67 Stop concatenating std::strings. Use formatter. 2020-08-18 17:35:08 +01:00
Kim Kulling
394651e640 x3d: migration of goups. 2020-08-10 22:13:45 +02:00
Kim Kulling
6205af4efb replace NULL and avoid ai_assert with more than 2 tests. 2020-06-23 21:05:42 +02:00
Kim Kulling
b3af5c5a14 closes https://github.com/assimp/assimp/issues/3253 : remove useless code 2020-06-17 20:37:39 +02:00
Kim Kulling
f8e6512a63 Move format importer and exporter into its won folder. 2020-05-02 15:14:38 +02:00