summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine/shaders
Commit message (Collapse)AuthorAgeFilesLines
* Android GLSL linker fix Tomi Korpipää2014-04-296-8/+12
| | | | | | | | Task-number: QTRD-3059 Change-Id: Ie5b82c6418cb87f7d9c04fcca287f5924d8616a5 Change-Id: Ie5b82c6418cb87f7d9c04fcca287f5924d8616a5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Color problem fixed Tomi Korpipää2014-04-2414-45/+45
| | | | | | | | | | | Task-number: QTRD-3001 Changed all colors to QVector4Ds to avoid mixups with vec4 and vec3 colors in shaders. Change-Id: I8b44b4d711befca900dd35b3386881f7c31d7dd5 Change-Id: I8b44b4d711befca900dd35b3386881f7c31d7dd5 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Add custom item support, part 2Tomi Korpipää2014-04-161-0/+26
| | | | | | | | | Task-number: QTRD-2866 + Added custom item rendering Change-Id: If24400fed7c0467d8ebbd554d6e4df3ec5a205f3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Add custom item support, part 1Tomi Korpipää2014-04-156-16/+93
| | | | | | | | | | | | | | Task-number: QTRD-2866 + Added API for adding and removing custom items + Added custom data and custom render items + Added shaders for textured objects + Added custom item rendering draft to scatter + Fixed some shaders - to be continued in part 2 Change-Id: I9735fd02fc9e86ae486cca4c06f6d7f2a4b0b7da Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Row/colun selection using axis labels, part 1Tomi Korpipää2014-03-311-3/+2
| | | | | | | | | | | Task-number: QTRD-2981 + Bars done + Scatter done (= no label selection) - Surface to be done Change-Id: Icd352e40ad6d0ada76380f3dba742f280fd278b3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixed disappearing of shadows on background Tomi Korpipää2014-01-205-75/+13
| | | | | | | | Task-number: QTRD-2627 Change-Id: Iac3ce3628382cc2416f842966591bc1b7f1dcbd2 Change-Id: Iac3ce3628382cc2416f842966591bc1b7f1dcbd2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* References to alpha and TP removedTomi Korpipää2014-01-2012-24/+36
| | | | | | | | + implemented the rest of lightColor Task-number: QTRD-2405 Change-Id: I38402b45cc4a567a79d07b23983567551d06b4fe Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Removed unused and duplicate shaders Tomi Korpipää2013-11-1310-170/+0
| | | | | | | | | - texture.frag, texture.vert and texture_ES2.frag are used in Q3DMaps if it is reintroduced some day Change-Id: I80e838ce2471ecef45d7662c59d8fbc74bf72769 Change-Id: I80e838ce2471ecef45d7662c59d8fbc74bf72769 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Removed rounding additions for surface shadersMika Salmela2013-11-125-5/+5
| | | | | Change-Id: I430aca3c3ff6cb1ce4ee7eb8eab1a31c57d1e890 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Shadow support for surfaceMika Salmela2013-11-085-3/+153
| | | | | | | Task-number: QTRD-2266 Change-Id: I99fd7a6eda570df3d114ab10a1b07c22736cc86c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Gradient support Part 1Miikka Heikkinen2013-11-073-9/+15
| | | | | | | | | TODO: - Finish scatter - QML (maybe left until data set is sorted, though) Change-Id: I87a8117cb29f147080e0662c55b1098cb2e71689 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* ES2 support for scatter pointsTomi Korpipää2013-11-061-0/+8
| | | | | | | Task-number: QTRD-2539 Change-Id: I2465322d9a4341ce4c345756fe085a4c5ad2be5b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Dropped flat shader requirement from 1.50 to 1.20 Tomi Korpipää2013-10-232-4/+8
| | | | | | | | | | Task-number: QTRD-2287 - still does not work on ES2, as it's GLSL ES 1.0 Change-Id: I17cdb893daef35e83269ea2a73180fdaf3caca80 Change-Id: I17cdb893daef35e83269ea2a73180fdaf3caca80 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Fixed ES2 gradient problem Tomi Korpipää2013-10-211-1/+1
| | | | | | | | | | Task-number: QTRD-2453 + changed gradient texture to a power-of-two size to avoid gradient errors on Android Change-Id: I67b1c87d3143073ceb2523017e3968d16d0cd503 Change-Id: I67b1c87d3143073ceb2523017e3968d16d0cd503 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Zero-color gradient fix for surface Tomi Korpipää2013-09-244-13/+2
| | | | | | | | Task-number: QTRD-2329 Change-Id: I616e2e97ac67ddd9fbdf2d0715f5841b3df46561 Change-Id: I616e2e97ac67ddd9fbdf2d0715f5841b3df46561 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* ES2 shader support for surface Tomi Korpipää2013-09-184-32/+39
| | | | | | | | Task-number: QTRD-2290 Change-Id: I52a7fbd8d72e6cd4f73dd3072103cdbf518df321 Change-Id: I52a7fbd8d72e6cd4f73dd3072103cdbf518df321 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Theme draft 2 Tomi Korpipää2013-09-173-3/+3
| | | | | | | | Task-number: QTRD-2277 Change-Id: Ide3997c2bc5bbe4844b40e84caf9096a597813de Change-Id: Ide3997c2bc5bbe4844b40e84caf9096a597813de Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Module renamedTomi Korpipää2013-09-1026-0/+853
Task-number: QTRD-2224 Change-Id: Iec18b6121809300b11d85445281d3c626c434f35 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 15:54:24 +0000