aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/scenegraph/coreapi/qsggeometry.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Update license headers and add new licensesJani Heikkinen2014-08-251-19/+11
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I84a565e2e0caa3b76bf291a7d188a57a4b00e1b0 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Clearly point out the distinction between GUI and Render threads.Gunnar Sletta2014-03-201-0/+3
| | | | | | | | This is something it is easy to get wrong, so try to make it as visible as possible. Change-Id: I2253ae63214cef0fb91c8b9423d7918ffc20e888 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Use QSGGeometry::lineWidth() when drawing GL_POINTSAlex Montgomery2014-01-131-4/+6
| | | | | | | | | | | | | | Since glLineWidth doesn't affect the drawing of GL_POINTS, it makes sense to use the lineWidth member to affect point size when drawing points. [ChangeLog][QtQuick][QSGGeometry] Changed QSGGeometry::lineWidth to also affect point size (glPointSize) when drawing GL_POINTS, in addition to the existing behavior of affecting line width when drawing GL_LINES, GL_LINE_STRIP, and GL_LINE_LOOP. Task-number: QTBUG-35772 Change-Id: I0ea73f9261509e8d356f91a063dc90dc0f8980bd Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Add Q_UNUSED for reserved fields.Alan Alpert2013-09-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents the following compiler errors with Clang src/quick/scenegraph/coreapi/qsggeometry.h:183:10: error: private field 'm_reserved_bits' is not used [-Werror,-Wunused-private-field] uint m_reserved_bits : 25; ^ src/quick/scenegraph/util/qsgsimplerectnode.h:66:11: error: private field 'reserved' is not used [-Werror,-Wunused-private-field] void *reserved; ^ src/quick/items/qquickclipnode_p.h:66:10: error: private field 'm_reserved' is not used [-Werror,-Wunused-private-field] uint m_reserved : 31; ^ src/quick/scenegraph/coreapi/qsgmaterial.h:143:11: error: private field 'm_reserved' is not used [-Werror,-Wunused-private-field] void *m_reserved; ^ src/quick/scenegraph/coreapi/qsgnode.h:267:10: error: private field 'm_reserved' is not used [-Werror,-Wunused-private-field] uint m_reserved : 31; Change-Id: I0ea00fbd4b45156dedabfd16a3cb3e5f6170f2ff Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* improve docs of QSGGeometry::set[Vertex|Index]DataPatternGunnar Sletta2013-05-161-2/+4
| | | | | Change-Id: I6ca0d8549891302cc9d71bdfac11704752caaf60 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Doc: corrections, spelling, and ListView requirements commentsDavid Fries2013-05-151-6/+6
| | | | | | | | | | From the ListView comment I thought the model had to be derived from QAbstractListModel, but that's not the case, QAbstractListModel will work just fine, it just doesn't support specific cases such as trees. Change-Id: I59305006540ddc049e276cf412571373cbfa6c67 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Added examples on how to use FBOs with scene graph.Gunnar Sletta2013-03-031-1/+1
| | | | | | | | | | I also cleaned up the naming of the other scene graph examples a bit, so that they sort together in the samples list and have a more obvious naming scheme. Task-number: QTBUG-29548 Change-Id: I455eacb02c06058a6d49e12e4f1813ec80b655f6 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-101-1/+1
| | | | | | Change-Id: I6c3bd7bebe3d62d1cfd0fa6334544c9db8398c76 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-231-24/+24
| | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ie7f5d49ed8235d7a7845ab68f99ad1c220e64d5c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* doc: fix some typos in .cpp filesSergio Ahumada2012-09-071-1/+1
| | | | | Change-Id: Ica7685aefde84ec80d8af7a67541af454de4adce Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Three scene graph examples with docs.Gunnar Sletta2012-08-131-1/+1
| | | | | | | | How to make a custom QSGGeometry, how to use QSGSimpleMaterial and how to use render with raw GL. Change-Id: I3e5a32b6ae12d7d781c11050ed26a54845e92cca Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Fix various broken links in documentationBea Lam2012-08-031-1/+1
| | | | | Change-Id: I9e2dac37d18e3ca62e4a92be25e5c2e60ffeba00 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Improve on scenegraph documentation.Gunnar Sletta2012-06-081-33/+306
| | | | | | | Change-Id: Ib584a45454f6fd2a3c0bfb32a76b19839e4a2a09 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com> Reviewed-by: Chris Adams <christopher.adams@nokia.com> Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Fix documentation for QSGGeometry::allocate()Glenn Watson2012-05-161-0/+3
| | | | | | | | | | Make clear in the documentation that client code must dirty the geometry node that contains the geometry class, to allow the renderer implementation to update internal buffers. Change-Id: I5cfddee1d0969410d7b3175c381679bd9083cc2b Reviewed-by: Damian Jansen <damian.jansen@nokia.com> Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
* Fix compilation on QNX.Tobias Koenig2012-03-201-0/+4
| | | | | Change-Id: I5e01cad23066a645c1434ce1463d370733f53e4f Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-301-1/+1
| | | | | | | | | | 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: If39bd256b0fa85eba17ea30f8ab87ea27d758908 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-231-1/+1
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I6a730abc0c396fb545a48b2d6938abedac2e3f1c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Update copyright year in Nokia copyright headers.Jason McDonald2012-01-171-1/+1
| | | | | | | | Update copyright headers from before 2011, and a couple of new ones that were merged after the previous change to copyright headers. Change-Id: Ia76e08e2734afa4ef3f1207dbcda5ff3bc81b366 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove out-of-line uses of qMalloc/qFree/qRealloc.Robin Burchell2012-01-121-3/+3
| | | | | | | | | Per http://codereview.qt-project.org/#change,11562, we are trying to remove these in favour of direct allocation, or (in the case of inline code) specialised out-of-line wrappers. Change-Id: I113609c4f97dc5c8020a72cbd398572cdb5b7505 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Add lineWidth property to QSGGeometryAlex Wilson2011-12-151-0/+25
| | | | | | | | | Allows users to set a line width when using drawingModes GL_LINES, GL_LINE_LOOP etc. Only calls glLineWidth on these drawingModes, and does it just before the glDrawElements/glDrawArrays. Change-Id: I2af583970b2acf0ddb59025a454caa75a8ddbd4f Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Say hello to QtQuick moduleKent Hansen2011-12-021-0/+466
This change moves the QtQuick 2 types and C++ API (including SceneGraph) to a new module (AKA library), QtQuick. 99% of this change is moving files from src/declarative to src/quick, and from tests/auto/declarative to tests/auto/qtquick2. The loading of QtQuick 2 ("import QtQuick 2.0") is now delegated to a plugin, src/imports/qtquick2, just like it's done for QtQuick 1. All tools, examples, and tests that use QtQuick C++ API have gotten "QT += quick" or "QT += quick-private" added to their .pro file. A few additional internal QtDeclarative classes had to be exported (via Q_DECLARATIVE_PRIVATE_EXPORT) since they're needed by the QtQuick 2 implementation. The old header locations (e.g. QtDeclarative/qquickitem.h) will still be supported for some time, but will produce compile-time warnings. (To avoid the QtQuick implementation using the compatibility headers (since QtDeclarative's includepath comes first), a few include statements were modified, e.g. from "#include <qsgnode.h>" to "#include <QtQuick/qsgnode.h>".) There's a change in qtbase that automatically adds QtQuick to the module list if QtDeclarative is used. Together with the compatibility headers, this should help reduce the migration pain for existing projects. In theory, simply getting an existing QtDeclarative-based project to compile and link shouldn't require any changes for now -- but porting to the new scheme is of course recommended, and will eventually become mandatory. Task-number: QTBUG-22889 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Change-Id: Ia52be9373172ba2f37e7623231ecb060316c96a7 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 10:38:59 +0000