summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Fix polar background margin not reacting to titles correctlyMiikka Heikkinen2014-07-041-4/+3
| | | | | | | | Hiding angular axis title didn't cause the background margin to reduce appropriately. Change-Id: Icf62aaf62b978524dc4ac13c1f8561b517103c55 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Improved the visuals in slice modes.Miikka Heikkinen2014-07-042-15/+49
| | | | | | | | | | | | | | | Grid lines should no longer vanish into white background due to excessive ambient light multiplier when using high ambient with no specular. I'm still not happy with how bars slice mode colors look. The colors seem washed out compared to main view. Also, on bars, some specular is needed to make bars look 3D, but too much makes it ugly. Also fixes some misc issues in surface slice mode. Task-number: QTRD-3237 Change-Id: I4bed3d922cbc8f5191cc01ab3396849db767cae9 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Exposed default input handlers to QMLMiikka Heikkinen2014-07-048-92/+273
| | | | | | | | | | | Also added properties to control rotation, zoom, and selection individually. Also added missing documentation about surface texture. Task-number: QTRD-3202 Change-Id: I981edb7f336aea499440559f4a2098711200206d Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Remove obsolete fillDepthTexture functionMika Salmela2014-07-043-21/+0
| | | | | | | | Not needed anymore. The m_noShadowTexture takes care of this. Task-number: QTRD-3212 Change-Id: I30d8b6a9cfa7561914c4210cb7334d8ef8a4cca8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Texture to surfaceMika Salmela2014-07-0418-29/+407
| | | | | | | | API for setting a texture to surface. Task-number: QTRD-3232 Change-Id: Icd9de61882b54b9c1fc84a742e49980926ca681d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix non-visible selected item drawing in static optimization modeMiikka Heikkinen2014-07-021-69/+71
| | | | | | Task-number: QTRD-3207 Change-Id: Ib7101aa66ed4e11b8be61975239e55f7dd9eff10 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Add qmlspectrogram example documentationMiikka Heikkinen2014-07-022-0/+10
| | | | | Change-Id: I5a325fa17215c486184cdce0bc26cce8d9c755da Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Removed common.priMiikka Heikkinen2014-07-029-9/+15
| | | | | | | | Common.pri was removed because it was misleadingly named. Moved its contents to more logical places. Change-Id: Ic400472c14f24f42c0a1d3c23786b1c05d6d2659 Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
* Fix labels and grid lines changing size when aspect ratio is changedMiikka Heikkinen2014-07-0214-148/+163
| | | | | | | | | | | Since shaders needed fixing anyway for surface because of this, also implements the support for object gradients for surface, which was missing. Task-number: QTRD-2666 Task-number: QTRD-3211 Change-Id: I0c5da7fdfef308a96ec0bae4750fd22035da4e82 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Added horizontal aspect ratio property for abstract graphsMiikka Heikkinen2014-07-0111-42/+159
| | | | | | | | Value 0.0 indicates automatic scaling (the default). Task-number: QTRD-3192 Change-Id: I5e4cc1b7a03c0ba811e2ed3916a440906429af57 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Fix custom item position in polar graphsMiikka Heikkinen2014-06-302-6/+14
| | | | | | Task-number: QTRD-3184 Change-Id: Id2550a143021771341d5bfef7e08cd5868404ca5 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Adjust background margins based on angular labels and titleMiikka Heikkinen2014-06-309-64/+177
| | | | | | | | Also separated the vertical and horizontal background margins. Task-number: QTRD-3184 Change-Id: I988217d4df7749585dd85b5ea8f3f50254dca6ad Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Fix polar axis title positioningMiikka Heikkinen2014-06-274-8/+64
| | | | | | Task-number: QTRD-3184 Change-Id: I366f41b928e06931784c6ff74e9b6b8a52414e3f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Removed unnecessary texture enablingsTomi Korpipää2014-06-273-24/+2
| | | | | Change-Id: Ia35d2b73a76372c7e92670bb2c379ebc2f387b4a Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Polar chart for scatterMiikka Heikkinen2014-06-264-299/+288
| | | | | | Task-number: QTRD-3184 Change-Id: Ie8e10050e58a3630eda87ec44fb342776d667ae6 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Add radialLabelOffset property for graphsMiikka Heikkinen2014-06-2612-11/+114
| | | | | | | | | This property indicates where radial labels of the polar chart are drawn Task-number: QTRD-3184 Change-Id: I1500e67da5e578b90d679876130c2d56c1d08039 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Add flipHorizontalGrid property for surfaceMiikka Heikkinen2014-06-2613-23/+134
| | | | | | | | | | | | This property allows drawind the horizontal grid and axis labels on top of the graph rather than on the bottom. This is useful when surface graph is used for 2D spectrograms in orthographic mode, as otherwise the grid is covered by the surface itself. Particularly relevant for polar plots of the same. Task-number: QTRD-3184 Change-Id: I9dbcdbfc754e13af52d2cf31a1d9991ef4b241f7 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Polar graph support, phase oneMiikka Heikkinen2014-06-2620-239/+607
| | | | | | | | | | - Polar property for toggling the polar mode - Example added. Example docs will be added in another patch once all of the functionality the example needs has been implemented. - Only surface graph supports polar so far. Scatter to be added later. Change-Id: I54d36f764ac1771ac88f73a5f3a2142f2309f6e8 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Added some extra checking for selection texture creationMiikka Heikkinen2014-06-244-12/+30
| | | | | Change-Id: Iedeaa2581c32b6d46168568fef736b234ac17e95 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix label width issue when axis range changesMiikka Heikkinen2014-06-241-2/+4
| | | | | | Task-number: QTRD-3177 Change-Id: If76ddb47034f6af452ca58f4f792a1c31771110f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Bars: Moved bar, background and grid line drawing to separate methodsTomi Korpipää2014-06-247-120/+344
| | | | | | | + Added floor reflection support in ifdefs Change-Id: I1060aee1bc8f7a0360ad01675c36c0f1a2120f1c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Texture power-of-two for ES2Tomi Korpipää2014-06-122-5/+5
| | | | | | | Force power-of-2 for all ES2 devices instead of just Android and iOS. Change-Id: I6b64182f18b02153833776c82ce8378907443b85 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Minor examples and doc fixesMiikka Heikkinen2014-06-101-6/+6
| | | | | Change-Id: I2523091dee02c496dfd7eb52844b9f302d49a529 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* QML doc fixesTomi Korpipää2014-06-108-35/+42
| | | | | Change-Id: I2760f559916a1a52a6217f0e5fd26a32d78996ff Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix selectedElement qmldesigner crashMiikka Heikkinen2014-06-107-11/+29
| | | | | | | Also fix some minor inconsistencies in the API. Change-Id: Ia31321a1f70d132173a909fef68fd3b59e06e080 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* 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>
* Doc updatesMiikka Heikkinen2014-06-093-16/+14
| | | | | Change-Id: Idb05bcede58e56b6eafa8441ef4adaf2e5e74cae Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix for static optimization crash on androidMika Salmela2014-06-063-39/+64
| | | | | | | Added checks if visible items really exists and if buffers are empty. Change-Id: Id29f87924e098c6f8b7b57bc74543ce37787995f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Update features list in docsMiikka Heikkinen2014-06-061-1/+8
| | | | | Change-Id: I9c8e3739e8408992d7e5ea9d5fc9d29d18438201 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix missing axis titles with zero rotation and fixed titlesMiikka Heikkinen2014-06-064-23/+25
| | | | | Change-Id: I026578b224772fe9d96f6f7789e253d433690091 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Removed unused variableTomi Korpipää2014-06-061-1/+0
| | | | | Change-Id: I9659e0492ee2e4f56717f2189f7aece034f778a2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Change label polygon offset to follow draw orderMiikka Heikkinen2014-06-053-9/+18
| | | | | Change-Id: I6b0bbb458fe9eae9664cd50f9b20f672b08cf4b9 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Plugins.qmltypes updatedTomi Korpipää2014-06-051-3/+76
| | | | | | Task-number: QTRD-3150 Change-Id: I717ed6a7d59d74f6d850cbb0954186a6c00390df Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Clean upTomi Korpipää2014-06-053-15/+23
| | | | | | Task-number: QTRD-3149 Change-Id: Ife8937e93b06b118b369ff909097a137106736cf Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Minor doc fix to sceneMiikka Heikkinen2014-06-051-2/+6
| | | | | Change-Id: Ibff77f2aea13c7627bf612ae75358025231198c8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Scatter perf improvementMika Salmela2014-06-0523-63/+904
| | | | | | | Task-number: QTRD-3148 Change-Id: I2c9efa84184819aaac123ee29685bc3a9e35bfe6 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-08 23:36:42 +0000