summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine/surface3drenderer.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Revert surface shadow cull disableMiikka Heikkinen2014-06-091-0/+3
| | | | | | | | The fix caused weird self-shadowing issues in some cases, needs to be done differently. Change-Id: Ie66b03b6d8c7f480a5822774de76b033586b6a3a Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix missing axis titles with zero rotation and fixed titlesMiikka Heikkinen2014-06-061-7/+8
| | | | | Change-Id: I026578b224772fe9d96f6f7789e253d433690091 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Change label polygon offset to follow draw orderMiikka Heikkinen2014-06-051-3/+6
| | | | | Change-Id: I6b0bbb458fe9eae9664cd50f9b20f672b08cf4b9 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Android surface selection fix Tomi Korpipää2014-06-041-1/+1
| | | | | | | Task-number: QTRD-3163 Change-Id: I61589f9848ebcce7b0166e22d504c2375e564347 Change-Id: I61589f9848ebcce7b0166e22d504c2375e564347 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Misc fixes found during testingMiikka Heikkinen2014-06-041-0/+2
| | | | | | | | | - Memory leaks - Y-axis placement issues in scatter and surface Change-Id: I7ec6c9c3e53502445b52c049c973186a7c54c95f Reviewed-by: Titta Heikkala <titta.heikkala@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Clean up Tomi Korpipää2014-06-041-7/+11
| | | | | | | Task-number: QTRD-3149 Change-Id: I37ae7bc7e88b7d8a2c81585333ab87e7fcb8fcc0 Change-Id: I37ae7bc7e88b7d8a2c81585333ab87e7fcb8fcc0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix surface shadows and other misc fixesMiikka Heikkinen2014-06-031-3/+0
| | | | | | | | | | | - Remove culling from surface shadows to make them look correct - Remove unnecessary metatype registration from qmloscilloscope - itemmodeltest multi-change fixed - Valgrind fixes Task-number: QTRD-3160 Change-Id: I2da8b3e024dae56c52afb6b915535f49c6c987fc Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Clean up renderersTomi Korpipää2014-06-031-10/+0
| | | | | | | Task-number: QTRD-3149 Change-Id: I71b9b7533ad3730d0d203c3d07e66d824b690fbb Reviewed-by: Titta Heikkala <titta.heikkala@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Misc fixes found while valgrinding.Miikka Heikkinen2014-06-021-8/+8
| | | | | Change-Id: If744721eff62f07f20bff95ca815ca80ca50fee1 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix surface selection texture generationMiikka Heikkinen2014-05-301-3/+3
| | | | | | Task-number: QTRD-3157 Change-Id: Ida6cdac83a9f233a57ab5a621799bd1af2dd0cfc Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
* Implement binary search for determining surface sample spaceMiikka Heikkinen2014-05-281-69/+78
| | | | | | Task-number: QTRD-3066 Change-Id: I3a6d727c528e37e914aa1c3f08ee6d268a2c5230 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix labels transparency within each axisMiikka Heikkinen2014-05-281-71/+90
| | | | | | Task-number: QTRD-3141 Change-Id: I8ca51b411e2d92e0c615c81d215d89575d614acd Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Optionally show axis titles on the graphMiikka Heikkinen2014-05-271-33/+28
| | | | | | Task-number: QTRD-2961 Change-Id: I6a344156bd29fa8fb1ede0546af4d0e67e5e2db4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added API for changing data aspect ratioTomi Korpipää2014-05-261-4/+3
| | | | | | Task-number: QTRD-3144 Change-Id: I9acd1be13083d7fbbed840882260a60f46c5f698 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Cache ObjectHelper instancesMiikka Heikkinen2014-05-221-15/+11
| | | | | | Task-number: QTRD-2792 Change-Id: I90d83bd9b73a0f337fd26f1b92000e72b3ec0607 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added support for custom items with absolute coordinatesTomi Korpipää2014-05-211-5/+16
| | | | | | Task-number: QTRD-3122 Change-Id: Iefd4c4adad45721ed3519bdcecbbfa1e97039f08 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Surface slice grid line fix Tomi Korpipää2014-05-201-2/+2
| | | | | | | Task-number: QTRD-3115 Change-Id: I0be10ebb9c2a9472da63e258723bdd305e0102cf Change-Id: I0be10ebb9c2a9472da63e258723bdd305e0102cf Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix label alignmentsMiikka Heikkinen2014-05-191-7/+8
| | | | | | | | - Left and right were logically swapped - Horizontal axis labels on slice views were incorrectly aligned Change-Id: I8c13acaeec02961464ee63f8b489e353dcb379e6 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Optimize label rotations a bitMiikka Heikkinen2014-05-191-10/+20
| | | | | Change-Id: Ie6075aefa70228769d5a2717e9d96c23b9fee494 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Implement axis label autorotationMiikka Heikkinen2014-05-191-54/+178
| | | | | | Task-number: QTRD-2857 Change-Id: I158abb75272813cf7eb5d4b419e24325389d940e Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added option to use orthographic projectionTomi Korpipää2014-05-141-3/+11
| | | | | | | Task-number: QTRD-3078 Change-Id: I07ebc2b7edd542cd28e405dfc80282f18b7a7314 Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Use blending for custom items only when neededTomi Korpipää2014-05-141-4/+4
| | | | | | | Task-number: QTRD-3077 Change-Id: I2406a8fd133943379a5cb1c1c2961a419ef9315f Reviewed-by: Titta Heikkala <titta.heikkala@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* API to query custom item selection Tomi Korpipää2014-05-131-0/+3
| | | | | | | | | | Task-number: QTRD-3046 + Added missing elementSelected signal to QML Change-Id: I5e79d8e910d2730e3d2ae5550ce576f01aac0b18 Change-Id: I5e79d8e910d2730e3d2ae5550ce576f01aac0b18 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Added API for querying label selectionTomi Korpipää2014-05-131-0/+3
| | | | | | Task-number: QTRD-3045 Change-Id: Ib5c8f29bcf0148ae604e27b2a81e6f72a2dbca2a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Allow surface rows and cols be in ascending or descending XZ orderMiikka Heikkinen2014-05-081-26/+55
| | | | | | | | | | This allows adding rows that have smaller Z-value than the previously added row instead of being forced to insert rows into the beginning of the data array in these cases. Task-number: QTRD-2428 Change-Id: I4dc6c5a48a55ca494a2372f917aa7447f61f336e Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Value axis reversing supportMiikka Heikkinen2014-05-081-0/+6
| | | | | | | Task-number: QTRD-2428 Change-Id: I51b3a1f8f974d5b72b36ee1188b7557539b9609b Reviewed-by: Titta Heikkala <titta.heikkala@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Bar data item and row changing optimizationsMiikka Heikkinen2014-04-301-9/+10
| | | | | | | | | | No longer reset the entire render item array if single item or row changes, significantly speeding up these operations. Task-number: QTRD-2190 Change-Id: I44b8abd384003e252e4bfc34af5d73ac1dee34bf Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Fix texture cleanup.Miikka Heikkinen2014-04-281-12/+3
| | | | | | | | | Make deleteTexture also zero the pointer and do the check if deletion is needed, as those are required anyway on the caller side in most cases. Change-Id: Ia12102c97a647127230db2518c32f81322ce6743 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 13:06:38 +0000