Commit Graph

11434 Commits (128922a79879b4ba88852eb05cee92f703a298a8)

Author SHA1 Message Date
Kim Kulling d6aa3db4ef
Merge branch 'master' into master 2022-04-20 21:59:17 +02:00
Kim Kulling 41fbc5e715
Merge pull request #4488 from HadesD/patch-1
Fix ogre xml serializer
2022-04-20 21:58:49 +02:00
Kim Kulling 37be87b0bd Some minor findings 2022-04-19 23:37:16 +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
RedSkittleFox feec92022f
Merge branch 'master' into MMD_Fixes 2022-04-13 21:07:58 +02:00
RedSkittleFox 5ab1be8d04 Fixed deprecated class usage; removed unsupported C++17 feature 2022-04-13 11:38:57 +02:00
Kim Kulling b699d3a26a
Merge pull request #4440 from sacereda/obj-pbr-explicit
Avoid setting PBR properties when they are not found on mtl file
2022-04-13 10:11:53 +02:00
RedSkittleFox f26dc74f21 Fixed MMD Importer not loading files from buffer and enabled unit test 2022-04-13 02:51:12 +02:00
RedSkittleFox b38c25fe09 Reuploaded (fixed) mmd model 2022-04-13 02:50:31 +02:00
Kim Kulling aa814a522d
Merge branch 'master' into obj-pbr-explicit 2022-04-12 11:12:58 +02:00
Kim Kulling dc8ba61095
Merge pull request #4463 from jakrams/user/jakras/bitangent-fuzzer-fix
Prevent nullptr access to normals-array in bitangent computation
2022-04-12 11:10:47 +02:00
Kim Kulling ae9f5b6fc5
Merge branch 'master' into user/jakras/bitangent-fuzzer-fix 2022-04-12 10:41:43 +02:00
Kim Kulling 26e471ad62
Merge pull request #4454 from mpcarlos87/Android-Script-Update
Updated Android build script
2022-04-12 10:41:13 +02:00
Guangmo Lin 778ac976b2
Fix draco building error when import assimp with cmake add_subdirectory #3663 2022-04-11 15:08:20 +08: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 e5747dad9b First concepts 2022-04-05 20:07:22 +02:00
Kim Kulling 5c438963c0
Disable correct compiler-warning: unused-function. 2022-04-05 19:59:36 +02:00
Kim Kulling 97c7ab3c05 Move stb_image header into its own header file. 2022-04-05 19:53:41 +02:00
Kim Kulling fa5a8476ee Fix gcc warning: unused function 2022-04-05 19:04:29 +02:00
Kim Kulling b8658cefe0 Link std_image statically. 2022-04-05 18:48:45 +02:00
Carlos Martinez Perez 2bfb78f91d
Merge branch 'master' into Android-Script-Update 2022-04-03 12:25:04 +02:00
Kim Kulling 75ab2beb06
Merge pull request #4466 from ifiddynine/patch-3
Detect Roughness factor exported by Blender
2022-04-02 21:54:06 +02:00
Kim Kulling 88dadd6c40
Merge branch 'master' into patch-3 2022-04-02 11:22:33 +02:00
Kim Kulling 8109689dc2
Merge branch 'master' into Android-Script-Update 2022-04-01 14:57:47 +02:00
Kim Kulling 42adc82354
Merge pull request #4473 from xiaohunqupo/master
Fix compile error: When enable macro ASSIMP_DOUBLE_PRECISION
2022-03-31 18:35:07 +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 b08c04b87a Fix compile errro in VC140 2022-03-31 15:08:12 +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
Danny许 f985fe12cc
Fix compile error
When enable macro ASSIMP_DOUBLE_PRECISION
2022-03-31 11:20:18 +08:00
Danny许 422a45694a
Merge pull request #4 from assimp/master
Merge
2022-03-31 11:18:37 +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
Carlos Martinez Perez 257927d7cf
Merge branch 'master' into Android-Script-Update 2022-03-24 18:59:16 +01:00
Kim Kulling ba6c67c328
Merge pull request #4464 from assimp/kimkulling/revert_static_runtime_Selection_for_all
Use static runtime only on option is selected
2022-03-24 08:01:49 +01:00
Kim Kulling 0a56065962
Use static runtime only on option is selected 2022-03-24 00:41:07 +01:00
Jan Krassnigg 537c46a42a Prevent nullptr access to normals-array in bitangent computation 2022-03-23 15:45:09 +01:00
Carlos Martinez Perez 90a24440db - Adapted bat file to new NDK and toolchain
- Able to build x86, x86_64, armv8, armv7 for android
- Automatically detects latest ndk on your system
2022-03-18 17:01:45 +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
Kim Kulling 19f2a624a9
Merge pull request #4451 from Promit/promit/gltf-attrib-bug-fix
GLTF2 attribute name/parse bug fix
2022-03-17 11:35:44 +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