summaryrefslogtreecommitdiffstats
path: root/src/datavisualization
Commit message (Collapse)AuthorAgeFilesLines
* Copyright header changesMika Salmela2015-04-14195-585/+585
| | | | | | | Copyright header changes for 5.5. Change-Id: I0361cfe1ebdb28955cb927700f14cf7b72694421 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Once more crash fix on texture adding.Mika Salmela2014-11-211-5/+13
| | | | | | | B2Qt device called uvs creation before array creation. Change-Id: Ia0cac175a3e0769f2571a0eadc7c764ae4092cc2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Fix crash when adding a texture on QMLMika Salmela2014-11-211-5/+7
| | | | | | | | When texture was attached on the qmlsurface example, the smoothUVs was called before the actual model mesh was created. Change-Id: I5a62b06291232df54ce08d586d8794b332a4eece Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Fix flickering in android on some examples when zooming.Miikka Heikkinen2014-11-211-0/+5
| | | | | Change-Id: I3c9de6801430dc74c97fb6563ded6114befc6968 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix incorrect shader initialization for static optimized es2Miikka Heikkinen2014-11-211-2/+2
| | | | | | Change-Id: I8fdacfde272ace4c25c74c316de514cd4275da74 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Support larger custom meshes.Miikka Heikkinen2014-11-1813-126/+22
| | | | | | | | | | Vertex index was limited to unsigned short, meaning even slightly complex meshes couldn't be used. Changed to unsigned int. Also removed unused vertex indexer methods. Change-Id: Iebe62bd3a501dc79ee2857cca28ac0d05bd4a55e Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Some doc updatesMiikka Heikkinen2014-11-182-1/+3
| | | | | Change-Id: Ib4bb651877db4aa0dfd13cb8f1c08e786960a221 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Change copyright headers.Miikka Heikkinen2014-11-07195-1365/+1365
| | | | | | Change-Id: I453438fee92f18c983c1bef04c68b24a7ff72cf9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Added flags to software renderer test Tomi Korpipää2014-11-052-0/+4
| | | | | | Change-Id: I0667a0e53fd07fe9c6ce7b2d63887eda1692bf3b Change-Id: I0667a0e53fd07fe9c6ce7b2d63887eda1692bf3b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Fixed font size jumping in ES2 Tomi Korpipää2014-11-051-1/+1
| | | | | | | | Task-number: QTRD-3412 Change-Id: I7f19ee34ccdde3a227033e3a88994e157b0092c4 Change-Id: I7f19ee34ccdde3a227033e3a88994e157b0092c4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Force software renderer to using ES2 Tomi Korpipää2014-11-053-10/+57
| | | | | | | Task-number: QTRD-3410 Change-Id: I86b240b6548ec4c94f6be0dc352ed112965926f3 Change-Id: I86b240b6548ec4c94f6be0dc352ed112965926f3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Fixed surface slice problemTomi Korpipää2014-10-311-1/+1
| | | | | | Task-number: QTRD-3402 Change-Id: I70ef641fc7249b144d6e98971f1fb74f2935d706 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Use QOffscreenSurface instead of QWindow for dummy surfaces.Miikka Heikkinen2014-10-303-9/+7
| | | | | | | | | Android doesn't like creating extra QWindows, so changed dummy surfaces used to do static initialization and cleanup to use QOffscreenSurface. Change-Id: Ia42e288a05ef49524252c457f3a3494677e3fc63 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Fix another crash at app shutdown.Miikka Heikkinen2014-10-301-3/+2
| | | | | | | Context doesn't exist on all envs at shutdown. Change-Id: I6c0398203f0ab3ceaa38f64936cdf375c43e9f55 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix crash on application shutdown.Miikka Heikkinen2014-10-301-1/+1
| | | | | | | | Label items should not try to delete their textures at destructor if they are already deleted. Change-Id: I8131301bec47a0a2617b4a923d7cce430d35e18b Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix crash when initializing QCustom3DLabel out of context.Miikka Heikkinen2014-10-292-32/+40
| | | | | | Task-number: QTRD-3391 Change-Id: I5c2f2b674e50e7d39bc9355ebc9bcf05f22d5a39 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Add missing includes to utils.cpp.Miikka Heikkinen2014-10-291-0/+2
| | | | | Change-Id: I46db1f02575b8d140890708bf04633fa23f28a15 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Support for dynamic opengl builds.Miikka Heikkinen2014-10-2925-967/+909
| | | | | | Task-number: QTRD-3392 Change-Id: I786bbf5ee9252b92d43d02d6b88ed9b986b4a5eb Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Squeeze labels on ES2Mika Salmela2014-10-283-10/+28
| | | | | | | | | | If the label text with slightly smaller font would fit into smaller texture, force to use the smaller one. Task-number: QTRD-3395 Change-Id: Ib70f6722ea8403e4aa25ed190b21c059d9d0e062 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Mac touchpad support addedTomi Korpipää2014-10-272-1/+14
| | | | | | Task-number: QTRD-2286 Change-Id: Ibe211caedab231e908af900af65d4075b926a875 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Release housekeepingMiikka Heikkinen2014-10-244-18/+19
| | | | | | | | | - Changed the version number to 1.2 where relevant. - Regenerated plugins.qmltypes - Updated known issues Change-Id: I5f737a970d0ac7fc14dbd2d30a8684ecced45ac0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Surface shadow improvementMika Salmela2014-10-227-13/+80
| | | | | | | | | Not allowing bias go below 0.001 prevents the shadow acne. Faulty formula for lighning direction. Task-number: QTRD-3382 Change-Id: Ided8bf423a961744ace8bef32ae18d6fa2c443ef Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Added C++ autotests for seriesTomi Korpipää2014-10-211-0/+3
| | | | | | | | | Also fixed a bug found in testing, and added tests for optional constructors for already tested classes. Task-number: QTRD-3368 Change-Id: I2214f28e2c5069ecab422fc6817acb2f0c0b192b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Fix shadows when viewing directly from above.Miikka Heikkinen2014-10-211-8/+21
| | | | | | | | | | | Fudge the camera y-angle so that it's never looking directly from above or below. The actual problem is that eye vector is paraller to up vector if viewing directly from above, which results in invalid view matrix. Task-number: QTRD-2789 Change-Id: Ia79b8bb4b8317c6aaf6ac4c70a6bb70c24b5309e Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Document the issue with large surfaces and static scatters.Miikka Heikkinen2014-10-203-8/+30
| | | | | | | | | | OpenGL ES2 and/or 32bit environments can have relatively low maximum supported vertex counts per draw call, so large surfaces and static scatters may not get rendered. Task-number: QTRD-3364 Change-Id: I7fd024b0428548ac7e2ca043a06d01d2442dd226 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Qt 5.4 qml type fix Tomi Korpipää2014-10-171-1/+1
| | | | | | | | Fixes missing QML Types in assistant. Change-Id: Id79c3f281ec4fcc9bd9816ec731ff654e61b3e04 Change-Id: Id79c3f281ec4fcc9bd9816ec731ff654e61b3e04 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Added invalid value tests for QML autotestsTomi Korpipää2014-10-172-2/+3
| | | | | | | | | Plus fixed a QML documentation bug, and added a missing inheritance to docs. Task-number: QTRD-3383 Change-Id: I1f7c56c49b829fee2cfd0731bbcc7e248a06a0c0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Test for QML proxiesTomi Korpipää2014-10-161-8/+8
| | | | | | | | Also added missing default values to some docs. Task-number: QTRD-3368 Change-Id: I98940a80d6edfe60801c6b2606307b3ec3ab8c39 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Regenerate render bufferMika Salmela2014-10-161-2/+4
| | | | | | | | | | Looks like the render buffer for depth gets incomplete and that causes resets. Regenerating the buffers seems to be helpful. Task-number: QTRD-3372 Change-Id: I1f0fb40f06fac44e062f2f2b512bc9424479328c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Fix scatter item autosizing.Miikka Heikkinen2014-10-151-8/+10
| | | | | | | | Autosizing only accounted for freshly changed series when calculating the total item count visible in the graph. Change-Id: I7c0990123d3e3827c3518713f5389fedf91aca92 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added tests for QML inputTomi Korpipää2014-10-151-0/+1
| | | | | | | | Also updated missing inheritance to docs Task-number: QTRD-3368 Change-Id: I7b091009d7d89d601215bb4484b8eac7274bcf14 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Fix the bug introduced in previous fix.Miikka Heikkinen2014-10-151-1/+3
| | | | | | | | It's not enough to just clear the label items upon axis cache destruction, they need to be deleted, too. Change-Id: I63bdd01f9b328491107292f42cca6aa2ba7b4434 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Small cleanups for surfaceMika Salmela2014-10-152-14/+7
| | | | | | | | | Unnecessary modelMatrix multiplications removed. Intentional whitespace removal. Change-Id: I78b8e6f984d44baf7015c9551701b04cb869fc8b Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Added tests for QML custom items Tomi Korpipää2014-10-152-0/+2
| | | | | | | | | | Also added skeleton for remaining QML tests and some inheritance updates to documentation. Task-number: QTRD-3368 Change-Id: I28cb52c4738953b7f281ce91a3764f849643d35a Change-Id: I28cb52c4738953b7f281ce91a3764f849643d35a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Simplify context handling at cleanup.Miikka Heikkinen2014-10-154-17/+18
| | | | | | | | | | | | | If the context exists at renderer deletion, it is possible that it no longer has valid surface, which means it won't be possible to set it back to current if we change context for deletion cleanup. Since the current context will be one of our shared contexts anyway, there is no need to do a dummy context for cleanup unless the current context is null. Change-Id: Ibabe081742beb975ee848ccb3690703ef5b027a9 Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Gradient adjustment logic was broken.Miikka Heikkinen2014-10-141-5/+5
| | | | | | | | Bug in adjustment logic caused adjustment to happen pretty much always. Task-number: QTRD-3374 Change-Id: Id6151d2d3eb8369bbf9252e4eb4b76ed57fb1f3c Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Bars3D, Surface3D and Scatter3D tests Tomi Korpipää2014-10-141-5/+0
| | | | | | | | | | Task-number: QTRD-3368 + Removed erroneous property from docs Change-Id: I675e16b58e7b190b2b33d29029654039a60b5bfc Change-Id: I675e16b58e7b190b2b33d29029654039a60b5bfc Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Fix gradient artifacts on some edge casesMiikka Heikkinen2014-10-141-0/+13
| | | | | | | | | | | | | | When static optimization is in use with mesh objects and range gradient, and the object Y-value resolves into a texture coordinate that is exactly on the texel boundary, the rendered fragments of the object are not all same colors on some graphics cards, despite all vertices having the same UV value. Fixed by adjusting the Y-value slightly if it is close to the boundary. Task-number: QTRD-3370 Change-Id: Ie028602cbd9a00bb0e17049eb8f40feb8b18a6bf Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Reset camera target when setting a presetMiikka Heikkinen2014-10-131-0/+5
| | | | | Change-Id: I3a1595530a976b73144109cf2eef72a188831a10 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix context cleanupMiikka Heikkinen2014-10-137-18/+74
| | | | | | | | | | Context was not getting properly cleaned up in cases where render thread stopped before the cleanup took place. Now we ensure that required cleanup is done before context thread terminates. Change-Id: I1489914dafec928eebb69bac737f6f858ff49432 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Remove separate depth texture for surface shadowsMika Salmela2014-10-132-44/+6
| | | | | | | | | | Use the same depth texture for the backwall and the surfaces. No need to any culled texture. Task-number: QTRD-3160 Change-Id: I7a4e8aa61b98d5264a92173174e911e50af8d52a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* If GL_MAX_TEXTURE_SIZE cannot be read, don't check for itMiikka Heikkinen2014-10-101-1/+1
| | | | | | | | | | In QML apps, the texture for custom labels can get created before glGenIntegerv returns a valid value for GL_MAX_TEXTURE_SIZE. Do not check for max size when it is zero. Change-Id: I114ac8494bd5aa509490bd38ae58827fd21e2729 Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added doc about reflections and stencil buffer Tomi Korpipää2014-10-091-0/+3
| | | | | | Change-Id: I939d02433291b00a529598718b6390d7246f89f9 Change-Id: I939d02433291b00a529598718b6390d7246f89f9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixed recurring GL_INVALID_VALUE OpenGL errors Tomi Korpipää2014-10-093-113/+149
| | | | | | | | | Now that these are not generated all the time, makes it easier to use glGetError to find actual errors. Change-Id: I4e10f5798e4e79466a47a0d671c04b445899c62c Change-Id: I4e10f5798e4e79466a47a0d671c04b445899c62c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix screen position based queries in threaded rendering environmentMiikka Heikkinen2014-10-097-21/+46
| | | | | | | | | | | | | | | | QtQuick's threaded renderer doesn't seem to always pair up sync and render (or more accurately, beforeSynchronizing and node's preprocess calls). Sometimes sync comes without a followup render, or there are two syncs in a row, even though the sync is using direct connection. Both of these cases broke the old logic for handling position based queries. Changed the logic to actually ensure we have resolved the query before emitting the relevant signal. Task-number: QTRD-3358 Change-Id: Ica6c8c311f53a06311c21532aaabc18c28556655 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fixed selecting through the floor bugTomi Korpipää2014-10-082-37/+44
| | | | | | Task-number: QTRD-3359 Change-Id: I418aaef640c05f7af7b860c89f5a5231e3f14c16 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Grid line color bug in surface fixed Tomi Korpipää2014-10-081-2/+2
| | | | | | | Task-number: QTRD-3361 Change-Id: Id40db146efb84f6a9b642e7e0678d6b656cdbd19 Change-Id: Id40db146efb84f6a9b642e7e0678d6b656cdbd19 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Polar coordinates angle grid lines fixes Tomi Korpipää2014-10-081-0/+4
| | | | | | | Task-number: QTRD-3360 Change-Id: I33177ccfe93136e6ce048fad0dbed70fe560b204 Change-Id: I33177ccfe93136e6ce048fad0dbed70fe560b204 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix minor issues found in testingMiikka Heikkinen2014-10-081-0/+3
| | | | | | Change-Id: If40f10043951409b3d6597776b60d7eb55c73eec Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Texture UVs for surface to follow data dimensionMika Salmela2014-10-072-3/+16
| | | | | | | | | Change texture UVs to be generated according to data dimension. Also utilise this change on texturesurface example. Change-Id: Ideacfba409dc2e7cf579fb38d897e08c9f9a1b71 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>