summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine/surface3drenderer.cpp
Commit message (Collapse)AuthorAgeFilesLines
...
* Multi series selection part 3: surfaceMiikka Heikkinen2013-11-221-8/+12
| | | | | | | Task-number: QTRD-2556 Change-Id: I3a465c1bfff95f6c89d2f473f9e235c6079b8116 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* User-modifiable themes, part 1Tomi Korpipää2013-11-221-18/+17
| | | | | | | | | | | | Task-number: QTRD-2120 + old functionality remade - new functionality to be added + fixed a compilation error in qbarseries for mingw Change-Id: I710c97b5d4023861be8e8cc5cc61c05bb4644964 Signed-off-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Multi series selection part 1: barsMiikka Heikkinen2013-11-201-6/+5
| | | | | | | Task-number: QTRD-2556 Change-Id: I1f537f0b4c299028d4415f074d5eac6552bb3b9b Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Initialization for depth textureMika Salmela2013-11-181-1/+2
| | | | | | | | Precaution for using depth texture before nothing has been drawn. Task-number: QTRD-2570 Change-Id: I47ece387542acbd1ffed8d650a70ecc471efb30e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Changes scene to be proxy for input position and selection communication.Keränen Pasi2013-11-151-17/+2
| | | | | Change-Id: I83729508c8a0281569be5f43791d44d36d800ca2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Basic multiseries supportMiikka Heikkinen2013-11-151-18/+25
| | | | | | | | Task-number: QTRD-2548 Change-Id: Iba324c0e8be56f2b3f8f6c6a992883c134a51a9d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Slice render out-of-sync fixed Tomi Korpipää2013-11-131-9/+3
| | | | | | | | Task-number: QTRD-2555 Change-Id: I443f990a16a3d662332ac4021d3c22cb428875f1 Change-Id: I443f990a16a3d662332ac4021d3c22cb428875f1 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Removed unused and duplicate shaders Tomi Korpipää2013-11-131-3/+3
| | | | | | | | | - 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>
* Default ES2 vertex shader into useMika Salmela2013-11-131-1/+1
| | | | | | | Task-number: QTRD-2551 Change-Id: I64b32fa0da64c0c0dbe4542ce90214e8a1ebb9d2 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Shadow support for surfaceMika Salmela2013-11-081-37/+59
| | | | | | | Task-number: QTRD-2266 Change-Id: I99fd7a6eda570df3d114ab10a1b07c22736cc86c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Gradient support part 2Miikka Heikkinen2013-11-081-4/+1
| | | | | | | | Scatter gradients. Task-number: QTRD-2200 Change-Id: Ia6ac271440d0d26b7cae9332ef2ba4e7bf1a11fe Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Gradient support Part 1Miikka Heikkinen2013-11-071-8/+5
| | | | | | | | | TODO: - Finish scatter - QML (maybe left until data set is sorted, though) Change-Id: I87a8117cb29f147080e0662c55b1098cb2e71689 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Clear surface data array after array reset Tomi Korpipää2013-11-071-0/+5
| | | | | | | | Task-number: QTRD-2542 Change-Id: I5983b217ae15f17d75ac09fe3492e6d56b8e8152 Change-Id: I5983b217ae15f17d75ac09fe3492e6d56b8e8152 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Add configurable main and slice view ordering.Keränen Pasi2013-11-051-6/+9
| | | | | Change-Id: I9f5d7399d60971c782fa8ac6fc39a05fa3bbcaa8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Surface toggling API implementedTomi Korpipää2013-11-041-57/+68
| | | | | | | Task-number: QTRD-2337 Change-Id: I59695a042c864faed90839c4e566fcece5cb94f4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Remove unnecessary render cycle for slicing mode.Miikka Heikkinen2013-11-041-7/+0
| | | | | Change-Id: I685352180bd7c17783c1f8a131b2d1877106622c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Cleaning controller callbacks from renderers, part 2Miikka Heikkinen2013-10-311-42/+4
| | | | | | | | | Removed m_controller from renderers so it won't accidentally be used again. Replaced the remaining callbacks with queued signals. Task-number: QTRD-2216 Change-Id: Ib10bc661bcdc3d810baa8b2513f5e6dd67f7207e Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Cleaning controller callbacks from renderers, part 1Miikka Heikkinen2013-10-311-14/+14
| | | | | | | | Input state and position via synchronization Task-number: QTRD-2216 Change-Id: If53530aa9f65a8668fb628ba86d367149a62e64f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Support for non-zero centered data in barsTomi Korpipää2013-10-301-2/+2
| | | | | | | Task-number: QTRD-2198 Change-Id: Ief48895d93ac9a8ab70743f3da0fdaf7ccd6ea27 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Selection overhaulMiikka Heikkinen2013-10-301-91/+100
| | | | | | | | | | | | | | | | Selection modes are now proper flags, so you can easily mix and match item, row, and column modes as you wish. Slice flag means automatic slicing control - if user wishes to control slicing himself, he should not set this mode flag. Clicking an item on graph now emits clicked signal from renderer to controller on all graphs instead of setting the selected item. Controller will set the selected item based on this information. Task-number: QTRD-2366 Task-number: QTRD-2491 Change-Id: I6251c42e22ea676613fbd36685e33574e6eb9a1a Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Grid line bars replaced by flatsTomi Korpipää2013-10-291-25/+53
| | | | | | | | | Task-number: QTRD-2509 + polygon offset added to labels Change-Id: I9d56a2001943d2d817f32c503790c07c241297b5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Tech preview RC fixes Tomi Korpipää2013-10-251-0/+2
| | | | | | Change-Id: I5a47053c8708b9a9c37b845bc55166f02fc99de3 Change-Id: I5a47053c8708b9a9c37b845bc55166f02fc99de3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Doc: language review datavisualizationNico Vertriest2013-10-251-1/+1
| | | | | | | Task-number: QTBUG-33360 Change-Id: I67eaab3914effa2a7a5be1b72c6d2c59cb2402f6 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Dropped flat shader requirement from 1.50 to 1.20 Tomi Korpipää2013-10-231-1/+1
| | | | | | | | | | 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>
* Removed jitter from the selection ballMika Salmela2013-10-231-3/+3
| | | | | | | | Task-number: QTRD-2372 Change-Id: I360d1295e6982fab8a3e27521a392ff29a5c68e5 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Polygon offset to surface gridMika Salmela2013-10-231-19/+17
| | | | | | | | - Verified on Android & Angle Change-Id: I5049b54d4133f26c48462eebdb64384b8b026845 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Minor cleanup to surface rendererMiikka Heikkinen2013-10-221-54/+36
| | | | | Change-Id: I592f8505820f364b12237e0d706d4069a0604f15 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Slice view lighting fixed Tomi Korpipää2013-10-221-44/+14
| | | | | | | | | | Task-number: QTRD-2490 + grid line lighting fixed Change-Id: Ieed6b3ab52baca958b84a814093ccd1e6fa8ba71 Change-Id: Ieed6b3ab52baca958b84a814093ccd1e6fa8ba71 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixed buffer creation failure issueTomi Korpipää2013-10-221-0/+3
| | | | | | | Task-number: QTRD-2316 Change-Id: Ic1b206687c6d5f591259d11874cddd3f6f4c51b2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Removed obsolete additions (zComp -related) Tomi Korpipää2013-10-221-5/+2
| | | | | | Change-Id: If4cb4f89bdfd9dc357f8fc2d8cc1ad95e446c483 Change-Id: If4cb4f89bdfd9dc357f8fc2d8cc1ad95e446c483 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Minor optimizations and cleanup to bars and scatter renderingMiikka Heikkinen2013-10-221-12/+7
| | | | | Change-Id: I4fc5b83bfb41ff9bcd54438710b68c8132334cd3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fixed ES2 gradient problem Tomi Korpipää2013-10-211-2/+2
| | | | | | | | | | 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>
* Fix grid line shadowing Tomi Korpipää2013-10-211-2/+6
| | | | | | Change-Id: I25870a86853508737b54116405c98ddf7e41e6b7 Change-Id: I25870a86853508737b54116405c98ddf7e41e6b7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Background lighting fix Tomi Korpipää2013-10-211-1/+2
| | | | | | | | Task-number: QTRD-2482 Change-Id: Ifb7bf95a7ff1da7adea3a40ce54855d915a803a2 Change-Id: Ifb7bf95a7ff1da7adea3a40ce54855d915a803a2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Removed zComp Tomi Korpipää2013-10-211-31/+29
| | | | | | | | Task-number: QTRD-2488 Change-Id: I7d7b067a1d82a44aa349f553f0aff7c173969ea9 Change-Id: I7d7b067a1d82a44aa349f553f0aff7c173969ea9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Removed floor lines from surface slice Tomi Korpipää2013-10-171-33/+3
| | | | | | | | | - Floor lines are not visible because slice view is in orthographic projection Change-Id: Ia22fa08ef258228750157f5c45f1e2f8a2f3da9d Change-Id: Ia22fa08ef258228750157f5c45f1e2f8a2f3da9d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Change order of slice and main renderingMiikka Heikkinen2013-10-171-7/+5
| | | | | | | Fixes issue with having one frame with incorrect slice. Change-Id: I5f3ef79f4fc304bf87aaff7f3fd5d3d6fa349dce Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix crashes and bugs when using surface with ES2Miikka Heikkinen2013-10-151-6/+4
| | | | | | | | +Fix compile warnings +Fix qmlsurface example Change-Id: I28bbf38e7aa51b1ec315374182a9daae8eded87c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Minor optimizations to bars and surface Tomi Korpipää2013-10-151-40/+40
| | | | | | Change-Id: Iffdef975ccecb796baf238b23b9cb46a7cee3e24 Change-Id: Iffdef975ccecb796baf238b23b9cb46a7cee3e24 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix crash when changing to slice selection mode with no data visibleMiikka Heikkinen2013-10-111-0/+4
| | | | | | | Not all selection related stuff was cleaned when data array changed Change-Id: Ifb8c960f2bd9b3fb38137ef09296fa098a123c25 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Make grid visibility affect surface slice modeMiikka Heikkinen2013-10-111-84/+87
| | | | | Change-Id: I26d4b150cb7cd2aa30b651ee92bbd90554d63187 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix slice view reset on proxy changeMiikka Heikkinen2013-10-111-1/+5
| | | | | Change-Id: I7497da41e60ab0db405e3b44ff63771222ec14b3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Surface slice view lighting adjusted Tomi Korpipää2013-10-111-8/+5
| | | | | | Change-Id: I5ac4ea2e06d6682d65690990e7d23a1e1f6f0b6c Change-Id: I5ac4ea2e06d6682d65690990e7d23a1e1f6f0b6c Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Mac compilation fixesTomi Korpipää2013-10-101-1/+1
| | | | | Change-Id: I050b25f0921dfb12cb064002b3d020d499d4c953 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Aspect ratio preservation for surface slice viewMika Salmela2013-10-091-11/+6
| | | | | | | | | Task-number: QTRD-2387 Change-Id: I51e9900d419931e75d5df2f5962590ee5f3cdbc7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Compilation error fix Tomi Korpipää2013-10-081-4/+4
| | | | | | | | + compilation warning fixes Change-Id: Ib4f98f496733fd72ddf4a5da9ce4e379b84fa1ba Change-Id: Ib4f98f496733fd72ddf4a5da9ce4e379b84fa1ba Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* No perspective for surface sliceMika Salmela2013-10-041-17/+10
| | | | | | | Task-number: QTRD-2375 Change-Id: I6e6da54628a0b16fcfe7a9371deaff02686d1b1e Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Fixed double-tap issues with surface slice Tomi Korpipää2013-10-041-5/+10
| | | | | | | | | Task-number: QTRD-2370 Task-number: QTRD-2371 Change-Id: I389f70f68ac4d6d478947b736b602fba62b46bef Change-Id: I389f70f68ac4d6d478947b736b602fba62b46bef Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Selection fixed for Android surface Tomi Korpipää2013-10-031-11/+3
| | | | | | | | Task-number: QTRD-2368 Change-Id: I7b6bf5f16111a7dfdb49cb391b29872bf12ac8fd Change-Id: I7b6bf5f16111a7dfdb49cb391b29872bf12ac8fd Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* QML surface crash fix for Android Tomi Korpipää2013-10-031-1/+17
| | | | | | | | Task-number: QTRD-2358 Change-Id: I376cc09180d580f1959efe7e02d7b945fc04b765 Change-Id: I376cc09180d580f1959efe7e02d7b945fc04b765 Reviewed-by: Mika Salmela <mika.salmela@digia.com>