summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Clean up doc errors in the qt4 branch1_0_RC1Julian de Bhal2012-04-053-4/+16
| | | | | Change-Id: I52eacdbe0e15de7571934b0a6a6609396bda1719 Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com>
* Fix for BillBoardTransform in QML not working.Danny Pope2012-03-281-3/+0
| | | | | | | Task-number: QTBUG-24454 Change-Id: I315ffafb0dccee3621fcd37309c82bd6a2b63c86 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* 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>
* Update of screenshots for Qt3D Building Instructions.dpope2012-03-2610-47/+49
| | | | | | Task-number: QTBUG-24465 Change-Id: I65efd41255e88b70ff9b89cbfd1519cd6bd4e01d Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Fix documentation to reflect functionality.dpope2012-03-221-2/+1
| | | | | | Task-number: QTBUG-20689 Change-Id: Ib9724aea50d6c9f45188cca619c4c01e161a72dd Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com>
* Updated file headers.dpope2012-03-2110-10/+10
| | | | | | | Updated with correct year etc. Change-Id: I73f630dbbef742baacb4306c0025fc527b19774c Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com>
* Fix QGLSubSurface rendering problem.dpope2012-03-211-1/+1
| | | | | | | | QGLPainter now uses the x,y position of sub-surfaces when rendering. Task-number:QTBUG-24339 Change-Id: Ibf10b25815eb963fc4a8816676ec13ed7fb13454 Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com>
* Buffered rendering issues for Qt-3D.dpope2012-03-0810-10/+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>
* Rename QArrayDataKent Hansen2012-03-011-4/+4
| | | | | | | | The qtbase/containers branch introduces a class called QArrayData, which has nothing to do with qt3d's QArrayData. Change-Id: I26b45fc4032fde85d95df5ed37d7fe9c64542236 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Fix warnings for variables only used in assertsJulian de Bhal2012-03-010-0/+0
| | | | | Change-Id: Ib8d6fe6067cc62f39dab8b2b9195a2369a1879a0 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>
* Buid fix if use '-no-stl' configure optionYuchen Deng2012-03-010-0/+0
| | | | | | | error C2039: 'toStdString' : is not a member of 'QString' Change-Id: If56f3e3dc2424c4fd96883f3b211bedc4b495781 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Add class doc for new resource handling.Sarah Smith2012-02-290-0/+0
| | | | | | | | | The new resource handling needs some overview documentation, describing the new regime for managing GL resource life-cycle. Change-Id: Ib677b9b286bfb156cfd8304813254838130f979a Reviewed-by: Danny Pope <daniel.pope@nokia.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Lib3DS was removed.Sergey Dubitskiy2012-02-2912-1968/+1
| | | | | | | | This code was a dead weight. The loading of 3DS files is covered by Asset Importer library anyway. Change-Id: Ife1a1a30c76a5f3d9a008768837e3219c09926e2 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Add examples doc & fix doc a bit.Sarah Smith2012-02-2932-124/+375
| | | | | | | | | | | | | | | | | Create new qdoc examples doc to reference our four showcase examples: cube, lander, monkeygod and shaders. There was an issue with the shaders tutorial because even tho' this is under a seperate directory qdoc pulls them all into the same namespace with the \example tag so this had to be changed to shadertut. Also began fixing qdoc errors but there is a huge pile and this fix needs to go in. Task-number: QTBUG-24135 Change-Id: I940d88b264f2753811b5eabb6d1f787d47a172f0 Reviewed-by: Julian de Bhal <julian.debhal@nokia.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* fixed qml3d testsZheng Liu (George)2012-02-294-6/+8
| | | | | | | | to make qml3d tests run on linux system Change-Id: I0dc03e959c30a33cceef809d26ddefc484923d10 Reviewed-by: Danny Pope <daniel.pope@nokia.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Mark the scene plugin API for deprecation.Sarah Smith2012-02-292-0/+55
| | | | | | | | | | | | | The actual deprecation process will take a while and won't be completed until later this year during the 1.1 release cycle. For now, just mark the tutorials and API's so that folks can prepare for the removal in some future release. Task-number: QTBUG-24409 Change-Id: I7f327d6e032db6bd5fb3873005a0c96cbbf077c6 Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Add a hacky script to help with qdoc errors.Sarah Smith2012-02-291-0/+86
| | | | | | | | | | | | Now that it is not practicable to build our documentation outside of the qt5 doc build process we are in the situation of getting around 5000 lines (as of now) full of errors from qdoc over just the projects we depend on. This script tries to tame that output a bit and still keep the useful messages. Change-Id: I3cb0ea08c2cdd4527039534f74d37c13c400df90 Reviewed-by: Danny Pope <daniel.pope@nokia.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Fix misleading header guards.Sarah Smith2012-02-295-13/+10
| | | | | | | | | | Ooops - cut 'n paste error here. These header guards still referred to the old lib3ds files that they were copied from. Change-Id: Ib0e66dc64966f6462835315a28758bfbd6c289be Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com> Reviewed-by: Danny Pope <daniel.pope@nokia.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Remove lib3ds integration.Sarah Smith2012-02-2944-13819/+0
| | | | | | | | | | | | A previous commit removed the plugin and scene creation code, and this one removes all the lib3ds code which was imported a couple of years back. The 3ds format is now supported by Asset Importer. Task-number: QTBUG-24407 Change-Id: Ia82dbd0dc0c1dccbaed36f47be1ac40189bb1747 Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com> Reviewed-by: Danny Pope <daniel.pope@nokia.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Fix doc typo.Sarah Smith2012-02-291-1/+1
| | | | | | | Reviewed-by: Danny Pope <daniel.pope@nokia.com> Change-Id: Ifa6458f389e5ee2ff9b8d7af793fea486f6f0e34 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Fix unit tests + builds on windows.Sarah Smith2012-02-2924-176/+1479
| | | | | | | | | | | | | | | | | | | 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: Id4f78823f851c822709208c3793f35a0dd472e5e Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Implement suggested change to avoid clashes.Sarah Smith2012-02-291-4/+6
| | | | | | | | | | | | | | | | | | Note that this bug was quickly addressed by a previous change, but this further change implements some code-review suggestions. See the comments on http://codereview.qt-project.org/16528 Renames and changes the targets for this file to avoid clashes. Note that this change relies on another change in qt/qtdoc: http://codereview.qt-project.org/16612 Task-number: QTBUG-24316 Change-Id: I22b5cbadaa2d09ce56f1799377e23b49f399b920 Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Resource handling needs refactoring.Sergey Dubitskiy2012-02-292-1/+3
| | | | | | | | | Some minor memory leaks were fixed. Task-number: QTBUG-24043 Change-Id: I792874911e68f4e6549184dbaebb8397f676c3f8 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>
* Revert 00af107 to fix index pg clobber.Sarah Smith2012-02-291-1/+1
| | | | | | | | | | | | Looks like the assumption in 00af107 was wrong. Seems as though the Qt Module doc http://doc.qt.nokia.com/5.0-snapshot/modules.html wants to point to qt3d at qml-qt3d.html so lets try that. Anything for now so as not to clobber the main index page for Qt5. Task-number: QTBUG-24316 Change-Id: I476a7655b207b64bef2b64f5b2aba893eea33373 Reviewed-by: Alan Alpert <alan.alpert@nokia.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Resource handling needs refactoring.Sergey Dubitskiy2012-02-297-0/+93
| | | | | | | | | | | | In QML application we need to cleanup opengl resources (textures,etc.) before opengl context is destroyed. We connect to QOpenglContext's aboutToBeDestroyed() signal to perform cleanup. Task-number: QTBUG-24043 Change-Id: I6ba06f46103e87f011ade03188ffc05de3e38b84 Reviewed-by: Danny Pope <daniel.pope@nokia.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Buid fix if use '-no-stl' configure optionYuchen Deng2012-02-294-11/+11
| | | | | | | error C2039: 'toStdString' : is not a member of 'QString' Change-Id: I6ba677c6416327de706bb9413567ff7e351c864b Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Fix warnings for variables only used in assertsJulian de Bhal2012-02-291-4/+5
| | | | | | | Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com> Change-Id: Ibca1afc7d0a2902a2a297284af7bbb03e6d6fa2b Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Suppress debug output on model load.Sarah Smith2012-02-292-7/+8
| | | | | | | | | | | | | | | Switch to using an environment variable for displaying model debug output. The _DEBUG macro is not a guarantee that the debug output will only be produced in debug builds, since its not respected by some compilers. In any case, even in debug mode lots of spurious output is not desired. Let's remove the _DEBUG macro, in favour of a documented environment variable. Change-Id: I8d02652460c2b7a82d85c0c9b95cc8cbe3c58d54 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Add class doc for new resource handling.Sarah Smith2012-02-291-7/+28
| | | | | | | | The new resource handling needs some overview documentation, describing the new regime for managing GL resource life-cycle. Change-Id: I2dfbed8cba085672e6adffcce8650cdb90eba256 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Resource handling needs refactoring.Sergey Dubitskiy2012-02-1731-6/+121
| | | | | | | | | | 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-1799-207/+246
| | | | | | | | | | | | | | | 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>
* Fix old quick3d strings.Sarah Smith2012-02-131-2/+2
| | | | | | | | Now with the move to the new naming these strings should be QT3D. Also the capitalisation was wrong anyway. Change-Id: Ib491d68fc55e1d96708add96c8ce180628598f2f Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Task: Resource handling needs refactoring.Sergey Dubitskiy2012-02-1227-63/+70
| | | | | | | | | | | | | 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>
* 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 qml import statements.Julian de Bhal2012-02-1043-44/+37
| | | | | | | | Changed all instances of "import QtQuick 1.0" to 2.0, and removed all instances of "import Qt 4.7" Change-Id: I2a8a3022e4596e9d9957f242c98c2e483467e206 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Add cleanup functions for QGLTextureCube.dpope2012-02-105-7/+62
| | | | | | Change-Id: I7ed9b56162978e93400c9d587e525942ecfc289a Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Cloning of QGLSceneNodes incl child nodes.dpope2012-02-102-0/+31
| | | | | | | | | | | | | Cloning with recursive child-node cloning included. Task-number: QTBUG-22086 Patched across from qt/quick3d:qml2 Change-Id: Idbf39b8e160d29eaee0ec0a6ede0900176e65dc1 Reviewed-by: Christopher Ham <christopher.ham@nokia.com> Reviewed-by: Danny Pope <daniel.pope@nokia.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Update of icons.dpope2012-02-109-30/+1174
| | | | | | | Icons updated to the newer style - needs on device testing. Change-Id: I9ff198b378e1d00a7d6a4c91cc60b1d0e60e9237 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Added cleanup function for Texture2D.Sergey Dubitskiy2012-02-083-0/+67
| | | | | | | | | | This function releases opengl resources created in current context. It prints warning when called from other, non-sharing context. Also, when Texture2D is destroyed it prints warnings if some resources were not properly released. Change-Id: I4d163cbaa210a43fdc6d79426e77417e523d62c4 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Removed unused empty functions from QGLMultiTextureExtensionsdpope2012-02-081-5/+10
| | | | | Change-Id: I338a12156a23dfcebd8677eb39871a97be183ce7 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Don't install tutorials into qtbase/binJulian de Bhal2012-02-086-6/+0
| | | | | | | Cleared DESTDIR entry in .pro files in tutorials. https://bugreports.qt-project.org/browse/QTBUG-23884 Change-Id: I05d62057cdcc2036d53281704850abd5b3765f6b Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Documentation changes.dpope2012-02-071-8/+16
| | | | | | | | Minor errors fixed in the index.qdoc file. Change-Id: I41a2ea1979bae56ab876f0ee39fc87858d7df998 Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com> Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Remove qmlproject files.Sarah Smith2012-02-0728-528/+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>
View Lorry Controller Status