summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Add missing dots (qtcanvas3d)Paul Wicking2018-06-195-5/+5
| | | | | | Task-number: QTBUG-68933 Change-Id: Ia02aa2a78aa4a4f3c6502b6fcac965e969060cb2 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Remove the iCCP chunk from the PNG imageMika Salmela2017-11-307-0/+0
| | | | | | | | | This patch updates the png files giving warnings known incorrect sRGB profile. Task-number: QTBUG-64878 Change-Id: Icc378f4081727d1d37b1debdeddf66e718e636e6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Examples: don't set colors as stringsv5.9.0-beta3v5.9.0-beta2v5.9.0-beta1Marc Mutz2017-03-293-3/+3
| | | | | | | | | Use the 3-int ctor of QColor instead. Change-Id: Ib00e3f6c93a153dfdaddde6e72cb6f8f3234fdc4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Fix cellphone example flickingMiikka Heikkinen2016-09-061-12/+9
| | | | | | | Task-number: QTBUG-50393 Change-Id: I3da3fede43ede5e8d4a942e0c4df4e83117ca4cc Reviewed-by: Sami Makkonen <sami.makkonen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1Liang Qi2016-05-19186-108/+119
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ic5484d9d51b7ff5f4fe17d3876daba2123045244
| * fix example installsOswald Buddenhagen2016-05-10186-108/+119
| | | | | | | | | | | | | | this includes removing an intermediate level from the source hierarchy. Change-Id: Ic601e15c05ccc451a291f2b3991db5034013484f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-081-0/+0
|\| | | | | | | Change-Id: I30b435f828cc2a0381e8ed34baacf4ecca545e6e
| * Purge sRGB chunks from PNGs in examples.Edward Welbourne2016-03-291-0/+0
| | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce Change-Id: I968920638ff587b9ead6a2396bb41dd266a8a161 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Updated three.jsv5.7.0-alpha1Miikka Heikkinen2016-03-031-4/+4
| | | | | | | | | | | | | | 'debugger' keyword was causing "Unimplemented code." prints. Change-Id: Ic1a018208e6c2fcc818416fc72d4d3b15e095bb1 Reviewed-by: Pasi Keränen <pasi.keranen@theqtcompany.com>
* | Update three.js to r74Miikka Heikkinen2016-02-235-12393/+20927
| | | | | | | | | | | | | | | | | | | | | | | | Updated affected examples as well. Planets example click detection was refactored, as r74 raycaster seems a lot slower than r71. Added a set of simpler dummy spheres to massively speed up the click detection. Change-Id: Idb07fccfa65a0b06277b215a7c5cc2c03a78e819 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Pasi Keränen <pasi.keranen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-151-5/+3
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If24938cb15392873cfd45c49901c6f1cc3e9f128
| * Fix cellphone example flickingMiikka Heikkinen2016-01-121-5/+3
| | | | | | | | | | | | | | | | | | | | | | Apparently Flickable has changed internally so that giving two flick commands with same parameters in a row results in no flicking done at all. Fixed the example so that we only ever send one flick. Change-Id: I3ebd514e7958a86b918735df57612984fab6c8fa Task-number: QTBUG-50393 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Pasi Keränen <pasi.keranen@theqtcompany.com>
* | Unify license header usage.Antti Kokko2016-01-2545-861/+1491
| | | | | | | | | | | | | | | | | | Updated license headers to use new BSD header instead of LGPL3 one (in those files which will be under BSD) Change-Id: Id8773e1fd61510d186d76a29728086d35c2821b0 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Bigger slider and its handleKatja Marttila2016-01-121-2/+2
|/ | | | | | | | | With embedded devices it is hard to hit the slider handle Change-Id: If70a29a8794e34634d75b06744a780c674b102d1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com> Reviewed-by: Pasi Keränen <pasi.keranen@theqtcompany.com>
* Tweak some examples to make them look better on AndroidMiikka Heikkinen2015-11-034-10/+7
| | | | | Change-Id: I287e8fb36c95a65eb14c846d430f759ebdf5750e Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Reduce unnecessary overdraw on examplesMiikka Heikkinen2015-10-2916-16/+16
| | | | | | | | | | Using both full screen opaque canvas and background Rectangle item causes one unnecessary fullscreen fill. Changed Rectangles to Items and used window background color instead, which is the recommended way. Change-Id: Ia2689fcafba7b66333f5e98574c28566faba4764 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Fix cellphone demo stutteringMiikka Heikkinen2015-09-241-1/+1
| | | | | | | | Camera lookat needs to be calculated after camera position is set. Change-Id: I0a858e47074573037e590211d9ae383c5b8171ff Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Doc updatesMiikka Heikkinen2015-09-082-0/+0
| | | | | | | Added doc images for new examples and fixed one version number. Change-Id: I7b867cd93be1c4abfa20567faf44d93f79974cf5 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Minor clarifications to the method names and comments.Pasi Keränen2015-09-072-16/+17
| | | | | | | | Tried to clarify some method names and comments. Change-Id: If94bd7ccddc0f43cb91d6cae99b09ef37dbdbc61 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Added scale offset to earth clouds.Pasi Keränen2015-09-071-5/+14
| | | | | | | | | | Qt 3D Planets example has scale offset that makes the cloud layer appear to be higher up from the surface, added same scaling factor for the three.js version. Change-Id: I76b487320f7e36ed2de3a3689a99f6b243bc229d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* Added interactive cellphone demo exampleMiikka Heikkinen2015-09-0731-6432/+7918
| | | | | | | | | | The cellphone demo creates an interactive mobile phone UI with QML and displays it on 3D model of the phone. The UI is fully interactive when phone is rotated to face the used. Change-Id: I8d3c94a75c853747b68208c9aed00429764174ea Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Fixes button label behavior on touch devices.Pasi Keränen2015-09-071-17/+0
| | | | | | | | | | On touch devices the button labels were invisible until clicked. This task removes the on hover animation to make the text visible all the time Change-Id: Ie93157655acd34add5df8ac3966c802818f878ec Task-number: QTBUG-48107 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* Removed unnecessary Enterprise version of exampleTomi Korpipää2015-09-015-417/+51
| | | | | | Change-Id: If8152a586fc0e0c704f6494a80a33aa5d73f455a Task-number: QTBUG-46917 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Fix examples installMiikka Heikkinen2015-08-2710-31/+40
| | | | | | | | | Removed example.pri and added missing EXAMPLE_FILES declarations to make installed examples buildable. Change-Id: I20fad76429b7e4a2af684999de9b894e4fca59dd Task-number: QTBUG-46997 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Fix black canvas at startupMiikka Heikkinen2015-08-075-4/+9
| | | | | | | | | | | | The default texture was invalid (GL id 0), so canvas drew as black rectangle before the first frame was rendered. Changed the default texture to a valid fully transparent one pixel texture to give applications control over what to show before the first frame. [ChangeLog][Renderer] Fix black canvas at startup Change-Id: Ia91a494c002403f1622e093a75d00cf224166e94 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Added support for 'alpha' context attribute.Miikka Heikkinen2015-08-072-44/+47
| | | | | | | | | | | | | | | Use QQuickWindow::TextureHasAlphaChannel texture option in render node when 'alpha' context attribute is true. The 'alpha' attribute now defaults to true as per WebGL spec. Also fixed the default values and the documentation of other context attributes to match WebGL spec. [ChangeLog][Context3D] Support for 'alpha' context attribute Task-number: QTBUG-46515 Change-Id: Ic4d4e46e4e323517343690a2916b6b9363107a87 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Merge remote-tracking branch 'origin/wip/threading' into devMiikka Heikkinen2015-08-0612-13/+721
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/qtcanvas3d/canvas3d.cpp src/imports/qtcanvas3d/canvas3d_p.h The Canvas::frameTimeMs() method had to be changed a bit to fit the new architecture. Change-Id: I34a3db1b07492bf37045376bd42690993a2d2f15
| * Using Qt Quick item as Canvas3D textureMiikka Heikkinen2015-06-177-1/+705
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Merge remote-tracking branch 'origin/dev' into wip/threadingMiikka Heikkinen2015-06-08103-386/+2707
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Execute Canvas3D OpenGL in render threadMiikka Heikkinen2015-06-043-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Made planets example scalable to small screensTomi Korpipää2015-07-012-12/+18
| | | | | | | | | | | | | | | | | | | | | Task-number: QTEE-943 Change-Id: I90b4a8433a5ce965e8447a74706f959bb1ff42e7 Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | | Additions to Planets example for iOS/iPad use.Pasi Keränen2015-06-2518-0/+86
| | | | | | | | | | | | | | | | | | | | | | | | Adds custom Info.plist for iOS and all the icon variants. Change-Id: I68e3a0704b871782425e825cf7810c05bf7510e5 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* | | Remove qrc prefix from Planets exampleLaszlo Agocs2015-06-112-29/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | This breaks when including the demo in a pure QML environment (like the Boot2Qt demo launcher). Omitting the prefix is the best since it works both with and without a QRC. Change-Id: I31f0f9f074d7c5656e7fc44680e7327aa3456c11 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* | | Merge remote-tracking branch 'origin/5.5.0' into 5.5Liang Qi2015-06-111-13/+13
|\ \ \ | | | | | | | | | | | | Change-Id: I1068ecb4cbab4e9a04d7e3f2d2783b6da41a5971
| * | | Fix jsonmodels example docsv5.5.0-rc1v5.5.0Miikka Heikkinen2015-06-101-13/+13
| | |/ | |/| | | | | | | | | | | | | | | | | | | Snippets were missing due to obsolete paths. Task-number: QTBUG-46568 Change-Id: I4f0bde17ea33513973a2b7195bf74756c2f98221 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* | | Additions to OneQt for iOS/iPad use.Pasi Keränen2015-06-1120-4/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | Changes font sizes to fit iPad screen resolution, adds custom Info.plist for iOS and all the icon variants. Change-Id: I67c29d4cc87305c82f726f7190283a3c28cbaf7e Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* | | Made sliders in planets example easier to use on touch devicesTomi Korpipää2015-06-112-6/+13
| | | | | | | | | | | | | | | | | | Change-Id: I2b4d151ce55ca68c7fb5dd0f8ff022dcdb83e38e Task-number: QTBUG-46585 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* | | Changed Planets example to use BufferedGeometry.Pasi Keränen2015-06-101-3/+6
|/ / | | | | | | | | | | | | | | | | | | Changed Planets example to use the BufferedGeometry that is more optimal as it keeps all data in the GPU. This increased performance on iPad Air 5% Change-Id: I38d01065f5d34ec74df3217d4baccec474c6bb32 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* | Simplifying code in Planets example.Pasi Keränen2015-06-011-48/+57
| | | | | | | | | | | | Change-Id: I9a2c5c684b6d0f31c18a4eae23f08f60cf6cca3a Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* | Move images under separate qresource tag in planets exampleMiikka Heikkinen2015-05-291-33/+35
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Fixed camera jumps in planets exampleTomi Korpipää2015-05-292-22/+23
| | | | | | | | | | | | | | Change-Id: If72f2e7f7110d4ac58862cde019fa25b3cf5fdca Task-number: QTBUG-46370 Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* | Fixed jittering of planets with minimum scalingTomi Korpipää2015-05-282-78/+132
| | | | | | | | | | Change-Id: I10d2202468518e85b4cea850a9a335bb70937856 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* | Fixing the pixelratio setting in three.js examples.Pasi Keränen2015-05-282-2/+4
| | | | | | | | | | | | Change-Id: If7134c579aea73e43cf6e8f98ee1c888dc1b5c8b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* | Updating OneQt documentation.Pasi Keränen2015-05-284-51/+73
| | | | | | | | | | | | Change-Id: If482e713c834fdbaf14c63281984309cc23ad48e Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* | Doc: review revised Canvas3d documentationNico Vertriest2015-05-271-5/+5
| | | | | | | | | | | | Task-number: QTBUG-44180 Change-Id: I3c6b10354435716e503254cbea0dd75901234242 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* | Fixed Planets example documentationTitta Heikkala2015-05-271-1/+1
| | | | | | | | | | | | | | Image link corrected. Change-Id: I6edb60d0aae6ef92f5ac5457042c71ece5fcc3e1 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* | Renaming properties in OneQt example.Pasi Keränen2015-05-273-134/+134
| | | | | | | | | | | | Change-Id: I4bc2add33b39ea562d0ecbccbc4badb026037a51 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* | Added documentation for Planets exampleTitta Heikkala2015-05-275-9/+141
| | | | | | | | | | | | Change-Id: I6377e0f845cac98e8933e8ef503779a6bb6565a1 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* | Tweaking the shininess of the planets in Planets example.Pasi Keränen2015-05-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Fix resource aliasing in examplesMiikka Heikkinen2015-05-2724-37/+39
| | | | | | | | | | | | | | Now examples compile with Qt Quick compiler. Change-Id: I389c163fb25cdb0afc3f62fc39a670e206f78b63 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 13:14:31 +0000