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
Filip Lundgren
4175198d04
Detect Roughness factor exported by Blender
...
Matches the logic used by Blender's own FBX exporter / importer.
2022-03-26 22:33:10 +01:00
Jan Krassnigg
537c46a42a
Prevent nullptr access to normals-array in bitangent computation
2022-03-23 15:45:09 +01:00
Promit Roy
5ec7e57b99
Merge branch 'assimp:master' into master
2022-03-17 15:00:09 -04:00
Promit Roy
68d33a6e13
Added support for more bone weights in GLTF2
...
The GLTF2 importer doesn't actually read beyond the first four bone weights (first attribute). This patch expands the parser to store as many bone weights as are available in the file.
2022-03-17 14:55:26 -04:00
Promit Roy
765b38cf04
Update glTF2Asset.inl
...
Fixing mistakes in attribute names for GLTF. This causes attribute index to not be parsed out correctly (e.g. JOINTS_1) and fails the scene load.
2022-03-16 16:49:45 -04:00
Kim Kulling
c2b05acaa6
Fix stack-overflow in MDLLoader
...
- Use correct len to copy filename.
- Closes https://github.com/assimp/assimp/issues/4447
2022-03-16 13:59:21 +01:00
Kim Kulling
552f3a308d
Fix nullptr dereferencing
...
- Check if we have any texture coordinates before calculating them
- closes https://github.com/assimp/assimp/issues/4445
2022-03-16 10:08:20 +01:00
Kim Kulling
d594e6eea4
Merge branch 'master' into obj-pbr-explicit
2022-03-15 14:30:24 +01:00
Kim Kulling
0904490150
Merge branch 'master' into issue_4349
2022-03-15 14:11:57 +01:00
Kim Kulling
b1dc8cfe56
Merge branch 'master' into master
2022-03-15 11:58:45 +01:00
Kim Kulling
68f3386c7b
Merge branch 'master' into metallic-roughness-split
2022-03-15 08:38:38 +01:00
Kim Kulling
72888c49f6
Merge branch 'master' into parse_obj_anisotropy
2022-03-15 08:13:35 +01:00
jaefunk
4457d9300a
Merge branch 'master' into issue_4349
2022-03-14 15:41:20 +09:00
Sergio Acereda
729ab8ae33
Trying to fix reorder error
2022-03-12 08:15:11 +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
jaefunk
e02d51ec24
add ifndef guard for resolve to fails to compile
2022-03-11 10:51:13 +09: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
Terence Russell
efe92e9ec1
Merge branch 'assimp:master' into master
2022-03-09 10:15:41 -07:00
kimkulling
26598dc6bd
Forget to save file.
2022-03-09 11:00:05 +01:00
kimkulling
76e10b96fc
Fix missing members and do some small refactorings.
2022-03-09 10:51:37 +01:00
Terence Russell
b35879989c
Added missing ObjMaterial.h to CMakeLists
2022-03-08 20:00:22 -07:00
Kim Kulling
ba379c20e1
Merge branch 'master' into fix/obj_with_bspline_crash
2022-03-06 17:39:57 +01:00
Kim Kulling
80a8807c47
Fix compiler warnings
2022-03-05 20:37:34 +01:00
Kim Kulling
d4527d4e87
Merge branch 'master' into master
2022-03-05 14:00:32 +01:00
Sergio Acereda
cfe84b9260
Use generic METALNESS and DIFFUSE_ROUGHNESS texture types
2022-03-03 16:18:25 +01:00
Sergio Acereda
52008ec989
Apply clang-format
2022-03-03 15:42:23 +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
sola
c73ff82fc4
FBXConvert::ConvertMeshMultiMaterial: allocate memory using variable count_vertices
2022-02-25 19:58:44 +08:00
Kim Kulling
72da1e6d7b
Merge branch 'master' into master
2022-02-23 21:20:39 +01:00
Kim Kulling
6f31254ae1
Ensure dictionary for LazyDics is created before adding content to it
2022-02-23 20:57:15 +01:00
Terence Russell
4ddacdb5df
Expose the original OBJ illum model as a material property.
2022-02-22 17:55:41 -07:00
Kim Kulling
466b34cf53
Merge branch 'master' into kimkulling/fix_ordering_of_gltf2_issue4407
2022-02-22 21:09:11 +01:00
Kim Kulling
aa04ee89f1
Fix init order to fix build
2022-02-22 21:07:42 +01:00
Kim Kulling
a6808b868c
Small code cleanup
2022-02-22 21:07:23 +01: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
Kim Kulling
52b106bf7e
Merge branch 'master' into master
2022-02-20 19:04:32 +01:00
youkeyao
ad766cb738
update the calculation and orthogonalization for bitangent
2022-02-20 17:15:11 +08:00
Terence Russell
17123ed4a1
Add support for bump -bm (bump/normal multiplier)
2022-02-17 22:10:46 -07:00
Jean-Christophe Fillion-Robin
33a48c6ca6
cmake: Fix assimp target install rule fully specifying component
...
This commit ensures generated install rules for the assimp target are
all consistently associated with components named after LIBASSIMP_COMPONENT
or LIBASSIMP-DEV_COMPONENT CMake variables.
It streamlines the packaging of specific components of assimp in client
projects leveraging the CPACK_INSTALL_CMAKE_PROJECTS variable.
Failing to do so leads to "/path/to/assimp-build/code/cmake_install.cmake"
file having install rules associated with a component called "Unspecified".
See https://cmake.org/cmake/help/v3.10/command/install.html#installing-targets
and https://cmake.org/cmake/help/v3.22/module/CPack.html#variable:CPACK_INSTALL_CMAKE_PROJECTS
2022-02-17 05:47:34 -05:00
Kim Kulling
9bf5d01469
Fix invalid initialization of constexpr.
2022-02-16 21:22:35 +01:00
Kim Kulling
9e23d771bc
Fix invalid initialization of constexpr.
2022-02-16 21:19:17 +01:00
Kim Kulling
76a7614c4b
Adapt ai_epsilon to code
2022-02-16 20:07:27 +01:00
Kim Kulling
067c5d9ec4
Refactoring: add usage of ai_epsilon to fbx.
2022-02-16 00:17:26 +01:00
