diff options
| author | Antti Määttä <antti.maatta@qt.io> | 2019-04-12 13:54:35 +0300 |
|---|---|---|
| committer | Antti Määttä <antti.maatta@qt.io> | 2019-05-03 09:34:00 +0000 |
| commit | 73ebd0f9cf6376a762c96d37ab6046fefd8d4789 (patch) | |
| tree | e415e2af7e30002563422ba9cbec02f3276b013e /src/Runtime/Source/runtime/Qt3DSLogicSystem.cpp | |
| parent | ccc70e48e576c0dffc289df4850a909fb6fef83d (diff) | |
Implement dynamic loading of slide resources
Implements loading of textures and images during runtime instead of load
time.
- Images which are not part of any slide are loaded at load time
- Master slide images are always loaded at load time
- Images used in a slide are loaded when the slide is entered
- Images are unloaded when slide is exited and any other slide does not
use them
Task-number: QT3DS-3208
Change-Id: I7a827a5e828908efd2b104fe25374c66958319d2
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Runtime/Source/runtime/Qt3DSLogicSystem.cpp')
| -rw-r--r-- | src/Runtime/Source/runtime/Qt3DSLogicSystem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Runtime/Source/runtime/Qt3DSLogicSystem.cpp b/src/Runtime/Source/runtime/Qt3DSLogicSystem.cpp index 1aec08f1..4a8341b4 100644 --- a/src/Runtime/Source/runtime/Qt3DSLogicSystem.cpp +++ b/src/Runtime/Source/runtime/Qt3DSLogicSystem.cpp @@ -221,7 +221,7 @@ struct SLogicSystem : public ILogicSystem listIter != listEnd; ++listIter) if (listIter->m_Id == inActionIndex) { listIter->m_Active = inActive; - if (IApplicationCore::isPickingEvent(logicIter->first.m_CommandHash)) { + if (IApplication::isPickingEvent(logicIter->first.m_CommandHash)) { SElement *theElement = inElemAllocator.FindElementByHandle( logicIter->first.m_ElementHandle); if (theElement && inActive) |