summaryrefslogtreecommitdiffstats
path: root/src/render/geometry/qbuffer.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Extend Qt3D documentationPaul Wicking2019-06-071-0/+24
| | | | | | | | | | | | | | | | This change adds missing C++ and/or QML documentation for: * enum QBuffer::AccessType * QBuffer::accessType() * QBuffer::dataAvailable() * ForwardRenderer::externalRenderTargetSize * enumeration Qt3D.Render.Light::type * Qt3D.Render.Light::color * Qt3D.Render.Light::intensity Fixes: QTBUG-73071 Change-Id: I48b13cb8001558b20bd801b6f96f5b5933144d82 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-10-051-1/+16
|\ | | | | | | | | | | | | Conflicts: src/animation/backend/channelmapper_p.h Change-Id: I4e0f59c6648925ba45d30ccc2405524a9e901a0e
| * Deprecate QBuffer::typeKevin Ottens2017-09-221-1/+16
| | | | | | | | | | | | | | | | It can also be removed from the backend class, now the renderer doesn't look at it anyway. Change-Id: I5643922dccc81c0ee33f80e4b0ea34b63e51d89c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-251-2/+2
|/ | | | | Change-Id: I92c955068e233c50043ad7d06a32300dd386c24d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Rename QBuffer::access property to accessTypeSean Harmer2017-03-291-3/+3
| | | | | Change-Id: Ie56a792272d2bf748a0d64096d46852ab718c37a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Initialize member in QBufferPrivateSean Harmer2017-02-121-0/+1
| | | | | | Change-Id: If4c908bef743a44334e8492aa613b8d14de18ee8 Coverity-Id: 154549 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Transfers gpu buffer data to cpuJuan José Casafranca2017-01-311-5/+31
| | | | | | | | | | | | | | | | | | | | Added some code to retrieve the data in the gpu back to a cpu pointer in the opengl helpers. Added a framegraph node which specifies if any data must be downloaded from the gpu Added a flag in the buffer object to specify if the data from that buffer must be downloaded. Added a job to send the data back to the frontend. Added a path in the renderer to download the gpu data. Task number: QTBUG-57727 Change-Id: I315a9221e5116c7d07f818e00c654fe1901144f4 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Merge remote-tracking branch 'origin/5.8' into devLiang Qi2017-01-301-1/+2
|\ | | | | | | Change-Id: I0bc5a9f5a6971cd6bb6ad531515928adefc5b0cb
| * Doc: added doc for parameter \a otherNico Vertriest2017-01-251-1/+2
| | | | | | | | | | | | | | Undocumented parameter 'other' in Qt3DRender::QBufferDataGenerator::operator==() Change-Id: Iadeeec3316df86bb3681e707051e43683b7e9bbb Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QBuffer: add enum value for DrawIndirectBufferPaul Lemire2017-01-131-0/+2
|/ | | | | | | | Needed for rendering the particles as a result of dispatch compute calls. Change-Id: Iba6759d55677ff0064b203674dc16f99998ad3f7 Reviewed-by: Paul Lemire <paul.lemire@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: Minor fixes for Qt3DRender::QBuffer and QGeometryTopi Reinio2016-12-071-2/+2
| | | | | | | | Fix broken link, missing parameter names, and typos. Change-Id: I129d9169d7a943403676e0f48c34b6e1edaab0f1 Reviewed-by: Nico Vertriest <nico.vertriest@theqtcompany.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: several qdoc issuesNico Vertriest2016-12-051-1/+1
| | | | | | | | - replaced \return - replaced \update Change-Id: Ia819e274b1416b246e179caa304ac1eb1570d3e8 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Add docs for QBufferDataGeneratorPaul Lemire2016-11-181-0/+85
| | | | | Change-Id: Ia509fe6d61f35090b498d3c7268294ebb5804241 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Merge branch '5.7' into devSean Harmer2016-08-141-0/+13
|\ | | | | | | Change-Id: Id62e225062a030f4864fb7af2ed6f60d6be87460
| * Doc: complete QBuffer docPaul Lemire2016-08-101-0/+13
| | | | | | | | | | | | Change-Id: I2698dd760c8124fb7cddbd3d22c739db2576dcdd Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Add partial data update support for QBufferOleg Evseev2016-08-131-1/+25
|/ | | | | | | | | | | Perform upadateData through queue of replacements specified by QBufferUpdate: start position (offset) and QByteArray (replacing data) Add example based on custom-mesh-cpp to show how updating data works. Task-number: QTBUG-50720 Change-Id: I2eceb514af21209deb278d73c94773e39f300fb3 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Documentation for render-geometryColin Ogilvie2016-05-281-1/+5
| | | | | | Task-number: QTBUG-46037 Change-Id: Ie0069ab43a0575d4f9578a43a7302cd560423fc6 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* De-inline dtors of public polymorphic classesMarc Mutz2016-05-191-0/+7
| | | | | | | | | | | | | | 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>
* Use QSharedPointer::create() for some change objectsSean Harmer2016-05-121-1/+1
| | | | | | | | Uses one memory allocation for the shared pointer bookkeeping block and the object, rather than two. Change-Id: Ia8c587cf33e981e8a4e4dd565938217be76e256b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QNodePropertyChange -> QPropertyUpdatedChangeSean Harmer2016-05-101-3/+3
| | | | | | Task-number: QTBUG-51494 Change-Id: Ic326499f80b5a91b2d19c09770de926f220cc805 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove QSceneChange::SenderTypeSean Harmer2016-05-101-1/+1
| | | | | | Task-number: QTBUG-51494 Change-Id: I2414bee3b9eb3bd1146fd356bb0552366e63a976 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove ChangeFlag from NodeUpdated change type ctorsSean Harmer2016-05-101-1/+1
| | | | | | | | | | | | ...and fix resulting compilation issues and tests. Had to temporarily allow QNode[Added|Removed] property change to be able to handle QVariant payloads too. This will be split out into a separate pair of classes in a future commit. Task-number: QTBUG-51494 Change-Id: I1748e3b8aa3c39fa171ee0c5af4204502826ba07 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Rename NodeUpdated ChangeFlag to PropertyUpdatedSean Harmer2016-05-101-2/+2
| | | | | | | | This more correctly reflects the semantic meaning. Task-number: QTBUG-51494 Change-Id: I3a230e959ea007f1d19808eae73b5d95b6f06514 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-14/+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-3/+3
| | | | | | | Trying to unify naming of change types. Change-Id: I0bfca0b7ba5adeaaa6145f75ddb41731f76adc09 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QBuffer creates creation changesSean Harmer2016-03-241-1/+14
| | | | | Change-Id: I25fc4afadd0b600c5a9ee06ca40b4d684a96cff2 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QBufferFunctor renamed to QBufferDataGeneratorRobert Brock2016-03-081-6/+6
| | | | | | | | | | bufferFunctor -> dataGenerator As per API review Change-Id: Ie67fff2fd6b75574ca840bd43836028c0726ec5e Task-number: QTBUG-51469 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QBuffer rename sync to syncDataRobert Brock2016-02-261-14/+14
| | | | | | | As per API review Change-Id: Ibb4fe23483ddf6d8fdeb9f8eea4112eb652d54a9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QBuffer merged with QAbstractBufferPaul Lemire2016-02-261-16/+36
| | | | | Change-Id: I1e0c25ec01115569af59b53ec4d447a1fd55d8b3 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-261-15/+119
|\ | | | | | | | | | | | | | | | | Conflicts: src/doc/src/qt3dcollision-module.qdoc src/render/frontend/qcamera.cpp src/render/frontend/qcameralens.cpp Change-Id: I8a0ae250a6b8e065a1ef3c817968ebb7ef23b20d
| * Doc: Exclude private header files from the documentation buildTopi Reinio2016-01-251-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | In the documentation configuration, exclude all '_p.h' files from the documentation build. This prevents QDoc from generating documentation for private classes, and also allows removal of documentation that explicitly set the private classes \internal. Change-Id: I8fcf5c99a2a0b75e9ee5dcd928fa4a2b4b8cf34f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Added skeleton docs to geometry classesTomi Korpipää2016-01-201-11/+119
| | | | | | | | | | | | | | 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-3/+3
| | | | | | Change-Id: Icec2f9f207221e35ffdeeb594bb9b4dc6ef890f1 Task-number: QTBUG-49797 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Rename Renderer -> Render throughoutSean Harmer2015-10-191-1/+1
| | | | | | | | 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>
* RenderBuffer: handle the sync propertyPaul Lemire2015-10-141-0/+10
| | | | | | | | | And update the frontend QBuffer with the data obtained from the functor if sync is true. Change-Id: I86e4dff50fedf3fbc6057843a8a60c978d68b047 Task-number: QTBUG-48454 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* QBuffer: add a sync propertyPaul Lemire2015-10-141-1/+30
| | | | | | | | When true, data loaded through a functor will also be updated to the frontend. Change-Id: I2980e00a927ed5f787e217a20e2c42d8c5ea0e81 Task-number: QTBUG-48454 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* Move Qt3DCore into Qt3DCore namespaceSean Harmer2015-10-131-2/+2
| | | | | | | 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/+140
Change-Id: I0c9e83e3142e6b083feb2cbcabcc4279de64b95b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>