summaryrefslogtreecommitdiffstats
path: root/src/core/nodes/qcomponent.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Move Render aspect into the Qt3DRender namespaceSean Harmer2015-10-131-1/+1
| | | | | | | Updated examples and tests accordingly. Change-Id: I8848a88472de2302aa072fa11f21ea934672b7e6 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Merge remote-tracking branch 'origin/5.5' into devAndy Nichols2015-08-171-3/+3
|\ | | | | | | Change-Id: Id0a3559e001631a077bc1c3a17c30a48599eecb9
| * Do not add duplicate entities to the component-to-entities mapLaszlo Agocs2015-08-021-1/+1
| | | | | | | | | | | | | | | | | | We can encounter attempts to register the same entity for a component. This should silently do nothing. Task-number: QTBUG-47486 Change-Id: I984c554e8a05db7e8e07c86d551837ab039df92b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * QScene is now privatePaul Lemire2015-07-061-1/+1
| | | | | | | | | | | | | | QSceneInterface was removed as it didn't make sense anymore Change-Id: I1110d1dcef72bd7654d773370ab304ac06515037 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * QComponent: replace dynamic_cast with static_castPaul Lemire2015-07-021-1/+1
| | | | | | | | | | | | | | Change-Id: Ic78656851660b099df2c92621ac0ad0be326d8f1 Task-number: QTBUG-46996 Reviewed-by: Tobias Koenig <tobias.koenig@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-291-1/+12
|\| | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/render/defaults/qforwardrenderer.cpp src/render/doc/qt3drender.qdocconf Change-Id: I1c4a15d2b57980dca82fa420ab6ef8c48c049a2c
| * QNode parent changesPaul Lemire2015-06-111-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - introduce QNode::setParent(QNode *) - QNode created with explicit parent now invoke QNodePrivate::_q_addChild - QNode::cleanup introduces, need to be added to the dtor of every QT3D_CLONABLE QNode subclass. Handles proper destruction. - QNode::cleanup added to all classes that should have it. - Updated unit tests of Nodes, Entity, Scene Change-Id: Id2c2784122a78edaae5580fe5976d88be5a1921c Task-number: QTBUG-45947 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Merge branch '5.5' into devSean Harmer2015-06-051-10/+51
|\| | | | | | | Change-Id: I8b3235703b7ceeb23de0b07753bed5f29436da31
| * doc: Remove uses of \returnsMartin Smith2015-06-051-1/+1
| | | | | | | | | | | | | | | | | | It is a doxygen command that is not recognized by qdoc. Change-Id: I8146f7d394a8ed42fec366a2078dccd65cbdf2bc Task-number: QTBUG-46495 Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
| * 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: Add Qt3D QML module and QML type documentation skeletonv5.5.0-beta1Topi Reinio2015-04-291-0/+16
| | | | | | | | | | | | | | | | | | | | | | Add documentation structure and comment blocks containing \qmltype, \qmlproperty, etc. commands for Qt3D QML module. The actual documentation (descriptions) are still missing, but this allows the QML type documentation to be generated. Change-Id: Id0e1afc89c13d963c950c142a3407aa70702562f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * QComponent: completed docPaul Lemire2015-04-231-7/+27
| | | | | | | | | | Change-Id: I916a315254c7724796ee085e99877f96f9d95a9a 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>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-03-171-4/+4
|\| | | | | | | | | | | | | Conflicts: src/core/doc/qt3dcore.qdocconf Change-Id: I3e0b4288daf6be5cd0d274ab34223e7a9ea2ec18
| * ChangeArbiter/SceneChange: use id as change subjectPaul Lemire2015-02-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Instead of having a QNode* or QObservable as the subject of a change, we use it's unique NodeId instead. That will prevent the ChangeArbiter from trying to distribute changes by looking at a QNode/QObservable id when the QNode/QObservable might have been destroyed in the meantime. Change-Id: Ia419d5b841434fd65522c8c65de552089cfe97cf Task-number: QTBUG-44628 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Fix: remove QByteArrayLiteral used when setting SceneChange property namesPaul Lemire2015-02-281-2/+2
| | | | | | | | | | | | | | | | This was probably forgotten when the property name was changed fron QByteArray to char *. Change-Id: Idd6a988703a241519b3aba7b1d127adae5e1375e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Doc: link and qdoc errors Qt3DNico Vertriest2015-03-111-3/+3
|/ | | | | | | Task-number: QTBUG-44180 Change-Id: Ic798dee5d33dbf18dbc9d978a0f07217895a30ee Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.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>
* Cleanup entities component lists on destructionKevin Ottens2015-01-281-0/+6
| | | | | Change-Id: I1e5f006b612a69e6b5cc98aecb6c8fdc3d6281b0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QComponent: add the enabled propertyPaul Lemire2015-01-241-1/+50
| | | | | | | Also added the doc and a copy method. Change-Id: Icf2d8ae57a75f58e3fd6049e63bfa5761ccaa40c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Change uuid -> id as it really isn't universally unique any longerSean Harmer2014-12-191-2/+2
| | | | | Change-Id: If25d1f71dfff62009db1cd4f72a1b0725b4c6d14 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* QComponent: add array of referenced entitiesPaul Lemire2014-11-141-0/+39
| | | | | | | | | | This will allow us to easily check which entities reference a given component. This will make sharing components easier and avoid us having to have RenderEntity like classes in every aspect just to check if a Component is being referenced. Change-Id: Ie6876dba334249c10f93a8f815dc45c31a83c755 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Automate the NodeUpdated notificationsKevin Ottens2014-10-151-7/+0
| | | | | | | | | | | | Now, each time a signal known to be the notification of a property change is emitted, we notify the observers automatically. Properties for which no NOTIFY has been provided are ignored. This change also allowed to drop quite some redundant code in QNode subclasses. Change-Id: Ib4fbeb8311148a6b8789f19ebe437fc7d413a599 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Get rid of ComponentUpdatedKevin Ottens2014-10-151-1/+1
| | | | | | | | NodeUpdated is enough information for property changes, we don't need to have it finer grained on the type of node. Change-Id: If718905cd1fce247d33a89cf258dc2ea3a852d91 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QComponent shareable propertyPaul Lemire2014-10-031-0/+25
| | | | | | Task-number: QTBUG-41524 Change-Id: I3851064c01165e49a872ec568c86337c653e6a86 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QNode refactoringPaul Lemire2014-10-031-16/+0
| | | | | | | | | | | | | | | | 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>
* Renamed Component to QComponentPaul Lemire2014-07-051-0/+82
Change-Id: Ifd585f5883e446d0569c38219d26ba581455e857 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>