summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Deprecation of the qt/quick3d repository.HEADmasterdpope2012-02-101786-300593/+30
| | | | | Change-Id: I271146636615ab16f79ad3e66985076e2bd7a95c Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* QTBUG-23408 - Remove raw html from docsChristopher Ham2012-01-311-48/+34
| | | | | | | | Removing raw html table from main page in docs. Replacing with QDocs table. Change-Id: I4fa5005ba6bc36087989e79b7b7c389baaf9d592 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* ModelTweaker was renamed to "3D Asset Viewer"Sergey Dubitskiy2012-01-3043-20/+21
| | | | | Change-Id: Ib34723c2bbb0171b15edec0db798bc7e01bbdbc8 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* fixed some bugs in asset viewerZheng Liu (George)2012-01-276-94/+160
| | | | | Change-Id: I18e887ba1604be1f5ca8e6911aec533b1d65b99e Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Bugfix: grid text is drawn correctly even if app window is resized.Sergey Dubitskiy2012-01-271-14/+27
| | | | | | Change-Id: I97b5065718343ef219296405a41dd9cedd37a67c Reviewed-by: Christopher Ham <christopher.ham@nokia.com> Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* QTBUG-20443. Fixed Quad and Cube sizes and texcoords.Sergey Dubitskiy2012-01-255-46/+76
| | | | | | | | Task-number: QTBUG-20443 Change-Id: Ief0b15f8ca07104936c2bf64f764e50b10a7e89c Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com> Reviewed-by: Christopher Ham <christopher.ham@nokia.com> Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Upgrade to AssImp library v2.0.863.Sergey Dubitskiy2012-01-25266-3997/+4526
| | | | | | | | | Also includes a new example. Task-number: QTBUG-22194. Change-Id: I8870edadff58f8103e3645574b635a3b83ce1d98 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Adding a color picker and material editting to ModelTweakerChristopher Ham2012-01-2316-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: Christopher Ham <christopher.ham@nokia.com> Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Save on exit and GUI changes.Danny Pope2012-01-2315-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>
* QTBUG-23551. Model is copied to the dir where QML is saved.Sergey Dubitskiy2012-01-181-4/+25
| | | | | | Change-Id: I18ba1dbb3236b6596f9886b165f93135f761ae89 Reviewed-by: Christopher Ham <christopher.ham@nokia.com> Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Window resize problem 'fix'.Danny Pope2012-01-181-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: Christopher Ham <christopher.ham@nokia.com> Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* QTBUG-23454. Added reference grid. Added zoomin/zoomout controls.Sergey Dubitskiy2012-01-177-6/+359
| | | | | Change-Id: Ifdaad630cee1f9445325d7fb61012c76d44a38b0 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Fix Model Tweaker "Lock" icon not working.Danny Pope2012-01-164-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-01-112-0/+31
| | | | | | | | Work around for POTT-support problem - we now check for POTT support and convert if necessary. Change-Id: I8121c9f86c137c28a24bc9b81231fb4f27b707e8 Reviewed-by: Christopher Ham <christopher.ham@nokia.com> Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Fix namespace compilation.Sarah Smith2012-01-1073-65/+208
| | | | | | | | | | | Back-ported from Qt5 changes: 24b1b6bd5c6a3960cfdf71cc644d95926430c267 d641f03b6efecce266ef329eb4bbc48d87c2fc12 2734491c7230bfa54af46ef56085a56e61eed8a0 f037bb1fa72b7dee790367776a913b18a07445ac Change-Id: I73e2e8996376ea40b9763224554aafba7fe7bdb6 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* ModelTweaker: Bug fixes.Patrick Burke2011-12-234-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: Sarah Jane Smith <sarah.j.smith@nokia.com>
* ModelTweak: Unified file loading/saving classesPatrick Burke2011-12-139-124/+143
| | | | | | | Again, there should be no user-visible functionality changes. Change-Id: I100735a4c03c006e3c8986dd18359ca5d52d3405 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Ensure that texture changes are propagated to the Item3DGareth Stockwell2011-12-131-0/+4
| | | | | | | Task-number: QTBUG-23095 Change-Id: I66c2f2fec0059f973c9125d6302bb98c952c45d3 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Don't use qt_snprintf outside of testlib.Jason McDonald2011-12-081-4/+5
| | | | | | | | | 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: I2a2044cc1b2cb450e059973ab5177b837056826c Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Mesh conversion on Cylinder and Capsule.Sarah Smith2011-12-0627-493/+1300
| | | | | | | | | | | | | | | | | | | | | | Follow the example of the Sphere and convert Cylinder and Capsule to being meshes as well. Add some useful doc to the three classes showing the performance and other considerations for each. Add a basic manual test, with a README. Slightly improve the warning message from QDeclarativeMesh. Fix a bug with Sphere where nothing would display if the default values for a sphere were used. This was because the createGeometry() function was only triggered when properties changed. Now also trigger it if draw is called and the scenegraph for the object has not yet been created. Same code was also required on the new shape meshes. Change-Id: I475e34e31741ba8583587961fc3d0ee3d03bcb9d Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Prevent warnings about install path.Sarah Smith2011-12-051-7/+8
| | | | | | | | | Friends don't let friends have spurious warnings - these ones might be new, from some change to qmake. But this change is right anyway - we should not be exporting all these values if we are not packaging. Change-Id: I1b7bd4eebbcd1540cd7734e6c2aeb82ff8977aac Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* ModelTweak: Fix to bug QTBUG-22949 Sytax error generated in some casesPatrick Burke2011-12-021-1/+1
| | | | | | Change-Id: Ibaf82abf981f1a065ce78fc26dac5b69bbc90e55 Reviewed-by: Christopher Ham <christopher.ham@nokia.com> Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Modify the sphere so it is a mesh.Sarah Smith2011-12-0112-264/+560
| | | | | | | | | | | | | | | | | | | | There was a performance bug illustrated by a Qt3D user where an app that had a large number of identical spheres, took minutes to load. The problem was that even though the geometry was identical there was no way to utilise this to create a scene with multiple items referencing one sphere, because the geometry actually was being created in the draw function.... Now fixed so that the Sphere becomes a SphereMesh which can be referenced from any number of Item3D's. Added a Sphere convenience class so that legacy code will keep working. Updated the solarsystem_qml class to use the new functionality. Change-Id: I62a60b519bbb048ecadaa09e0d5520ddb49ff100 Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Performance optimizations for graphics scale.Sarah Smith2011-12-011-8/+88
| | | | | | | | | | | | | When animating or otherwise setting values, it is common to set the origin for the scale to zero, and the value of the scale to 1.0. Both of these mean that there is no net effect when the transform is applied, but several matrix multiplications would be done anyway. Optimisations for these common cases have been added so it is now possible to set a transform for scale to 1, 1, 1 and not have it cost. Change-Id: I63b2ff39303cd20e23cb44a5615471f3da7f59b9 Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Improve qDumpScene.Sarah Smith2011-12-016-52/+172
| | | | | | | | | | | | | | | | | | | The output of this useful debugging tool was a bit erratic, with spurious newlines, and hard to read formatting. Fix, that and also while on the job improve formatting, and fix the fact that it became undefined with QT_NO_DEBUG_STREAM which could result in programs breaking when defines were changed. Now if QT_NO_DEBUG_STREAM is defined the function is still there, but just exits without doing anything. Also add a non-detailed mode for quick summaries, and for complex scenes where too much detail would be produced. Add a debugging flag to the viewport. Get a dump of the scene when you set a showSceneGraph flag in your qml. This could be improved as it does not handle cases where the Item3D's are in components. Its a good start. Change-Id: I8a5ef3e8739dbe72617aad33377c691838a06fa2 Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Remove spurious private header warns.Sarah Smith2011-12-012-26/+4
| | | | | | | | When these classes were made public in the quick3d library some private header warnings were not removed - fix that now. Change-Id: I9d23dce91be9d7a92b31df91a8deeaa2ae4830ae Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Fixing harmattan pkgsSarah Smith2011-12-01134-278/+297
| | | | | | | | | | | | | | | | | The fixes are going into the qtc_harmattan packaging scripts, since the scratchbox for harmattan seems to be no longer working. Eventually we should remove it and put the qtc_harmattan one in instead, but for now keep both around until its proven to work. This is also important because bifh might need it. Basically - remove the translation line, fix up a lot of broken desktop files, use a different location for the icons, and generally fix all the problems as described in the bug. Task-number: QTBUG-21955 Change-Id: I02cdf6c02ef9515b14384aaaf8e039a09a6cb82b Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Add a HideNode feature to scene nodes.Sarah Smith2011-11-282-5/+12
| | | | | | | | This works like the enable on a declarative node, and in fact will be used to support the enabled property on Item3Ds. Change-Id: Idfb19b0fffd77abf9994d5b16e9f36d86145c96a Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Begin removing N900 support.Sarah Smith2011-11-2643-602/+0
| | | | | | | | These desktop files are a pain to maintain and we now must begin to deprecate N900 support, by removing them. Change-Id: If53ed68079b11057aed6c6588ed2b9865c67e38b Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Remove the translation line.Sarah Smith2011-11-2642-42/+0
| | | | | | | | | Problems with display on the launcher grid are attributed to the translation line being there when there is no translation supplied. In any case its not helping so remove it. Change-Id: I7e537214f878023dfde81ce0f76320f825b4eeed Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* ModelTweak: code cleanupPatrick Burke2011-11-252-165/+78
| | | | | | | | | | | | | * Refactored functions to be proper signals in ModelViewport * Removed individual doubles stored for x/y/z of transform/scale/rotate and replaced them with variant vector3d properties. * Same with the "mouse down" stored variable replaced with a variant point Again no functionality changes, code is just written cleaner and more in the "qml way". Change-Id: If2769f1c50398bde06f27895fccd414b335a6fb5 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Create .pro file to run the examples collection scriptKalle Lehtonen2011-11-251-0/+2
| | | | | | | | This will give better support support for common qmake & make based build systems. Change-Id: Id465e5e040d06edf4b70fb267acdfb27550e67e1 Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* ModelTweak: Code cleanupPatrick Burke2011-11-2410-232/+117
| | | | | | | | | | | | | | | | | * Removed no longer used GrayButton and ValueField. * Refactored the BlenderToggle and ModelViewportResize components to be more reusable. * Fixed three instances of if( that slipped through. * Removed no longer needed console.log lines. * Pulled the save-qml code out into it's own SaveButton. * Replaced a number of function onFoo() statements with proper signal handlers. * Removed unnecessary button. No functionality changes were made. Change-Id: I0412e7aadfba16ab54d1762b57c3d8b3f8a5e1ac Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* ModelTweak: move buttons so they don't need to be moved when maximisingPatrick Burke2011-11-232-5/+9
| | | | | Change-Id: Ia59fb69e0ab244b67d2d1471fd07a3fb2eb96320 Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* ModelTweak: QA & BugfixPatrick Burke2011-11-234-14/+16
| | | | | | | | Update QuickLoad/QuickSave with proper use of Q_INVOKABLE and signals. Fix default Effect{} on Item3D. Change-Id: Ib925f69cb4fbffb5f967f81bb1b6fd3c73eb308a Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
* Remove TGA plugin from Symbian packageKalle Lehtonen2011-11-221-5/+0
| | | | | | | | TGA plugin is moved to Qt due Harmattan installation problems and is not anymore compiled in QtQuick3D. Change-Id: I425e67203d6b5d0999435d6657456572f0f76d60 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* ModelTweak: fixing save dialog 4d76c36Patrick Burke2011-11-180-0/+0
| | | | | Change-Id: I054e5fe6abbdf32b271f7dcf057f2657945b36a1 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* ModelTweak: fixing save dialog 4d76c36Patrick Burke2011-11-181-6/+7
| | | | | Change-Id: I054e5fe6abbdf32b271f7dcf057f2657945b36a1 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* ModelTweak: Refactored ConfigPane into ButtonBar and ModelPropertiesPatrick Burke2011-11-175-225/+255
| | | | | | | Also added a little lock png as well for locking the 3 rotations. Change-Id: Ib31f2eb27a3b783c27868e150ce5997fb5de2a74 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* ModelTweaker: Alter relative paths correctly between qml/modelPatrick Burke2011-11-172-6/+13
| | | | | Change-Id: I335889d230467761f620ce311b789ae40081366a Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* ModelTweaker: Help fixes to 33cf3598ff4b8913d6682e48a5af14471d80740cPatrick Burke2011-11-171-5/+3
| | | | | Change-Id: I41e456bc29bf656cffcda3c3222c20c17c250103 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* ModelTweaker: viewport transitions implementedPatrick Burke2011-11-173-16/+53
| | | | | Change-Id: If2169810994418a08eed4cb2aa53200eb65d55c2 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* ModelTweak: tidied up the maximise/restore buttonPatrick Burke2011-11-179-12/+27
| | | | | | | | Also moved the images into a seperate directory whilst I was updating the grow/shrink images. Change-Id: I55d3aff8a8f25b2a0c3db24d41c6c08555e9878a Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* ModelTweaker: blender value sliderPatrick Burke2011-11-173-18/+161
| | | | | | | At Danny's request to make it more "blender-like" :) Change-Id: I6cd693047554b6da0b8ab1d88b513e415128ad9a Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* ModelTweaker: Limit display of translate/rotate/scale to 3 placesPatrick Burke2011-11-171-9/+9
| | | | | Change-Id: Ibd4c8f2fdfc44e57286dca383e19f5268cfa9fa9 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* ModelTweak: Made buttons look like they come out of blenderPatrick Burke2011-11-172-4/+33
| | | | | | | At request of Danny. :) Change-Id: Id9816720307b3d5fa36c328227b74cc3cde5f0da Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* ModelTweak: "open 3d model file" button/dialogPatrick Burke2011-11-177-68/+102
| | | | | | | | Also fixes a minor bug with the order in which scale/rotate/translate is applied. Change-Id: I7da6fecefebdf52efe02d7da317eb3fbdfd2fe38 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* ModelTweaker: Added QtFileDialog prompt for saving qmlPatrick Burke2011-11-161-1/+9
| | | | | Change-Id: I4aa4eb5727bc4a5e2e9a7d0175da4a9228ca6f45 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* ModelTweaker: Maximise/restore button on viewports.Patrick Burke2011-11-164-8/+25
| | | | | Change-Id: I4d8f63b080b93c710ea40830679ed34ad48f34a2 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* ModelTweaker: Implementing minimum-scale via mouse dragging.Patrick Burke2011-11-161-24/+24
| | | | | Change-Id: Iaa07b8fc8409111d9dd011fbb67763d9aa28ce8b Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 16:13:28 +0000