summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Collapse)AuthorAgeFilesLines
* QGLSubsurface was fixed. Qt3d "Shapes" demo now works on Mac.Sergey Dubitskiy2012-07-181-11/+22
| | | | | | | | | | On Mac, GL scene is not repainted when window is resized. But his issue is not related to qt3d... Task-number: QTBUG-26392 Task-number: QTBUG-26391 Change-Id: I9cb30b2975acd2ef07037560bc964d23f797442e Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Qt3d "Shapes" demo: cube and teapot are misplaced.Sergey Dubitskiy2012-07-091-14/+10
| | | | | | Task-number: QTBUG-26142 Change-Id: I63bcca2f67005e6cc675ec8c7f15c05870be9046 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Make it possible to compile Qt3D without QML/Quick.Casper van Donderen2012-07-061-1/+2
| | | | | | | | | The C++ implementation of Qt3D could not be compiled without also having installed QtQML and QtQuick. This change allows the compilation of the non-QML part of Qt3D separately. Change-Id: I791a03a0f0e1118f3ec20b77be327786148b8923 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* (Partial) Work done on Coverity report.Sergey Dubitskiy2012-06-222-0/+5
| | | | | | | Only partial because Coverity report is no longer accessible. Change-Id: Id7e1171bd9ab3c3900eaa771c04a8df2a1d7dabe Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Update the Qt3D and Shapes version.Sarah Smith2012-06-2012-18/+18
| | | | | | | | | | | For the Qt5 release Qt3D will be bumped to 2.0 to match QML2.0 and thus we need to apply this across all code and examples. Task-Number: QTBUG-26183 Change-Id: Ief54cb6f39da97ccfeeccc56f93a77b25316f71e Reviewed-by: Julian de Bhal <julian.debhal@nokia.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Remove device specific files.Sarah Smith2012-06-199-204/+0
| | | | | | | These files are no longer required. Change-Id: Idb2cdb73efce40897f3ed625e82ae4220f97598b Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>
* Modifications to stop animations/timers in idle mode.dpope2012-06-124-17/+9
| | | | | | Task-number: QTBUG-26071 Change-Id: Ida93554729e49638b91b2cb6bb3df61677d2a9b1 Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com>
* Fix to teaservice demo for material colouring.dpope2012-05-173-25/+38
| | | | | | | | Objects were not being correctly highlit by mouse-over. This has been rectified through more efficient use of materials and effects. Change-Id: Id5f05aff579a22a377a907a1b0a25f5328590791 Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com>
* Fix qml3d tests incl windows.Sarah Smith2012-05-032-1/+2
| | | | | | | | | | | | | | | | | | There are a lot of problems with our tests on platforms where the fixed-function pipeline is in force, that is no shaders are available. We have code paths that are supposed to deal with that but they're poorly maintained and now crash. Try to fix a few of them, and work around others which are exposed by the qml3d tests on windows CI boxes (that have software OpenGL 1.x). We notice that QT_QPA_PLATFORM=minimal causes a crash with QML tests that have a test function without a surrounding TestCase element. Let's fix that and see if it helps also the mysterious windows test crashing problem. Task-number: QTBUG-25276 Change-Id: Ieeb67536f86467bb6819b62319ac3cee2219a8ae Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Merge remote branch 'gerrit/1_0_RC1'dpope2012-05-014-11/+119
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolved Conflicts: demos/quick3d/flickr3d/flickr3d.pro demos/quick3d/flickr3d/main.cpp demos/quick3d/flickr3d/qml/Flickr3d.qml demos/quick3d/flickr3d/qml/RssModel.qml demos/quick3d/flickr3d/qtquick3d.ico demos/quick3d/model_viewer/qtquick3d.ico demos/quick3d/qmlres.h demos/quick3d/quick3d.pro demos/quick3d/robo_bounce/main.cpp demos/quick3d/robo_bounce/robo_bounce.pro demos/quick3d/robo_bounce/robo_bounce.qrc demos/quick3d/tea_service/main.cpp doc/src/examples/basket.qdoc doc/src/examples/cube.qdoc doc/src/examples/lander.qdoc doc/src/examples/monkeygod.qdoc doc/src/qline3d-math.qdoc doc/src/qt3d-building.qdoc doc/src/qt3d-examples.qdoc doc/src/qt3d.qdoc doc/src/tutorials/sceneformat.qdoc doc/src/tutorials/simpleobject.qdoc examples/qt3d/basket/basket.pro modules/qt_qt3dquick.pri qt3d.pro src/imports/shapes/capsulemesh_p.h src/imports/shapes/cylindermesh_p.h src/imports/shapes/shapes.pro src/imports/threed/threed.pro src/plugins/sceneformats/assimp/ai_plugin.h src/plugins/sceneformats/assimp/assimp.pro src/plugins/sceneformats/assimp/qaiscene.cpp src/plugins/sceneformats/assimp/qaiscenehandler.cpp src/plugins/sceneformats/bezier/bezier.pro src/plugins/sceneformats/obj/obj.pro src/quick3d/qquickeffect.cpp src/quick3d/qquickitem3d.cpp src/quick3d/qquickmesh.cpp src/quick3d/quick3d.pro src/threed/materials/qglmaterial.cpp src/threed/scene/qglrenderorder.cpp src/threed/scene/qglsceneformatplugin.cpp src/threed/textures/qgltexture2d.cpp src/threed/viewing/qglmockview_p.h tests/auto/auto.pro tests/manual/animations/animations.pro tests/manual/displaymodel/displaymodel.pro tests/manual/model3ds/model3ds.pro tests/manual/navigation1/navigation1.pro tests/manual/qrc/qrc.pro tests/manual/rotation/rotation.pro tests/manual/scaling/scaling.pro tests/manual/shapes/info.json tests/manual/shapes/shapes.pro tests/manual/submesh/submesh.pro tests/manual/transformations/transformations.pro tests/manual/translation/translation.pro tutorials/quick3d/shaders/meshes/teapot.bez tutorials/quick3d/shaders/shader-tutorial-1-textures.qml tutorials/quick3d/shaders/shader-tutorial-2-vertex-shader.qml tutorials/quick3d/shaders/shader-tutorial-3-transformed-coordinates.qml tutorials/quick3d/shaders/shader-tutorial-lighting.qml tutorials/quick3d/shaders/shader-tutorial-varying.qml tutorials/quick3d/shaders/shader-tutorial.qml tutorials/quick3d/shadertut/main.cpp tutorials/quick3d/shadertut/qml/ShaderTutorial.qml tutorials/quick3d/shadertut/qml/meshes/teapot.bez tutorials/quick3d/shadertut/qml/shader-tutorial-1-textures.qml tutorials/quick3d/shadertut/qml/shader-tutorial-2-vertex-shader.qml tutorials/quick3d/shadertut/qml/shader-tutorial-3-transformed-coordinates.qml tutorials/quick3d/shadertut/qml/shader-tutorial-lighting.qml tutorials/quick3d/shadertut/qml/shader-tutorial-varying.qml tutorials/quick3d/shadertut/shader-tutorial-1-textures.qml tutorials/quick3d/shadertut/shader-tutorial-2-vertex-shader.qml tutorials/quick3d/shadertut/shader-tutorial-3-transformed-coordinates.qml tutorials/quick3d/shadertut/shader-tutorial-lighting.qml tutorials/quick3d/shadertut/shader-tutorial-varying.qml tutorials/quick3d/shadertut/shader-tutorial.qml tutorials/quick3d/shadertut/shaders.pro tutorials/quick3d/shadertut/shadertut.pro tutorials/quick3d/shadertut/shadertut.rc tutorials/quick3d/teapot_bounce_qml/qml/meshes/teapot.bez tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.pro tutorials/quick3d/teapot_qml/qtquick3d.ico tutorials/quick3d/teapot_qml/teapot_qml.pro Change-Id: Ia247e1f9c8364393b142eb4f5f7ddab766c70557
| * Porting Qt4 flickr3d demo to Qt5.dpope2012-03-283-9/+124
| | | | | | | | | | | | | | Still requires full network textue support from Qt4 to operate correction. Change-Id: I731d495d93792fb898500beea019e7329bf7c7e3 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
| * Buffered rendering issues for Qt-3D.dpope2012-03-082-2/+0
| | | | | | | | | | | | | | | | | | | | QML examples now set to buffered render. Further problems may exist, but are not showing on my linux or windows machines. Task-number: QTBUG-24211 Change-Id: Iad2dca07fa0628d83aab3b4e16970b4b026cc092 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
| * Remove Model-Viewer demodpope2012-03-0627-2310/+2
| | | | | | | | | | | | | | Removed as irrelevant. Change-Id: I147cb692a83ca356c185d84752607692b56da1de Reviewed-by: Danny Pope <daniel.pope@nokia.com>
| * Mangle robo_bounce to build into bin.Julian de Bhal2012-03-0133-54/+96
| | | | | | | | | | | | | | | | | | | | | | Collapse directories down into subset supported by pkg.pri Moved images into meshes in anticipation of directory rename to resources Update pro file, qrc, imports etc to refer to new file structure. Change-Id: I79aec59eb186d92ec68fc7cf7be03ab8aa6e6c75 Reviewed-by: Danny Pope <daniel.pope@nokia.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
| * Have tea_service qml demo install into qt3d/binJulian de Bhal2012-02-291-2/+22
| | | | | | | | | | | | | | Reviewed-by: Danny Pope <daniel.pope@nokia.com> Change-Id: Iab4979744db7d769b5614c2994d3960f62671b68 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
| * Modify flickr to install into qt3d/bin directoryJulian de Bhal2012-02-299-2/+21
| | | | | | | | | | | | | | Reviewed-by: Danny Pope <daniel.pope@nokia.com> Change-Id: I567cf7c66956203bbc7fe5f6dc69dfb27d689205 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
| * Fix demos version of qmlres.h to refer to demosJulian de Bhal2012-02-295-9/+9
| | | | | | | | | | | | | | Reviewed-by: Danny Pope <daniel.pope@nokia.com> Change-Id: I61ddbd3051e9967915d133d2b41137c420d32621 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
| * Resource handling needs refactoring.Sergey Dubitskiy2012-02-1714-2/+50
| | | | | | | | | | | | | | | | | | | | Phase Two: Fix all C++based demos/examples/tutorials. Call cleanupResources() for all textures created. Task-number: QTBUG-24043 Change-Id: I4bef23f7fe56e092de79bb91b41d6d691329b2cf Reviewed-by: Danny Pope <daniel.pope@nokia.com>
| * Integrate Qt3D into Qt5 and fix some qdoc errors.Peter Yard2012-02-175-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Danny Pope <daniel.pope@nokia.com>
| * Workaround fixes to pageflip and shapes demos.dpope2012-02-162-4/+2
| | | | | | | | | | | | | | | | Underlying problem with doublebuffer context creation remains. Change-Id: Ie821646a3a8120ac2b44b17f8ef92d1c89cf6650 Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com> Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* | qMalloc, qFree, qRealloc, qMemCopy, qMemSet are deprecated.Debao Zhang2012-04-271-2/+3
| | | | | | | | | | | | | | Use the stdlib version directly instead Change-Id: Icbcab5281ae601d3a44f048b969dc0f9c283e643 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* | Licence header Quick3D -> Qt3D name change.Julian de Bhal2012-04-123-3/+3
| | | | | | | | | | Change-Id: Idb9eaa260bbac4f7a1281900e683f97d74cadcb5 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* | Removed orientation code.Sarah Smith2012-03-301-28/+0
| | | | | | | | | | | | | | | | | | The rest of the app is not rotation aware, and this produces warnings, so just remove it. Task-number: QTBUG-20383 Change-Id: I27c4de2dc507eb2f29c17cdd92b973bdd8277918 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* | Refactor packaging and deployment.Sarah Smith2012-03-238-207/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Fix flickr3d.qml demo to stop viewpoint changes.dpope2012-03-221-0/+6
| | | | | | | | | | | | Task-number: QTBUG-21220 Change-Id: I4444709d6b08576d44e2e1a93e72f6d98110db48 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* | Change vestiges of old name to new Qt3D naming.Sarah Smith2012-03-2011-11/+11
| | | | | | | | | | | | | | | | | | Somehow these files had escaped the naming done previously and still had the old QtQuick3D. Change-Id: Ia84be39b4bd13977b96d14ac7ae17c140f6a5a47 Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* | Update for new QML naming.Sarah Smith2012-03-143-3/+3
| | | | | | | | | | | | | | | | | | QML renaming must be done before the deprecation mechanism is turned off. Task-number: QTBUG-24722 Change-Id: I8e4b9c919eefa72184fa1745d10141885f83369c Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* | Buffered rendering issues for Qt-3D QMLdpope2012-03-082-2/+0
| | | | | | | | | | | | | | | | | | QML examples now set to buffered render. There may be further underlying buffered rendering problems, however these aren't showing up on my windows or linux platforms. Task-number: QTBUG-24211 Change-Id: Iad2dca07fa0628d83aab3b4e16970b4b026cc092 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* | Remove model viewer demodpope2012-02-2927-2310/+4
| | | | | | | | | | Change-Id: I0f4da8ebc624f961189a999ef99151f4c8573443 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* | Workaround fixes to pageflip and shapes demos.dpope2012-02-292-4/+2
| | | | | | | | | | | | | | Underlying problem with doublebuffer context creation remains. Change-Id: Ie821646a3a8120ac2b44b17f8ef92d1c89cf6650 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* | Have tea_service qml demo install into qt3d/binJulian de Bhal2012-02-171-2/+22
| | | | | | | | | | Change-Id: Ib211d6450a3f839280cda622f0f9d13adfd3cb62 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* | Modify flickr to install into qt3d/bin directoryJulian de Bhal2012-02-179-2/+21
| | | | | | | | | | Change-Id: I0121ec3f4a18152a4ece6fa40b7276a113eae3b8 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* | Fix demos version of qmlres.h to refer to demosJulian de Bhal2012-02-175-9/+9
| | | | | | | | | | Change-Id: Ib48ad8886b19ed8af4fea9d0b88f7815ece1df20 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* | Mangle robo_bounce to build into bin.Julian de Bhal2012-02-1433-54/+96
| | | | | | | | | | | | | | | | | | | | Collapse directories down into subset supported by pkg.pri Moved images into meshes in anticipation of directory rename to resources Update pro file, qrc, imports etc to refer to new file structure. Change-Id: I79aec59eb186d92ec68fc7cf7be03ab8aa6e6c75 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* | Resource handling needs refactoring.Sergey Dubitskiy2012-02-1414-2/+50
| | | | | | | | | | | | | | | | | | | | | | 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-145-5/+5
|/ | | | | | | | | | | | | | | | 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-1210-11/+12
| | | | | | | | | | | | | 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 demo files into qt3d/bin and tidy up demo .pro filesJulian de Bhal2012-02-125-5/+10
| | | | | Change-Id: I9a0e5bc28ae1089819dce7a766c572e8a4f8b780 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Update of icons.dpope2012-02-104-15/+587
| | | | | | | Icons updated to the newer style - needs on device testing. Change-Id: I9ff198b378e1d00a7d6a4c91cc60b1d0e60e9237 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Remove qmlproject files.Sarah Smith2012-02-075-80/+0
| | | | | | | | These apparently were needed as a work-around but are now deprecated for some platforms. Change-Id: Ib0a86842c2dc73f534adbce3ce50246846a633fb Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>
* Remove spurious dependency from info.json filesJulian de Bhal2012-02-024-12/+0
| | | | | | | | | Deleted com.nokia.components dependancy from info.json files in the qt3d repo. Change-Id: If56a4f2968d8be5ecef8d2a0443bd15306c652c7 Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com> Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>
* Fix syntax error in info.json filesJulian de Bhal2012-02-014-4/+4
| | | | | | | | Removed trailing comma Change-Id: Iaf0a46f671a444f04559393ad7ed883a05b378aa Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com> Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-3090-90/+90
| | | | | | | | | | 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-2090-90/+90
| | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I36e7a01dc458ad25afef2de46a5807f2983fac43 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-1259-59/+59
| | | | | | 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-1231-31/+31
| | | | | | | 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-2149-269/+53
| | | | | | | | | | | | | | | | 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-1278-78/+78
| | | | | Change-Id: Icd7709d4fd91fc972d503f8e3f9de0e47f56ff96 Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Remove unnecessary dependencies.Sarah Smith2011-12-084-8/+0
| | | | | Change-Id: I19c636af7f6739e45aefe5f5a00fc0525f83a407 Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Compile QtQuick3d.Friedemann Kleint2011-12-025-6/+5
| | | | | | | | After qtdeclarative:6c8378eaf1edbbefe6aaa3672b0127816a004fd7 (splitting up declarative). Change-Id: Ic70f0cdffbe2debb7d6a56d72a90ef7215e62a5b Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 16:15:41 +0000