summaryrefslogtreecommitdiffstats
path: root/src/render/defaults/qdiffusespecularmapmaterial.cpp
Commit message (Expand)AuthorAgeFilesLines
* Move defaults and geometries out of Qt3DRender and into Qt3DExtrasPaul Lemire2016-04-231-328/+0
* QAbstractTextureProvider renamed to QAbstractTexturePaul Lemire2016-04-061-12/+12
* QAnnotation changesFranck Arrecot2016-03-171-8/+8
* QTechnique renamingRobert Brock2016-03-081-3/+3
* Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-261-4/+0
|\
| * Doc: Exclude private header files from the documentation buildTopi Reinio2016-01-251-4/+0
* | Unify license header usageAntti Kokko2016-01-261-11/+14
* | Fix deprecation warningsSean Harmer2016-01-171-1/+1
* | Fix annotations in QDiffuseSpecularMapMaterial defaultSean Harmer2016-01-171-2/+12
|/
* Added parameters to signals and made setters Q_SLOTSTomi Korpipää2015-12-091-5/+41
* Migrate NormalDiffuseSpecularMapMaterial to be light-awareLaszlo Agocs2015-12-041-2/+2
* Migrate DiffuseSpecularMapMaterial to be light-awareLaszlo Agocs2015-12-021-4/+0
* Doc: Fix QDoc warnings and do further cleanupTopi Reinio2015-11-231-1/+1
* Rename QOpenGLFilter to QGraphicsApiFilterAndy Nichols2015-11-031-13/+13
* Rename Renderer -> Render throughoutSean Harmer2015-10-191-8/+8
* Move Render aspect into the Qt3DRender namespaceSean Harmer2015-10-131-10/+10
* Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-291-1/+1
|\
| * Doc: Fix multiple documentation issuesv5.5.0-rc1Topi Reinio2015-06-151-1/+1
* | Merge branch '5.5' into devSean Harmer2015-06-051-20/+34
|\|
| * Do not pass `this` to Private c-torKonstantin Ritt2015-05-201-3/+3
| * Doc: Fix multiple C++ documentation issuesTopi Reinio2015-04-141-39/+39
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-03-171-1/+1
|\|
| * Prefer q_func() over direct access to q_ptrKonstantin Ritt2015-03-161-1/+1
* | Doc: link and qdoc errors Qt3DNico Vertriest2015-03-111-35/+22
|/
* Copyright header change.Mika Salmela2015-02-091-19/+14
* Make ctor of QAbstractTextureProvider protectedPaul Lemire2015-02-081-2/+2
* QTexture renamed to QAbstractTextureProviderPaul Lemire2015-02-081-12/+12
* Remove default uniform values for lightPosition and intensityLaszlo Agocs2015-02-021-0/+6
* Default cpp materials + material-cpp examplePaul Lemire2014-12-311-0/+285