summaryrefslogtreecommitdiffstats
path: root/examples/qt3d
Commit message (Collapse)AuthorAgeFilesLines
* Add precision for sampler2DShadow in ES3 shaderLaszlo Agocs2015-04-221-1/+1
| | | | | | | | | As per GLSL ES 3.0 spec there is no default precision for this type, similarly to float. Therefore some drivers (f.ex. newer Mali ones) reject the shader without specifying the precision. Change-Id: Ib5e9a2d47924da84d6a74dde0b9e894fc4b580e4 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: Add skeleton documentation for the examplesTopi Reinio2015-03-1727-0/+864
| | | | | | | | | | | | Add a skeleton version of the example documentation for each example, create a group page for them and link to it from the module landing pages. This allows browsing the example code from the docs and also enables listing them in Qt Creator's Welcome mode. Change-Id: I1ba16399b115bb8c5503bc91d2a8dee46417cd01 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove copyright headers from the ES3-specific shadow map shadersLaszlo Agocs2015-03-134-144/+0
| | | | | | | | | | | | | | | | Not having the headers is fine since the built-in shaders do not have them either, neither in Quick nor in Qt3D. The main issue with ES is that in ESSL3 the spec states that the version directive is only allowed in the first line and no comments are allowed before. This is not true for standard GLSL where the spec states the comments and whitespace are allowed before. Mesa does not seem to enforce this, but we have already found at least one GL ES 3.0 implementation which does. Change-Id: I6ac3f949eeb44a005f69cc03f7d6f6eb5b577f2e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Move the examples under a qt3d subdirLaszlo Agocs2015-03-04314-0/+138877
| | | | | | | | Modules cannot have their examples in the top-level examples directory because in the pre-built packages all modules' examples are merged together. Change-Id: I80fdbb8f1ec6f3d8fd793e4d856e705000237127 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove Qt3D 1.x sourcesSean Harmer2014-03-28120-11649/+0
| | | | | | Change-Id: Ic6c05d78f617155892b546721946ee2c5c9b660a Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Merge branch 'master' into newapiSean Harmer2014-02-0755-336/+323
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/threed/scene_ai/qailoader.cpp src/threed/scene_ai/qailoader_p.h src/threed/scene_ai/qaiscene.h src/threed/scene_ai/scene_ai.pri Change-Id: I4132b51ddddb43319a7fc1b4b9a8df692dc22411
| * Replaced Nokia copyrights in headerTeemu Kaukoranta2013-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced old Nokia copyrights with Digia copyrights. Removed "All rights reserved" strings without leading copyrights were removed (for example, 'Copyright SomeCompany, all rights reserved remain untouched). Did NOT touch contact details, will change them later. Excluded folders that have '3rdparty' in path. Used command: find . -path '*/3rdparty/*' -prune -o -exec grep -ilI -E '.*Copyright.*Nokia.*' {} \; | tee >(xargs sed -i -r '1,10 s/([ \t#*]*)(.*Copyright.*Nokia.*)/ \1Copyright \(C\) 2013 Digia Plc and\/or its subsidiary\(-ies\)\./I') >(xargs sed -i -r '1,10 s/(^[ \t#*]*)(all rights reserved.*)/\1/I') This excludes binary files and retains whitespace and #* characters in the beginning of the edited lines. Change-Id: Idbe2a510335385929a282bd70606b8841dff36a8 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
| * remove obsolete DEPENDPATH assignmentsOswald Buddenhagen2012-12-161-1/+0
| | | | | | | | | | | | | | | | qmake now add CONFIG+=depend_includepath by default, making manual DEPENDPATH setup unnecessary. Change-Id: I8f7144bbd53741a2e57f2b90a41a13aa16efc53e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * remove some unnecessary CONFIG additionsOswald Buddenhagen2012-12-1610-10/+0
| | | | | | | | | | | | | | qt is already added by spec_pre.prf, warn_on by default_pre.prf. Change-Id: I362942adad909b718c0af7c7e44cd0c8688901c2 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * All QWindow properties that have "window" in them have been renamed.Shawn Rutledge2012-11-132-2/+2
| | | | | | | | | | | | | | Depends on patch Ie4424ec15fbdef6b29b137f90a2ae33f173edd21 in qtbase. Change-Id: I1c6c8a15f379768e0187d8dffd015cdb82c90c93 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| * Change copyrights from Nokia to DigiaIikka Eklund2012-09-2343-258/+258
| | | | | | | | | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ib09067b91869c2840710bffee104bc63c76b0bf7 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Use float throughout the Qt3D module for consistency and performanceSean Harmer2012-09-168-57/+57
| | | | | | | | | | | | | | | | | | | | This commit changes the API of all classes in this module to use float rather than qreal. This makes the API consistent across platforms and improves floating point performance. Change-Id: I95ae65cb31428748e066d5efca059ce24087fafa Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Sarah Jane Smith <sez@storybridge.org>
| * Compile after Math3d was changed to use float instead of qreal.Friedemann Kleint2012-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Introduced by qtbase: 51d40d7e9bdfc63c5109aef5b732aa2ba10f985a . Fix warnings about truncation from double to float. Introduce qFuzzyCompare() and mark some tests as insignificant. Task-number: QTBUG-27189 Change-Id: Icc2038df5c4c25a7fa9a89ed906a934c2af60cec Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Doc: Fixed usage of "Qt 3D", title names, and file names.Jerome Pasion2012-08-011-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed usage of "Qt 3D" according to the Qt 5 product guidelines - created links - "Qt3D" -> "Qt 3D" - Renamed titles and used the titles for linking - previously linked to the .html files - Renamed the main page to qt3d-index.html for easier visibilty and to be consistent with other Qt modules - whitespace fix Change-Id: Iac794e5f2ded9d59e3c9e7407a60b430acc45665 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | Object animations.Sergey Dubitskiy2012-07-2416-1/+4329
|/ | | | | | | | | | Animation tracks for object rotate/scale/translate can be loaded and played. A simple example illustrating this feature is also provided. Task-number: QTBUG-19906 Change-Id: I7a07c214f8ad7065b7f3f48d8929cb7d546af5f3 Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com>
* Licence header Quick3D -> Qt3D name change.Julian de Bhal2012-04-122-2/+2
| | | | | Change-Id: Idb9eaa260bbac4f7a1281900e683f97d74cadcb5 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Refactor packaging and deployment.Sarah Smith2012-03-231-0/+2
| | | | | | | | | | | | | | | Updating Qt3D's packaging and deployment: remove some platform specific packaging references. These can be hidden away in the build scripts for those platforms and do no need to be in the generic package logic. To support this approach begin fixing qmlres and the main.cpp's. Fix and streamline the pkg.pri file, and add some much needed comments. Note that this change *will* break current packaging scripts - those can need to be fixed in seperate commits. Change-Id: I05c2081f61b91bc91673668f6e423a206ac026d5 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* New qt3d example to demonstrate model loading and rendering.Sergey Dubitskiy2012-03-2112-1/+2492
| | | | | Change-Id: Ia962df79bbb61374bb18afddc7a1b1a18cb99a01 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Fix unit tests + builds on windows.Sarah Smith2012-02-291-1/+0
| | | | | | | | | | | | | | | | | | | Some of these unit test problems were not just windows, but the issues manifested most badly on windows. Create a mock view object that is similar to the real QGLView, but more specially designed for unit tests, and setup with sensible defaults. Use this for the main failing unit tests. This fixed some of the issues, but there is also a problem with window geometry on windows, and it is not going to be fixed as part of this change. See https://bugreports.qt-project.org/browse/QTBUG-24539 for more. Also fix a few other minor breaks including tutorials not being packaged properly, and places where literal strings were used. Change-Id: Iddd5058bc0aa4e20c4c8adc087e890e5fb5d1346 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Resource handling needs refactoring.Sergey Dubitskiy2012-02-1416-4/+70
| | | | | | | | | | | Phase Two: Fix all C++based demos/examples/tutorials. Call cleanupResources() for all textures created. Task-number: QTBUG-24043 Change-Id: I4bef23f7fe56e092de79bb91b41d6d691329b2cf Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com> Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Integrate Qt3D into Qt5 and fix some qdoc errors.Peter Yard2012-02-149-9/+9
| | | | | | | | | | | | | | | | This doc change by 'integrating into Qt5' also made some changes to the build system, so that now you need QT+=3d everywhere (instead of QT+=qt3d as it was previously). We have been asked to make this change, and it seems it is required for this doc system to work, so lets get it done. Note that the original change had a docsnippets target but that did not work at all and will have be done in a later commit. Change-Id: Icf4bc6b4be9494f1752e18ca1f5198c8fe8ecf53 Reviewed-by: Peter Yard <peter.yard@nokia.com> Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>
* Task: Resource handling needs refactoring.Sergey Dubitskiy2012-02-124-4/+4
| | | | | | | | | | | | | Phase One: 1. fixed lots of memory leaks related to Texture2D's not being deleted. 2. Texture2D now prints warning in destructor, if cleanupResources() was not properly called before. Task-number: QTBUG-24043 Change-Id: Ia6a8bbe38ad66778a38705e0a4464f24373d8846 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Build qt3d/c++ based examples into qt3d/bin using pkg.priJulian de Bhal2012-02-1010-0/+23
| | | | | Change-Id: Ib3681004af81271994c467e477b2ee0969cf07fe Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Update of icons.dpope2012-02-102-6/+28
| | | | | | | Icons updated to the newer style - needs on device testing. Change-Id: I9ff198b378e1d00a7d6a4c91cc60b1d0e60e9237 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-3040-40/+40
| | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Iaddf1e489f97d2b08894827c90e9e58cd02d2ef2 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-2040-40/+40
| | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I36e7a01dc458ad25afef2de46a5807f2983fac43 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove the graphics view example & support.Sarah Smith2012-01-1224-1865/+0
| | | | | | | | | | | | | This is not supported in qt5 so remove it. In the future we will encourage putting QML applications on the side of a cube or teapot using the FBO support. But doing this via QGraphics* code which really belongs to both the 4.8 days and the old imperative non-QML way of doing things - not a good idea. We can't recommend that as a viable approach. Change-Id: I70f69f17edd949e313758f930bb75cdaad3c46c5 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-122-2/+2
| | | | | | Change-Id: I6e681df7e4fac972a604531cecd9850cd9710935 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Update copyright year in Nokia copyright headers.Jason McDonald2012-01-1255-55/+55
| | | | | | | Update copyright headers from before 2011. Change-Id: Id5a16806e69c595b12cc761acfa0a0eaf0b99d72 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Make Qt3D buildable without widgets or opengl.Sarah Smith2011-12-2152-284/+41
| | | | | | | | | | | | | | | | Pull out all references to QGLContext, and QGLWidget and so on; and replace with the equivalent from the gui library. Where there is no equivalent, eg the BindOptions enum, then reimplement. Also get rid of the harmattan and symbian packaging goop. This had become completely unmaintainable, and was making it very hard to see what dependencies were being pull in by the various parts of the build system. In order to have any confidence that conditional compilation would not add in some problematic dependency, clean all this up. Task-number: QTBUG-23299 Change-Id: Ied92ca1397076986e455674b064d8540bb13c0df Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* New Repo: Updating all non-code references (comments and such) to Qt3D.Patrick Burke2011-12-1255-55/+55
| | | | | Change-Id: Icd7709d4fd91fc972d503f8e3f9de0e47f56ff96 Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* More fixes to QtQuick3D namespace compilation.Toby Tomkins2011-11-2811-2/+26
| | | | | Change-Id: Ib648c9fbd613be1548c194fe6afd3d791c1ae368 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Compile with C++0xAlan Alpert2011-10-211-1/+1
| | | | | Change-Id: Ic8820362cdbc8fa662a5e97db841656cf38d1baa Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* QtQuick3d: Compile on Windows.Friedemann Kleint2011-10-209-9/+9
| | | | | | | | | - Fix missing library specifications - Fix g++ string conversion warnings. Change-Id: I48f19ac0f33bea1154c31c9aeab1bbd83f8f3d84 Reviewed-by: Patrick Burke <patrick.burke@nokia.com> Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>
* Remove legacy build system logic.Rohan McGovern2011-10-1810-10/+10
| | | | | | | | In Qt4, qtquick3d had to reinvent a lot of Qt's own build system logic. In Qt5, modularization makes this unnecessary, so remove it. Change-Id: I683acba659c1a3842e927262cacd9377cdac7c35 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Fix skating viewport, and quit.Sarah Smith2011-10-141-0/+1
| | | | | | | | | | | | | | | | | Under qt 5 what seems to have been a long standing bug was exposed where glViewport was called with the first two arguments set to the x, y origin of the window. These have always been 0, 0 apparently but under xcb that is not the case and dragging the window of a running qt3d app across the desktop was causing the gl to scroll across inside the window. Looked pretty weird. Now set to 0, 0 as elsewhere and seems to have fixed the problem. Also fixed quit not working, and put a test for the new quit enabled viewport into basket app. Will need to be added to other apps also. Change-Id: I85651cc0df2fdbef466f843e12c046986f495b29 Reviewed-on: http://codereview.qt-project.org/6505 Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Fixes for surface vs QOpenGLContext & QWindow.Sarah Smith2011-10-0326-70/+247
| | | | | | | | | | | | | | | | | | | With the qt5 refactor branch going in the ability to get a QPaintDevice has gone away - this was really a "relic from the desktop days". Painting still applies for FBO's and so on, but in the case of QML we are on an SG view and there is no paint device there. So move the QGLView to using a QWindow and QOpenGLContext as well to follow suit and replace all the logic in surface stuff to cope with that. Also update all examples, demos, tutorials and tests. Change-Id: Ie8dbeb97c87ef0821326fb7ccf5d5d4b1f90fd06 Reviewed-on: http://codereview.qt-project.org/5900 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Port to refactorGunnar Sletta2011-09-214-7/+7
| | | | | | Change-Id: I8e4f56577f708eea208c51538c77fd4b2c4fefb5 Reviewed-on: http://codereview.qt-project.org/5219 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Shuffling around icons.Patrick Burke2011-08-241-0/+0
| | | | | | Change-Id: I722c2e3571b4545dd351f9e8790c2f015b974e05 Reviewed-on: http://codereview.qt.nokia.com/3459 Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Replace outdated license headersJason McDonald2011-08-192-0/+80
| | | | | | | | | | | Squash commit of master changes. Reviewed-on: http://codereview.qt.nokia.com/2612 Change-Id: I23b6fd648da34f84cd5704f7611b09f0c68d2840 Reviewed-on: http://codereview.qt.nokia.com/2617 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/3226
* Build system refactorings - squashed.Patrick Burke2011-08-0210-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deployment updates. Reviewed-on: http://codereview.qt.nokia.com/1732 Deployment updates. Reviewed-on: http://codereview.qt.nokia.com/1856 More deployment updates. Reviewed-on: http://codereview.qt.nokia.com/1912 Tidying up build system removing need for qml_pkg.pri. Reviewed-on: http://codereview.qt.nokia.com/2229 Tidying up build system removing need for qt3dquick_pkg_dep.pri. Reviewed-on: http://codereview.qt.nokia.com/2230 Tidying up build system removing need for qt3d_pkg_dep.pri. Reviewed-on: http://codereview.qt.nokia.com/2232 Final major change to cleanup build system. Should eliminate problems where the "qml" directories aren't being updated upon rebuilds, and allows easier deployment to devices via Qt Creator. Reviewed-on: http://codereview.qt.nokia.com/2247 Change-Id: Iedc926ef421fcb9039833c328cca8b0802b3bd44 Reviewed-on: http://codereview.qt.nokia.com/2494 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Remove all Symbian code from the repo.Sarah Smith2011-07-2019-94/+9
| | | | | | | | | | | | We continue with Symbian for the Qt4 program but since Qt5 support for symbian is not implemented and if it is will likely look very different, remove this code for now. Change-Id: Iced82075e37e3685f7247a7558c298adb54e10ef Reviewed-on: http://codereview.qt.nokia.com/1863 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Fix up misc symbian vs qtc clashes.Sarah Smith2011-07-0611-211/+19
| | | | | | | | | | | Conflicts: examples/quick3d/photoroom/main.cpp pkg.pri Change-Id: I01238e324968f30c0a85177fa9db84e8d0d69ed4 Reviewed-on: http://codereview.qt.nokia.com/1124 Reviewed-by: Sarah Jane Smith
* Symbian icons.Danny Pope2011-07-061-0/+202
| | | | | | | Change-Id: I3784274d27d034ad2e3f2278dc9c1f29b9a6b3b4 Reviewed-on: http://codereview.qt.nokia.com/1102 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sarah Jane Smith
* Various symbian fixesSarah Smith2011-07-0619-6/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/quick3d/model_viewer/model_viewer.pro demos/quick3d/robo_bounce/robo_bounce.pro demos/quick3d/tea_service/tea_service.pro examples/qt3d/basket/basket.pro examples/qt3d/builder/builder.pro examples/quick3d/basket/basket.pro examples/quick3d/cube/cube.pro examples/quick3d/forest/forest.pro examples/quick3d/lander/lander.pro examples/quick3d/matrix_animation/matrix_animation.pro examples/quick3d/monkeygod/monkeygod.pro examples/quick3d/moon/moon.pro examples/quick3d/photoroom/photoroom.pro examples/quick3d/shaders/shaders.pro examples/quick3d/sphere/sphere.pro examples/quick3d/tutorials/teapot_bounce_qml/teapot_bounce_qml.pro examples/quick3d/tutorials/teapot_qml/teapot_qml.pro src/quick3d/quick3d.pri Change-Id: Ia14cfdcabd85b2264266d977f97a1216244a783c Reviewed-on: http://codereview.qt.nokia.com/1202 Reviewed-by: Sarah Jane Smith
* Refactor packaging.Sarah Smith2011-07-0646-1556/+35
| | | | | | | | | | | | | | | | | | | | | | Packaging was always not so good. With the arrival of yet another packaging system to support, with QtSDK and Harmattan, it was overdue time to refactor the build system. Factored out all the places where Qt3D and QtQuick3D dependencies were exactly 3 levels below the source .pro file. This catches all of the examples and all of the demos, except for the ones in the tutorials directories. It is fine if those don't appear in packages, since their main value is in examining them in the IDE, rather than just having a package run them for you. It also catches both of the import plugins. Thus we save a huge amount of duplication of packaging information and can place the Qt SDK Harmattan packaging into a couple of variables in a new pkg.pri file. The two deps are now in a qt3d_pkg_dep.pri and qt3dquick_pkg_dep.pri file which include the pkg.pri. Change-Id: I28de17d7faa5ccf9157afad99471079c0b62ee87 Reviewed-on: http://codereview.qt.nokia.com/1191 Reviewed-by: Sarah Jane Smith
* Fix cut-n-paste error.Sarah Smith2011-06-171-7/+8
|
* Fix QTBUG-19249Sarah Smith2011-06-1730-0/+59
| | | | | | | | | | Other fixes to windows QML also needed, but this one was package related. Have setup to launch the sample programs by using windows shortcut (.lnk) files as these provide the ability to specify the current directory to run the program from, making it possible to locate the .dll's. Using shortcut files implies also have to create icons for all the programs as well.
* Modifications to solarsystem textures and animations.Danny Pope2011-06-095-4/+5
|
* Add shader effect to qt3d solar-system exampleJulian de Bhal2011-06-0910-5/+212
| | | | Change-Id: I47d19da1fce06573f20296269c5443917d915200
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 05:00:19 +0000