summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix changing items in static optimization modeMiikka Heikkinen2014-10-037-81/+202
| | | | | | Task-number: QTRD-3344 Change-Id: I8c1d2e2ae4afd6f9058c59adfc3d784b5f724358 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fixed window blend bugTomi Korpipää2014-10-021-1/+0
| | | | | | | | Alpha buffer size should not be set for the window's surface format. Task-number: QTRD-3351 Change-Id: I64ee61990e8ceb88bdbab715a2902b454619f3e5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixed ordering of subviewsTomi Korpipää2014-10-022-13/+29
| | | | | | Task-number: QTRD-2790 Change-Id: I8ac6ce89920a9c988c7a059e1b02c980a0264200 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Reduce font size if label gets too wide to fit textureTomi Korpipää2014-10-011-19/+56
| | | | | | | | Task-number: QTRD-3230 Change-Id: I0cb76f077c1930033c03f833c9c9f2d347c41f9c Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix selection color and gradient for static optimizationMiikka Heikkinen2014-10-014-25/+111
| | | | | | | | | | Added separate shaders for rendering selected items, as the texture mapping that the regular static optimization shaders expect is not correct for single objects. Task-number: QTRD-3306 Change-Id: I6eb6cef94a4d2b4e5bdd03748f18db641a9fc4f6 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Make background margin configurableMiikka Heikkinen2014-09-3015-38/+281
| | | | | | | | | | | Added margin as abstract graph property. If the margin is narrow, the positions of theedge labels of the axes are adjusted to avoid overlap with edge labels on other axes. Task-number: QTRD-3204 Change-Id: I7fa5a04c8f2091519d99689ef2f6cbcf799fb15e Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Add C++ API for getting the custom item list from graph.Miikka Heikkinen2014-09-294-1/+18
| | | | | | | | QML already had this. Task-number: QTRD-3173 Change-Id: Ib4203eef7a0bc477ddc79467c91b22f95d573154 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Make various selection queries thread safeMiikka Heikkinen2014-09-292-10/+17
| | | | | | Task-number: QTRD-3333 Change-Id: I09cb9a119a3490de008feb97cbb6f0c623238927 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Allow setting bounds for camera zoom levelMiikka Heikkinen2014-09-265-49/+152
| | | | | | Task-number: QTRD-3337 Change-Id: I503dc4402907a2fdfa74ca86698b0e98a23b3b08 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix absolutely scaled volumesMiikka Heikkinen2014-09-261-2/+3
| | | | | | | Min/max bounds were set incorrectly. Change-Id: I54e115ef98321531410bcb64146ae32230375d4e Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Implement zooming to cursorMiikka Heikkinen2014-09-2626-51/+532
| | | | | | | | | Zooming to cursor is now default operating mode of the default input handler. Task-number: QTRD-3263 Change-Id: I5699fc0ce7393059538972cd52f31f06d87e3d8d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Allow setting the floor level on bar graphs.Miikka Heikkinen2014-09-2210-18/+110
| | | | | | Task-number: QTRD-3313 Change-Id: Ie0f8e36af8698081a6937c360043773da895b6e6 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Change custom labels to use label shaderMiikka Heikkinen2014-09-198-47/+21
| | | | | | | | | This fixes the problem with specular highlight making camera-facing labels unreadable. Task-number: QTRD-3276 Change-Id: If16424b07a1f3362428980353c5fb5213c33d06b Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added possibility to change graph's localeMiikka Heikkinen2014-09-1915-47/+238
| | | | | | | | | | Locale affects how axis labels are formatted. Default locale is still the "C". Task-number: QTRD-3229 Change-Id: I6126ce676906f4bbc91ae0abd18775bc1d564118 Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Full update for static buffers when data updatedMika Salmela2014-09-173-1/+12
| | | | | | | Task-number: QTRD-3322 Change-Id: I6ac9e0506ed7355e06d2174d8f8f551cb82b8a86 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixed custom item wrong side reflectionTomi Korpipää2014-09-173-2/+12
| | | | | | | Task-number: QTRD-3311 Change-Id: Ia5aea90259c249a5ffd48e16fae4e2dc33902afd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix volume frame translation for rotated volumesMiikka Heikkinen2014-09-171-1/+1
| | | | | | Task-number: QTRD-3323 Change-Id: I08823f257a1a273da97a9e9e8597e4ffdb87d93b Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix to slice crash bug fixTomi Korpipää2014-09-163-9/+16
| | | | | | | Task-number: QTRD-3301 Change-Id: Ia0ae6d5e3ac9aabc9af9199df27bbbe7f7908d60 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Prevent selection label generation on rotateTomi Korpipää2014-09-162-5/+7
| | | | | | | | | | Task-number: QTRD-3234 Selection pointer label needs to be regenrated only when either theme or label text changes. Change-Id: Iabe91a88b719b186c998cda9e712207752762279 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Invalid slice usage crash fixedTomi Korpipää2014-09-163-2/+23
| | | | | | | | Task-number: QTRD-3301 Change-Id: I0e39348a2e9392b4c1f0bd7ef26c5613272460e2 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com> Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
* Fixed renderToImage for ES2Tomi Korpipää2014-09-152-0/+12
| | | | | | | Task-number: QTRD-3305 Change-Id: I656cc878e6e83fe09d627b418f9cf624672a18b3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Implement volume slice framesMiikka Heikkinen2014-09-1214-84/+612
| | | | | Change-Id: I409f3c95892b26ca6097dd4509109fc9978b9900 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Limit volume to axis rangesMiikka Heikkinen2014-09-1019-155/+412
| | | | | | | | | The volume object that would go partially outside axis ranges is scale and repositioned so that it only renders the portion that is inside the axis ranges. Change-Id: I792494e437998ba6276f58fab645767276c1476d Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Add possibility to scale custom items according to data rangesMiikka Heikkinen2014-09-089-32/+148
| | | | | | | | Proper behavior of volume objects that are shown only partially will be added in a separate patch later. Change-Id: I1fcd98faa6c4a7d09e3fef1645ed9816ff54654f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* ES2 gradient support for static optimizationMika Salmela2014-09-045-4/+50
| | | | | Change-Id: I3d5d5d006a26225a3a7ab5795fceb97630db0011 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Allow setting volume subtexture along any axisMiikka Heikkinen2014-09-032-31/+103
| | | | | Change-Id: Iafaac6bd2106253bec913d1d9ee8a3f40e339adf Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Remove undeclared identifierMika Salmela2014-09-031-4/+0
| | | | | | Task-number: QTRD-3303 Change-Id: I8f43df8f0d90997c05ffaf93e451a52baacefa63 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Make volume items draw after regular custom itemsMiikka Heikkinen2014-09-031-155/+171
| | | | | | | | | Since volume items typically contain transparencies, make them draw after regular custom items, which are less likely to be transparent. Change-Id: Id7c48b6c77d7ed8654b72923d7dccf4158c9c088 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* QML support for volume itemsMiikka Heikkinen2014-09-032-0/+3
| | | | | Change-Id: I4061bfd4d288aabaea76847c9f692e71ecf5f94c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Change volumetric example to show fictional terrainMiikka Heikkinen2014-09-031-1/+1
| | | | | | Change-Id: I7cb3c59acef5364ff964da3e756d2db387b53308 Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Add option to use low definition volume shader.Miikka Heikkinen2014-09-0213-50/+247
| | | | | | | | Low definition volume shader samples the texture at even intervals, so it will sometimes skip texels, causing flickering. Change-Id: Iee6cb0e8893498b89ce1a40f34701a53d100283e Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Pixel perfect volume shaderMiikka Heikkinen2014-09-013-75/+128
| | | | | | | | | Now the volume should render with pixel perfect accuracy. The drawback is that it is significantly slower than the old approximate solution. Change-Id: I4df7e9a28a27b56150c71a85a4c1fb69a215dabc Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Unified gradient for pointsMika Salmela2014-08-293-7/+11
| | | | | | | | | | Made gradient image same size as the texture and similar calculation for the pixel. Result should be more coherent for all. Task-number: QTRD-3295 Change-Id: I666dacc6f525258ccefda288e26cac480cb385cb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Range gradient for points on static optimizationMika Salmela2014-08-288-18/+103
| | | | | Change-Id: Ic44a6a28617f272540d146f02bf50b4bd84cd9c8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* New vertex shaders for previous task.Mika Salmela2014-08-272-0/+62
| | | | | Change-Id: I992da6ca5835ac41b45410d79750e9f33f551793 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Diffuse and specular color for static optimizationMika Salmela2014-08-275-40/+44
| | | | | Change-Id: I2c51ba06c6af9193a70f4a268dfd2fbd6c6910b3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix build issue with Qt 5.2.1Miikka Heikkinen2014-08-2711-29/+44
| | | | | | | | | | | | | | QImage is not a QObject, and therefore QImage::Format doesn't seem to be a supported type for a Q_PROPERTY, either. At least this was the case in Qt 5.2.1. In Qt 5.3.1 this worked. In any case, worked around the issue by removing textureFormat as a property. This shouldn't be an issue, since texture cannot meaningfully be manipulated from QML anyway. Also fixed some compile warnings. Change-Id: I257c1502d3340c49c24085fb8bf2e6176d875215 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Mac reflection bug fixedTomi Korpipää2014-08-272-6/+5
| | | | | | | + some mingw & clang compilation fixes Change-Id: Ib4cd5534d9d4e630c021f3d9901114983cdc26eb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Reflection API addedTomi Korpipää2014-08-2611-171/+280
| | | | | | | Task-number: QTRD-3287 Change-Id: I6c06b8fe025e0f1f87be00be906cab0e1f18a19f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Add alpha multiplier to QCustom3DVolume apiMiikka Heikkinen2014-08-2510-94/+295
| | | | | | Change-Id: I856c4166513f6d6f7b73fd52bc46d52ab1b8fdff Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Implement API function for rendering volume slice to an image.Miikka Heikkinen2014-08-253-5/+84
| | | | | Change-Id: Iea18967c3b525a8d4507a06e6541c85ed3abb470 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Tweak volume shaders.Miikka Heikkinen2014-08-224-81/+102
| | | | | | | Also fix custom object default texture. Change-Id: Iba9ff6afb807d9f7a4e1f58b0e5fb4bca4c9c431 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Make volume transparency uniform regardless of viewing angleMiikka Heikkinen2014-08-202-3/+11
| | | | | Change-Id: If3acbb161b99f67d81f7af9c05ae8bcfe154e052 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Improve volumetric exampleMiikka Heikkinen2014-08-191-2/+2
| | | | | | | | | - Changing color table - Different texture details (generation in background) - Optional fps display Change-Id: Iad6b50ef8541084e0142de0f9cb7ae70f841dde9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Gradient color style support for complex meshes on staticMika Salmela2014-08-198-15/+174
| | | | | Change-Id: Ie9f135a2f3139a429a451c338e03dcf0ea6b4533 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Make volume shading sample once per texture layer.Miikka Heikkinen2014-08-194-18/+62
| | | | | | Change-Id: Ia3a13e2cb8d7dcf744a55dcb827f5cb436a043c4 Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Implement volume rendering supportMiikka Heikkinen2014-08-1824-43/+1483
| | | | | | | | New subclass of QCustom3DItem, QCustom3DVolume is provided. The documentation for the example will be done in a separate commit. Change-Id: Idb3fdb0654c6bec7606ca012b75852a5a8412397 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Enable camera targeting.Miikka Heikkinen2014-08-0617-130/+192
| | | | | | | | | | | | | | | Also fix custom item positioning in absolute mode as it was completely broken in bars and z-coord was flipped in others. Clarified Q3DObject::position property usage, namely that it is reserved for internal use for now. Some refactoring also done. Task-number: QTRD-2567 Change-Id: I5da65b83a2f8ecf20f8fd054e59748278ef1a714 Reviewed-by: Titta Heikkala <titta.heikkala@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Reduce the size of surface selection textureMiikka Heikkinen2014-08-042-24/+13
| | | | | | | | | | Now four times more vertices are supported. Task-number: QTRD-3244 Change-Id: I80594f4c4f80f485d94dbc2f73892251bb20c521 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Titta Heikkala <titta.heikkala@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Added mention of WinRT only supporting Quick2 apiMiikka Heikkinen2014-07-041-2/+2
| | | | | Change-Id: Ia92494674bfc618d9368075dabe6ea0490e6c3d1 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 17:48:59 +0000