summaryrefslogtreecommitdiffstats
path: root/src/render/geometry/qcylindergeometry.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Move defaults and geometries out of Qt3DRender and into Qt3DExtrasPaul Lemire2016-04-231-583/+0
| | | | | | | QBoundingVolumeDebug has been disabled for now. Will be re-enabled later on. Change-Id: Id6b0abab2ec2aa697330bd20d782f9d104d25d50 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QBufferFunctor renamed to QBufferDataGeneratorRobert Brock2016-03-081-9/+9
| | | | | | | | | | bufferFunctor -> dataGenerator As per API review Change-Id: Ie67fff2fd6b75574ca840bd43836028c0726ec5e Task-number: QTBUG-51469 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix vert and index calculations in QCylinderGeometryAndy Maloney2016-01-311-18/+6
| | | | | | | | | | | | | | This fixes two issues: 1) The total number of vertices was being calculated incorrectly in QCylinderGeometryPrivate - ignoring most of the cap vertices. 2) The side indices were calculated incorrectly - "one ring too far" resulting in extra geometry. Also removes some unnecessary "continues" in loops. Change-Id: I5d7b613ec5c0c8284f61d817908017521fa74055 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-261-0/+116
|\ | | | | | | | | | | | | | | | | Conflicts: src/doc/src/qt3dcollision-module.qdoc src/render/frontend/qcamera.cpp src/render/frontend/qcameralens.cpp Change-Id: I8a0ae250a6b8e065a1ef3c817968ebb7ef23b20d
| * Added skeleton docs to geometry classesTomi Korpipää2016-01-201-0/+116
| | | | | | | | | | | | | | Change-Id: I312b3f1eed1578899319cfc30b9bad143c5c467e Task-number: QTBUG-46037 Reviewed-by: Pasi Keränen <pasi.keranen@theqtcompany.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Unify license header usageAntti Kokko2016-01-261-11/+14
|/ | | | | | | Update old header.LGPL3 to header.LGPL Change-Id: I8eac0cd6bbc276a56df487249cc459c0d4fab165 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Added parameters to signals and made setters Q_SLOTSTomi Korpipää2015-12-091-4/+4
| | | | | | Change-Id: Icec2f9f207221e35ffdeeb594bb9b4dc6ef890f1 Task-number: QTBUG-49797 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QCylinderGeometry: expose attributes as propertiesPaul Lemire2015-10-241-0/+24
| | | | | Change-Id: I525b3ce19a5c98c8015c295363e6fe49e99e3409 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Rename Renderer -> Render throughoutSean Harmer2015-10-191-3/+3
| | | | | | | | This is for consistency between the C++ namespaces and QML imports and with the other aspects. Change-Id: I73392f138b4e519b12888f52530123e3d0ba445e Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move geometry related classes to their own directorySean Harmer2015-10-131-0/+452
Change-Id: I74fdfceeeca4801c51fba3586404d5b5dab771b4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>