summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine/shaders
Commit message (Collapse)AuthorAgeFilesLines
* Fix mixing of vec3 and vec2 for coords_mdlMika Salmela2017-12-212-2/+1
| | | | | | | | Vec3 used on fragment shader when vec2 used on vertex shader. On surfaceTextureFlat coords_mdl not used at all, so remove it. Change-Id: I7898db37e7967a7cb9933fe1a05f42a332c06130 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* OpenGL warning fixTomi Korpipää2015-10-271-1/+1
| | | | | Change-Id: I296a28c2dd105fdd7df6c9fe1ccf30186541e64d Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Surface shadow improvementMika Salmela2014-10-225-12/+78
| | | | | | | | | Not allowing bias go below 0.001 prevents the shadow acne. Faulty formula for lighning direction. Task-number: QTRD-3382 Change-Id: Ided8bf423a961744ace8bef32ae18d6fa2c443ef Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Implement zooming to cursorMiikka Heikkinen2014-09-262-0/+11
| | | | | | | | | Zooming to cursor is now default operating mode of the default input handler. Task-number: QTRD-3263 Change-Id: I5699fc0ce7393059538972cd52f31f06d87e3d8d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Implement volume slice framesMiikka Heikkinen2014-09-122-0/+25
| | | | | Change-Id: I409f3c95892b26ca6097dd4509109fc9978b9900 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Limit volume to axis rangesMiikka Heikkinen2014-09-104-116/+135
| | | | | | | | | The volume object that would go partially outside axis ranges is scale and repositioned so that it only renders the portion that is inside the axis ranges. Change-Id: I792494e437998ba6276f58fab645767276c1476d Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* ES2 gradient support for static optimizationMika Salmela2014-09-041-0/+12
| | | | | Change-Id: I3d5d5d006a26225a3a7ab5795fceb97630db0011 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Add option to use low definition volume shader.Miikka Heikkinen2014-09-022-5/+122
| | | | | | | | Low definition volume shader samples the texture at even intervals, so it will sometimes skip texels, causing flickering. Change-Id: Iee6cb0e8893498b89ce1a40f34701a53d100283e Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Pixel perfect volume shaderMiikka Heikkinen2014-09-012-69/+122
| | | | | | | | | Now the volume should render with pixel perfect accuracy. The drawback is that it is significantly slower than the old approximate solution. Change-Id: I4df7e9a28a27b56150c71a85a4c1fb69a215dabc Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* New vertex shaders for previous task.Mika Salmela2014-08-272-0/+62
| | | | | Change-Id: I992da6ca5835ac41b45410d79750e9f33f551793 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Add alpha multiplier to QCustom3DVolume apiMiikka Heikkinen2014-08-252-19/+49
| | | | | | Change-Id: I856c4166513f6d6f7b73fd52bc46d52ab1b8fdff Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Implement API function for rendering volume slice to an image.Miikka Heikkinen2014-08-251-2/+2
| | | | | Change-Id: Iea18967c3b525a8d4507a06e6541c85ed3abb470 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Tweak volume shaders.Miikka Heikkinen2014-08-222-74/+89
| | | | | | | Also fix custom object default texture. Change-Id: Iba9ff6afb807d9f7a4e1f58b0e5fb4bca4c9c431 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Make volume transparency uniform regardless of viewing angleMiikka Heikkinen2014-08-202-3/+11
| | | | | Change-Id: If3acbb161b99f67d81f7af9c05ae8bcfe154e052 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Make volume shading sample once per texture layer.Miikka Heikkinen2014-08-191-6/+18
| | | | | | Change-Id: Ia3a13e2cb8d7dcf744a55dcb827f5cb436a043c4 Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Implement volume rendering supportMiikka Heikkinen2014-08-184-0/+202
| | | | | | | | New subclass of QCustom3DItem, QCustom3DVolume is provided. The documentation for the example will be done in a separate commit. Change-Id: Idb3fdb0654c6bec7606ca012b75852a5a8412397 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Texture to surfaceMika Salmela2014-07-044-0/+117
| | | | | | | | API for setting a texture to surface. Task-number: QTRD-3232 Change-Id: Icd9de61882b54b9c1fc84a742e49980926ca681d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix labels and grid lines changing size when aspect ratio is changedMiikka Heikkinen2014-07-025-7/+17
| | | | | | | | | | | Since shaders needed fixing anyway for surface because of this, also implements the support for object gradients for surface, which was missing. Task-number: QTRD-2666 Task-number: QTRD-3211 Change-Id: I0c5da7fdfef308a96ec0bae4750fd22035da4e82 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Bars: Moved bar, background and grid line drawing to separate methodsTomi Korpipää2014-06-243-3/+3
| | | | | | | + Added floor reflection support in ifdefs Change-Id: I1060aee1bc8f7a0360ad01675c36c0f1a2120f1c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* 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>