| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Restore qt3d-index.html as the main landing page. Needed
for external linking.
- Fix \inmodule commands for Renderer classes
- Add proper group so that all three modules are listed on
the landing page, both C++ and QML modules
- Remove qt3drenderer-index.html (to be consistent with
Qt3DCore), copy contents over to the module page and
to a new file, qt3d-examples.qdoc.
- Fix indexTitles in qdocconf files, and subprojects for
Renderer QML types and Qt3D examples
Change-Id: I0e2497771d0525d120ffa9d7d6338b01fdfa6963
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
Not fully documented yet, but enables the classes and QML types to be
visible in the documentation.
Change-Id: I557aeae9ff6314b697bcc9313c1061543363b645
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
| |
Q_DECLARE_METATYPE() is required, even for QObject subclass pointers,
if you want to be able to call qMetaTypeId() for that type.
Task-number: QTBUG-46661
Change-Id: Iaabf758f1d3b92569a463d2a5fb13389f086bd5c
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
| |
Change-Id: I29c3b972cc9847ecd28a22e9de484aef0f3ac185
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
|
|
|
|
|
|
| |
Change-Id: Ibea422bfe658c89dad919f98b7269bc801c9c295
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
| |
To help adjust expectations.
Change-Id: I5a2363c04ed6272d304f55ba7a3e5de3f3920088
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
| |
There is no Qt3D library, there is only Qt3DCore, Qt3DRenderer and
Qt3DInput so we put the global stuff into the Qt3DCore docs.
Change-Id: I31077581ba159d828d0f64968a83920308676007
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
| |
So as to avoid public header without a QPrefix. Real integration
points will be added later.
Also removed it from the Qt3D namespace and fixed linkage.
Task-number: QTBUG-46617
Change-Id: I1bea09f45f5fdba3d658b57b86b907ab57164479
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This should make the documentation and code terminology consistent
throughout. We can rename the source directories at a later date if
needed.
Task-number: QTBUG-46622
Change-Id: I2737e54192341808f4a0270ad19ba70f6c4af589
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
|
|
|
|
|
| |
Task-number: QTBUG-46592
Change-Id: Ib28a8fcf2c0e692dd10227f9a9e3c6a10a7fcdbd
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
|
|
|
|
|
|
|
| |
Leave the cylinder-cpp example to show minimal code for setting up
a basic element. Reshape torus-cpp to show several shapes available.
Change-Id: Ic9dd7cb54258b5eb442ee0492ef4fc2e4b30f836
Reviewed-by: Sean Harmer <sean.harmer@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>
|
|
|
|
|
|
| |
Task-number: QTBUG-46539
Change-Id: I0e9e2d405da2fa5ecc2fc8b8efece6f7364e1b39
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-46143
Change-Id: I1ebf37c5f78f4532749d7b432bca367c51d7efdd
Reviewed-by: Tim Blechmann <tim@klingt.org>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
gltf/LICENSE.md is from 4fb289da,
https://github.com/KhronosGroup/glTF/blob/master/LICENSE.md
(excluding third-party licenses - only glTF graphical assets
are used in the examples).
Task-number: QTBUG-45612
Change-Id: I66c7d7d3ef2ae8ad10feb74a1e7be41d6ac281ad
Reviewed-by: Sami Makkonen <sami.makkonen@digia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add documentation structure and qdoc comments for \class,
\qmltype, \property, and \qmlproperty, etc, for the Qt3DRender
C++ and QML modules.
The actual documentation (descriptions) are still missing, but this
allows the QML type documentation to be generated and reduces the
qdoc error count.
Change-Id: I9e96241f07ca2388f1a8cc2a3677fa6d02a2404d
Task-number: QTBUG-46037
Reviewed-by: Martin Smith <martin.smith@digia.com>
|
|
|
|
|
|
|
|
| |
Added mutex to QThreadPooler destructor to wait that mutex is not
destroyed while locked. This seems to be important for autotests.
Change-Id: I5423344ecd2c24e896adaf5b9b52309200ed8801
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
| |
Added mutex for QFuture reservation on QThreadPooler
Change-Id: I6fc399c2518180d78a7ed387a90330af02b1b8a5
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
|
|
|
|
|
|
|
| |
Added examples.pri to examples folder to help deployment to devices.
Change-Id: Ib7b6514d5b5a31dee9a3b7f6f79277550fb77502
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
| |
Added few lines about assimp dependency on some examples.
Change-Id: I7fcb233f3691d6671c582e0c4541eeaaee19165d
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
| |
Respect aiString::length to avoid strlen().
Change-Id: I284d061da1dd62de0dda4b72da417cfbc1e99d85
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
| |
Few basic tests for threadpooler. Also adds QT3DCORE_PRIVATE_EXPORTT for
QAspectJobManager.
Change-Id: I6bf930b0013b301c6a8ce2193ad9b34fe4638eb3
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
|
|
| |
Split example-assets.qrc into smaller resource files per
directory and add those to the examples as required.
Task-number: QTBUG-45990
Change-Id: I0a5a6cee64dc23560e9e093f272ff0d90a6e2e97
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
| |
Change-Id: I22389f9a904f203b91ee291f1fc7e9e8e059f31b
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
| |
Referencing a partially-constructed object is typically a bad design.
Change-Id: I48ef92452202f6c8c0014e17efd20e2ee2ae7e40
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
| |
For classes derived from QNodePrivate, it is not used anymore.
Change-Id: I9573042500c2c7533687d251e72bac14cb793525
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
| |
QObject does that behind the scenes, in a proper way.
Change-Id: I92561060757d36358d1e507f4335ca605f681678
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: I04b9c4a2cfd43dc840b8f2b700ed74052582bc99
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
| |
Change-Id: Ie3fc342e4901202a611ffaa4fd263a1387b908f5
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Massimo Callegari <massimocallegari@yahoo.it>
|
|
|
|
|
|
|
|
|
| |
Previously the clearColor was the same for the whole frame using the first
RenderView's clear color. In some cases (FBO rendering) we may want the
renderer to set/update the clear color between RenderViews.
Change-Id: I85318d10a8ae0b03a8e5576ec39e15b14f1bc21d
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I68d16f2f0c5b967f75c3d150a5bd0ff5758896cd
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
|
|
|
|
|
|
|
| |
set to true which makes the texture unique
Change-Id: I4d7249b3021d95b31a5b93f086bc3aab54fe82da
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
Will allow to disable texture sharing in the backend when needed,
defaults to false
Change-Id: If3a75c7763db6eb479319d5c0b9356b164e0f163
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
| |
Set enabled to true by default on a RenderMesh
Change-Id: I269505ab74f05fa81dae5eceef4c0afe24f10031
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Fix a typo in QPhongMaterial class which caused setting ambient value
to shininess parameter.
Fix a typo in ES2 version of pervertexcolor fragment shader.
Change-Id: I4623905a800ad310f19eb95d7391faaf70e9dd2b
Task-number: QTBUG-44907
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
| |
Enable the examples to run stand-alone (when launched from
Qt Creator's welcome screen).
Task-number: QTBUG-45990
Change-Id: Idc53d8342e75faf962410a91c3b2fe26a02610e5
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
|
| |
Properly initialize the enabled flag in RenderMaterial
and use Q_AUTOTEST_EXPORT to make it available to the
unit tests
Change-Id: Ie38169815f920f828effe03b52f6f32c85030523
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
| |
Remove Q_ENUMS in favor of the new Q_ENUM macro which provides
registration as meta enum and a debug stream operator.
Change-Id: I39c61af189daebe2bf0c7474202da9f6110441c5
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
| |
Allow to select a mesh file and load it with the assimp scene loader.
Change-Id: I0018fbbdbcf76c65f35b0670c1b1082e304cc9df
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
| |
Change-Id: I9ded38f9d65e8b528abc729f0eb6f35558b0ce6d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
| |
Note: you need red/cyan glasses to fully enjoy the experience
Change-Id: Ic823831eea0f4658c2ab9116eb1505893847b6e8
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
| |
When a RenderPass stateset overriddes the global stateset set by the current
FrameGraph branch at render time, this is done by merging the global
stateset with the RenderPass defined stateset.
Change-Id: I07baca0d50b1c02cf1298b382039aedabd6084cc
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
| |
Also added doc
Change-Id: I45d077910dc8ac3d8cd06cf6835eb41be2ae5fe3
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
| |
Check if the FrameGraph root node has a parent, if not set it to trigger a
NodeCreated notification.
Then set it as the current activeFrameGraph.
Change-Id: Ife652391bc8520b42d35a8469b55bf067e1e08a2
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
| |
C++ equivalent of SkyboxEntity
Change-Id: I560b6f5f19660370fb9f3e3edfb596879cf17382
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
| |
Cpp classes to follow
Change-Id: If2479917aa516cf5da37111ae6a5886a8e24e9e7
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: I1a1098ab45d118a01001a8d86e9de8326ecae76f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
| |
Also fixed material loading issue (was using wrong material index)
Note: the flag aiProcess_FlipUVs was required to have textures displayed
correctly.
Change-Id: I3f5b436fad20d6bf50c8e5ddca56f78948b44fec
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: Ib5a6ea27610dfad3352adacd57c8f0f02c97f31f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
| |
This offers a way to explicitly request every render states to be disabled.
Also updated the doc to be clear about how render states are defined.
Change-Id: I91af58dd3ede7ffd7fc9cc022c5e007104791151
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|