summaryrefslogtreecommitdiffstats
path: root/src/render/defaults
Commit message (Collapse)AuthorAgeFilesLines
* Unify license header usageAntti Kokko2016-01-2633-363/+462
| | | | | | | Update old header.LGPL3 to header.LGPL Change-Id: I8eac0cd6bbc276a56df487249cc459c0d4fab165 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Add annotations to QNormalDiffuseMapAlphaMaterial defaultSean Harmer2016-01-171-1/+10
| | | | | Change-Id: Idac0899f153254c26ed5a07761179c01504fd49f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add surface selector to forward renderer framegraphSean Harmer2016-01-173-1/+25
| | | | | Change-Id: I9c436d3f5b9181075bfc0121174d530406f45c69 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix deprecation warningsSean Harmer2016-01-179-9/+9
| | | | | Change-Id: I1ec0536ba81c738fc330f7f4c615a4e216645ea0 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations in QSkyboxEntity defaultSean Harmer2016-01-172-0/+12
| | | | | Change-Id: I31ac1aba277a472577e1ba03c766dc4f1bf01f30 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations in QDiffuseMapMaterial defaultSean Harmer2016-01-172-1/+14
| | | | | Change-Id: I6400350e8cbb52095859508a900225ee2fd7108f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations in QDiffuseSpecularMapMaterial defaultSean Harmer2016-01-172-2/+14
| | | | | Change-Id: I42a2ef40d274dab27971a17611dd5dd058e67653 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations for QGoochMaterial defaultSean Harmer2016-01-172-1/+12
| | | | | Change-Id: I5cb3fb08fd9208e7e452e04cb4976033d091202d Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations in QNormalDiffuseMapMaterial defaultSean Harmer2016-01-172-2/+14
| | | | | Change-Id: I3da1cb2912efb6be8dc8dbacf3bae915199860ea Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations in QNormalDiffuseSpecularMapMaterialSean Harmer2016-01-172-1/+14
| | | | | Change-Id: Id9cd5cacec76f342f5090eecba5f33cad6fd8007 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations for QPerVertexColorMaterial defaultSean Harmer2016-01-172-1/+14
| | | | | Change-Id: I91e8cb7277bd5957f60a8176c4a01f1f2188c93c Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations in QPhongAlphaMaterial defaultSean Harmer2016-01-172-1/+14
| | | | | Change-Id: Ie96e1276dad51536d42d7d01c59885a82431a033 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove outdated TODO commentSean Harmer2016-01-171-1/+0
| | | | | Change-Id: I3f04ad88b194a02bd7ffbc60edd407a5ea29615a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add annotation to QPhongMaterialSean Harmer2016-01-172-1/+15
| | | | | | | | Allows technique selector in QForwardRenderer to select from the available techniques rather than excluding them all. Change-Id: Ia044f3ccdf15e012b52d519fad5f0415592046fe Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix dynamic texture provider property handlingLaszlo Agocs2016-01-064-8/+8
| | | | | | | | The Q_PROPERTY has to include the namespace, otherwise setting properties via QObject::setProperty() will fail. Change-Id: Ifdf7012fd8b670710bac38eb0e5ce8eab057e719 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix parameter mismatch in QDiffuseMapMaterialLaszlo Agocs2016-01-051-1/+1
| | | | | | Task-number: QTBUG-50126 Change-Id: Ia0f4ec12b2598f2b117cc5860c648310e2dca0b9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Reduce specular reflectivity defaultsLaszlo Agocs2015-12-104-4/+4
| | | | | | | | 0.95 -> 0.01 to prevent eye-poppingly white specular highlights. Change-Id: I3e765bad13afe991053932e73cea13b95c950c1c Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* Do lighting calculation in world spaceLaszlo Agocs2015-12-101-2/+2
| | | | | | | | | | | | | | | | As opposed to (mostly) camera space. Oops. While somewhat hidden with point lights, the problem became apparent with directional lights. Now that we have proper directional lights, change the default light, that is used when no light components are specified at all, from point to directional since this is cheaper and provides less surprises with arbitrary scenes. Also remove the duplicate phongalpha vertex shader in the process. Change-Id: I295660a1400b16b69e1516672e31794312ee48d1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Added parameters to signals and made setters Q_SLOTSTomi Korpipää2015-12-0925-209/+523
| | | | | | Change-Id: Icec2f9f207221e35ffdeeb594bb9b4dc6ef890f1 Task-number: QTBUG-49797 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Migrate NormalDiffuseSpecularMapMaterial to be light-awareLaszlo Agocs2015-12-043-10/+4
| | | | | | | | | | Remove duplicated vertex shaders in the process. [normal]diffusespecularmap.vert is the same as [normal]diffusemap.vert hence there is no need for the former. Change-Id: If448005c593c765551ca239af6789df2f6e53af6 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* Migrate NormalDiffuseMap(Alpha)Material to be lights-awareLaszlo Agocs2015-12-043-8/+0
| | | | | | Change-Id: I91a6db87836c0e37af10d8de90e431240a7851e2 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* Migrate GoochMaterial to be light-awareLaszlo Agocs2015-12-021-2/+0
| | | | | | | On the ES2 path only the first light is taken into account for now. Change-Id: Ia8974bedddaa43539563149e718284076a519b5e Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Migrate PhongAlphaMaterial to be light-awareLaszlo Agocs2015-12-022-6/+0
| | | | | Change-Id: Ie082b7885e4465181c8c38e17bf0ce17543154b9 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Migrate DiffuseSpecularMapMaterial to be light-awareLaszlo Agocs2015-12-022-6/+0
| | | | | Change-Id: I692e7ad9cdd63c2098e799c41937b2a4440f9c70 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Migrate PerVertexMaterial to be light-awareLaszlo Agocs2015-12-022-7/+0
| | | | | | | | The original version has no specular component so leave that out in this version as well. To make this simple, introduce adModel(). Change-Id: I474485a19163ec55e6f6e025d94d8172297e847c Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Migrate DiffuseMapMaterial to be light-awareLaszlo Agocs2015-12-012-6/+0
| | | | | Change-Id: I79cac9384a258bfd3e106beba1aebb44c5f15491 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Unify the default and phong shadersLaszlo Agocs2015-12-012-6/+0
| | | | | | | This also means that (Q)PhongMaterial is now lights capable. Change-Id: I8191fa6dfe96dadafdc9a2db47066650a8c96ee6 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Added missing export for QGoochMaterialTomi Korpipää2015-11-251-1/+1
| | | | | Change-Id: Ie36fb1dd004884b5e53009c34c262016ff777c8a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Default framegraph -> enable frustum cullingPaul Lemire2015-11-242-1/+6
| | | | | Change-Id: Ic1b2f8f07d634ae8a8bfb755ff2dd76f681603be Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* Doc: Fix QDoc warnings and do further cleanupTopi Reinio2015-11-239-20/+20
| | | | | | | | | Fix the documentation issues that still remained broken after renaming the namespaces/QML modules. Do further cleanup and minor doc editing. Change-Id: Iff38c8c1b99e7f712dc3f9ad07ecd37a747b3a26 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Remove QAbstractTransform and friendsSean Harmer2015-11-172-2/+0
| | | | | | | | New simplified QTransform doesn't need these any longer. We now get a nice reduction in QObject count when dealing with transformations. Change-Id: I8ba8febada4ad1f05728aa848fb5e70a62028040 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove transforms property of QTransformSean Harmer2015-11-172-5/+1
| | | | | | | | Compound transformations are now built up using QMatrix4x4 in both QML and C++. Updating examples accordingly. Change-Id: I03c9abf1f6cdd1b56226dc0e16a7ad5ce84516dd Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add C++ QPhongAlphaMaterialPaul Lemire2015-11-164-2/+486
| | | | | | Change-Id: Id0a428bb2bc4301d08a86153deddd85fd340dc0f Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* Rename QOpenGLFilter to QGraphicsApiFilterAndy Nichols2015-11-039-117/+117
| | | | | | | | | | | | | | | | | | | | | | This API change is part of an effort to remove anything specific to one graphics API (in this case OpenGL) from the public APIs. In addition to the name of the class being changed, the QGraphicsApiFilter::Api has been refactored to reference the Graphics API, rather than an OpenGL API. Now this list includes OpenGL, and OpenGLES, but could also include Vulkan, DirectX, or any other graphics rendering API we wish to support in the future. Right now the properties in this class are still reflective of the OpenGL APIs, and may need to be extended with other properties in the future for other rendering technologies. The QGraphicsApiFilter::Profile enum has also been changed to be more more clear. So for now there are enums NoProfile, CoreProfile, and CompatibilityProfile. Task-number:QTBUG-49078 Change-Id: Ib5f9c3b7adee5badec6bce8a12b23683eb43b4cb Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Doc: Updated the docs for the namespace changesVenugopal Shivashankar2015-10-272-4/+4
| | | | | | | | | | | | | | | | Each of the submodules now have there own namespace so the following changes are required to adapt: - Added \namespace docs for the new namespaces. - Updated all the \class and \instantiates entries to use the appropriate namespace qualifier. - Changed the \module and \qmlmodule names for Qt 3D Core and Qt 3D Render modules. - Added the missing \module and \qmlmodule pages for the Qt 3D Collision module. Change-Id: Ibc5bf30e4f50aecb6a3b24bc8536f17ed19d681d Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Rename Renderer -> Render throughoutSean Harmer2015-10-1929-102/+102
| | | | | | | | 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>
* Move Qt3DCore into Qt3DCore namespaceSean Harmer2015-10-1314-40/+40
| | | | | | | Update other aspects, tests and examples accordingly. Change-Id: Ib1bcf0bdf4f5aec4422dc0c80bfc32b27fb1a317 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add "We mean it" warnings to private headersSean Harmer2015-10-1310-0/+110
| | | | | Change-Id: Ic4a69123255c33990765ea3601e01914c2d8cb70 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move Render aspect into the Qt3DRender namespaceSean Harmer2015-10-1330-203/+207
| | | | | | | Updated examples and tests accordingly. Change-Id: I8848a88472de2302aa072fa11f21ea934672b7e6 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Doc: Added \inmodule statement where it was missingNico Vertriest2015-10-061-0/+1
| | | | | | Change-Id: Ie653166790034f63740772b2a69ed6c9dea0522e Task-number: QTBUG-48602 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Merge remote-tracking branch 'origin/5.5' into devAndy Nichols2015-08-174-2/+488
|\ | | | | | | Change-Id: Id0a3559e001631a077bc1c3a17c30a48599eecb9
| * Add gooch material and exampleSean Harmer2015-07-044-2/+488
| | | | | | | | | | | | | | Edge inking will come later. So many techniques to choose from. Change-Id: Ibbea66c09c158bebba5d8efaf08d18417fa9b161 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-298-7/+8
|\| | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/render/defaults/qforwardrenderer.cpp src/render/doc/qt3drender.qdocconf Change-Id: I1c4a15d2b57980dca82fa420ab6ef8c48c049a2c
| * Merge branch '5.5.0' into 5.5Sean Harmer2015-06-218-8/+8
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/input/qkeyboardcontroller.cpp Change-Id: Ifb0b5af165fb11dbe07849f34d3b93d9cc78eeaa
| | * Doc: Fix multiple documentation issuesv5.5.0-rc1Topi Reinio2015-06-158-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
| * | QNode parent changesPaul Lemire2015-06-111-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | - introduce QNode::setParent(QNode *) - QNode created with explicit parent now invoke QNodePrivate::_q_addChild - QNode::cleanup introduces, need to be added to the dtor of every QT3D_CLONABLE QNode subclass. Handles proper destruction. - QNode::cleanup added to all classes that should have it. - Updated unit tests of Nodes, Entity, Scene Change-Id: Id2c2784122a78edaae5580fe5976d88be5a1921c Task-number: QTBUG-45947 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Merge branch '5.5' into devSean Harmer2015-06-0520-149/+678
|\| | | | | | | Change-Id: I8b3235703b7ceeb23de0b07753bed5f29436da31
| * Do not pass `this` to Private c-torKonstantin Ritt2015-05-2018-36/+36
| | | | | | | | | | | | | | For classes derived from QNodePrivate, it is not used anymore. Change-Id: I9573042500c2c7533687d251e72bac14cb793525 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * QSkyboxEntity default addedPaul Lemire2015-05-104-2/+467
| | | | | | | | | | | | | | C++ equivalent of SkyboxEntity Change-Id: I560b6f5f19660370fb9f3e3edfb596879cf17382 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Fix typo in QPhongMaterialPaul Lemire2015-05-091-1/+1
| | | | | | | | | | | | Change-Id: I46c2e8a8be187c0c296c3ad0d7e7148e2cd1406c Task-number: QTBUG-44907 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-31 19:58:32 +0000