summaryrefslogtreecommitdiffstats
path: root/src/render/frontend/qcuboidmesh.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Do not pass `this` to Private c-torKonstantin Ritt2015-05-201-3/+3
| | | | | | | For classes derived from QNodePrivate, it is not used anymore. Change-Id: I9573042500c2c7533687d251e72bac14cb793525 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: Fix multiple C++ documentation issuesTopi Reinio2015-04-141-0/+5
| | | | | | | | | | | | | | | | | | | - Remove multiple \namespace commands for namespace Qt3D. QDoc in 5.5 is now able to collate namespace members from multiple modules. - Mark 'Q...Private' classes and functions taking private arguments as \internal - Use correct \qtvariable for Qt 3D Core and Render - Add src/plugins directory to Qt 3D Core documentation build to correctly generate Assimp-related documentation. - Ensure documentation for C++ properties is visible by using the \property command instead of documenting the setter/getter functions. - Add export and logging macros to qdoc ignore directives - Remove unnecessary use of \fn command - Language and styling fixes Change-Id: I2481fa30ad2f6869b85c038c20ff1730b8522d46 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Correct use of std::numeric_limits::maxThiago Macieira2015-03-121-1/+1
| | | | | | | | It requires #include <limits> and extra set of parentheses due to windows.h max() macro. Change-Id: Iee8cbc07c4434ce9b560ffff13ca7dd7c94a7af1 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add another missing limits includev5.5.0-alpha1Laszlo Agocs2015-03-111-0/+2
| | | | | Change-Id: Ia11e7d53e95b2575f4ba9100c36a9d203979213a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Copyright header change.Mika Salmela2015-02-091-19/+14
| | | | | | | | As for preparation for Qt5.5 release the copyright header is updated to correspond the current license requirements. Change-Id: I36632918b66f455539453b42c369689fb11298ec Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* renderlogging.h -> renderlogging_p.hSean Harmer2014-11-191-1/+1
| | | | | Change-Id: I985366c47d2a1f721761c64b1870850071ace885 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QMeshData: enum for primitivesPaul Lemire2014-10-221-1/+1
| | | | | | | | | | Each value in the enums maps directly to the correct GLint for a given primitive patch. This allows to still return an int to be used directly by the renderer. This should also fix compilation error of ES2. Change-Id: I7ec54dcb2cbb02b67fa6225bb80fb7e691687e2c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QAbstractMeshData merged with QMeshData and moved to RendererPaul Lemire2014-10-221-6/+6
| | | | | | | That implied moving QAbstractMesh to Renderer as well. Change-Id: I9013bf0458b849f7805d214a70580a80e86d8c84 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QAbstractMesh: setDirty -> updatePaul Lemire2014-10-201-8/+8
| | | | | | Change-Id: I8e4094d69446ec8290fa34e4875f5e1cf822054c Task-number: QTBUG-41522 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QAbstractShapeMesh removedPaul Lemire2014-10-171-4/+4
| | | | | | Change-Id: Ibc2cb1231ccb2d7a6f986978bd030997be0c2090 Task-number:QTBUG-41528 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Have copy() only on QNodeKevin Ottens2014-10-161-9/+9
| | | | | | | | | | It was previously both on QNode and QNodePrivate. The one on QNodePrivate didn't give us much as it didn't eliminate the virtual of QNode. Change-Id: Ia1ea9dd831674109c84bd7005abe7fde3b1223fa Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Hide doClone implementations behind a macroKevin Ottens2014-10-151-7/+0
| | | | | | | | | This way we will avoid inconsistencies. It also means making some of the copy() implementations more clever. Change-Id: Ic79c9ec7c9c32f8951d5d9f5184592880bf8d5fd Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QNode refactoringPaul Lemire2014-10-031-18/+14
| | | | | | | | | | | | | | | | Move almost everything to private classes. Assimp loading restored. All examples working. QNode hierachy is now handled through QObject::setParent, addChild, removeChild are part of the private api. Note: commented QChangeArbiter unit tests as they can no longer work with this patch and will restore them when QChangeArbiter will have been made private. Task-number: QTBUG-41470 Task-number: QTBUG-41523 Change-Id: I4430974b3aa7f3744c38714b451b122e0cb4d0c9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Improved/Refactored cloning and doClone off all subclassesPaul Lemire2014-09-301-2/+5
| | | | | | | | Note: As we are using QScene during cloning, it is important that node hierarchy be created and added in the proper order (parent then child). Change-Id: I8fd53f7ca696ec9aca19cc70dc116ccba4154911 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Comparison operator for QAbstractMeshFunctor subclassesPaul Lemire2014-09-301-0/+13
| | | | | Change-Id: I18f0c46631615787a5505f7591514bfd33ac6bd0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Rename MeshData -> QMeshDataSean Harmer2014-08-181-14/+14
| | | | | Change-Id: I23a466ebd29666bed1c56f29c6f049544a4eca23 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix use of variable before initializationThiago Macieira2014-08-171-1/+1
| | | | | | | | | Caught by ICC. qcuboidmesh.cpp(75): warning #592: variable "mesh" is used before its value is set Change-Id: I9f1a82e17c0d22c1c2b2ec0ca0b953f9ecb16644 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QCuboidMesh implements doClone and copy methodsPaul Lemire2014-08-131-0/+20
| | | | | Change-Id: I1f10e6dc8eda39e2058926748e103c877d6d7daa Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add QCuboidMesh and use it in rollerball as the wallsSean Harmer2014-07-271-0/+501
Change-Id: If2b83a7f949464760a7e98381eccc5f2f57491a5 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>