summaryrefslogtreecommitdiffstats
path: root/src/extras/defaults/qtexturedmetalroughmaterial.h
Commit message (Collapse)AuthorAgeFilesLines
* Remove more deprecated codeMike Krus2020-02-271-67/+0
| | | | | Change-Id: I14695a93c4dc1b54c5ebc149b0fde0d328d75d7b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Switch export macros to standard formKai Koehne2019-04-021-1/+1
| | | | | | | | | | | | Qt expects the export macros to have Q_ prefixes, otherwise the symbol versioning script won't find them and mark them. Also remove non-exising QT3DLOGIC_PRIVATE_EXPORT macro from src/doc/qt3d.qdocconf Task-number: QTBUG-74752 Change-Id: I71b9e85ff09c002fb283824aa51a5a8f50e937f4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QMetalRoughMaterial replaces QTexturedMetalRoughMaterialKevin Ottens2017-09-041-35/+6
| | | | | | | | | This is a complete drop in replacement now, no need to keep code for both. We use inheritance so that properties in QMetalRoughMaterial can be versioned properly. Change-Id: Ia95b40c5abd466fbb20e5b15ca4e6d167fb80ec3 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Mark protected ctor of QTexturedMetalRoughMaterial explicitSean Harmer2017-03-281-1/+1
| | | | | Change-Id: I308a3ca229e0a673c0c9f8a4f9f26048151e7c63 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Remove env light API from metal/rough materialsKevin Ottens2017-02-241-8/+0
| | | | | | | | | Now that EnvironmentLight is available in Qt3DRender this is no longer necessary. We have a much better way to set the environment lighting now. Change-Id: I492d1383aaf4e60b434c7ab94f3696e499545f9f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Metal/Rough materials: metallic -> metalnessKevin Ottens2017-02-161-4/+4
| | | | | | | | Rename decided during API review in order to match with roughness. Change-Id: I4b1a13e6028ba410fb31a80e6c64f9539581f8c4 Task-Id: QTBUG-58894 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove exposure property from metal/rough materialsKevin Ottens2017-01-311-4/+0
| | | | | | | | This is now controlled on the camera lens as it should be. No need to have that per material instance anymore. Change-Id: I2e46a38f2cc2f2e2d670ed73a2be6d98464b21b1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QTexturedMetalRoughMaterial: albedo really is baseColorKevin Ottens2017-01-311-4/+4
| | | | | Change-Id: I0e46976e2fa03eb1ad2f77b8c672bcc31c4da973 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Adding PBR lighting to Qt3DExtrasKevin Ottens2017-01-271-0/+108
This is a first implementation which only exploits environment maps for lighting. It still needs to interact with the lights coming from Qt 3D API. It also provided a fully texture map based material. Improvements and plain colors variant of the material will come in later commits. Change-Id: Ifc6079e5c40484b6daac05692780495013b7c401 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>