Commit Graph
12266 Commits
Author SHA1 Message Date
Kim Kulling e41fe74b2a Merge branch 'master' into semi-desert-master 2023-08-30 21:17:25 +02:00
Kim Kulling 8c8f974ea3 Merge branch 'master' of https://github.com/semi-desert/assimp into semi-desert-master 2023-08-30 21:16:21 +02:00
Kim Kulling f623870dd1 Merge pull request #5170 from vulcanozz/vulcano/export_gltf2_with_roughness_texture
Add DIFFUSE_ROUGHNESS_TEXTURE for gltf2 exporter
2023-08-29 15:27:55 +02:00
Kim Kulling e79d105957 Merge branch 'master' into vulcano/export_gltf2_with_roughness_texture 2023-08-29 15:13:43 +02:00
Kim Kulling 0afaf976b9 Merge pull request #5192 from PencilAmazing/irrfix
IRR - Fix UTF-16 file parsing (and possibly more?)
2023-08-29 15:11:06 +02:00
Kim Kulling b52731c707 Merge branch 'master' into irrfix 2023-08-29 14:22:22 +02:00
Kim Kulling 97227d7a4c Merge pull request #5193 from martinweber/collada-ignore-unit-size-property
Collada: added import property to disable unit size scaling
2023-08-29 14:15:50 +02:00
Kim Kulling cc2c5d3ae3 Merge branch 'master' into collada-ignore-unit-size-property 2023-08-29 14:01:40 +02:00
Kim Kulling 2f6f58707d Merge pull request #5161 from malytomas/master
fix incorrect default for material::get with aiColor3D
2023-08-28 11:45:54 +02:00
Kim Kulling b9ea538e6f Merge branch 'master' into master 2023-08-28 11:11:50 +02:00
Kim Kulling 215caa65aa Merge branch 'master' into irrfix 2023-08-25 00:01:15 +02:00
Kim Kulling 80a03071ba Merge pull request #5209 from sashashura/openddlparser
bump openddl-parser to v0.5.1
2023-08-25 00:00:39 +02:00
Kim Kulling fa69c47d45 Merge branch 'master' into openddlparser 2023-08-24 23:46:23 +02:00
Kim Kulling fe6730f225 Merge pull request #5212 from guguTang/xin-issue_5211
Ensure that the strength attribute is the same when importing or exporting gltf2
2023-08-24 23:45:41 +02:00
Kim Kulling 60b6d80936 Merge branch 'master' into xin-issue_5211 2023-08-24 21:03:57 +02:00
Kim Kulling c953c9b76f Merge pull request #5213 from AnyOldName3/pdb-install-fixes
Use correct PDB paths
2023-08-24 20:35:00 +02:00
AnyOldName3 e50233b2c1 Use correct PDB paths
The previously-specified paths were only correct for a static library
build.
I therefore fenced off that code to be specific to static library
builds.

For shared library builds, I added a generator-expression-based
alternative.
Annoyingly, this won't work with static library builds, so we don't get
the concise, reliable version in all circumstances.

I've avoided modifying any of the paths anything ends up at to avoid
breaking changes.

Resolves https://github.com/assimp/assimp/issues/4269
2023-08-23 17:19:01 +01: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
Alex 081cae6a95 Fix WIN32_LEAN_AND_MEAN redefinition 2023-08-17 13:25:30 +00:00
Alex 7cbf4c4136 Fix win build 2023-08-17 12:35:44 +00:00
Alex bc7ef58b49 bump openddl-parser to v0.5.1 2023-08-17 12:00:22 +00:00
Kim Kulling 72c10d856f Merge pull request #5207 from sashashura/4658377717055488
Fix Invalid-free in Assimp::FBX::Scope::Scope
2023-08-17 10:27:36 +02:00
Alex 5c45cdc0ad Fix Invalid-free in Assimp::FBX::Scope::Scope 2023-08-16 07:45:23 +00:00
Kim Kulling 3a02de4d28 Merge pull request #5194 from Gargaj/floatwarn
Fix warning-as-error
2023-08-15 16:53:36 +02:00
Kim Kulling d77903423f Merge branch 'master' into floatwarn 2023-08-15 12:55:37 +02:00
Aaron 0bfc588c39 Update Triangulate Process [more another case] 2023-08-15 18:01:16 +08:00
PencilAmazing 2e60cb6ae6 Merge branch 'master' into irrfix 2023-08-14 01:50:06 -04:00
Kim Kulling 556c89b5f1 Merge pull request #5199 from sashashura/5513536726761472
Fix UNKNOWN READ in std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<ch
2023-08-12 08:20:15 +02:00
Kim Kulling e5d9339c21 Merge branch 'master' into 5513536726761472 2023-08-12 08:05:27 +02:00
Kim Kulling 461601e9ff Merge pull request #5174 from feuerste/fix_magic
Fix violation of strict aliasing rule in `BaseImporter::CheckMagicToken`.
2023-08-12 08:04:34 +02:00
Kim Kulling 1c5dc86afb Merge branch 'master' into fix_magic 2023-08-12 07:39:40 +02:00
Martin Weber d8a7399a04 Merge branch 'assimp:master' into collada-ignore-unit-size-property 2023-08-10 08:10:18 +02:00
Kim Kulling df9c5cdb9f Merge pull request #5191 from sashashura/823345681268736
Fix UNKNOWN READ in Assimp::MDLImporter::InternReadFile_Quake1
2023-08-09 21:17:15 +02:00
Kim Kulling 79dcc289d0 Merge branch 'master' into 823345681268736 2023-08-09 20:58:56 +02:00
Kim Kulling aa5b41446c Merge pull request #5200 from paroj/master
Be more precise regarding index buffer
2023-08-09 20:09:17 +02:00
Pavel Rojtberg 20a2cc4c94 it is the importer, not the postproc 2023-08-09 02:05:44 +02:00
Pavel Rojtberg 2baadf2fe5 Be more precise regarding index buffer 2023-08-08 18:34:13 +02:00
Alex b9460dd959 Fix UNKNOWN READ in std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<ch 2023-08-08 16:01:00 +00:00
Gargaj 49ed0711d1 Fix another warning 2023-08-05 15:43:31 +02:00
Gargaj 8312b31d27 fix warning-as-error 2023-08-05 15:39:47 +02:00
Martin Weber bb1873dd22 Collada: added import property to disable unit size scaling 2023-08-04 09:54:55 +02:00
Alex f7e7f82b9d Add const 2023-08-03 17:10:17 +00:00
PencilAmazing b5032db741 Reverse accidental change with test file 2023-08-02 13:57:21 -04:00
PencilAmazing d6edfad8bb Fix non UTF-8 xml file parsing by passing buffer size manually, as per pugixml documentation 2023-08-02 13:52:40 -04:00
PencilAmazing cf5ffdc366 Merge branch 'master' of https://github.com/assimp/assimp into irrfix 2023-08-01 21:36:40 -04:00