summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Implement volume slice framesMiikka Heikkinen2014-09-1218-92/+669
| | | | | Change-Id: I409f3c95892b26ca6097dd4509109fc9978b9900 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Limit volume to axis rangesMiikka Heikkinen2014-09-1025-180/+584
| | | | | | | | | 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-0813-56/+281
| | | | | | | | 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-037-39/+183
| | | | | 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-032-156/+183
| | | | | | | | | 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-0310-1/+422
| | | | | Change-Id: I4061bfd4d288aabaea76847c9f692e71ecf5f94c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Change volumetric example to show fictional terrainMiikka Heikkinen2014-09-0310-53/+319
| | | | | | 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-0217-51/+265
| | | | | | | | 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-278-41/+60
| | | | | 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>
* Added reflection to 2 examplesTomi Korpipää2014-08-268-2/+19
| | | | | | | | | Task-number: QTRD-3290 + changed the theme in texturesurface example Change-Id: I872ef7048e21c3bbf9daa0b2a620c9cdfe2256c8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Reflection API addedTomi Korpipää2014-08-2615-174/+327
| | | | | | | Task-number: QTRD-3287 Change-Id: I6c06b8fe025e0f1f87be00be906cab0e1f18a19f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Add alpha multiplier to QCustom3DVolume apiMiikka Heikkinen2014-08-2514-110/+372
| | | | | | 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-259-19/+204
| | | | | Change-Id: Iea18967c3b525a8d4507a06e6541c85ed3abb470 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Tweak volume shaders.Miikka Heikkinen2014-08-229-128/+413
| | | | | | | Also fix custom object default texture. Change-Id: Iba9ff6afb807d9f7a4e1f58b0e5fb4bca4c9c431 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Gradient to highlight seriesMika Salmela2014-08-218-28/+114
| | | | | | | Added a gradient to highlight series on textured surface example. Change-Id: I2fc17dfa79f986cf5b651d964eb3bcf5d65f1c80 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Make volume transparency uniform regardless of viewing angleMiikka Heikkinen2014-08-203-4/+12
| | | | | Change-Id: If3acbb161b99f67d81f7af9c05ae8bcfe154e052 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Improve volumetric exampleMiikka Heikkinen2014-08-194-54/+251
| | | | | | | | | - 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>
* Show warning label in volumetric example on OpenGL ESMiikka Heikkinen2014-08-191-7/+25
| | | | | | Change-Id: I29ec58f9485a75a00cb1c60d7c57f4c06f620032 Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Make volume shading sample once per texture layer.Miikka Heikkinen2014-08-195-21/+65
| | | | | | 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-1837-45/+2343
| | | | | | | | 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>
* Documentation for textured surface exampleMika Salmela2014-08-155-4/+99
| | | | | | Change-Id: I517b02a31e342dc3ae2c1c80805f811f9d9670ff Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Image for texture surface documentationMika Salmela2014-08-132-0/+5
| | | | | | | Also theme and font size adjustment. Change-Id: I2306deceb8d45cd95fadb27e3b1ff88260f49ac9 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Textured surface exampleMika Salmela2014-08-1215-1/+776
| | | | | | | | Documentation once the feature set is final and code looking good. Size of image files adjusted when example area is locked. Change-Id: I7ff249ec3452d412a64ce029b33f7607965ffb3a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Add zooming to selection to bars exampleMiikka Heikkinen2014-08-064-0/+150
| | | | | | Task-number: QTRD-3262 Change-Id: I96de8d97813cc82707a9b608127464ed4d6be6f7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Enable camera targeting.Miikka Heikkinen2014-08-0627-190/+434
| | | | | | | | | | | | | | | 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>
* Avoid the Missing cmake tests error from qmake with Qt 5.4Laszlo Agocs2014-08-041-0/+2
| | | | | | | | | | Due to some bizarre new policy, any Qt module will fail unless tests/auto/cmake is present. See qtbase/mkspecs/features/create_cmake.prf. We don't care about cmake so just disable this thing in the .qmake.conf. Change-Id: I27b5b2e498d6056307b7e881ebc2b8e83978e5de Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Added mention of WinRT only supporting Quick2 apiMiikka Heikkinen2014-07-042-4/+4
| | | | | 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-043-16/+52
| | | | | | | | | | | | | | | 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-0413-134/+382
| | | | | | | | | | | 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>
* Arrow blender files backupMika Salmela2014-07-042-0/+0
| | | | | Change-Id: I293687ebea6565bf56ec7c3089fa236b46de1369 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Use default font in spectrogram exampleMiikka Heikkinen2014-07-041-2/+0
| | | | | Change-Id: I2b16eecfaf5ba866dd07c6593a8b101dbc2cc112 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Texture to surfaceMika Salmela2014-07-0423-42/+436
| | | | | | | | 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-024-11/+69
| | | | | 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-0216-153/+178
| | | | | | | | | | | 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-0118-47/+199
| | | | | | | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 19:14:01 +0000