summaryrefslogtreecommitdiffstats
path: root/src/render/render.pro
Commit message (Collapse)AuthorAgeFilesLines
* Eradicate Q_FOREACH loops and mark the module cleanMarc Mutz2019-05-221-3/+0
| | | | | | | | | | 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>
* Revert "Doc: Divide documentation into submodules"Topi Reinio2018-04-201-2/+0
| | | | | | | | | | | 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>
* Move Renderer specific classes into new folderPaul Lemire2018-03-191-1/+1
| | | | | | | | This is another step toward isolating the renderer from the render aspect Change-Id: I4031675b961d6645b65bbe05cf62d150993038b0 Task-number: QTBUG-61151 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Merge remote-tracking branch 'origin/5.10' into 5.11Sean Harmer2018-02-151-1/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/animation/doc/src/qt3danimation-module.qdoc src/render/backend/abstractrenderer_p.h src/render/backend/buffervisitor_p.h src/render/backend/renderer.cpp src/render/backend/renderer_p.h src/render/backend/triangleboundingvolume_p.h src/render/backend/trianglesextractor_p.h src/render/frontend/sphere_p.h src/render/jobs/calcboundingvolumejob.cpp src/render/jobs/job_common_p.h src/render/jobs/pickboundingvolumejob.cpp src/render/jobs/pickboundingvolumejob_p.h src/render/jobs/pickboundingvolumeutils.cpp src/render/jobs/renderviewjobutils_p.h tests/auto/render/boundingsphere/tst_boundingsphere.cpp tests/auto/render/commons/testrenderer.h tests/auto/render/raycasting/tst_raycasting.cpp tests/auto/render/render.pro tests/auto/render/renderer/tst_renderer.cpp Change-Id: I76633bc5a5a065e5f9ea62cc16563377e5c693a3
| * Render: Use SIMD Vectors and Matrices in the backendPaul Lemire2018-02-021-1/+12
| | | | | | | | | | Change-Id: I19b3b2f8fcb06eb2bc600ebe370465dd15a8eabc Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Doc: Divide documentation into submodulesTopi Reinio2018-02-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Remove hardcoded C++ version for MinGW/GCCKai Koehne2018-01-111-3/+0
|/ | | | | | | | | | | | | | This was apparently needed for older MinGW-w64 headers that did not properly define some common system functions otherwise. Anyhow, it is not required anymore for newer MinGW-w64, and actually breaks compilation with gcc 6 and newer: There we enable shift-overflow=2, which also warns about shifting into the sign bit for C++11, but not for C++14. Task-number: QTBUG-60249 Change-Id: I53bc858c6f8baf9b60940904b3b28f7a49ab28e6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Merge branch 'wip/qtquickintegration' into devSean Harmer2017-01-291-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/quick3d/imports/render/qt3dquick3drenderplugin.cpp src/render/backend/triangleboundingvolume.cpp src/render/backend/triangleboundingvolume_p.h src/render/frontend/qrenderaspect.cpp src/render/frontend/sphere.cpp src/render/frontend/sphere_p.h src/render/jobs/pickboundingvolumejob.cpp src/render/jobs/pickboundingvolumejob_p.h src/render/picking/objectpicker.cpp src/render/raycasting/qcollisionqueryresult_p.h src/render/render.pro src/src.pro tests/auto/render/objectpicker/tst_objectpicker.cpp tests/auto/render/render.pro Change-Id: I95717c7855887850d5c90e7ad8f19f1ffb37a545
| * Add render pluginAntti Määttä2017-01-271-1/+2
| | | | | | | | | | | | Change-Id: I083b029a9bde4a3c6d81cfd06dfc509ba4f60a2d Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QMesh geometry loading via plugin systemGuillermo A. Amaral2017-01-201-1/+3
|/ | | | | | | Ported ObjLoader to a plugin based system. Change-Id: I4bf50fe869f04173c022b6a22c45944ecdad4703 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Remove CONFIG+=static when gcov is enabledPaul Lemire2016-11-231-1/+0
| | | | | | | | Is actually counterproductive as we end up with almost no coverage data. Change-Id: Ib3beed103586cc68be90459de23818c2fbcb26c8 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Adjust to qtConfig() changes in qtbaseLiang Qi2016-08-211-2/+0
| | | | | Change-Id: Ic5b9447ef9ba54124553775b973d616af22b7032 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Render: get rid of duplicate phong shadersPaul Lemire2016-07-191-2/+0
| | | | | | | These are already stored in extras like all the other default effects Change-Id: Ie31130adc1ecb36ef90fee40923eba774fe5b88b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Enable QT_NO_FOREACH for some librariesMarc Mutz2016-05-141-0/+3
| | | | | | | | | 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>
* Move defaults and geometries out of Qt3DRender and into Qt3DExtrasPaul Lemire2016-04-231-6/+0
| | | | | | | QBoundingVolumeDebug has been disabled for now. Will be re-enabled later on. Change-Id: Id6b0abab2ec2aa697330bd20d782f9d104d25d50 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* fix dependenciesOswald Buddenhagen2016-02-251-3/+3
| | | | | | | remove excess ones and don't over-expose private ones. Change-Id: Ie0a39117de0f6f25ea7231cb67c2cd8d723c04e3 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* rely on the automatically defined QT_BUILD_*_LIBOswald Buddenhagen2016-02-251-2/+0
| | | | | Change-Id: Ib4667e1d11309e76f60150eb4e474dbc1b4191ce Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-251-4/+4
| | | | | | | | this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: Ied46fc47e5f998053ab8a31547e09676144a65c1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Move all raycasting code as private in Qt3DRenderKevin Ottens2015-12-101-0/+1
| | | | | Change-Id: I871cbc57166493f30ea307305d8664e2f8a8873f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Move picking into its own directorySean Harmer2015-10-251-0/+1
| | | | | Change-Id: I4982f08d18c855a57f621af28b13cc876f20eb16 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Rename Renderer -> Render throughoutSean Harmer2015-10-191-6/+6
| | | | | | | | This is for consistency between the C++ namespaces and QML imports and with the other aspects. Change-Id: I73392f138b4e519b12888f52530123e3d0ba445e Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Final batch of file moves for nowSean Harmer2015-10-131-1/+3
| | | | | Change-Id: I0c9e83e3142e6b083feb2cbcabcc4279de64b95b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move render servies to their own directorySean Harmer2015-10-131-0/+1
| | | | | Change-Id: I0efb45750c9a487f2d013ce0ed028ae5f5b05fce Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move texture classes to their own directorySean Harmer2015-10-131-0/+1
| | | | | Change-Id: I026cad678b06d8d785f7652f42d1dccc2fede88a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move lights into their own directorySean Harmer2015-10-131-0/+1
| | | | | Change-Id: I4caecd5072dfc2c0ad11ec2a76f1e6be44d3ce8f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move material system into own directorySean Harmer2015-10-131-0/+1
| | | | | Change-Id: Iddc3a5d41dc0aff858d8bc3c5b2f7982bd693d00 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move geometry related classes to their own directorySean Harmer2015-10-131-0/+1
| | | | | Change-Id: I74fdfceeeca4801c51fba3586404d5b5dab771b4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move render state classes into own dir and tidy upSean Harmer2015-10-131-0/+1
| | | | | Change-Id: I0829c42283d6a25e9b3ec623f45739ea266718cf Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move graphicshelpers into their own directorySean Harmer2015-10-131-0/+1
| | | | | | | | This is a move towards grouping files by function rather than frontend vs backend. Change-Id: I7d0536cb3875618a4b7acd841dde6eaaf65cddf1 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Doc: Use a single a doc project for all the submodule docsVenugopal Shivashankar2015-10-051-2/+0
| | | | | | | | | | Although there are different headers and import statements to use for these submodules, it's still convenient for the reader with one doc project. Task-number: QTBUG-48502 Change-Id: I3103501fd272739a0fb8bfd8e0aa7d3f48e5df82 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* QRayCastingService implementation using bounding volumesRémi Benoit2015-08-091-1/+1
| | | | | | | | Bounding volumes are used to compute the collisions. Returns all hits or only first bounding volume hit. Change-Id: Ie40ffde56d126a63b1bdd498cdb7afae6eff1a9c Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Use Qt3DRenderer consistently for documentation configurationSean Harmer2015-06-111-1/+1
| | | | | | Change-Id: Ibea422bfe658c89dad919f98b7269bc801c9c295 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove dependency on the obsolete opengl moduleLaszlo Agocs2015-02-131-1/+1
| | | | | | | QGL* is not used anywhere so the module is not needed. Change-Id: I1e091b1c3c0ed37c3587c6caf3bb7cf18cf5af0b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add skeleton documentation for Qt3DRenderSean Harmer2014-12-311-0/+2
| | | | | Change-Id: Ib57dee14e76bc698d56fe5c5975bb98c054ed2bd Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Added QPhongMaterialPaul Lemire2014-12-221-1/+4
| | | | | | | | | QPhongMaterial is a default phong lightning implementation to be used in Qt3D scenes created from C++. Supports OpenGL 3.1, 2.0 and ES 2.0 Change-Id: I6f57ccf7ae2264cd0110de2081de841406a5efc4 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Don't force a dynamic build when not configured for gcovSean Harmer2014-12-211-2/+0
| | | | | | | | This is needed to allow Qt3D to build when Qt is configured for a static build. Change-Id: Ib3d5bbe3df57ef13d94788dcbadedef983b028a6 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove references to unused private headers variable in .pro filesSean Harmer2014-12-211-1/+1
| | | | | Change-Id: Ia0e38843b4dc720e55d6e65d9bd97c27eeb7e9f7 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* renderlogging.h -> renderlogging_p.hSean Harmer2014-11-191-1/+1
| | | | | Change-Id: I985366c47d2a1f721761c64b1870850071ace885 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add an example demonstrating more materialsSean Harmer2014-11-131-1/+1
| | | | | | Change-Id: I02c17262812fbfbd94287a0449027d985a2fe7ae Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QParameter refactoredPaul Lemire2014-09-301-0/+1
| | | | | | | | | | | Removed type property. Created private export to export private classes. Set up a setValue in the private class to handle QML cases where we can receive a QJSValue. Change-Id: I95f2f8fa7bcb539a873245db25c4c2a69b15f1e0 Task-number: QTBUG-41538 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QGraphicsHelper FBO creationPaul Lemire2014-09-151-1/+1
| | | | | | | | | For OpenGL 2 uses QtOpenGLExtension for FBO support. MRT to come in a later patch. Change-Id: Ie2ae1830d198cac722cbc2c0f3bad335416eb64c Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Assimp external dependencyPaul Lemire2014-08-191-2/+3
| | | | | | | | The AssimpParser is now a SceneParser plugin that is build if config tests for assimp succeed. Change-Id: I0e3f6a6ce2a43298b71b0261084f6c79521f214d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add rollerball example to show rendering and physics basicsSean Harmer2014-07-181-1/+1
| | | | | | | | At present it only exercises the renderer but it will be extended to also cover the physics aspect too. Change-Id: I83217f09eeb3471b8a508fa8a8948410ad1e1d58 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* d-pointer FrameGraph componentSean Harmer2014-06-261-1/+1
| | | | | Change-Id: I1384e6daf0aafcef7229f277e3002043360d3565 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Removed last QML dependency of the Render module.Paul Lemire2014-05-251-1/+1
| | | | | Change-Id: Ie1041622b7de10d22afc439042301493e737b7f1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QQmlExtensionPlugins for Qt3DCore and Qt3DRendererPaul Lemire2014-05-251-1/+1
| | | | | | | | | | | | | | | | | Quick3D components for core and renderer have been moved to their own module. For each module, a QQmlExtensionPlugin has been created and is installed in qtbase/qml/Qt3D/. To use the Qml API, 3dquick needs to added in the .pro. 3dquickrenderer can be added if subclassing Quick3D elements defined in Renderer. Otherwise, appending it is not necessary as the Qml engine will automatically load the QQmlExtensionPlugin. Core has no more reference to the QML module. Qt3DRenderer still has references to the QML module which will be remove in follow up patches. Change-Id: I0cd5cbd27020c776b9eb8d1548514df2b1321bbd Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Categorized logging in RendererPaul Lemire2014-04-221-1/+5
| | | | | | | | | | | | | | | Logging categories in Renderer : -Backend -Frontend -Framegraph -Io -Jobs Also cleaned up things here and there while going over various classes. Change-Id: I8bf1da0769c764621236dc45e954d193c768e2af Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Relocate the render aspect outside of coreSean Harmer2014-03-291-0/+36
Change-Id: I636442d2d71342fd248b90674176cede895feab2 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 09:53:59 +0000