Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,350 Commits 19 Branches 43 Tags
35e0f6d80f01fa3cd55c87603ccacaaa282e313d
Commit Graph

339 Commits

Author SHA1 Message Date
Futuremappermydud
a0b3df6dbd Fix target names not being imported on some gLTF2 models 2023-12-04 21:11:55 +01:00
julianknodt
9efbbe0a69 Read int from uvwsrc 
Previously was reading a uint, which always failed. Since the output was never checked, this
seemed to work, and works fine for most models since they only use UV channel 0.
 2023-11-14 16:31:56 +01:00
Kim Kulling
8cf2d6e588 Refactoring: Some cleanups 2023-11-12 21:09:33 +01:00
fvbj
8fcc65a8af Extension of data export to GLB/GLTF format 
Allows to export unlimited (more than 4) bones per vertex
Use JOINTS_1,2,.. and WEIGHTS_1,2,...
Added AI_CONFIG_EXPORT_GLTF_UNLIMITED_SKINNING_BONES_PER_VERTEX flag
 2023-10-08 14:43:53 +00:00
Kim Kulling
e79d105957 Merge branch 'master' into vulcano/export_gltf2_with_roughness_texture 2023-08-29 15:13:43 +02:00
tangxin
4389c3d80c The texture strength attribute in aiMaterial set when importing and exporting gltf files is inconsistent 2023-08-23 14:54:40 +08:00
zhucan
d07934bf25 adjust comment 2023-08-18 01:03:49 +08:00
zhucan
554fa8f5e2 code format 2023-08-18 01:03:49 +08:00
zhucan
2b4606c082 add fallback strategy for metallicRoughnessTexture 2023-08-18 01:03:49 +08:00
朱灿
3a03fe31b1 gltf2 export diffuse roughness 2023-08-18 01:03:49 +08:00
zhucan
32716002ac Add DIFFUSE_ROUGHNESS_TEXTURE for gltf2 exporter 2023-08-18 01:03:49 +08:00
Marco Feuerstein
37a1366fb7 Add missing rapidjson headers. 2023-07-21 11:33:06 +02:00
Marco Feuerstein
bf38d67935 Fix detection of KHR_materials_specular. 2023-07-13 11:51:56 +02:00
Marco Feuerstein
2875de132f Fix compilation on windows. 2023-06-29 08:20:51 +02:00
Marco Feuerstein
17fac97b04 Fix magic token usage. 2023-06-29 08:20:51 +02:00
Marco Feuerstein
1c0f3c5f87 Fix string length calculation. 2023-06-29 08:20:50 +02:00
Marco Feuerstein
a2bdfdd05a Improve binary check for gltf and gltf2. 
By checking the magic token we don't depend on the extension any more
and follow the official way to detect a gltf file as binary, see also
https://github.com/KhronosGroup/glTF/blob/main/extensions/1.0/Khronos/KHR_binary_glTF/README.md#header
and https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html#binary-header.
 2023-06-29 08:20:50 +02:00
Kim Kulling
bef66deeda Update glTF2Importer.h 2023-06-08 20:56:14 +02:00
Kim Kulling
1ab4161cd7 Update glTF2Importer.cpp 2023-06-08 20:55:48 +02:00
Kim Kulling
186d7fd606 Merge branch 'master' into FixSkinnedWeightsAfterVertexRemappingOptimization 2023-06-08 13:16:08 +02:00
Kim Kulling
466f6960ac Merge branch 'gltf2_metadata_export' of https://github.com/C-Tech-Development-Corp/assimp into C-Tech-Development-Corp-gltf2_metadata_export 2023-05-30 08:14:49 +02:00
Kim Kulling
17c1a9125f Merge branch 'master' into FixSkinnedWeightsAfterVertexRemappingOptimization 2023-05-24 23:36:59 +02:00
Kim Kulling
b7a8c4ba75 Update glTF2Asset.inl 2023-05-23 10:33:14 +02:00
Kim Kulling
e947471549 Merge branch 'master' into refactor/KHR_material_specular 2023-05-22 09:49:01 +02:00
Florian Born
d825eb7cf0 Skinning weights i gltf were broken by PR#5003 (vertex remapping) 2023-05-08 20:04:38 +02:00
Kim Kulling
71366fff8e Merge branch 'master' into msvc-clang-inconsistent-missing-destructor-override 2023-04-26 09:31:55 +02:00
Adam Beili
e193220ad8 Merge branch 'master' into refactor/KHR_material_specular 2023-04-06 02:42:18 +02:00
Kim Kulling
89ccc89298 Merge branch 'master' into fix_pretransform_vertices_with_cameras 2023-04-04 17:21:05 +02:00
Suhajda Tamás
9915e875bf glTF2: Fix incorrect camera position 2023-04-03 23:35:04 +02:00
Jackie9527
7df4efea44 Fix warning related to inconsistent-missing-destructor-override. 
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
 2023-04-01 21:49:38 +08:00
