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
Alex
d7dc88e0d0
Fix UNKNOWN READ in Assimp::MDLImporter::InternReadFile_Quake1
2023-08-01 13:04:16 +00:00
Jan Krassnigg
a45bb31618
Build fix
2023-08-01 14:16:41 +02:00
Jan Krassnigg
1e93280f47
Infrastructure for reporting progress
...
This commit adds two classes:
* ProgressTracker
* ProgressScope
The first is for users to implement, and to instantiate when they desire
to get informed about the overall progress.
The second is to be added to all functions that may take a considerable
amount of time, such that they can report back how far along they are.
These are much more convenient to use than the existing ProgressHandler.
ProgressScope is designed such that it only requires "local knowledge"
about upcoming and finished work. Scopes are nested and combined to
form the final global progress.
The active ProgressTracker is stored in a thread_local pointer.
This is a consicius decision since in assimp there is often no 'context'
passed through. The ProgressTracker may be needed anywhere, and it would
be tedious and a huge change to pass it through to every function.
Therefore, using a thread_local variable makes it accessible everywhere,
without a major interface change. Since assimmp is single-threaded,
but may be run in parallel on multiple threads, a thread_local is a
good trade-off, in my opinion.
This change only adds few uses of ProgressScope, to generally show how
it would be used. Also for our use cases these where the most pressing
places to add progress reporting, so this already covers loading from FBX
files pretty well.
2023-08-01 14:06:12 +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
Kim Kulling
439b3369c1
Merge branch 'master' into fix_magic
2023-07-23 21:21:29 +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
Marco Feuerstein
52e5c3f39e
Fix violation of strict aliasing rule.
2023-07-21 09:48:45 +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
3423949490
Merge branch 'master' into master
2023-07-08 12:37:42 +02:00
Kim Kulling
e08cb0b5b8
Merge pull request #5172 from feuerste/missing_header
...
Add missing header.
2023-07-08 12:36:52 +02:00
PencilAmazing
668db327f4
Fix misplaced quote
2023-07-07 13:27:45 -04:00
Marco Feuerstein
8b005eaa83
Add missing header.
2023-07-07 14:28:05 +02:00