- 17 Jun, 2015 - 1 commit
-
-
Miikka Heikkinen authored
Implemented QTCANVAS3D_texture_provider extension for creating a texture object for QQuickItems that implement texture providers. [ChangeLog][Renderer] Enabled using Qt Quick items as textures. Change-Id: I947304155734af50c8a21f34292b244bb099702f Reviewed-by:
Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by:
Laszlo Agocs <laszlo.agocs@theqtcompany.com> Reviewed-by:
Topi Reiniö <topi.reinio@digia.com> Reviewed-by:
Pasi Keränen <pasi.keranen@digia.com>
-
- 11 Jun, 2015 - 1 commit
-
-
Miikka Heikkinen authored
We need to return the canvas side resource id of the buffer matching the id we get from OpenGL. Change-Id: I99631013804d706794a8f477e0f57b354eba489d Task-number: QTBUG-46532 Reviewed-by:
Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by:
Pasi Keränen <pasi.keranen@digia.com>
-
- 08 Jun, 2015 - 1 commit
-
-
Miikka Heikkinen authored
Conflicts: src/imports/qtcanvas3d/canvas3d.cpp src/imports/qtcanvas3d/context3d.cpp src/imports/qtcanvas3d/context3d_p.h src/imports/qtcanvas3d/framebuffer3d.cpp src/imports/qtcanvas3d/framebuffer3d_p.h src/imports/qtcanvas3d/program3d.cpp src/imports/qtcanvas3d/uniformlocation.cpp src/imports/qtcanvas3d/uniformlocation_p.h Change-Id: I214239d40936e14dd69498167b08f199a692f325
-
- 04 Jun, 2015 - 1 commit
-
-
Miikka Heikkinen authored
The render loop has been redesigned. The OpenGL commands are queued instead of executed immediately. updatePaintNode() now transfers the commands to the renderer, which implements all OpenGL related things that used to be in the Canvas class. The actual rendering is done in response to beforeRendering signal in the render thread. [ChangeLog][Renderer] OpenGL rendering moved to render thread. Task-number: QTBUG-44953 Change-Id: Ibd5897e64b84b6c7ce169cece8293381eca94ab9 Reviewed-by:
Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by:
Pasi Keränen <pasi.keranen@digia.com>
-
- 03 Jun, 2015 - 1 commit
-
-
Liang Qi authored
Change-Id: I61edafed8a790578e13ca2beeacfd8bf42b74465
-
- 01 Jun, 2015 - 6 commits
-
-
Miikka Heikkinen authored
Change-Id: Ic261c506c54913d727ef4643dc6187ebef855cab
-
Miikka Heikkinen authored
Change-Id: Ie23b7009ad299e934ce70f5899a5429d0a6ee40f Reviewed-by:
Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
-
Miikka Heikkinen authored
Task-number: QTBUG-46410 Change-Id: I0f221ff495f9d7910e8c2f8f88aa639556e8cc96 Reviewed-by:
Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by:
Pasi Keränen <pasi.keranen@digia.com>
-
Titta Heikkala authored
Also added copyright header to both wizard templates to the Java Script file. Change-Id: I997981652518f8812aaf1ebdbee21cda5a90f174 Reviewed-by:
Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by:
Pasi Keränen <pasi.keranen@digia.com>
-
Pasi Keränen authored
Change-Id: I9a2c5c684b6d0f31c18a4eae23f08f60cf6cca3a Reviewed-by:
Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by:
Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
-
Miikka Heikkinen authored
Fixed the found errors. Primarily the problems were related to error conditions that were not correctly set. Change-Id: I35c06d9205e6970392b44a6d21e63c717dd9232f Reviewed-by:
Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
-
- 29 May, 2015 - 2 commits
-
-
Miikka Heikkinen authored
Qt Quick compiler builds failed to load the images if everything was under the same qresource tag. Possibly some generated structure got too large. Change-Id: I17494189658fa7fee3a5ae82f56ca622d0a91098 Reviewed-by:
Titta Heikkala <titta.heikkala@theqtcompany.com> Reviewed-by:
Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by:
Pasi Keränen <pasi.keranen@digia.com>
-
Tomi Korpipää authored
Change-Id: If72f2e7f7110d4ac58862cde019fa25b3cf5fdca Task-number: QTBUG-46370 Reviewed-by:
Titta Heikkala <titta.heikkala@theqtcompany.com> Reviewed-by:
Pasi Keränen <pasi.keranen@digia.com>
-
- 28 May, 2015 - 3 commits
-
-
Tomi Korpipää authored
Change-Id: I10d2202468518e85b4cea850a9a335bb70937856 Reviewed-by:
Pasi Keränen <pasi.keranen@digia.com>
-
Pasi Keränen authored
Change-Id: If7134c579aea73e43cf6e8f98ee1c888dc1b5c8b Reviewed-by:
Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by:
Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
-
Pasi Keränen authored
Change-Id: If482e713c834fdbaf14c63281984309cc23ad48e Reviewed-by:
Titta Heikkala <titta.heikkala@theqtcompany.com> Reviewed-by:
Pasi Keränen <pasi.keranen@digia.com>
-
- 27 May, 2015 - 8 commits
-
-
Nico Vertriest authored
Task-number: QTBUG-44180 Change-Id: I3c6b10354435716e503254cbea0dd75901234242 Reviewed-by:
Pasi Keränen <pasi.keranen@digia.com>
-
Titta Heikkala authored
Image link corrected. Change-Id: I6edb60d0aae6ef92f5ac5457042c71ece5fcc3e1 Reviewed-by:
Pasi Keränen <pasi.keranen@digia.com>
-
Titta Heikkala authored
Added section that describes the wizard template provided with the module. Change-Id: Id07f612e7fa2623103f44253fe666b52f160d485 Reviewed-by:
Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by:
Pasi Keränen <pasi.keranen@digia.com>
-
Pasi Keränen authored
Change-Id: I4bc2add33b39ea562d0ecbccbc4badb026037a51 Reviewed-by:
Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by:
Pasi Keränen <pasi.keranen@digia.com>
-
Titta Heikkala authored
Change-Id: I6377e0f845cac98e8933e8ef503779a6bb6565a1 Reviewed-by:
Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by:
Pasi Keränen <pasi.keranen@digia.com>
-
Pasi Keränen authored
The shininess of the planets in the example were left to the default 30.0 which is quite shiny. To achieve more realistic look'n'feel the planets with specular texture (earth) are tweaked to be a bit more shiny and the planets without a specual texture (the rest) are tweaked to be not shiny at all. Change-Id: I01acf6789cc632c8fba9be80a0792ae9170d05fd Reviewed-by:
Titta Heikkala <titta.heikkala@theqtcompany.com> Reviewed-by:
Pasi Keränen <pasi.keranen@digia.com>
-
Miikka Heikkinen authored
Now examples compile with Qt Quick compiler. Change-Id: I389c163fb25cdb0afc3f62fc39a670e206f78b63 Reviewed-by:
Pasi Keränen <pasi.keranen@digia.com>
-
Miikka Heikkinen authored
Change-Id: I8d30feb99efbb4340a89ef32376dbf7a49e5905c Task-number: QTBUG-46312 Reviewed-by:
Pasi Keränen <pasi.keranen@digia.com>
-
- 26 May, 2015 - 8 commits
-
-
Tomi Korpipää authored
Change-Id: I81f9faf361445e9fd2112c7c95046927b552e193 Task-number: QTBUG-45897 Reviewed-by:
Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by:
Pasi Keränen <pasi.keranen@digia.com>
-
Titta Heikkala authored
Change-Id: I80d0e39b319a2727e4132e50d5b6a5dca2d1362c Reviewed-by:
Pasi Keränen <pasi.keranen@digia.com>
-
Titta Heikkala authored
Change-Id: I1d72a656452002044cce8ee2807a9171f3b96f0e Reviewed-by:
Pasi Keränen <pasi.keranen@digia.com>
-
Pasi Keränen authored
ImageCube can now be used with swipe gestures to control the visible information in the example. Change-Id: I9cdc2d2049346e994cb68d7ca667492c992830cd Reviewed-by:
Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
-
Miikka Heikkinen authored
The context version doesn't match surface version on some android platforms. Fix the issue by forcing context format 2.0 on ES2. Change-Id: I973246352f2e51acf22e622bdec51ce6574612fd Task-number: QTBUG-42455 Reviewed-by:
Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
-
Titta Heikkala authored
Change-Id: I5271a7801f6cde8cc577cbfdd22d997c5edfc82f Reviewed-by:
Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by:
Pasi Keränen <pasi.keranen@digia.com>
-
Pasi Keränen authored
Three.js examples were placed in the root of Qt examples folder, this moves them to be under canvas3d as they should be. Change-Id: I506685d8a147975bc137fbac3b22d8ce28639631 Reviewed-by:
Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by:
Pasi Keränen <pasi.keranen@digia.com>
-
Tomi Korpipää authored
Change-Id: Ie219b22bb216da4151101940048a4a9f4c066fda Task-number: QTBUG-45898 Reviewed-by:
Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by:
Pasi Keränen <pasi.keranen@digia.com>
-
- 22 May, 2015 - 2 commits
-
-
Titta Heikkala authored
Change-Id: Ia7900610debde06d9ddf37319f58dd48cb6fc4a1 Reviewed-by:
Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by:
Pasi Keränen <pasi.keranen@digia.com>
-
Titta Heikkala authored
Added example that shows how three.js can be used with QtCanvas3D. Documentation will be added in separate commit. Change-Id: I9557fefebd4c1a749af95bef3952560b03b3320f Reviewed-by:
Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by:
Sami Makkonen <sami.makkonen@digia.com> Reviewed-by:
Pasi Keränen <pasi.keranen@digia.com>
-
- 21 May, 2015 - 2 commits
-
-
Miikka Heikkinen authored
Having a break following a return statement is not necessary. Change-Id: I848c67acaa3dad1da6f860818f422a31ab66298b Reviewed-by:
Pasi Keränen <pasi.keranen@digia.com>
-
Miikka Heikkinen authored
On desktop environments, GL_PROGRAM_POINT_SIZE and GL_POINT_SPRITE need to be explicitly enabled to support variable point size and texturing the points. Change-Id: I27e17997b34ba877595a68cc74ffb63c2b1b2954 Reviewed-by:
Pasi Keränen <pasi.keranen@digia.com>
-
- 20 May, 2015 - 4 commits
-
-
Miikka Heikkinen authored
The first FBO we create gets corrupted by something outside Canvas3D in some cases. E.g. changing the text in an completely unrelated Text element may corrupt Canvas3D FBOs. This only happens with some GPU drivers, likely due to a bug in the drivers themselves. To work around the issue, the first FBO we create is a dummy that we delete once the real FBOs are done. Change-Id: Ie8c2a0ec3899c3eb22e4de8809c3b41607cc83c3 Task-number: QTBUG-46101 Reviewed-by:
Pasi Keränen <pasi.keranen@digia.com>
-
Miikka Heikkinen authored
Fix depth enum usage in examples. Remove the TODO comment about depth enums being commented out. They are commented out because stencil defines the same enums. Change-Id: I516b60f36a54775e5af504e70e9e9dab9fe5ab54 Reviewed-by:
Pasi Keränen <pasi.keranen@digia.com>
-
Miikka Heikkinen authored
Reduced copy/paste by centralizing typed array data pointer resolving. It now also uses byte offset in typed arrays if they have it. Change-Id: I2d3d63ba0a8056884044ac73e47bf3821279be97 Task-number: QTBUG-45825 Reviewed-by:
Pasi Keränen <pasi.keranen@digia.com>
-
Tomi Korpipää authored
Note: Does not fix all the null problems in the bug. Change-Id: I491f179451f89a95f5bc6bd8572284d3b764d4b9 Task-number: QTBUG-45898 Reviewed-by:
Pasi Keränen <pasi.keranen@digia.com>
-