From e3f96c934f5ef2251b6748c18e7709fb98033e55 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Sun, 20 May 2018 17:15:43 +0200 Subject: doc: Clean up the qml api docs Fix weird language, remove non-existent stuff, take the updated descriptions from the C++ APIs in a few cases, and add a few enhancements, in particular for DataInput and SubPresentationSettings. Change-Id: Icea43b5975bc05625c984f0cef8a2d1aa2f94ae6 Reviewed-by: Andy Nichols --- src/runtime/api/q3dselement.cpp | 65 ++++++++++++++++++++++++++--------------- 1 file changed, 42 insertions(+), 23 deletions(-) (limited to 'src/runtime/api/q3dselement.cpp') diff --git a/src/runtime/api/q3dselement.cpp b/src/runtime/api/q3dselement.cpp index 3e72e83..a09d21e 100644 --- a/src/runtime/api/q3dselement.cpp +++ b/src/runtime/api/q3dselement.cpp @@ -37,7 +37,7 @@ QT_BEGIN_NAMESPACE \inmodule 3dstudioruntime2 \since Qt 3D Studio 2.0 - \brief Controls a scene object in a Qt 3D Studio presentation. + \brief Controls a scene object (node) in a Qt 3D Studio presentation. This class is a convenience class for controlling the properties of a scene object (such as, model, material, camera, layer) in a Qt 3D Studio @@ -183,10 +183,12 @@ void Q3DSElementPrivate::setPresentation(Q3DSPresentation *pres) \ingroup 3dstudioruntime2 \brief Control type for elements in a Qt 3D Studio presentation. - This type is a convenience type for managing a presentation element. + This type is a convenience for controlling the properties of a scene object + (such as, model, material, camera, layer) in a Qt 3D Studio presentation. - All methods provided by this type are queued and handled asynchronously before the next - frame is displayed. + \note The functionality of Element is equivalent to + Presentation::setAttribute(), Presentation::getAttribute() and + Presentation::fireEvent(). \sa Studio3D, Presentation, SceneElement */ @@ -195,37 +197,54 @@ void Q3DSElementPrivate::setPresentation(Q3DSPresentation *pres) \qmlproperty string Element::elementPath Holds the element path of the presentation element. - This property must be set as part of Element declaration. - You can specify an element of a sub-presentation by adding "SubPresentationId:" - in front of the element path, for example \c{"SubPresentationOne:Scene"}. -*/ -/*! - \qmlmethod void Element::setAttribute(string attributeName, variant value) + An element path refers to an object in the scene either by name or id. The + latter is rarely used in application code since the unique IDs are not + exposed in the Qt 3D Studio application. To refer to an object by id, + prepend \c{#} to the name. Applications will typically refer to objects by + name. - Sets the \a value of an attribute on an element specified by this instance. - The \a attributeName is the \l{Attribute Names}{scripting name} of the attribute. + Names are not necessarily unique, however. To access an object with a + non-unique name, the path can be specified, for example, + \c{Scene.Layer.Camera}. Here the right camera object gets chosen even if + the scene contains other layers with the default camera names (for instance + \c{Scene.Layer2.Camera}). - The attribute must be preserved for scripting to be set by this function, or else it will fail. - An attribute is preserved if it is either \e{animated}, or - \e{an attribute on a master element that is unlinked and changed per-slide}. + If the object is renamed to a unique name in the Qt 3D Studio application's + Timeline view, the path can be omitted. For example, if the camera in + question was renamed to \c MyCamera, applications can then simply pass \c + MyCamera as the element path. + + To access an object in a sub-presentation, prepend the name of the + sub-presentation followed by a colon, for example, + \c{SubPresentationOne:Scene.Layer.Camera}. */ /*! - \qmlmethod void Element::fireEvent(string eventName) + \qmlmethod variant Element::getAttribute(string attributeName) + + Returns the current value of an attribute (property) of the scene object + specified by this Element instance. The \a attributeName is the + \l{Attribute Names}{scripting name} of the attribute. + */ - Dispatches an event with \a eventName on the element specified by this instance. - Appropriate actions created in Qt 3D Studio or callbacks registered using the registerForEvent() - method in attached scripts will be executed in response to the event. +/*! + \qmlmethod void Element::setAttribute(string attributeName, variant value) + + Sets the \a value of an attribute (property) of the scene object specified + by this Element instance. The \a attributeName is the \l{Attribute + Names}{scripting name} of the attribute. */ /*! - \qmlsignal Element::elementPathChanged(string elementPath) + \qmlmethod void Element::fireEvent(string eventName) - This signal is emitted when the element path property changes. - The new value is provided in the \a elementPath parameter. + Dispatches an event with \a eventName on the scene object + specified by elementPath. - The corresponding handler is \c onElementPathChanged. + Appropriate actions created in Qt 3D Studio or callbacks registered using + the registerForEvent() method in attached \c{behavior scripts} will be + executed in response to the event. */ QT_END_NAMESPACE -- cgit v1.2.3