summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine/surface3drenderer.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Color problem fixed Tomi Korpipää2014-04-241-6/+6
| | | | | | | | | | | 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>
* Custom Item Example addedTomi Korpipää2014-04-221-3/+4
| | | | | | | | | | Task-number: QTRD-3043 + surface selection bug fix - snapshot to be added Change-Id: I17276e39c304cbf1a58eaa2334eff2268656dbf4 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Add custom item support, part 2Tomi Korpipää2014-04-161-35/+38
| | | | | | | | | 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-151-3/+29
| | | | | | | | | | | | | | 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>
* Fix crash when shadows are supported but flat is notMiikka Heikkinen2014-04-101-11/+18
| | | | | | | | Task-number: QTRD-3033 Change-Id: I07c9a9e8795f0e282e8cbd696a627bc2dc8776bc Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Optimize multiple series rendering.Miikka Heikkinen2014-04-101-113/+102
| | | | | | | | | | | | | | Cache all series instead of just the visible ones on all graphs instead of just surface. Changes to one series now trigger data update to only the affected series, which should significantly improve performance in these cases. Task-number: QTRD-2600 Task-number: QTRD-2957 Change-Id: I6db7c689108fce8d25aace6682a193936d6f0eaf Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Axis label dragging support, part 2Tomi Korpipää2014-04-031-11/+5
| | | | | | | | | | | Task-number: QTRD-2367 + Added emitting selection signals + Added an example about creating an input handler for axis label dragging - Snapshot for example docs to be taken Change-Id: I641f4feb9e31c32023727b1c7c695324923accc4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Enable querying selection label via APIMiikka Heikkinen2014-04-031-49/+16
| | | | | | | | | | | | Also enable suppressing drawing the label on graph. Selection label formatting was consequently moved from renderers to series. Task-number: QTRD-2896 Change-Id: Ia6a1a40298d8db0f54349de3eb27fb0b683dd302 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Axis label dragging support, part 1Tomi Korpipää2014-04-011-46/+105
| | | | | | | | | | Task-number: QTRD-2367 + Added label selection support to surface & scatter + Added Y-label selection support to bars Change-Id: I3153f1e38019604be763492feba66c3af084de14 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Improve axis formatter flexibilityMiikka Heikkinen2014-03-281-3/+3
| | | | | | | | Number of grid lines and labels are no longer tied to segment count. Change-Id: I517ebc905f1f70e2e00ae86c05fd0e49e922845d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Make axis labels more accurate by using qreals for label valuesMiikka Heikkinen2014-03-261-3/+3
| | | | | | | | | Also refactor axis formatter sub grid array to be one dimensional. There is no need to know which segment each sub grid line belongs to. Change-Id: Ie9813088650fcc0ca844f3c358ea1abae9258367 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Implement QLogValue3DAxisFormatterMiikka Heikkinen2014-03-261-0/+1
| | | | | | | | | Task-number: QTRD-2787 Change-Id: I6ecff5c3d2047a2c566051951bf237bf3e68ffab Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Actually use axis formatter in renderer.Miikka Heikkinen2014-03-251-226/+133
| | | | | | | Task-number: QTRD-2787 Change-Id: I0ced8e506928df5fba2e8df94258b53457f4412e Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Use GL_LINES for ES2 grid linesTomi Korpipää2014-03-241-21/+68
| | | | | | | | Task-number: QTRD-2527 Change-Id: I08b9c740f6dfaf8107601cfc1e7e53db13bf8268 Note: Not to be merged until 1.0 is released Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix surface slice problem on MacMika Salmela2014-03-171-1/+22
| | | | | | | Separate shader for slice surfaces. Change-Id: I29f89dc718a4a5dde8d78e1f602283889087bf23 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix Valgrind found issuesMiikka Heikkinen2014-02-251-5/+4
| | | | | Change-Id: Iccacab527abf745e7ccd1e562ff9ea5dea4c8005 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Set objects dirty on Y axis range changeMika Salmela2014-02-241-1/+14
| | | | | | | Task-number: QTRD-2889 Change-Id: Iac92a50b6454d8e83ece984a13a0bcfa1f908d9f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Don't do unnecessary polygon fill enablingsMiikka Heikkinen2014-02-241-6/+4
| | | | | Change-Id: I7111837454e901dc44a7aaf094f1762dcf14455c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix the variable naming in findMatchingRowMiikka Heikkinen2014-02-241-5/+5
| | | | | | | Y -> Z Change-Id: I793b956212ba51c523f965c5f99db250d0cac1cf Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Multiseries support for selection pointerMika Salmela2014-02-211-52/+120
| | | | | | | Task-number: QTRD-2515 Change-Id: Id3611533c4dd333b68b96669c7230707506b68ab Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixed surface shadow wrong direction bug Tomi Korpipää2014-02-211-9/+1
| | | | | | | | Task-number: QTRD-2887 Change-Id: I37938a86fe4b414cd969fda819d096dc885fa48f Change-Id: I37938a86fe4b414cd969fda819d096dc885fa48f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Scaling and offset support for multiseriesMika Salmela2014-02-201-86/+203
| | | | | | | | Task-number: QTRD-2868 Change-Id: I47cb0c6e26e2445ca39426e6a52963b80ebb3816 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Clean up public API and includes usageMiikka Heikkinen2014-02-181-5/+3
| | | | | Change-Id: I20ba0ffafa6bbe22d624a15fe3046ef2e33ab6d7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Surface remaining shadow problem fixed Tomi Korpipää2014-02-171-2/+4
| | | | | | | | Task-number: QTRD-2871 Change-Id: Iaabd77f48fcb02b4f439a91fec4fbc5721b13295 Change-Id: Iaabd77f48fcb02b4f439a91fec4fbc5721b13295 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Selection works on wireframe-only mode Tomi Korpipää2014-02-171-2/+2
| | | | | | | | Task-number: QTRD-2875 Change-Id: Iabce6db6a121fcfe6c8669b91c994df01d411d35 Change-Id: Iabce6db6a121fcfe6c8669b91c994df01d411d35 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Draw surface grid in slice when wireframe only Tomi Korpipää2014-02-171-24/+26
| | | | | | | | Task-number: QTRD-2876 Change-Id: Iaa09592250e7e827ef194abc27cee86596ca5d8d Change-Id: Iaa09592250e7e827ef194abc27cee86596ca5d8d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Series visibility affects slice Tomi Korpipää2014-02-171-1/+2
| | | | | | | | Task-number: QTRD-2873 Change-Id: If03f492cec9d3c39387554b0a191df09efa6ee06 Change-Id: If03f492cec9d3c39387554b0a191df09efa6ee06 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Take qml_plugin.prf into useMiikka Heikkinen2014-02-131-0/+3
| | | | | | | Enables us to lose a bunch of hacks. Change-Id: Id7641012004428aa9782cfb5dbaf9fc9c4629706 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Multiseries support for surface sliceMika Salmela2014-02-111-48/+61
| | | | | | | Task-number: QTRD-2867 Change-Id: I705e3b743ab9d561d93039a60288d71627db8661 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixed sampleSpace validity checkMika Salmela2014-02-111-1/+1
| | | | | | | | Task-number: QTRD-2863 Change-Id: Ia809f01772289aa2cc3e34cb055c334fb1647e4d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Multiseries support for surfaceMika Salmela2014-02-101-64/+59
| | | | | | | | | Multiseries support for item and row changes. Task-number: QTRD-2767 Change-Id: I5702989e7f59913481a2ca888e402effa22a4221 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Check for surface object createdMika Salmela2014-02-071-10/+12
| | | | | | | Task-number: QTRD-2864 Change-Id: Ibbb4186cdf064debc25bc7b255da1abbc658077a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Added axis labels to surface slice Tomi Korpipää2014-02-071-9/+35
| | | | | | | | Task-number: QTRD-2854 Change-Id: Icf6e57a39b1d7044b522daadedbe0df5aa73e15c Change-Id: Icf6e57a39b1d7044b522daadedbe0df5aa73e15c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Surface shadow problem fixed Tomi Korpipää2014-02-071-17/+35
| | | | | | | | | Task-number: QTRD-2815 Task-number: QTRD-2637 Change-Id: I8c17a09976826683358084392e190a7333f63357 Change-Id: I8c17a09976826683358084392e190a7333f63357 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Multiseries support for surfaceMika Salmela2014-02-061-348/+403
| | | | | | | Task-number: QTRD-2767 Change-Id: Ifa7ca07f2afdb27974ad20819f0a4646293764b0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Moved nonfunctional public methods to privateTomi Korpipää2014-01-301-3/+3
| | | | | | | Task-number: QTRD-2809 Change-Id: I009316652475d71d82a66ba23368b045f34c1f9a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Surface slice view scaling fix Tomi Korpipää2014-01-291-2/+4
| | | | | | | | Task-number: QTRD-2799 Change-Id: I43650b9b1fb87a112db5e0a233c96c32346def70 Change-Id: I43650b9b1fb87a112db5e0a233c96c32346def70 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Valground betaMiikka Heikkinen2014-01-271-0/+1
| | | | | Change-Id: I05867a256caea389fb1d2c19bccbf244732343a2 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix copyright yearMiikka Heikkinen2014-01-271-1/+1
| | | | | | | Task-number: QTRD-2803 Change-Id: If670633f52519741a096abe901d55fd084ddc9c5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Added series rotation and bar item rotation supportMiikka Heikkinen2014-01-271-2/+4
| | | | | | | Task-number: QTRD-2654 Change-Id: I864d33bc173b35b8680eddb402bdf1817ecb031f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Made jira tasks of TODOs, part 2 Tomi Korpipää2014-01-221-31/+27
| | | | | | | | | + commented-out code and qDebugs removed Task-number: QTRD-2398 Change-Id: Iab13e3ae9d672c0a3bcb4735b3fd1931b2eb7d86 Change-Id: Iab13e3ae9d672c0a3bcb4735b3fd1931b2eb7d86 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Made jira tasks of TODOs, part 1Tomi Korpipää2014-01-221-25/+0
| | | | | | | | - commented-out code will be removed (and made tasks of, if necessary) in part 2 Task-number: QTRD-2398 Change-Id: Ib94a4a873ecd25f4040c74c42902e204f3f41943 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* InputState enum dividedTomi Korpipää2014-01-211-0/+2
| | | | | | | Task-number: QTRD-2683 Change-Id: Ib05469ac1bf8c8ed828974a3adb91ecb5f8f1fc9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* References to alpha and TP removedTomi Korpipää2014-01-201-7/+23
| | | | | | | | + implemented the rest of lightColor Task-number: QTRD-2405 Change-Id: I38402b45cc4a567a79d07b23983567551d06b4fe Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Synchronize clicked detection properlyMiikka Heikkinen2014-01-171-3/+10
| | | | | | | | Implements item 2) in QTRD-2645 Task-number: QTRD-2645 Change-Id: I8b4b3a63eeeba3ba34b6865543380022a6d732ed Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Reintroduced namespace macros Tomi Korpipää2014-01-161-7/+2
| | | | | | | | Task-number: QTRD-2594 Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Docs updated after namespace macro removalTomi Korpipää2014-01-161-0/+5
| | | | | | | | - some links do not work Task-number: QTRD-2594 Change-Id: I255a4c12fe09e1a708c068a68073c1c99d6382b6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Removed QDataVis and namespace macrosTomi Korpipää2014-01-151-32/+32
| | | | | | | | | - docs will be fixed in QTRD-2594 Task-number: QTRD-2699 Task-number: QTRD-2700 Change-Id: Ia89d365c2de5d9254b165feb4f0a54ec099084be Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Slice view fixes Tomi Korpipää2014-01-151-2/+2
| | | | | | | | | | | | + zero moves, grid doesn't + y-axis label moved closer to grid + label alignment changes Task-number: QTRD-2769 Task-number: QTRD-2738 Change-Id: Ie4d5a4c47472f1e61e02447847157c8ad8195c07 Change-Id: Ie4d5a4c47472f1e61e02447847157c8ad8195c07 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Add series name propertyMiikka Heikkinen2014-01-141-3/+9
| | | | | | | | | | | +Don't call updateScene for every render cycle +Fixed item label update when format or name changes +Misc cosmetic fixes Task-number: QTRD-2736 Task-number: QTRD-2571 Change-Id: I43aa6b8e3202b09529b17a22bb24d05fcb545609 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>