summaryrefslogtreecommitdiffstats
path: root/src/render/geometry/qattribute.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into ↵v5.15.11-lts-lgplTarja Sundqvist2023-06-091-0/+2
|\ | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I81f01dbde95cc9cd8e98c7fb9bf3a390aa27f379
| * Qt3DRender: includemocsMike Krus2022-07-151-0/+2
| | | | | | | | | | | | | | | | Task-number: QTBUG-103286 Change-Id: Iaddad08bb469408ee975e463ac82c95870130cee Reviewed-by: Sean Harmer <sean.harmer@kdab.com> (cherry picked from commit 1e940bf2f8d260c313917718584736fa9fa86b14) Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Revert "Update commercial license headers"v5.15.3-lts-lgplTarja Sundqvist2021-03-231-19/+19
|/ | | | | | | | | | | This reverts commit 03e5f60e585701608c1181365faee484d7a1f14c. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: I359e89ed77b1b2750607617d138ebb6c316f0296 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update commercial license headersTarja Sundqvist2021-02-021-19/+19
| | | | | | | | | | | | | | | | Updated header.COMM to the files in tqtc-qt3d. Examples, documentation files or tests are not updated. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reason for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4155 Change-Id: I139c8ad72c042b0900239decc36cfed4bc1c4951 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
* Clean up includesMike Krus2019-10-011-2/+0
| | | | | | | | | Remove include statements for classes that are no longer used. Makes it easier to find remaining use cases that need addressed before complete removal in Qt 6. Change-Id: I60529ba1929ad64b162d3847d5df47cde2a60dad Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update QAttribute to use direct syncMike Krus2019-09-181-0/+13
| | | | | Change-Id: I92041eeb7c80d46027106834d7c52f854bccb386 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QAttribute: add new default attribute namesPaul Lemire2018-02-021-0/+20
| | | | | | | To support a second and third layer of textures Change-Id: Id54db9b4a9a8e85748ebf1ec04444c4fb252c04f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add default attribute names for joint indices and joint weightsSean Harmer2017-07-281-0/+18
| | | | | | | Needed for skinned mesh support. Change-Id: I8ded0555db157db32cd02b8d45794702da249fb9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QAttribute: add DrawIndirectAttribute typePaul Lemire2017-01-241-0/+25
| | | | | | | | | This will allow to specify a DrawIndirectBuffer and tell the renderer to use indirect draw calls. Tests and documentation updated accordingly. Change-Id: I98d5be396c6ae45ce5b93ae887f1c5d4ce3ec565 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Doc: Specify #include path for each \classTopi Reinio2016-12-071-0/+1
| | | | | | | | | | | | QDoc tries to guess the correct #include statement, displayed in the requisites table in the class reference. However, this often produces incorrect information for a module as complex as Qt3D. To fix this, manually specify the include path with the \inheaderfile command. Change-Id: I42929b92600d07d759f4f76e9051ff656785c652 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: various link errors qt3dNico Vertriest2016-10-131-1/+1
| | | | | | | | | | | assimpio.cpp:72: warning: Can't link to 'GLTFPIO' qpicktriangleevent.cpp:66: warning: Can't link to 'QPickSettings' qpicktriangleevent.cpp:76: warning: Can't link to 'PickSettings' shadow-map-qml.qdoc:28: warning: Can't link to 'RendererSettings' shadow-map-qml.qdoc:28: warning: Can't link to 'Techniques' Change-Id: I039a4134d18e2b2472554215a69e971650b29b64 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Merge branch '5.7' into devSean Harmer2016-08-141-3/+16
|\ | | | | | | Change-Id: Id62e225062a030f4864fb7af2ed6f60d6be87460
| * QAttribute: use target constructorPaul Lemire2016-08-101-2/+2
| | | | | | | | | | Change-Id: Ifc3f57ce96a2d0462eea5d174f6d50316380695e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Complete QAttribute documentationPaul Lemire2016-08-091-1/+14
| | | | | | | | | | Change-Id: Id0d2fa4434a851e4dc0b4565faa15fd5d834c283 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-021-2/+3
|\| | | | | | | | | | | | | | | Conflicts: .qmake.conf src/render/geometry/qattribute.cpp Change-Id: I17d35c69f1835928930240b4fe45e565fd0dfa0f
| * Add support for mat3 and mat4 attributesKevin Ottens2016-07-201-2/+3
| | | | | | | | | | | | | | | | | | | | Attributes don't support a vertexSize larger than 4, but it can come in handy to have bigger attributes when you want to push full matrices. mat2 already fits, so adding special handling for vertexSize == 9 (mat3) and vertexSize == 16 (mat4). Change-Id: Ic5376b1c7a87fc4225afdf756d65c924fde54996 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Fix internal naming consistency for attributesKevin Ottens2016-07-211-14/+14
| | | | | | | | | | Change-Id: I4229343144f0a8a234692bfd5147455aa95dd0bf Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Fix API consistency in QAttributeKevin Ottens2016-07-211-2/+14
|/ | | | | Change-Id: Ifb155a11cd36642ccfa30ec4d597ff72adfc0fc2 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Documentation for render-geometryColin Ogilvie2016-05-281-8/+23
| | | | | | Task-number: QTBUG-46037 Change-Id: Ie0069ab43a0575d4f9578a43a7302cd560423fc6 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Shared node bookkeepingPaul Lemire2016-05-231-0/+8
| | | | | | | | | | | | Any time a property references a QNode there is a risk that the node gets destroyed and then the property is left pointing to a dangling pointer. To handle such cases, setters of such properties are able to use a helper that internally connect QObject::destroyed signal to a setter removal method. Change-Id: I42428c851d0e3d2d88ab0cf6a5b75605334ec648 Task-number: QTBUG-53456 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* De-inline dtors of public polymorphic classesMarc Mutz2016-05-191-0/+5
| | | | | | | | | | | | | | By making the destructor (usually the first non-inline, non-pure, virtual function, and therefore the trigger for most compilers to emit the vtable and type_info structures for the class in that TU) out-of-line, vtables and, more importantly, type_info structures for the class are pinned to a single TU. This prevents false negative dynamic_cast and catch evaluation. It also allows to add code to them later, if necessary. Change-Id: I0da301cd788162abba6cdbbb21910090a22adb9a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QNodePropertyChange -> QPropertyUpdatedChangeSean Harmer2016-05-101-1/+1
| | | | | | Task-number: QTBUG-51494 Change-Id: Ic326499f80b5a91b2d19c09770de926f220cc805 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Q_NULLPTR -> nullptrSean Harmer2016-05-011-1/+1
| | | | | | Task-number: QTBUG-52736 Change-Id: I58f9cbcdf018e7b672d33dd865067485412b79fe Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Strip out cloning subsystemSean Harmer2016-04-291-19/+0
| | | | | Change-Id: I4def54a11de0f9c676ef6b2d7bd8e723ded25ab9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QNode: make cleanup a private slotPaul Lemire2016-04-231-8/+0
| | | | | | | | | | QT3D_CLONEABLE now implements a default dtor that calls _q_ cleanup QT3D_CLONEABLE_CUSTOM_DTOR is used for classes that really need to implement their own dtor but they need to invoke _q_cleanup manually Change-Id: I2937a3b9edeb5a763749f0044360d78ab4461a5e Task-number: QTBUG-51464 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Rename QScenePropertyChange -> QNodePropertyChangeSean Harmer2016-04-211-1/+1
| | | | | | | Trying to unify naming of change types. Change-Id: I0bfca0b7ba5adeaaa6145f75ddb41731f76adc09 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QAttribute creates creation changesSean Harmer2016-03-241-0/+17
| | | | | Change-Id: Ief63118100f03266e53aebd9732d5247e6461383 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QAttribute API changesPaul Lemire2016-02-291-5/+5
| | | | | | | | - rename dataType to vertexBaseType - rename dataSize to vertexSize Change-Id: I0eca7054dd69e8aac69bc1d7d5023a7ca6ca9da2 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QAttribute: merge with QAbstractAttributePaul Lemire2016-02-261-153/+288
| | | | | | | remove asVector and dump functions Change-Id: I0c4e4e240ed4b69f72b3de6379c6866743d48b17 Reviewed-by: Sean Harmer <sean.harmer@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>
* Rename Renderer -> Render throughoutSean Harmer2015-10-191-2/+2
| | | | | | | | 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 Qt3DCore into Qt3DCore namespaceSean Harmer2015-10-131-1/+1
| | | | | | | Update other aspects, tests and examples accordingly. Change-Id: Ib1bcf0bdf4f5aec4422dc0c80bfc32b27fb1a317 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Final batch of file moves for nowSean Harmer2015-10-131-0/+264
Change-Id: I0c9e83e3142e6b083feb2cbcabcc4279de64b95b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 04:38:53 +0000