Commit Graph

5976 Commits

Author SHA1 Message Date
Kim Kulling
3dd2dbd916 Merge branch 'master' into master 2022-05-03 17:19:06 +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
U-DESKTOP-0R560PH\George
a7e2b3ad30 Fixed library names for MinGW/MSYS2 2022-04-30 08:14:16 -07:00
Kim Kulling
1ac9173e8c Disable assertion tests floating point against inf for Intel oneAPI
- closes https://github.com/assimp/assimp/issues/4450
2022-04-28 10:08:01 +02:00
Kim Kulling
174b2fcf59 Fix invalid use of material reference. 2022-04-27 20:21:30 +02:00
Kim Kulling
37ec378b60 Fixx out-of-range access in ASE-Parser
- closes https://github.com/assimp/assimp/issues/4495
2022-04-27 19:52:23 +02:00
Kim Kulling
cce62fded1 Merge branch 'master' into master 2022-04-27 08:45:16 +02:00
Kim Kulling
d14bff5a9f Merge branch 'master' into master 2022-04-24 18:17:33 +02:00
Kim Kulling
7f913c180b Merge branch 'master' into master 2022-04-19 15:23:09 +02:00
Mykhailo418
8a1dc87b4c remove absolute_transform in FBXConverter 2022-04-18 18:10:59 +03:00
Mykhailo418
e3def37f42 assing absolute_transform to matrix 2022-04-18 17:26:37 +03:00
Mykhailo418
863e3e0ccb FbxConverter, bone mOffsetMatrix update 2022-04-18 16:02:17 +03:00
Ichiro
9ab6ebd363 Fix foreach 2022-04-18 04:11:06 +09:00
Ichiro
128242e371 Fix ogre xml serializer 2022-04-18 01:28:03 +09:00
Kim Kulling
aa814a522d Merge branch 'master' into obj-pbr-explicit 2022-04-12 11:12:58 +02:00
Kim Kulling
ae9f5b6fc5 Merge branch 'master' into user/jakras/bitangent-fuzzer-fix 2022-04-12 10:41:43 +02:00
Kim Kulling
6943e59886 Merge branch 'master' into obj-pbr-explicit 2022-04-08 14:36:57 +02:00
hgdagon
518d50d2e6 Fixes for Windows/MSYS2 2022-04-07 03:07:57 -07:00
Kim Kulling
88dadd6c40 Merge branch 'master' into patch-3 2022-04-02 11:22:33 +02:00
xiaohunqupo
a050dee096 Fix compile error:When enable macro ASSIMP_DOUBLE_PRECISION 2022-03-31 16:08:39 +08:00
xiaohunqupo
de6e90a657 Fix commit error 2022-03-31 15:36:57 +08:00
xiaohunqupo
2152aae2a3 Fix compile error due to namespace conflicts in VC140. 2022-03-31 15:34:49 +08: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
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
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