summaryrefslogtreecommitdiffstats
path: root/src/extras
Commit message (Expand)AuthorAgeFilesLines
* Fix normal calculation in MorphPhongMaterialJoni Poikelin2018-10-052-2/+2
* Fix QMorphPhongMaterialMäättä Antti2018-10-012-6/+23
* Add metalRoughFunction to ES3Mauro Persano2018-09-274-0/+458
* QOrbitCameraController: make zoom work when pressing shift keyPaul Lemire2018-09-261-1/+1
* QText2DEntity: clear glyphrun when scene changesPaul Lemire2018-09-242-1/+15
* Qt3DWindow/Qt3DQuickWindow base custom surface format on default onePaul Lemire2018-08-291-1/+1
* Doc: Fix incorrect ForwardRenderer properties typeTakumi ASAKI2018-08-171-2/+2
* QSkyboxEntity fixes:Paul Lemire2018-07-183-5/+5
* Doc: Fix documentation warnings related to Clang QDoc parserTopi Reinio2018-04-202-9/+10
* Revert "Doc: Divide documentation into submodules"Topi Reinio2018-04-205-917/+0
* Add support for Escape key in camera controllersMike Krus2018-04-204-0/+23
* Remove unused variables detected by clang-clFriedemann Kleint2018-04-121-3/+1
* Document state of the Qt 3D modulesKai Koehne2018-03-121-4/+7
* Enable alpha blending on QTextureMaterialMike Krus2018-03-083-0/+62
* Revert "CameraControllers: use the Camera's upVector"Sean Harmer2018-02-192-2/+2
* Merge remote-tracking branch 'origin/5.10' into 5.11Sean Harmer2018-02-152-1/+2
|\
| * QAbstractCameraController: Make struct InputState publicFriedemann Kleint2018-02-091-0/+1
* | Doc: Divide documentation into submodulesTopi Reinio2018-02-095-0/+914
* | CameraControllers: use the Camera's upVectorPaul Lemire2018-02-022-2/+2
* | Merge branch '5.10' into devSean Harmer2018-01-177-13/+13
|\|
| * Fix includes of Qt classesFriedemann Kleint2018-01-153-6/+6
| * Merge branch '5.9' into 5.10Sean Harmer2018-01-124-7/+7
| |\
| | * Fix includes of Qt classesFriedemann Kleint2017-11-234-6/+6
* | | Merge remote-tracking branch 'origin/5.10' into devLaszlo Agocs2017-12-1332-20/+66
|\| |
| * | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-082-0/+18
| |\ \
| | * \ Merge 5.10 into 5.10.0Oswald Buddenhagen2017-11-2011-0/+742
| | |\ \
| | * | | Fix resource init namespace issuesLaszlo Agocs2017-11-142-6/+16
| | * | | Fix material system qrc in static buildsLaszlo Agocs2017-11-082-0/+8
| * | | | Doc: Qt 3D Extras: Fix information on deprecated classesTopi Reinio2017-12-0528-9/+28
| * | | | QSkyboxEntity: try to reload texture only oncePaul Lemire2017-11-212-11/+20
| | |/ / | |/| |
* | | | Merge remote-tracking branch 'origin/5.10' into devAndy Nichols2017-11-2011-0/+742
|\| | |
| * | | Replace all phong variants with QDiffuseSpecularMaterialKevin Ottens2017-11-1511-0/+742
| |/ /
* | | Merge remote-tracking branch 'origin/5.10' into devAndy Nichols2017-11-1331-312/+640
|\| |
| * | Add missing layer to the baseColorMap nodeKevin Ottens2017-11-071-0/+1
| * | Remove qfirstpersoncameracontroller_p.h from defaults.priFriedemann Kleint2017-10-201-1/+0
| * | Connect the normal parameter to the right signalKevin Ottens2017-10-131-1/+1
| * | Have all the Phong variations based on a graphKevin Ottens2017-10-1325-307/+609
| * | Doc: Add the correct namespace for QAbstractCameraControllerTopi Reinio2017-10-121-1/+1
| * | Doc: add doc to undocumented methods in qt3dwindow.cppNico Vertriest2017-10-091-1/+27
| * | Fix dolly in/out speed calculationSean Harmer2017-10-061-1/+1
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-10-0563-1878/+1585
|\| |
| * | Add Qt3DExtras::QAbstractCameraControllerv5.10.0-beta1Andy Maloney2017-10-0310-843/+810
| * | Since the ES2 includes use FP make sure it is definedKevin Ottens2017-09-273-0/+6
| * | Move phongFunction in its own include fileKevin Ottens2017-09-2719-269/+423
| * | Add textureScale to MetalRoughMaterialKevin Ottens2017-09-273-0/+35
| * | Move most vertex shaders into a unified oneKevin Ottens2017-09-2717-186/+105
| * | Remove the *alpha.frag from extrasKevin Ottens2017-09-277-120/+4
| * | PhongAlpha: encode the alpha in kdKevin Ottens2017-09-274-20/+12
| * | Wrap adsModel into phongFunctionKevin Ottens2017-09-2521-130/+136
| * | Base PerVertexColorMaterial on adsModelKevin Ottens2017-09-255-161/+8
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 00:39:04 +0000