Commit Graph

444 Commits (a45bb31618031eb74393f9cba7b26f2ffe5b2f40)

Author SHA1 Message Date
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
Alex b158b716d1 Fix Memcpy-param-overlap in unzReadCurrentFile: bump zlib to 1.2.13 2023-06-14 07:41:41 +02:00
Kim Kulling f43cfa1fba
Merge branch 'master' into msvc-clang-unused-function 2023-05-24 23:23:40 +02:00
Kim Kulling d73595b85d
Merge branch 'master' into master 2023-05-24 21:35:26 +02:00
Kim Kulling aed43878ef
Merge branch 'master' into FlorianBorn71-SmallAllocationFixInFBXLoader 2023-05-15 14:28:46 +02:00
Kim Kulling e627f691a8 Merge branch 'SmallAllocationFixInFBXLoader' of https://github.com/FlorianBorn71/assimp into FlorianBorn71-SmallAllocationFixInFBXLoader 2023-05-15 09:30:57 +02:00
Mathieu Westphal 69145c8929 Fix librt link 2023-05-05 08:47:14 +02:00
Jackie9527 fbf8799cb5 Fix warning related to unused-function.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-05-03 23:02:38 +08:00
Jackie9527 92d426de2b Remove unused -Wno-missing-noreturn.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-29 01:05:25 +08:00
Jackie9527 51494e1b4f Remove unused -Wno-deprecated-copy-with-user-provided-dtor.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-29 00:55:13 +08:00
Jackie9527 cdefc9f7aa Remove unused -Wno-deprecated-copy-with-dtor.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-29 00:43:40 +08:00
Kim Kulling 230bee2e34
Merge branch 'master' into msvc-clang-missing-variable-declarations 2023-04-26 11:15:32 +02:00
Kim Kulling 07aae9eaee
Merge branch 'master' into msvc-clang-deprecated-copy-with-dtor 2023-04-26 10:42:51 +02:00
Kim Kulling 71366fff8e
Merge branch 'master' into msvc-clang-inconsistent-missing-destructor-override 2023-04-26 09:31:55 +02:00
Kim Kulling 965ebaf78b
Merge branch 'master' into deprecated-copy-with-user-provided-dtor 2023-04-26 08:22:51 +02:00
Kim Kulling 1ecb8e9196
Merge branch 'master' into msvc-clang-missing-noreturn 2023-04-25 23:56:39 +02:00
Jackie9527 ff17f1fe3d Remove -Wno-missing-variable-declarations.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-19 23:29:03 +08:00
Jackie9527 1b826afeda Remove -Wno-unreachable-code-break.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-19 22:26:44 +08:00
Jackie9527 116ceeca31 Remove -Wno-unreachable-code-return.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-05 07:39:12 +08:00
Kim Kulling 1733d9f795
Merge branch 'master' into msvc-clang-unreachable-code 2023-04-04 17:02:22 +02:00
Kim Kulling 17bdd5f9b5
Merge branch 'master' into msvc-clang-format-non-iso 2023-04-04 15:59:27 +02:00
Kim Kulling d6885d4025
Merge branch 'master' into msvc-clang-nested-anon-types 2023-04-03 19:59:59 +02:00
Kim Kulling 9fba0ee31b
Merge branch 'master' into msvc-clang-deprecated-copy-with-dtor 2023-04-01 20:46:34 +02:00
Jackie9527 dacaebc078 Remove unused -Wno-shadow-field-in-constructor.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 23:49:22 +08:00
Jackie9527 bddb4559a1 Remove -Wno-deprecated-copy-with-dtor.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 22:46:01 +08: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
Jackie9527 e36812a449 Remove unused -Wno-deprecated-copy-with-user-provided-dtor.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 19:07:13 +08:00
Jackie9527 87c309566f Fix warning related to missing-noreturn.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 18:46:12 +08:00
Jackie9527 20b2f857c5 Remove -Wno-unreachable-code
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 13:07:30 +08:00
Jackie9527 94067994cc Fix warning related to format-non-iso.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 12:29:42 +08:00
Jackie9527 6b54761310 Fix warning related to nested-anon-types.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 10:30:10 +08:00
Kim Kulling 85b470a3ee
Merge branch 'master' into clang-cl-15.0.1-support 2023-03-29 21:20:25 +02:00
Kim Kulling 2acfc125c3 Refactoring: Make GeoUtils reusable 2023-03-14 20:03:14 +01:00
Jackie9527 a0c29202be Add build options to fix issues with clang 15.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-03-02 21:12:35 +08:00
Andy Maloney e893248e7c Fix several spelling mistakes & a comment 2023-01-01 13:31:48 -05:00
Kim Kulling a8e50be781 Refactoring: Move asserthandler header to include 2022-12-23 16:19:39 +01:00
Kim Kulling 7b874983d0
Merge branch 'master' into SmallAllocationFixInFBXLoader 2022-09-08 20:15:52 +02:00
Underdisc 17289985a4 Update comment 2022-06-01 12:45:40 +02:00
Underdisc 02e0d1d05c Remove dllexport tags from static library builds. 2022-06-01 12:26:04 +02:00
Kim Kulling 472e15c405
Merge branch 'master' into kimkulling/link_stb_image_statically_issue_4467 2022-05-31 17:47:43 +02:00
hgdagon 85d47dc359
Merge branch 'master' into assimp_resource 2022-05-07 18:03:44 +04:00
hgdagon f86700f6f4
Merge branch 'master' into assimp_resource 2022-05-04 02:12:08 +04:00
hgdagon 936cc791f2
Move `ASSIMP_WARNINGS_AS_ERRORS` check 2022-05-03 13:01:20 -07:00
hgdagon e97e7574ae
Merge branch 'master' into assimp_warnings_as_errors 2022-05-03 23:24:52 +04:00
U-DESKTOP-0R560PH\George a7e2b3ad30 Fixed library names for MinGW/MSYS2 2022-04-30 08:14:16 -07:00
U-DESKTOP-0R560PH\George 694dc8a0c3 Add an option to treat warnings as errors 2022-04-30 08:08:34 -07:00
U-DESKTOP-0R560PH\George 94ebe71969 Resource script updates 2022-04-30 08:01:15 -07:00
Florian Born 7f0509ae87 Stack allocator is now inline 2022-04-21 11:33:04 +02:00
Florian Born 2b3c49cb93 All allocation changes 2022-04-20 12:33:39 +02:00
Kim Kulling 7f913c180b
Merge branch 'master' into master 2022-04-19 15:23:09 +02:00