summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine/surface3drenderer.cpp
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Surface slice view back againMika Salmela2013-10-021-23/+19
| | | | | | | | | | When constructing slice view, x&z coordinates are copied also. Point position set to vertex position, which is more robust. Task-number: QTRD-2363 Change-Id: Ifbee1bbdfa9a7575760116433204d9cea9a908aa Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Refactored MeshStyle and InputState Tomi Korpipää2013-10-021-2/+2
| | | | | | | | Task-number: QTRD-2362 Change-Id: I52ad876b9658a4a9f9a79a6358e68323075bd6c9 Change-Id: I52ad876b9658a4a9f9a79a6358e68323075bd6c9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Refactored SelectionMode Tomi Korpipää2013-10-021-19/+20
| | | | | | | | Task-number: QTRD-2362 Change-Id: I8d0c54d7a7d40fa063763427764aa32b4a3ed6a9 Change-Id: I8d0c54d7a7d40fa063763427764aa32b4a3ed6a9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Refactored LabelTransparency and ShadowQualityTomi Korpipää2013-10-021-39/+39
| | | | | | | Task-number: QTRD-2362 Change-Id: I4c9cc84d44a2fcf881e8b6062413aa3dbe2e5890 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Make surface selection label follow the themeMiikka Heikkinen2013-10-021-3/+1
| | | | | | | | Task-number: QTRD-2269 Change-Id: Ibcfb467e72fa2bf63453108d73a027446113fcb0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Texture coordinates updated on sample dimension changeMika Salmela2013-10-011-10/+6
| | | | | | | | It's about dimension change. Task-number: QTRD-2357 Change-Id: Iaa64569954a12ea846221111cbcf63753f5235d3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Position surface selection ball correctly on y-axisMiikka Heikkinen2013-10-011-1/+2
| | | | | | | Task-number: QTRD-2354 Change-Id: I219ef7f45a046b3fc9045b2eb704f190e66031b1 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Refactor surface data item to have X, Y, and Z values.Miikka Heikkinen2013-10-011-81/+113
| | | | | | | Task-number: QTRD-2332 Change-Id: I086d3a422ff444cbcede1aa238107ebcbce68729 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Surface follows selection mode changes on the flyMika Salmela2013-09-301-7/+32
| | | | | | | | Task-number: QTRD-2349 Change-Id: I7896646be32d482df38cd351f68763b4f659d764 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Surface shader changed on smooth update if no object yetMika Salmela2013-09-301-14/+19
| | | | | | | | | setSmoothSurfaceEnabled not effective if no object, ie. if setting the status before setting the model. Task-number: QTRD-2342 Change-Id: I6087bfc208cd5ebbc58071fbeabcf9b825629abd Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Allow resetting with existing array for surfaceMiikka Heikkinen2013-09-271-21/+33
| | | | | | | | | Improves performance when doing stuff like resetting image data. Task-number: QTRD-2335 Change-Id: I9e8ce49fd520b67125305a7614afc550b2244169 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixed ball positioning when surface scaledMika Salmela2013-09-261-6/+7
| | | | | | | | Scaling taked into account on normalization. Task-number: QTRD-2330 Change-Id: Ib3cf89693e8aa3a0b939f2974fd74007015090c7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Slice view implementedMika Salmela2013-09-261-55/+469
| | | | | | | | | | Implemented slice view and fixed selection mechanism. Task-number: QTRD-2321 Task-number: QTRD-2307 Change-Id: I492bd96678bb1bdb8020448e122931a0deccdc0d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Clear selection point if data changesMiikka Heikkinen2013-09-241-11/+3
| | | | | | | Task-number: QTRD-2313 Change-Id: Ie09d21eee1d118e3ced8d37e6623c7036deba4c9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Zero-color gradient fix for surface Tomi Korpipää2013-09-241-2/+2
| | | | | | | | Task-number: QTRD-2329 Change-Id: I616e2e97ac67ddd9fbdf2d0715f5841b3df46561 Change-Id: I616e2e97ac67ddd9fbdf2d0715f5841b3df46561 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Draw surface grid twice to get rid of artifactsMiikka Heikkinen2013-09-241-13/+9
| | | | | | | Task-number: QTRD-2312 Change-Id: I1fc609aeb26ef4aedc972145a5326f41b3f0b999 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Gradient setting API added to SurfaceTomi Korpipää2013-09-241-2/+2
| | | | | | | Task-number: QTRD-2288 Change-Id: Ibe8db55cb0435db71c1d2a9081e2dab746b46c07 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Made surface axis ranges adjustable.Miikka Heikkinen2013-09-241-71/+107
| | | | | | | | | | | | If the surface is partially off the visible range, only grids that are fully within the visible range will be drawn. If only one row or column is within visible range, surface is not drawn. Task-number: QTRD-2320 Change-Id: If2691577cde61dfd270d79c32b9d6f69984966ba Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Label "skewing" fixedTomi Korpipää2013-09-231-7/+4
| | | | | | | | Task-number: QTRD-2322 Change-Id: Ie4bb95dc4f62bad1fef605461452168ea260fa26 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Shadow support for surfaceTomi Korpipää2013-09-231-146/+232
| | | | | | | | | | | | | Task-number: QTRD-2266 - shadows are now supported (but disabled, as they don't work well) - we probably need a separate depth shader for surface + removed obsolete code and variables + cleaned up Change-Id: I91a59b7fef7fdccf40b43ef0534eecb37d97abe2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixed Valgrind reported memory issues.Heikkinen Miikka2013-09-201-0/+5
| | | | | Change-Id: I9ccb460b5cceb969827ede510b3c05d07467358d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Surface: base gradient from theme Tomi Korpipää2013-09-201-2/+2
| | | | | | | | Task-number: QTRD-2318 Change-Id: If0483647ce4674a7f2f0cc1fa7aaab3fca5b16fe Change-Id: If0483647ce4674a7f2f0cc1fa7aaab3fca5b16fe Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Surface: Implemented giving a height map via APITomi Korpipää2013-09-201-1/+2
| | | | | | | Task-number: QTRD-2273 Change-Id: Ib0c540d52711ced38421b744664de7eddd97b585 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Fix scaling of the surfaceMiikka Heikkinen2013-09-201-216/+379
| | | | | | | | | No longer will surface grid count cause scaling of the background etc. Task-number: QTRD-2267 Change-Id: I9dd62bcd6ed7b342abc8a52c7f88ed88d22ded69 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Qdoc documentation for new scene and input classes.Keränen Pasi2013-09-191-32/+33
| | | | | | Change-Id: I5d9680fcf2e49655c1b9bcdf961bbda02bf31968 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* ES2 tweak for surface Tomi Korpipää2013-09-181-0/+2
| | | | | | Change-Id: Ic80832ce0ca85e818ad4e063cbd052a5c003d73f Change-Id: Ic80832ce0ca85e818ad4e063cbd052a5c003d73f Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Remove buggy code for adjusting surface samplespace.Miikka Heikkinen2013-09-181-18/+8
| | | | | | | For now we require data range and axis range to be the same. Change-Id: Ie26a0728f9d6c4a014000ea8ccf71221f799899a Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* ES2 shader support for surface Tomi Korpipää2013-09-181-33/+44
| | | | | | | | Task-number: QTRD-2290 Change-Id: I52a7fbd8d72e6cd4f73dd3072103cdbf518df321 Change-Id: I52a7fbd8d72e6cd4f73dd3072103cdbf518df321 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix surface crash when row/column counts are oneMiikka Heikkinen2013-09-171-4/+8
| | | | | Change-Id: I6abc3a614f6479dc87631c1b712ab655515a70b2 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Misc bug fixesMika Salmela2013-09-171-59/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | - Enabled zooming on Surface C++ api - User modified gradient takes effect - Scene pointer is updated to selection pointer - Font changing is listened on selection pointer and label's are generated using selected font - Selection label format copied from scatter. Looks to be very handy. - Check for OpenGL 1.5 version and block coarse surface if below - Added some theme handling. Not sure if the bug is fully fixed. Probably requires shadow fixes to be fully similar to others. - HAHAA. Now even single rows and columns supported. Even one value will produce surface Task-number: QTRD-2279 Task-number: QTRD-2265 Task-number: QTRD-2261 Task-number: QTRD-2269 Task-number: QTRD-2268 Task-number: QTRD-2272 Change-Id: Id34d843b2898e4cf1e4dde10ce23e0eaab4738a7 Signed-off-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Axis setRange selects region from dataMika Salmela2013-09-131-3/+35
| | | | | | | Task-number: QTRD-2280 Change-Id: I6313ac321f84fbd6d9a06c198caccccd805d336b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 06:50:59 +0000