| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: If9fdd63d58b2f9d41dc3a6c99d1dde2245506d15
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
| |
Change-Id: If981333f7a3d78028d4f08c59867453d4192b955
Task-number: QTBUG-81058
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
|
|
| |
The only noteworth change is where a loop around spy.events modified
the container using takeFirst(). There was no reason to do so, so it
was changed to use the loop variable instead of the result of taking.
Change-Id: I02c62a7c2efc5d042c6e669fe5daddd7da7e85d2
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit c8964b8f1cf56718a189b0f57bad446cec30a8b8.
QDoc now supports documentation-specific custom module headers
and include headers that allow us to keep using a single
documentation project that covers multiple modules.
Change-Id: I84706a7149097a6b03f0f266e55d6f712a6c773e
Reviewed-by: Martin Smith <martin.smith@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QDoc in Qt 5.11 will use Clang (libclang) to parse C++ documentation.
In order to do that, Clang needs to have the include paths available
when parsing source; qmake provides that information to QDoc but only
when the documentation project is located under the correct module
(source) path.
By having dedicated doc projects for Qt 3D Core, Render, Input, etc.
the number of documentation warnings is signicantly reduced. A
top-level 'Qt 3D' project is still kept, and contains the landing page,
overview, examples, and top-level 'C++ classes' and 'QML types' pages
that list all types documented across all Qt 3D submodules.
Change-Id: Id5936de36f31c2a8764a64e1e9d7ae0d10e8ab14
Reviewed-by: Martin Smith <martin.smith@qt.io>
|
|
|
|
|
| |
Change-Id: If3bcfe24ebe7ecfb4519e0e400e601819783edad
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/extras/defaults/defaults.pri
src/extras/extras.qrc
src/quick3d/imports/extras/importsextras.pro
src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp
src/quick3d/quick3dextras/items/items.pri
src/quick3d/quick3dextras/quick3dextras.pro
tests/manual/manual.pro
Change-Id: I62232cb21495612f31f48a6749a52b68777c4ae3
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Modded assimp loader to load animations and to load submeshes into child
entities. Added keyframeanimation for node animations and morphing mesh.
Also added animation group for controlling multiple nodes as one animation
and animation controller to select and play animations.
Assimp loader adds QKeyFrameAnimations targeting an entity as child
objects of that entity, the QAnimationController finds them when the entity
is set and creates QAnimationGroups from based on the animation name.
Change-Id: I7e2e7a4479af49f8023b4a359b2b3118efdaa0da
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
areallocator is copied from qtdeclarative/src/quick/scenegraph/util.
We could link to QtQuick to use this allocator from the private headers,
but this would introduce a hard dependency on QtQuick that Qt3DExtras
doesn't yet have.
Image data for texture atlasses are stored inside QTextureAtlasData
structures, which are shared between
1. the frontend QTextureAtlas node, and
2. the texture generators that are updated each time something is
added to the atlas
If we didn't share this data, we would have to copy the current QImage
that stores the current state of the texture atlas, each time that a
new sub-image is added. This would result in considerable memory copying
overhead.
By sharing the data, we can just add new sub-images to the shared data
structure, and update the texture generator. This may happen dozens of
times within one frame. When the backend texture loading job is executed,
it will copy all the new sub-images into the overall texture image, and
create the texture data from that image. This way, exactly zero image
copying overhead happens in the frontend thread.
Change-Id: I8c418bf335afd1363ad7cefdf81778e4075038e8
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
| |
- Allows to extrude a 3D mesh from a text string
- Added 3d-text example
Triangulation fixes provided by Remi Faitout
Task-number: QTBUG-19234
Change-Id: I767ffa11092d30945e3fc19f90f72a5965f5a776
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
|
| |
The core, extras, input, logic and render libraries contain no
Q_FOREACH loops anymore. Enable QT_NO_FOREACH so it stays that
way.
Change-Id: Ie2fa6b7621cce2c89f76cf37d1511bf8c16c13ee
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
| |
Also created a Quick3DExtras for QML related extras (Qt3DQuickWindow)
Change-Id: I1b95ea841e07ac8d68a07a1911d783b722e6fe03
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
QBoundingVolumeDebug has been disabled for now. Will be re-enabled later on.
Change-Id: Id6b0abab2ec2aa697330bd20d782f9d104d25d50
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|