e41fe74b2a
Merge branch 'master' into semi-desert-master
2023-08-30 21:17:25 +02:00
8c8f974ea3
Merge branch 'master' of https://github.com/semi-desert/assimp into semi-desert-master
2023-08-30 21:16:21 +02:00
e79d105957
Merge branch 'master' into vulcano/export_gltf2_with_roughness_texture
2023-08-29 15:13:43 +02:00
cc2c5d3ae3
Merge branch 'master' into collada-ignore-unit-size-property
2023-08-29 14:01:40 +02:00
60b6d80936
Merge branch 'master' into xin-issue_5211
2023-08-24 21:03:57 +02:00
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
4389c3d80c
The texture strength attribute in aiMaterial set when importing and exporting gltf files is inconsistent
2023-08-23 14:54:40 +08:00
d07934bf25
adjust comment
2023-08-18 01:03:49 +08:00
554fa8f5e2
code format
2023-08-18 01:03:49 +08:00
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
32716002ac
Add DIFFUSE_ROUGHNESS_TEXTURE for gltf2 exporter
2023-08-18 01:03:49 +08:00
5c45cdc0ad
Fix Invalid-free in Assimp::FBX::Scope::Scope
2023-08-16 07:45:23 +00:00
d77903423f
Merge branch 'master' into floatwarn
2023-08-15 12:55:37 +02:00
0bfc588c39
Update Triangulate Process [more another case]
2023-08-15 18:01:16 +08:00
e5d9339c21
Merge branch 'master' into 5513536726761472
2023-08-12 08:05:27 +02:00
1c5dc86afb
Merge branch 'master' into fix_magic
2023-08-12 07:39:40 +02:00
d8a7399a04
Merge branch 'assimp:master' into collada-ignore-unit-size-property
2023-08-10 08:10:18 +02:00
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
49ed0711d1
Fix another warning
2023-08-05 15:43:31 +02:00
8312b31d27
fix warning-as-error
2023-08-05 15:39:47 +02:00
bb1873dd22
Collada: added import property to disable unit size scaling
2023-08-04 09:54:55 +02:00
f7e7f82b9d
Add const
2023-08-03 17:10:17 +00:00
d7dc88e0d0
Fix UNKNOWN READ in Assimp::MDLImporter::InternReadFile_Quake1
2023-08-01 13:04:16 +00:00
439b3369c1
Merge branch 'master' into fix_magic
2023-07-23 21:21:29 +02:00
dd40b0ccee
Changed #define FBX_FOV_UNKNOWN to const float kFovUnknown
2023-07-23 12:05:01 -07:00
3ec8a36764
Merge branch 'assimp:master' into sfjohnston_mods
2023-07-23 08:37:47 -07:00
37a1366fb7
Add missing rapidjson headers.
2023-07-21 11:33:06 +02:00
52e5c3f39e
Fix violation of strict aliasing rule.
2023-07-21 09:48:45 +02:00
64e0ba2625
Merge branch 'master' into sfjohnston_mods
2023-07-20 09:21:13 +00:00
16021ef9ac
Merge branch 'master' into cloud_storage_version
2023-07-14 11:47:24 +02:00
0e7cd18c8b
Strip aws gcs version string.
2023-07-14 09:37:48 +02:00
bf38d67935
Fix detection of KHR_materials_specular.
2023-07-13 11:51:56 +02:00
c7afea3cd7
Merge branch 'assimp:master' into sfjohnston_mods
2023-07-10 07:58:21 -07:00
e2b19ef776
Merge branch 'master' into file_extension
2023-07-10 11:19:27 +02:00
87cac888e4
More simplifications.
2023-07-08 12:58:11 +02:00
bdde968677
Address reviewer comment.
2023-07-08 12:58:11 +02:00
506baa21e6
Unify extension check for importers.
...
This enables proper checking for all kinds of extensions (including the
ones with multiple dots) for all importers and internal usage.
2023-07-08 12:58:11 +02:00
0256047168
Extend token search flag from alpha to graph.
...
This way we can fix Blender exported files being wrongly detected as
obj files.
2023-07-08 12:57:45 +02:00
90ff723b6c
Merge branch 'master' into gltf_binary
2023-07-03 21:31:28 +02:00
ed903543a7
Merge branch 'master' into 4879958521806848
2023-07-03 19:50:38 +02:00
093e35dd54
Fix eternal loop
2023-07-03 09:12:00 +00:00
edb8375702
Fix integer overflow
2023-07-03 09:11:38 +00:00
f1561f03ce
Merge branch 'master' into irrfix
2023-07-02 15:10:04 -04:00
0bacc7134d
Remove debugging code, clean up some notes
2023-07-02 14:32:17 -04:00
19da9cc84d
Port mesh loading to pugixml. Untested.
2023-07-02 14:32:12 -04:00
3e1fd74940
Fix up scene loading. pugixml is a breadth-first parser while irrxml is
...
a depth first. This only parses scene structure, no mesh loading yet.
2023-07-02 14:30:54 -04:00
537b445a59
Apply clang-format to files
2023-07-02 14:17:52 -04:00
6f3bfb5b60
Fix memory leak
2023-07-02 14:12:49 -04:00
3838a8aaf8
Fix unknown write in Assimp::ObjFileMtlImporter::getFloatValue
2023-07-02 14:12:49 -04:00
Kim Kulling
Kim Kulling
AnyOldName3
tangxin
zhucan
朱灿
Alex
Aaron
Martin Weber
Gargaj
sfjohnston
Marco Feuerstein
PencilAmazing
dog