summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Removed the unnecessary info about Qt 3D support in Qt 5qt4Venugopal Shivashankar2013-01-141-7/+0
| | | | | | | | | Task-number: QTBUG-28904 Change-Id: I1d534339d45396530d838cfdd5b059f5b3099478 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Leonard Lee <leonard.lee@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix for update signal on textures in QML.Danny Pope2012-05-023-19/+35
| | | | | | | Task-number: QTBUG-25401 Change-Id: Ide5584cb1e59cdd9fd8cab728f53c7d15ca846f0 Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com>
* Improve build doc.Sarah Smith2012-05-011-0/+19
| | | | | | | | | Be more explicit about not building when you don't have privileges to write into the Qt you're building against. Task-number: QTBUG-25000 Change-Id: I9b95e4eca3d2a433a9da2b7aaffb111d12a342db Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Fix faulty drawing of back face materialSimon Kern2012-04-191-0/+19
| | | | | | | | | | The old implementation set only the front face material in applyState(). This commit fixes this behavior and sets the back face material too. Task-number: QTBUG-18987 Change-Id: I603ba6b18e12399817abfa55c0e07d0f0d8d91d0 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Clarify harmattan build vs SDK.Sarah Smith2012-04-111-0/+1
| | | | | | | | The SDK offers to create deployment stuff - make sure those following the build instructions know not to say "yes" to that. Change-Id: I156f7dac9e7e08dacaf29516ebc63d835694478f Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Updated screenshots to remove references to QtQuick3D, and to Qt5.Danny Pope2012-04-113-2/+2
| | | | | Change-Id: I1da94c55bc6a9296f68889bcb8659f6ae3b02103 Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>
* Minor doc fixes for the QtQuick3D to Qt3D rename.Julian de Bhal2012-04-119-11/+11
| | | | | Change-Id: Iccbd45f5155b4180b4ad4d0af9c1dadb1b0e3592 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Fix failing qml3d tests.Sarah Smith2012-04-112-2/+9
| | | | | | | The sphere was changed by recent fixes. Change-Id: I01c58abb62d0206914149b7736bf415e80c04233 Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>
* Minor updates to Qt3D icons for consistency.Danny Pope2012-04-113-0/+0
| | | | | Change-Id: I75fc67426c71ab68848b7944686f75136a7aa13a Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Fix issues for release 1.0Sarah Smith2012-04-107-17/+6
| | | | | Change-Id: I7e140534523b95fc32c08445d432e72773452f04 Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>
* Update src package script for 1.0 release.Sarah Smith2012-04-051-7/+8
| | | | | Change-Id: Id8d93ac08bb32dd0562b01ea8f06f7d1e9c75f47 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Fix up license attribution for 3rd party code.Sarah Smith2012-04-0510-4/+824
| | | | | | | | | | | | Create license text references to include the attribution licensed code from the 3rd parties, and copy the Qt4 style for including this in the doc build. Also add attribution into the qglinfo program which is the one that launches on conclusion of a successful package install. Task-number: QTBUG-25160 Change-Id: Ifcf5a494518674d9ef2a1eb1c6977f7f87b33038 Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com> Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Remove threaded download manager class.Danny Pope2012-04-048-615/+13
| | | | | | | | | This is handled automatically by underlying Qt network code. Task-number: QTBUG-22109 Change-Id: Ic8d399a8ee0cf8e476f7a1025eebdc32a134f1a6 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Add completion signal for network loading of resources.Danny Pope2012-04-031-0/+1
| | | | | | | Task-number: QTBUG-20909 Change-Id: I6766cb361c1e3ec6f0921295771b89ed0b040936 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Doc and build fixes related to the QtQuick3D to Qt3D renameJulian de Bhal2012-04-0335-287/+172
| | | | | Change-Id: Icf0be1fb78bcd0a546ee2909423183f5a17ef7e2 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Rename qtquick3d.png/svg to quick3dJulian de Bhal2012-04-03109-56/+56
| | | | | Change-Id: Iec7d0973dbfe3d2df6e3f6bc532aa0fb6eee520e Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Remove orientation code.Sarah Smith2012-03-301-28/+0
| | | | | | | | | | | | This code does not work unless the launcher provides the runtime object and our launcher does not. It is very platform dependent also, so there is no point in having it. Now we get no warnings when running the app. Task-number: QTBUG-20383 Change-Id: Ia0adc019eafa7662049cc919faed0cce8863774d Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Suppress debug output on model load.Sarah Smith2012-03-292-10/+10
| | | | | | | | | | | | | | | 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: Ieb2f3647118e9380be75b2d3b22589a488bc4209 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Quick3D -> Qt3D name change.Julian de Bhal2012-03-28630-630/+630
| | | | | Change-Id: Idb9eaa260bbac4f7a1281900e683f97d74cadcb5 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* prepare for the release 1.0Zheng Liu2012-03-283-69/+67
| | | | | Change-Id: Icd81ed5da3594627da569034d59696ebe4322b59 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Fixed documentation for stock solids.Sergey Dubitskiy2012-03-285-16/+19
| | | | | | | Task-number: QTBUG-20443 Change-Id: Ie0ca573dd0957ceab24fb31bfb84767aabcee508 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Update screenshots for Qt3D Building Instructions.dpope2012-03-2810-78/+106
| | | | | | Task-number: QTBUG-24465 Change-Id: I65efd41255e88b70ff9b89cbfd1519cd6bd4e01d Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Fix for BillBoardTransform in QML not working.Danny Pope2012-03-281-3/+0
| | | | | | | | Task-number: QTBUG-24454 Change-Id: I315ffafb0dccee3621fcd37309c82bd6a2b63c86 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com> Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Clean up doc errors in the qt4 branchJulian de Bhal2012-03-213-4/+16
| | | | | Change-Id: I52eacdbe0e15de7571934b0a6a6609396bda1719 Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com>
* Shapes are more consistent now.Sergey Dubitskiy2012-03-196-322/+325
| | | | | | | | | | | | | | Cube, Quad, Sphere and Cylinder have unified size now. Capsule has unit-long unit-diameter cylinder part, plus two hemispheric caps. For those shapes, their centers were moved to each shape's barycenter. Teapot now has unit height, and nose pointed to Z+ direction. Teapot naturally sits on it's base. Task-number: QTBUG-20443 Change-Id: I066d1513c34623f2adb944f3b662d57ddb457469 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Add autotest to ensure ~Texture2D() in QDeclarativeEffectJulian de Bhal2012-03-184-2/+125
| | | | | Change-Id: Ide472f28cc9bb4e1d1a7b2a515f2e921b7cb2ddc Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Set correct effect for all geometry nodes.Sergey Dubitskiy2012-03-142-0/+24
| | | | | | | | | Before this fix objects were rendered flat white if only a subset of model's QGLSceneNode tree was rendered. Change-Id: Ie4e85297630c335fbdbb90ebbab285bac38a561e Reviewed-by: Danny Pope <daniel.pope@nokia.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Eliminate second top level .pro file to keep CI system happyJulian de Bhal2012-03-1412-88/+86
| | | | | Change-Id: I92274c0564f4b2ffe1a8469adca91167426862ea Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Build fix if use '-no-stl' configure optionYuchen Deng2012-02-154-12/+12
| | | | | | | | | | error C2039: 'toStdString' : is not a member of 'QString' Also see http://codereview.qt-project.org/16366 Task-number: QTBUG-19270 Change-Id: I0ecd5574689295825436365324c4dbe81aa11667 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Created documentation of Asset ViewerZheng Liu (George)2012-02-0819-62/+499
| | | | | | Change-Id: Ib0fa29397d1b353bc330fbbfa7745ff408e8139a Reviewed-by: Danny Pope <daniel.pope@nokia.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* QTBUG-23408 - Remove raw html from docsChristopher Ham2012-02-011-48/+34
| | | | | | | | Removing raw html table from main page in docs. Replacing with QDocs table. Change-Id: I4fa5005ba6bc36087989e79b7b7c389baaf9d592 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Upgrade to AssImp library v2.0.863.Sergey Dubitskiy2012-02-01266-3997/+4526
| | | | | | | | | Also includes a new example. Task-number: QTBUG-22194. Change-Id: I8870edadff58f8103e3645574b635a3b83ce1d98 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* QTBUG-20443. Fixed Quad and Cube sizes and texcoords.Sergey Dubitskiy2012-02-015-46/+76
| | | | | | Task-number: QTBUG-20443 Change-Id: Ief0b15f8ca07104936c2bf64f764e50b10a7e89c Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* ModelTweaker was renamed to "3D Asset Viewer"Sergey Dubitskiy2012-02-0143-20/+21
| | | | | Change-Id: Ib34723c2bbb0171b15edec0db798bc7e01bbdbc8 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* fixed some bugs in asset viewerZheng Liu (George)2012-02-016-94/+160
| | | | | Change-Id: I18e887ba1604be1f5ca8e6911aec533b1d65b99e Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Adding a color picker and material editting to ModelTweakerChristopher Ham2012-02-0116-280/+1211
| | | | | | | | | The color picker has been added - needs clean up. Picker now updates the model properly. Texture selection is now working. And saving works. Change-Id: I031799eb2fcb5f61d1cf71d6b2d6d6d03907491a Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* QTBUG-23551. Model is copied to the dir where QML is saved.Sergey Dubitskiy2012-02-011-4/+25
| | | | | Change-Id: I18ba1dbb3236b6596f9886b165f93135f761ae89 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Bugfix: grid text is drawn correctly even if app window is resized.Sergey Dubitskiy2012-02-011-14/+27
| | | | | Change-Id: I97b5065718343ef219296405a41dd9cedd37a67c Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Save on exit and GUI changes.Danny Pope2012-02-0115-217/+350
| | | | | | | | | Added fixes for Save on Exit task, as well as gui changes for QTBUG-23548. Task-number: QTBUG-22072 Change-Id: I4ff369c10d61e1ab70ce6dfd035fc60c8fb80807 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Window resize problem 'fix'.Danny Pope2012-02-011-0/+2
| | | | | | | | | This isn't ideal, but within the constraints of QML it's as good as things are going to get in the short term. Task-number: QTBUG-23547 Change-Id: Ic80821c213bcf0ab7c676eaa785c65aa179c9512 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* QTBUG-23454. Added reference grid. Added zoomin/zoomout controls.Sergey Dubitskiy2012-02-017-6/+359
| | | | | Change-Id: Ifdaad630cee1f9445325d7fb61012c76d44a38b0 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Fix Model Tweaker "Lock" icon not working.Danny Pope2012-02-014-32/+189
| | | | | | | | | Turns out it was never implemented in any way to begin with. Task-number: QTBUG-23546 Change-Id: I74a5c8e205ad3877e994aa54953866d3acdcc27d Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Fix for Power-of-Two texture problem.Patrick Burke2012-02-012-0/+31
| | | | | | | Work around for POTT-support problem - we now check for POTT support and convert if necessary. Change-Id: I8121c9f86c137c28a24bc9b81231fb4f27b707e8 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Fix namespace compilation.Sarah Smith2012-02-0173-65/+208
| | | | | | | | | | | Back-ported from Qt5 changes: 24b1b6bd5c6a3960cfdf71cc644d95926430c267 d641f03b6efecce266ef329eb4bbc48d87c2fc12 2734491c7230bfa54af46ef56085a56e61eed8a0 f037bb1fa72b7dee790367776a913b18a07445ac Change-Id: I73e2e8996376ea40b9763224554aafba7fe7bdb6 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* ModelTweaker: Bug fixes.Patrick Burke2012-02-014-14/+50
| | | | | | | | | * Fixed bug with tabbing fowards/backwards through values. * Fixed bug with values not being applied on focus loss in some situations. * Fixed lack of identification of the viewports. Change-Id: Ibd634b062ea555ebec90bcc195bdec5c344210e6 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* ModelTweak: Unified file loading/saving classesPatrick Burke2012-02-019-124/+143
| | | | | | | Again, there should be no user-visible functionality changes. Change-Id: I100735a4c03c006e3c8986dd18359ca5d52d3405 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Ensure that texture changes are propagated to the Item3DGareth Stockwell2012-02-011-0/+4
| | | | | | | Task-number: QTBUG-23095 Change-Id: I66c2f2fec0059f973c9125d6302bb98c952c45d3 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Bugfix for: Destuction of OpenGL context in QT4.8 leads to segfault.Sergey Dubitskiy2012-02-011-0/+1
| | | | | | | Task-number: QTBUG-23446 Change-Id: Iee9dbe567c33f65d6ec1e43dabf64a627d3d09ee Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Don't use qt_snprintf outside of testlib.Sarah Smith2011-12-211-4/+4
| | | | | | | | | | qt_snprintf is an internal function of testlib which is likely to be removed in the future. Therefore, it should not be called from outside of testlib. Change-Id: I22ede3fbfd6e899aa66f32a6666f13bdda86a849 Reviewed-by: Patrick Burke <patrick.burke@nokia.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Added qt3d.pro file.Patrick Burke2011-12-141-0/+2
| | | | | Change-Id: I038de6d9ad6860b58e4d5079d508546da95ef909 Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 23:19:06 +0000