Adam Beili
8ac0af5c58 . 2023-03-26 17:13:16 +02:00
Adam Beili
b6ecba9114 fix 2023-03-26 17:03:46 +02:00
Adam Beili
83053f3d56 Made usePbrSpecGloss a exportproperty, fixed mat_specular to spec 2023-03-26 16:55:38 +02:00
Adam Beili
fa00571049 fixed compilation bug 2023-03-26 14:52:44 +02:00
Adam Beili
c9177b7811 Merge branch 'master' into refactor/KHR_material_specular 2023-03-24 21:47:19 +01:00
Florian Born
8176c6a0e4 Adjusting the unit tests to pass new gltf 2023-03-10 18:36:43 +01:00
Florian Born
60cefdd549 Jan's fedback 2023-03-10 12:10:38 +01:00
Florian Born
dfd70b5c10 GLTF Importer: Build a list of the actual vertices so it works well with shared attribute lists 2023-03-09 19:06:58 +01:00
Aaron Jacobs
53e5f19b14 Use C++ style casts 2023-02-17 11:20:00 -08:00
Aaron Jacobs
e4386d3013 Fix implicit conversion errors on macOS 2023-02-16 15:21:43 -08:00
Kim Kulling
f830d7998e Merge branch 'master' into clean-up-ctors-dtors 2023-01-23 21:21:34 +01:00
Kim Kulling
036f2b3771 Merge branch 'master' into remove-stray-semicolon 2023-01-23 20:06:43 +01:00
Kim Kulling
3e20502e0f Merge branch 'master' into fix_gltf2_camera_fov 2023-01-23 19:14:42 +01:00
Kim Kulling
f2f967b8ba Merge branch 'master' into remove-useless-virtual 2023-01-22 20:25:45 +01:00
shimaowo
b298b79a46 add missing parens 2023-01-17 10:53:41 -08:00
Krishty
36305cf987 Tidy Up Constructors and Destructors 
This commit does not add or remove c’tors or d’tors, so it is *not* ABI-breaking.

If a c’tor/d’tor does nothing else than the default behavior, this commit replaces it with “= default”.

If an initializer list entry does nothing else than the default behavior, this commit removes it. First and foremost, remove default c’tor calls of base classes (always called by the compiler if no other base c’tor is explicitly called) and c’tor calls of members with complex types (e.g. “std::vector”).

In a few instances, user-defined copy c’tors / move c’tors / assignment operators / move assignment operators were replaced with “= default”, too. I only did this if I had a clear understanding of what’s going on.
 2023-01-16 21:47:11 +01:00
Krishty
43a062a5d7 Remove Stray Semicolon 2023-01-16 20:45:00 +01:00
shimaowo
39cbef1e21 Fix: fix incorrect math for calculating the horizontal FOV of a perspective camera in GLTF2 import #4435 2023-01-16 11:39:13 -08:00
Krishty
3d3e856925 Trim Trailing Whitespace 2023-01-16 09:12:35 +01:00
Krishty
e5c02e8d45 Remove Useless “virtual” 
These functions are already marked “override”, and their neighbors had “virtual” removed as well.
 2023-01-16 08:12:24 +01:00