Commit Graph

12211 Commits

Author SHA1 Message Date
Martin Weber
bb1873dd22 Collada: added import property to disable unit size scaling 2023-08-04 09:54:55 +02:00
Kim Kulling
60989a598e Merge pull request #5175 from sfjohnston/sfjohnston_mods
Bug fix and improvement to FBX camera field-of-view during import.
2023-07-23 21:31:39 +02:00
sfjohnston
dd40b0ccee Changed #define FBX_FOV_UNKNOWN to const float kFovUnknown 2023-07-23 12:05:01 -07:00
sfjohnston
3ec8a36764 Merge branch 'assimp:master' into sfjohnston_mods 2023-07-23 08:37:47 -07:00
Kim Kulling
131bc61d47 Merge pull request #5186 from feuerste/missing_header
Add missing rapidjson headers to `glTF2Asset.inl`.
2023-07-23 13:51:01 +02:00
Kim Kulling
d05dbfa8c9 Merge branch 'master' into missing_header 2023-07-23 13:29:56 +02:00
Kim Kulling
20cb815290 Merge pull request #5188 from assimp/kimkulling/remove_deprecated_swig_files
Remove deprecated swig files.
2023-07-23 13:29:43 +02:00
Kim Kulling
0ab7de70cd Remove deprecated swig files. 2023-07-23 12:49:25 +02:00
Marco Feuerstein
37a1366fb7 Add missing rapidjson headers. 2023-07-21 11:33:06 +02:00
Kim Kulling
64e0ba2625 Merge branch 'master' into sfjohnston_mods 2023-07-20 09:21:13 +00:00
Kim Kulling
bf7ccb6206 Merge pull request #5182 from tellypresence/fix_malformed_irr_files
Fix malformed irr files
2023-07-18 14:29:08 +00:00
Kim Kulling
a5a4090989 Merge branch 'master' into fix_malformed_irr_files 2023-07-18 12:31:44 +00:00
Kim Kulling
8c871ed4f0 Merge pull request #5183 from SirLynix/patch-2
Remove /WX from CMakeLists for MSVC
2023-07-17 17:05:16 +02:00
Jérôme Leclercq
46be2d3380 Remove /WX from CMakeLists for MSVC 2023-07-15 15:54:15 +02:00
Steve M
ca7f6de671 Merge branch 'master' into fix_malformed_irr_files 2023-07-14 20:40:56 -07:00
Steve M
3161f0e754 Introduce alternate versions with animations disabled to allow sucessful load 2023-07-14 20:19:28 -07:00
Kim Kulling
5b7ff294b8 Merge pull request #5156 from feuerste/cloud_storage_version
Handle gcs cloud storage file extensions with versioning.
2023-07-14 15:07:12 +02:00
Kim Kulling
16021ef9ac Merge branch 'master' into cloud_storage_version 2023-07-14 11:47:24 +02:00
Marco Feuerstein
0e7cd18c8b Strip aws gcs version string. 2023-07-14 09:37:48 +02:00
Kim Kulling
f66a7fd6bf Merge pull request #5176 from feuerste/gltf_specular
Fix detection of `KHR_materials_specular` on glTF2 export.
2023-07-14 09:23:12 +02:00
Steve M
1e6c7063b6 Fix typos 2023-07-13 20:28:48 -07:00
Marco Feuerstein
bf38d67935 Fix detection of KHR_materials_specular. 2023-07-13 11:51:56 +02:00
Kim Kulling
cf7d363766 Merge pull request #5159 from mosfet80/patch-4
Update run-cmake into sanitizer.yml
2023-07-11 15:45:55 +02:00
Kim Kulling
11f024b395 Merge branch 'master' into patch-4 2023-07-11 10:19:38 +02:00
Kim Kulling
53846430ce Merge pull request #5157 from feuerste/file_extension
Unify extension check for importers.
2023-07-11 10:18:49 +02:00
sfjohnston
c7afea3cd7 Merge branch 'assimp:master' into sfjohnston_mods 2023-07-10 07:58:21 -07:00
Kim Kulling
e2b19ef776 Merge branch 'master' into file_extension 2023-07-10 11:19:27 +02:00
Kim Kulling
fe49a9ed94 Merge pull request #5155 from feuerste/alpha_graph
Extend token search flag from alpha to graph.
2023-07-10 11:17:16 +02:00
Marco Feuerstein
87cac888e4 More simplifications. 2023-07-08 12:58:11 +02:00
Marco Feuerstein
bdde968677 Address reviewer comment. 2023-07-08 12:58:11 +02:00
Marco Feuerstein
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
Marco Feuerstein
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
Kim Kulling
e08cb0b5b8 Merge pull request #5172 from feuerste/missing_header
Add missing header.
2023-07-08 12:36:52 +02:00
Marco Feuerstein
8b005eaa83 Add missing header. 2023-07-07 14:28:05 +02:00
Kim Kulling
6308de6e5b Merge pull request #5154 from feuerste/gltf_binary
Improve binary check for gltf and gltf2.
2023-07-05 21:29:38 +02:00
Kim Kulling
90ff723b6c Merge branch 'master' into gltf_binary 2023-07-03 21:31:28 +02:00
Kim Kulling
9a94b26cdc Merge pull request #5168 from sashashura/4879958521806848
Fix UNKNOWN READ in Assimp::SMDImporter::ParseNodeInfo
2023-07-03 21:08:11 +02:00
Kim Kulling
ed903543a7 Merge branch 'master' into 4879958521806848 2023-07-03 19:50:38 +02:00
Kim Kulling
d3ee157342 Merge pull request #5166 from PencilAmazing/irrfix
Fix IRR and IRRMESH importers
2023-07-03 11:36:52 +02:00
Kim Kulling
a5bb4b59e4 Merge branch 'master' into irrfix 2023-07-03 11:19:53 +02:00
Alex
093e35dd54 Fix eternal loop 2023-07-03 09:12:00 +00:00
Alex
edb8375702 Fix integer overflow 2023-07-03 09:11:38 +00:00
Kim Kulling
0dcfe2f72c Merge pull request #5167 from assimp/kimkulling/add_missing_licence_issue-5144
Create licence.md
2023-07-03 10:04:34 +02:00
Kim Kulling
d1ad4e54d7 Create licence.md
- closes https://github.com/assimp/assimp/issues/5144
2023-07-03 08:26:50 +02:00
Kim Kulling
5770faac10 Merge pull request #5162 from feuerste/py_available_formats
[pyassimp] Replace static list of file extensions with the actually supported ones.
2023-07-02 21:26:07 +02:00
PencilAmazing
f1561f03ce Merge branch 'master' into irrfix 2023-07-02 15:10:04 -04:00
PencilAmazing
57306bcd63 Make unit test more useful in case importer breaks again 2023-07-02 14:55:25 -04:00
PencilAmazing
96eb87265e Apply clang-format to unit test 2023-07-02 14:35:22 -04:00
PencilAmazing
0bacc7134d Remove debugging code, clean up some notes 2023-07-02 14:32:17 -04:00
PencilAmazing
19da9cc84d Port mesh loading to pugixml. Untested. 2023-07-02 14:32:12 -04:00