| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
Copyright header changes for 5.5.
Change-Id: I0361cfe1ebdb28955cb927700f14cf7b72694421
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
|
|
|
|
|
|
|
| |
B2Qt device called uvs creation before array creation.
Change-Id: Ia0cac175a3e0769f2571a0eadc7c764ae4092cc2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Change-Id: I453438fee92f18c983c1bef04c68b24a7ff72cf9
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
|
|
|
|
|
|
| |
Change-Id: I0667a0e53fd07fe9c6ce7b2d63887eda1692bf3b
Change-Id: I0667a0e53fd07fe9c6ce7b2d63887eda1692bf3b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
Task-number: QTRD-3410
Change-Id: I86b240b6548ec4c94f6be0dc352ed112965926f3
Change-Id: I86b240b6548ec4c94f6be0dc352ed112965926f3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
|
|
|
|
|
|
| |
Task-number: QTRD-3402
Change-Id: I70ef641fc7249b144d6e98971f1fb74f2935d706
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Task-number: QTRD-3391
Change-Id: I5c2f2b674e50e7d39bc9355ebc9bcf05f22d5a39
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
| |
Change-Id: I46db1f02575b8d140890708bf04633fa23f28a15
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
|
|
|
|
|
|
| |
Task-number: QTRD-3392
Change-Id: I786bbf5ee9252b92d43d02d6b88ed9b986b4a5eb
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Change-Id: If40f10043951409b3d6597776b60d7eb55c73eec
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: Ic51682f7e3465c75d505e582f212eaa2cdc28c8b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
| |
Normals and triangles are generated according to data direction.
Task-number: QTRD-3160
Change-Id: Ia4286467682628930da3d82b204fd1ec078a396a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
- Buffer ids were not cleared appropriately
- Update didn't account for items outside axis ranges
- In some cases wrong shader was used for point series
Task-number: QTRD-3353
Change-Id: Iea465d99eb557402feb5fb017ae92393ee8f377f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
| |
Task-number: QTRD-3344
Change-Id: I8c1d2e2ae4afd6f9058c59adfc3d784b5f724358
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
Task-number: QTRD-3230
Change-Id: I0cb76f077c1930033c03f833c9c9f2d347c41f9c
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
Task-number: QTRD-3305
Change-Id: I656cc878e6e83fe09d627b418f9cf624672a18b3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
| |
Change-Id: I409f3c95892b26ca6097dd4509109fc9978b9900
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: Ic44a6a28617f272540d146f02bf50b4bd84cd9c8
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
| |
Change-Id: I2c51ba06c6af9193a70f4a268dfd2fbd6c6910b3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
+ some mingw & clang compilation fixes
Change-Id: Ib4cd5534d9d4e630c021f3d9901114983cdc26eb
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
| |
Change-Id: I856c4166513f6d6f7b73fd52bc46d52ab1b8fdff
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
|
|
|
|
|
| |
Change-Id: Ie9f135a2f3139a429a451c338e03dcf0ea6b4533
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
| |
Change-Id: Ia3a13e2cb8d7dcf744a55dcb827f5cb436a043c4
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
API for setting a texture to surface.
Task-number: QTRD-3232
Change-Id: Icd9de61882b54b9c1fc84a742e49980926ca681d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
| |
Change-Id: Iedeaa2581c32b6d46168568fef736b234ac17e95
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
Added checks if visible items really exists and if buffers are empty.
Change-Id: Id29f87924e098c6f8b7b57bc74543ce37787995f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|