summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix dynamic OpenGL ANGLE issue for planets-qml examplev5.5.05.5.0Tomi Korpipää2015-06-251-9/+7
| | | | | | Change-Id: I2d645189ed50567195f4fc1df8ec3e468037fb92 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Doc: Add some docs for the shadow map exampleSean Harmer2015-06-255-5/+324
| | | | | | Change-Id: Iea29c9f654fc57518bf3d428b30fa5955aa1230d Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Doc: Add documentation for the Wireframe QML ExampleSean Harmer2015-06-244-3/+197
| | | | | | | | | | | Add information about materials and shaders in the overview topic. Add file extensions to the configuration file to have all the example files listed in the example docs. Change-Id: I709f91fb854ca18fb3a56caf656c191fa15e99ef Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fixed planets-qml example for OS XTomi Korpipää2015-06-241-0/+11
| | | | | | | Change-Id: Iee3f1dc54231a8cf67d934025c1a8ff72dcc8b28 Task-number: QTBUG-46699 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Add ES2 support to planets-qml exampleMika Salmela2015-06-2333-96/+1025
| | | | | Change-Id: Ic5208d2149efbd03b82417ce3af17747375663f5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Added documentation for the planets-qml exampleTomi Korpipää2015-06-235-2/+87
| | | | | | | | | Change-Id: I07734c6a30f49b05cd7815d3c3412cd867a09836 Task-number: QTBUG-46602 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com> Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> (cherry picked from commit fc662e5a4597b568561c3a19abb24151086a229d)
* Planets QML example for Qt3DTomi Korpipää2015-06-2363-1/+8610
| | | | | | | | | | | | + Improved earth clouds - Some weirdness with alpha, easily visible with rings. Might be the textures, although the alpha on them seems fine with image viewer. - Earth clouds seem to have the alpha issue as well. Change-Id: Ibdfa49472790d3fc797e269b52986b71d93876f2 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> (cherry picked from commit 30f9015933957eaf9533229f94b1bcd48a8ce3ed)
* Map keyevents to correct signal names with namespaced argumentsSean Harmer2015-06-211-1/+1
| | | | | | Task-number: QTBUG-46752 Change-Id: I5e331849cbde6ca24cfd6dca3b019e6e8377dd3f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add some documentation about the framegraph conceptsSean Harmer2015-06-1911-5/+571
| | | | | | Change-Id: I9f2e21d3277d69a396a564ffd58c53ee91b37d45 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Use fully qualified argument types in signalsSean Harmer2015-06-181-43/+43
| | | | | | | Task-number: QTBUG-46752 Change-Id: I72f9c778eebf327d87d42a1eb20093700ee3e9eb Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Documentation for basic shapes exampleMika Salmela2015-06-184-5/+50
| | | | | | | | Add the documentation for the basic shapes example. Change-Id: I9a69198ddbd188ddaa7bd4ab0fae0dc2315719a9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: Fix multiple documentation issuesv5.5.0-rc1Topi Reinio2015-06-1527-109/+106
| | | | | | | | | | | | | | | | - 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>
* Doc: Add skeleton docs for Qt3D Input classes and QML typesTopi Reinio2015-06-156-2/+374
| | | | | | | | | 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>
* Fix crash on windowsSean Harmer2015-06-153-0/+7
| | | | | | | | | 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>
* Add an overview of Qt3D and its motivation and architectureLeena Miettinen2015-06-124-0/+273
| | | | | | Change-Id: I29c3b972cc9847ecd28a22e9de484aef0f3ac185 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Use Qt3DRenderer consistently for documentation configurationSean Harmer2015-06-116-57/+57
| | | | | | Change-Id: Ibea422bfe658c89dad919f98b7269bc801c9c295 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add list of platform support levelsSean Harmer2015-06-111-0/+15
| | | | | | | To help adjust expectations. Change-Id: I5a2363c04ed6272d304f55ba7a3e5de3f3920088 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move Qt3D generic index to Qt3DCore indexSean Harmer2015-06-112-90/+38
| | | | | | | | 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>
* Move temporary window class to examplesSean Harmer2015-06-1133-86/+65
| | | | | | | | | | | 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>
* Use Qt3D.Renderer rather than RenderSean Harmer2015-06-1196-133/+133
| | | | | | | | | | | 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>
* Fix cmake unit test for Qt3DSean Harmer2015-06-102-3/+9
| | | | | | Task-number: QTBUG-46592 Change-Id: Ib28a8fcf2c0e692dd10227f9a9e3c6a10a7fcdbd Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Reshape torus-cpp example to be basicshapes-cppMika Salmela2015-06-106-35/+349
| | | | | | | | 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>
* Make QAspectJobManager and base class privateSean Harmer2015-06-1014-235/+67
| | | | | | | | 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>
* Remove unnecessary metatype declarationsSean Harmer2015-06-0819-38/+0
| | | | | | Task-number: QTBUG-46539 Change-Id: I0e9e2d405da2fa5ecc2fc8b8efece6f7364e1b39 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix compilation on OS X 10.8Sean Harmer2015-06-051-0/+5
| | | | | | | Task-number: QTBUG-46143 Change-Id: I1ebf37c5f78f4532749d7b432bca367c51d7efdd Reviewed-by: Tim Blechmann <tim@klingt.org> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Examples: added license filesLiang Qi2015-06-052-0/+38
| | | | | | | | | | | | 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>
* Doc: Add Qt3D QML and C++ skeleton comments for qdocMartin Smith2015-05-2813-65/+663
| | | | | | | | | | | | | | 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>
* Add mutex to QThreadPooler destructorMika Salmela2015-05-271-0/+4
| | | | | | | | 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>
* ThreadPooler future reservation under mutexMika Salmela2015-05-261-0/+8
| | | | | | | Added mutex for QFuture reservation on QThreadPooler Change-Id: I6fc399c2518180d78a7ed387a90330af02b1b8a5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Target path definition for examplesMika Salmela2015-05-2432-31/+104
| | | | | | | Added examples.pri to examples folder to help deployment to devices. Change-Id: Ib7b6514d5b5a31dee9a3b7f6f79277550fb77502 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add comment about assimp to readmeMika Salmela2015-05-241-0/+8
| | | | | | | Added few lines about assimp dependency on some examples. Change-Id: I7fcb233f3691d6671c582e0c4541eeaaee19165d Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* [AssimpParser] Optimize aiString to QString conversionKonstantin Ritt2015-05-201-8/+16
| | | | | | | Respect aiString::length to avoid strlen(). Change-Id: I284d061da1dd62de0dda4b72da417cfbc1e99d85 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Unit tests for ThreadPoolerMika Salmela2015-05-204-2/+330
| | | | | | | | Few basic tests for threadpooler. Also adds QT3DCORE_PRIVATE_EXPORTT for QAspectJobManager. Change-Id: I6bf930b0013b301c6a8ce2193ad9b34fe4638eb3 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Examples: Remove shared resource library.Friedemann Kleint2015-05-2039-286/+110
| | | | | | | | | | 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>
* Fix property name for skybox exampleSean Harmer2015-05-201-1/+1
| | | | | Change-Id: I22389f9a904f203b91ee291f1fc7e9e8e059f31b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Properly initialize q_ptr (or avoid where it is not needed)Konstantin Ritt2015-05-2023-70/+48
| | | | | | | Referencing a partially-constructed object is typically a bad design. Change-Id: I48ef92452202f6c8c0014e17efd20e2ee2ae7e40 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Do not pass `this` to Private c-torKonstantin Ritt2015-05-20134-299/+296
| | | | | | | For classes derived from QNodePrivate, it is not used anymore. Change-Id: I9573042500c2c7533687d251e72bac14cb793525 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Do not initialize q_ptr in classes derived from QObjectPrivateKonstantin Ritt2015-05-2017-42/+32
| | | | | | | QObject does that behind the scenes, in a proper way. Change-Id: I92561060757d36358d1e507f4335ca605f681678 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* [QAspectEngine] Initialize properly and do not leak resourcesKonstantin Ritt2015-05-191-3/+12
| | | | | Change-Id: I04b9c4a2cfd43dc840b8f2b700ed74052582bc99 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Remove FBO complete debugPaul Lemire2015-05-171-1/+0
| | | | | | Change-Id: Ie3fc342e4901202a611ffaa4fd263a1387b908f5 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Massimo Callegari <massimocallegari@yahoo.it>
* Allow to have different clearColor per RenderViewPaul Lemire2015-05-153-4/+18
| | | | | | | | | 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>
* Register TextureRectangle and TextureBuffer to QMLPaul Lemire2015-05-151-0/+2
| | | | | Change-Id: I68d16f2f0c5b967f75c3d150a5bd0ff5758896cd Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* RenderTexture: handle the unique flag and append the node id to the dna whenPaul Lemire2015-05-152-2/+13
| | | | | | | set to true which makes the texture unique Change-Id: I4d7249b3021d95b31a5b93f086bc3aab54fe82da Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* QAbstractTextureProvider add unique propertyPaul Lemire2015-05-154-4/+54
| | | | | | | | | 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>
* Unit tests for RenderMeshPaul Lemire2015-05-145-2/+193
| | | | | | | Set enabled to true by default on a RenderMesh Change-Id: I269505ab74f05fa81dae5eceef4c0afe24f10031 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix some small typosUnai IRIGOYEN2015-05-141-1/+1
| | | | | | | | | | | 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>
* Remove exampleresources library from examples that do not use it.Friedemann Kleint2015-05-135-14/+0
| | | | | | | | | | 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>
* Unit tests for RenderMaterialPaul Lemire2015-05-135-2/+200
| | | | | | | | | 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>
* Port from Q_ENUMS to new macro Q_ENUM.Friedemann Kleint2015-05-1320-32/+30
| | | | | | | | | 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>
* assimp-cpp example addedPaul Lemire2015-05-133-1/+110
| | | | | | | 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>
View Lorry Controller Status