summaryrefslogtreecommitdiffstats
path: root/examples/qt3d/advancedcustommaterial
Commit message (Collapse)AuthorAgeFilesLines
* Use SPDX license identifiersLucie Gérard2022-06-226-271/+12
| | | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. License files are organized under LICENSES directory. Task-number: QTBUG-67283 Change-Id: I8105424281eed871037fa6c463871ca8829876b5 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 2f1bc82b35209aacd8d214a3c7e8e725bee85de6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove .prev_CMakeLists.txtKai Köhne2022-03-221-97/+0
| | | | | | | | These are leftovers from the qmake conversion. Pick-to: 6.3 Change-Id: Id80e21ed99bd67b1d05586f596a9585526d47e7e Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Improve examples CMakeLists.txtKai Köhne2022-02-151-16/+8
| | | | | | | | | | | | | | | | | | - Remove # generated from xyz.pro comment from pro2cmake - Remove "# special case" markers for pro2cmake - Remove automatic use of CMAKE_AUTORCC - Only opt into CMAKE_AUTOUIC if .ui files are involved - Remove explicit setting of CMAKE_INCLUDE_CURRENT_DIR - Combine multiple find_package(Qt6 ... calls) - use REQUIRED COMPONENTS - sort components alphabetically - Fix wrong indentations - Use (only) one empty line after multi-line commands Pick-to: 6.3 Change-Id: I42cb1788cd53082f71f6a67446dc94f502497dca Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Raise cmake_minimum_required to VERSION 3.16 in examplesJoerg Bornemann2021-08-171-1/+1
| | | | | | | Pick-to: 6.2 Task-number: QTBUG-95636 Change-Id: I2ae5ba6164cb5ed450c8924d484d30167461c10d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Disable RHI Renderer by defaultMike Krus2021-07-192-0/+7
| | | | | | | | | | | | | | | | | | | | RHI renderer use ShaderTools which is GPL licensed. This patch disables the plugin by default until Qt3D provides a suitable replacement for the dependency. To enable the RHI backend, compile Qt3D and pass parameter -DFEATURE_qt3d_rhi_renderer=ON to cmake. Unfortunate side effect of RHI backend being disabled is that when using Scene3D, the QtQuick renderer must be configured to use the opengl backend. [ChangeLog] RHI Backend is not longer built by default Task-number: QTBUG-94960 Pick-to: 6.1 6.2 Change-Id: I0bff7523e159b800734b58bfef37e5088d0a0d41 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Re-generate CMake project files for examplesJoerg Bornemann2021-05-182-0/+10
| | | | | | Pick-to: 6.1 Change-Id: Ic123a704f904096e112b5bdece167800dfc295bb Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* QtQuick based examples: let QtQuick/Qt3D decide on backendPaul Lemire2020-11-261-1/+0
| | | | | Change-Id: Id3ab38d02f8df7701410b8fcef8e112057825ecf Reviewed-by: Mike Krus <mike.krus@kdab.com>
* advancedcustommaterial example: add RHI supportPaul Lemire2020-11-265-0/+185
| | | | | | Pick-to: 6.0 6.0.0 Change-Id: I2e356cb893710c759a4d73eaf850ce39d46e5935 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* CMake: Regenerate examples to use qt_add_executableAlexandru Croitor2020-10-202-2/+2
| | | | | | Task-number: QTBUG-87661 Change-Id: I594521a2b9aada164d684b8ef6ce71c730bfb64a Reviewed-by: Mike Krus <mike.krus@kdab.com>
* CMake: Regenerate qt3d examplesAlexandru Croitor2020-10-162-0/+93
| | | | | | | | | | | | Many of the examples were missing find_package() calls. Some were missing some example install dir things. Some missing special cases. Some incorrectly specified library names due to missing mappings in pro2cmake. Some incorrectly specified target names. Change-Id: I131a02dc679502ea6c1cdeb32962e77f09e672af Reviewed-by: Mike Krus <mike.krus@kdab.com>
* CMake: Honor INSTALL_EXAMPLESDIRJoerg Bornemann2020-10-131-1/+5
| | | | | | | | | | | Re-generate examples, but only the chunks that handle INSTALL_EXAMPLESDIR, because there have been so many manual changes that were not special-cased. Fixes: QTBUG-87331 Change-Id: I0926c015ce2733b462adba18e3dbf47621a7e679 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Christophe Giboudeaux <christophe@krop.fr>
* Update examplesMike Krus2020-06-254-21/+24
| | | | | | | Not all work Change-Id: I7954f9fe41160c929ff48f8bdeae635b900fef33 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add support for building with CMakeMike Krus2020-05-221-0/+87
| | | | | Change-Id: If6c887c6356a160a5f3fb906d38a341fff0c7b29 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Fix build for Qt6Mike Krus2020-05-061-1/+1
| | | | | | | | | | | | | - updated dependencies, excluding qtgamepad for now - fixed issues with Q_PROPERTY not supporting forward declarations - fixed for changes in QtQuick private API - fixed for changes in QtOpenGLVersionFunctions API - fixed for removal of QT_OPENGL_ES* macros - fixed for changes in QtConcurrent API - fixed RHI based build Change-Id: I42ccd2f101b7f0a78e2860c6d551722bf6710a11 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Doc: Fix documentation warningsTopi Reinio2019-11-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | - Add (basic) documentation for Qt3DAnimation::QAnimationCallback. - Add missing namespace qualifiers for \class, \fn, \instantiates, \sa, and \property commands. - Remove linking to example file pages, as QDoc no longe treats them as linkable targets. - Fix function/QML method parameter documentation - Fix missing \qmlproperty types - Fix linking to QKeyEvent in QtGui. - Move Qt3DRender::Quick namespace documentation to where QDoc can see it. - Add enum documentation for Qt3DRender::QBlitFramebuffer::InterpolationMethod and Qt3DRender::QMesh::Status. - Other minor fixes This brings the current warning count to zero. Fixes: QTBUG-79822 Change-Id: I1154a7f9c34917a3f240e99da0e7a300be7d65a0 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Doc: Add missing dots (qt3d)Paul Wicking2018-06-191-1/+1
| | | | | | Task-number: QTBUG-68933 Change-Id: I4226b8b9d70548b6921948c5ea47520f40f5df98 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Doc: Fix documentation warnings related to Clang QDoc parserTopi Reinio2018-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | | Since Qt 5.11, QDoc uses Clang to parse C++ documentation. Clang requires a module header, as well as proper include paths, to build a precompiled header and process the sources. To do this, add a custom module header that pulls in all Qt 3D modules - this way, we can continue using a single documentation project to covers all of Qt 3D. Fix all documentation warnings are caused by missing namespaces, QML module/type names and typos, as well as a number of linking problems and other minor issues. After this change, the remaining documentation issues consist of 'No documentation for ...' warnings. Task-number: QTBUG-67790 Change-Id: I38b91163c475a00cc1893e793240470c5409eb57 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Move phongFunction in its own include fileKevin Ottens2017-09-272-2/+2
| | | | | | | | | Makes it cleaner overall since the light structs were shared with the metalrough includes and the gooch fragment shader but they didn't use the functions in there. Change-Id: I459ff0fc2d751a5be9296dc33dda0efcb06b917c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Wrap adsModel into phongFunctionKevin Ottens2017-09-252-18/+13
| | | | | | | This way the use is more similar to the one for metal/rough. Change-Id: I143df910f43e29ef622f24bd97a23c90a2c8ef68 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Get rid of adsModelNormalMappedKevin Ottens2017-09-224-46/+30
| | | | | | | | | | | | All materials and examples are ported away from it. It was really not related to normal mapping at all, somehow it was an implementation of adsModel working in tangent space instead of world space. Now we got it all in world space, just like for the metal/rough implementation. Change-Id: I3346277ce9b91328d70d914b319ac25f947fff0e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Write docs for advanced custom material exampleMäättä Antti2017-05-102-0/+84
| | | | | | | | Also add it to highlighted items. Task-number: QTBUG-60287 Change-Id: I87a6074bed171970b287c6cd934e6550d86e27e0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Call setSurfaceFormat after QQuiApplication instance initiationMäättä Antti2017-05-091-1/+1
| | | | | | | | | | The setSurfaceFormat function calls QOpenGLContext::openGLModuleType function which can only be called after QQuiApplication istance is initiated. Task-number: QTBUG-60617 Change-Id: I7cbf48f325de9c3cbbb5d8addb78bf55ae1b5d07 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Correct shader typo for rendering and fix shader selectionMike Krus2017-05-032-4/+3
| | | | | | Task-number: QTBUG-60288 Change-Id: I320f787c3b245cc52df80d89c75f856aeacf649d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* advancedcustommaterial: request proper GL formatPaul Lemire2017-04-252-2/+21
| | | | | | Change-Id: I9a4f1882805892248aa9f6a4cf8d83a49acaeb0b Task-number: QTBUG-60288 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Add advanced custom material exampleAntti Määttä2017-02-2821-0/+53564
Change-Id: I6c5ae0e29960aaab2d0babfe325a9f6483729600 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 13:05:00 +0000