| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/core/jobs/qthreadpooler.cpp
src/core/nodes/qcomponent.cpp
src/core/qpostman.cpp
src/core/qscene_p.h
src/core/services/qservicelocator_p.h
src/input/frontend/qinputaspect.cpp
src/plugins/sceneparsers/assimp/assimpimporter.cpp
src/plugins/sceneparsers/assimp/assimpimporter.h
src/plugins/sceneparsers/gltf/gltfimporter.h
src/plugins/sceneparsers/gltf/gltfio.cpp
src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp
src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
src/quick3d/quick3dextras/qt3dquickwindow.cpp
Change-Id: I3566708c6f74a34959e7bb64b64e93647ca3f699
|
| |
| |
| |
| |
| |
| |
| |
| | |
Reordering the header includes to comply with Qt coding conventions
Task-number: QTBUG-56185
Change-Id: I3943678c183c4ef46d403e0fff878c3cad964dfa
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|/
|
|
|
|
| |
Change-Id: Idac9e42676ad92143e94dd5df02214fb79e5204e
Coverity-Id: 154594
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
| |
Change-Id: I0afa9cbbf5bb242625136906a1ecea2c6552e48f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
| |
Helps avoid duplicated vtables and code (an out-of-line
copy always needs to exist for the vtable to point at).
Change-Id: I882552532cdba28a136542f3497f571d1593bac3
Reviewed-by: Volker Krause <volker.krause@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
| |
Replaced QList with QVector
Change-Id: I9295a4bec2dc7d9ab6893154519dcd0425d86c6e
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
... by replacing them with C++11 range-for loops. To
avoid detaches of these mutable Qt containers, wrap
the container in qAsConst(), where needed.
This is the batch with low-risk changes. They operate
on local containers or the loop body clearly does not
cause the container to change.
Saves 8.3KiB (2.8%) in text size on optimized GCC 5.3
Linux AMD64 builds.
Change-Id: I5fae547c8a3a0a4c5467b967da55470d353f0ba8
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
| |
Update old header.LGPL3 to header.LGPL
Change-Id: I8eac0cd6bbc276a56df487249cc459c0d4fab165
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: Ib56156893b974110e0ceec1685b791828afd7ecb
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
| |
Allows for smoother animations in logic components.
Change-Id: I2aad5055465b3afbac415e21a356e216701551ef
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
| |
Change-Id: I46fb61368e1637c5e06d3b1bd8de38982aa99c7b
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
|
|
|
|
|
|
| |
Change-Id: I5cd1c2ddb54d32a7d650e2a44f48d9f67f9821a2
Task-Id: QTBUG-49001
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
| |
Update other aspects, tests and examples accordingly.
Change-Id: Ib1bcf0bdf4f5aec4422dc0c80bfc32b27fb1a317
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
|
|
| |
This stuff will need to be made more configurable in the future.
Possibly in a data driven manner analogous to the framegraph but with a
simpler set of primitives. This would allow combining aspects in
custom ways and when to sync etc.
Change-Id: I6a36d1c32f2268d61af6928d0e63afe7377de2c0
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
| |
Prevents leaking of private headers and allows use of
QT3DCORE_PRIVATE_EXPORT for use with the job manager unit test.
Change-Id: I7f0c2b2e27e88eee6cb686f5ae55c78b73ea27d3
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
| |
As for preparation for Qt5.5 release the copyright header is
updated to correspond the current license requirements.
Change-Id: I36632918b66f455539453b42c369689fb11298ec
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
| |
Also make the current time available as a standard uniform in the
render aspect.
Change-Id: I163187c432cf32bf57d0c4bf4ee6b8e5d8aac42c
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
| |
Change-Id: I88e54d7906ac7d2ba563c61ee9c9319ea60f4af7
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The QAspectJobManager doesn't really need to be public now I think but
as it still is let's make the base class have it's own private class
that inherits from QObjectPrivate.
The ThreadWeaver threads all get cleaned up cleanly upon shutdown.
When trying with cylinder-cpp with all the rendering stuff in main()
commented out, we consistently get the crash in QFontCache. With the
rendering stuff enabled there is also an assert inside the swapbuffers()
call. This is because the render thread is not cleanly shutdown yet.
The QFontCache crash is something to do with freeing thread-local
storage. I will continue to investigate.
Change-Id: Ib3ad3ea04ae4859d27f0dd4604b00bc5a38859a1
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
| |
Change-Id: I87b75ed9702240e1db46cf1c5ee8cfe3bb2ea91e
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
| |
*dpointer
*renamed to QAspectJob
*return QVector of dependencies instead of const QVector &
Change-Id: I8324952102cba8407e63b78353ffbc23642e63a5
Task-number: QTBUG-41526
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
| |
Note: the export is maintained for the moment because the renderer aspect
still needs to know about that class. When the QBackendNode will be introduced
and QAbstractAspect refactored, this will be removed.
Change-Id: I35144c964cd36972866cc2b80ed3ffb2709a45b9
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: I5ef4fe5ca3c5cd7b373d87eecf515bfee28dedad
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
| |
Change-Id: I15a4a472f5283c56c8185b05699e33368c45ddb0
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
| |
Change-Id: I78cc1d0081a06f376a4e64bf87d109ade3892860
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
For now the renderer aspect is still compiled into the Qt3DCore library.
This needs to be split out into a plugin so it can be loaded
dynamically along with other future aspects.
Change-Id: Iba8402b35c7ebc1c503d438c87aad77f5fef2261
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|