summaryrefslogtreecommitdiffstats
path: root/src/datavis3d/engine/shaders
Commit message (Collapse)AuthorAgeFilesLines
* Module renamedTomi Korpipää2013-09-1026-853/+0
| | | | | | | Task-number: QTRD-2224 Change-Id: Iec18b6121809300b11d85445281d3c626c434f35 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* ES2 scene darkness issue fixed Tomi Korpipää2013-09-063-5/+6
| | | | | | | | Task-number: QTRD-2247 Change-Id: Idc62175ec46edaf3e4ac0017aeb9335772b865d4 Change-Id: Idc62175ec46edaf3e4ac0017aeb9335772b865d4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixed issues from Improve examples task Tomi Korpipää2013-09-044-6/+10
| | | | | | | | | | | Task-number: QTRD-2239 + white bars fixed + shaders improved; non-shadow is quite similar to shadow now Change-Id: I868b6ab9fb65151f47638ec366af4f11938e7a22 Change-Id: I868b6ab9fb65151f47638ec366af4f11938e7a22 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Option for softer shadows addedTomi Korpipää2013-09-023-19/+19
| | | | | | | + fixed a shadow shader bug that caused a little bit of shadowing always Change-Id: Ia39ff5d92d2aca32e4f6c5a3bd6d68213564254a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Shadow shader compatibility fix Tomi Korpipää2013-08-263-48/+48
| | | | | | Change-Id: I52aeac571776ce4289696853e08063bd527414e3 Change-Id: I52aeac571776ce4289696853e08063bd527414e3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Shader incompatibility fix Tomi Korpipää2013-08-203-48/+48
| | | | | | Change-Id: I493a5df016c6729a99bbe93c54b1790771405655 Change-Id: I493a5df016c6729a99bbe93c54b1790771405655 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Detects what point the user has clicked.Mika Salmela2013-08-076-16/+11
| | | | | Change-Id: I53cbba795776becab00076daead66ef2f2f3194b Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Surface gradient to theme and drawing implementation to renderer.Mika Salmela2013-07-262-5/+9
| | | | | Change-Id: I78a3f3d0aa9bd24a05368545cf8e779dda65ef4c Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Finally first visible surface.Mika Salmela2013-07-156-0/+180
| | | | | Change-Id: Ib168cbb8cd636539aee62098b98e6e24a112dab6 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Selection fix Tomi Korpipää2013-06-252-0/+2
| | | | | | | | | Now works for Qt Quick 2 as well. It seems alpha channel gets messed up if it's not forced to 1.0. Change-Id: Ia0b5474ac774f9cb0f5412a7b0e7b19a2064d624 Change-Id: Ia0b5474ac774f9cb0f5412a7b0e7b19a2064d624 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Shaders renamed to use correct file name extensions Tomi Korpipää2013-05-3022-16/+0
| | | | | | | | Now Qt Creator finds correct highlighters Change-Id: I9a2ab9596d29efaaa3ff0b202ef89bfbca38c627 Change-Id: I9a2ab9596d29efaaa3ff0b202ef89bfbca38c627 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Grid not in sync with background bug fixed Tomi Korpipää2013-05-231-2/+1
| | | | | | Change-Id: I1e85740648fb0d45b4c95498fd84f742eb8ca2ad Change-Id: I1e85740648fb0d45b4c95498fd84f742eb8ca2ad Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* OpenGL ES2 support implemented Tomi Korpipää2013-05-225-1/+137
| | | | | | | Change-Id: I5259f6baa8da8939d6470d495e9219ce84eb8dae Change-Id: I5259f6baa8da8939d6470d495e9219ce84eb8dae Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Transparent background texture support + selection color improvement Tomi Korpipää2013-05-221-1/+1
| | | | | | | | | Transparency is now supported in background textures. Q3DMaps: Selection supports now 16777215 objects (yes, one less than 16M). Change-Id: Ie6b7819a19b94bbc1b903a80587f4d919aca9aaf Change-Id: Ie6b7819a19b94bbc1b903a80587f4d919aca9aaf Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Lighter shadows and beveled bar Tomi Korpipää2013-05-213-163/+9
| | | | | | Change-Id: I53c1d930c7f8de0a89c93a3aed3e35e45b9ee44e Change-Id: I53c1d930c7f8de0a89c93a3aed3e35e45b9ee44e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Added datavis3d back under srcHeikkinen Miikka2013-05-1718-0/+702
| | | | | Change-Id: I209e8b3228b2ce0085c897db6fb2ea78e93afa67 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Directory structure reorganizedTomi Korpipää2013-05-0816-333/+0
| | | | | | | | Unnecessary subdirectory levels deleted from examples and src Change-Id: I88892b4fc92784e706be2264eeb7d6208250a50f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Shadow mapping implementationTomi Korpipää2013-05-082-27/+37
| | | | | | | Partially works, but mostly doesn't. Change-Id: I415833d07148d2aeae64c0c311e14766ab29ad5e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Shadow mapping implementation draft Tomi Korpipää2013-05-077-18/+145
| | | | | | | | Does not work yet Change-Id: Ic08c6b12fa5d5aa4f76ddef82fa81eab6982dd69 Change-Id: Ic08c6b12fa5d5aa4f76ddef82fa81eab6982dd69 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Implemented label printing using opengl (QPainter version ifdeffed, either ↵Tomi Korpipää2013-04-124-23/+33
| | | | | | | | | | one can be used) Change-Id: Id7d6761b0ad447c7f4f18f0933d065f190ad82b6 Change-Id: Id7d6761b0ad447c7f4f18f0933d065f190ad82b6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Texture stuff added (lots of test hacks still included, to be removed)Tomi Korpipää2013-04-111-19/+20
| | | | | Change-Id: Ib6a68df778970a3339ed16cd579f0bd9fa411e0b Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Preliminary texture support addedTomi Korpipää2013-04-102-0/+58
| | | | | | Change-Id: Ic52800160b10bbc9d4e7df7159d8891373623fbf Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Ambient color strength added to shadersTomi Korpipää2013-04-033-7/+5
| | | | | Change-Id: I44e2e6dc32a52aabc725de5b23a4e5d065ac0068 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Mac changes Tomi Korpipää2013-04-023-2/+4
| | | | | | Change-Id: I79f6ab9339e9f2b81190e19560794fbe322588af Change-Id: I79f6ab9339e9f2b81190e19560794fbe322588af Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Fixed lighting problems by moving all objects to positive z axisTomi Korpipää2013-03-152-5/+5
|
* Linux compilation fix for barchart exampleTomi Korpipää2013-03-151-1/+1
| | | | Tweaks
* Fixed linux compilation problemTomi Korpipää2013-03-152-8/+8
| | | | "Fixed" shader problem on negative z positions (still does not work properly)
* Implemented bar selection and highlightingTomi Korpipää2013-03-151-4/+2
| | | | | Implemented highlighting on selected bar's row and column Note: There's still a problem with lights and colors from center row backwards (not due to selection)
* Added initial version of bar selectionTomi Korpipää2013-03-132-0/+12
|
* Added a separate shader for backgroundTomi Korpipää2013-03-122-5/+3
| | | | | Added api call for setting color scheme Added api call to set whole data set at once
* Setting camera position added to bars apiTomi Korpipää2013-03-111-0/+33
| | | | Added another fragment shader
* Initial version of QtDataVis3DTomi Korpipää2013-03-073-0/+86
Includes: - initial version of q3dbars - an example using it