From e3f96c934f5ef2251b6748c18e7709fb98033e55 Mon Sep 17 00:00:00 2001
From: Laszlo Agocs <laszlo.agocs@qt.io>
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 <andy.nichols@qt.io>
---
 src/runtime/api/q3dspresentation.cpp | 198 ++++++++++++++++++++++-------------
 1 file changed, 128 insertions(+), 70 deletions(-)

(limited to 'src/runtime/api/q3dspresentation.cpp')

diff --git a/src/runtime/api/q3dspresentation.cpp b/src/runtime/api/q3dspresentation.cpp
index 0a797b2..9525422 100644
--- a/src/runtime/api/q3dspresentation.cpp
+++ b/src/runtime/api/q3dspresentation.cpp
@@ -476,12 +476,76 @@ void Q3DSPresentationPrivate::registerInlineQmlSubPresentations(const QVector<Q3
     \inqmlmodule QtStudio3D
     \ingroup 3dstudioruntime2
 
-    \brief Control type for Qt 3D Studio presentations.
+    \brief Represents a Qt 3D Studio presentation.
+
+    This class provides properties and methods for controlling a
+    presentation.
 
-    This type provides properties and methods for controlling a presentation.
+    Qt 3D Studio supports multiple presentations in one project. There is
+    always a main presentation and zero or more sub-presentations. The
+    sub-presentations are composed into the main presentations either as
+    contents of Qt 3D Studio layers or as texture maps.
+
+    In the filesystem each presentation corresponds to one \c{.uip}
+    file. When present, the \c{.uia} file ties these together by
+    specifying a name for each of the (sub-)presentations and
+    specifies which one is the main one.
 
-    All methods provided by this type are queued and handled asynchronously before the next
-    frame is displayed.
+    From the API point of view Presentation corresponds to the main
+    presentation. The source property can refer either to a \c{.uia} or
+    \c{.uip} file. When specifying a file with \c{.uip} extension and a
+    \c{.uia} is present with the same name, the \c{.uia} is loaded
+    automatically and thus sub-presentation information is available
+    regardless.
+
+    The Presentation type handles child objects of the types \l Element, \l
+    SceneElement, \l DataInput, and \l SubPresentationSettings specially. These
+    will get automatically associated with the presentation and can control
+    certain aspects of it from that point on.
+
+    \section2 Example usage
+
+    \qml
+    Studio3D {
+        Presentation {
+            id: presentation
+
+            source: "qrc:/presentation/barrel.uip"
+            profilingEnabled: true
+
+            onSlideEntered: console.log("Entered slide " + name + "(index " + index + ") on " + elementPath)
+            onSlideExited: console.log("Exited slide " + name + "(index " + index + ") on " + elementPath)
+            onCustomSignalEmitted: console.log("Got custom signal " + name)
+
+            DataInput {
+                name: "di_text"
+                value: "hello world"
+            }
+
+            SceneElement {
+                elementPath: "SomeComponentNode"
+                onCurrentSlideIndexChanged: console.log("Current slide index for component: " + currentSlideIndex)
+                onCurrentSlideNameChanged: console.log("Current slide name for component: " + currentSlideName)
+            }
+
+            SubPresentationSettings {
+                qmlStreams: [
+                    QmlStream {
+                        presentationId: "sub-presentation-id"
+                        Rectangle {
+                            width: 1024
+                            height: 1024
+                            color: "red"
+                        }
+                    }
+                ]
+            }
+        }
+    }
+    Button {
+        onClicked: presentation.setAttribute("SomeMaterial", "diffuse", "0 1 0");
+    }
+    \endqml
 
     \sa Studio3D
 */
@@ -489,22 +553,14 @@ void Q3DSPresentationPrivate::registerInlineQmlSubPresentations(const QVector<Q3
 /*!
     \qmlproperty url Presentation::source
 
-    Holds the presentation source (\c{*.uia} or \c{*.uip}) file location.
+    Holds the main presentation source (\c{*.uia} or \c{*.uip}) file location.
     May be either a file URL or a qrc URL.
 */
 
-/*!
-    \qmlproperty SubPresentationSettings Presentation::subPresentationSettings
-
-    Holds the settings for the subpresentations in the Qt 3D Studio presentation.
-
-    This property is read-only.
-*/
-
 /*!
     \qmlmethod void Presentation::goToSlide(string elementPath, string name)
 
-    Requests a time context (a Scene or a Component element) to change to a specific slide
+    Requests a time context (a Scene or a Component node) to change to a specific slide
     by \a name. If the context is already on that slide playback will start over.
 
     If \a elementPath points to a time context, that element is controlled. For
@@ -516,7 +572,7 @@ void Q3DSPresentationPrivate::registerInlineQmlSubPresentations(const QVector<Q3
 /*!
     \qmlmethod void Presentation::goToSlide(string elementPath, int index)
 
-    Requests a time context (a Scene or a Component element) to change to a specific slide by
+    Requests a time context (a Scene or a Component node) to change to a specific slide by
     index \a index. If the context is already on that slide playback will start over.
 
     If \a elementPath points to a time context, that element is controlled. For
@@ -528,7 +584,7 @@ void Q3DSPresentationPrivate::registerInlineQmlSubPresentations(const QVector<Q3
 /*!
     \qmlmethod void Presentation::goToSlide(string elementPath, bool next, bool wrap)
 
-    Requests a time context (a Scene or a Component element) to change to the next or the
+    Requests a time context (a Scene or a Component node) to change to the next or the
     previous slide, depending on the value of \a next. If the context is already at the
     last or first slide, \a wrap defines if change occurs to the opposite end.
 
@@ -541,7 +597,7 @@ void Q3DSPresentationPrivate::registerInlineQmlSubPresentations(const QVector<Q3
 /*!
     \qmlmethod void Presentation::goToTime(string elementPath, real time)
 
-    Sets a time context (a Scene or a Component element) to a specific playback \a time in seconds.
+    Sets a time context (a Scene or a Component node) to a specific playback \a time in seconds.
 
     If \a elementPath points to a time context, that element is controlled. For
     all other element types the time context owning that element is controlled instead.
@@ -564,88 +620,90 @@ void Q3DSPresentationPrivate::registerInlineQmlSubPresentations(const QVector<Q3
 */
 
 /*!
-    \qmlmethod void Presentation::setAttribute(string elementPath, string attributeName,
-                                               variant value)
-
-    Sets the \a value of an attribute on an element found at \a elementPath. The \a attributeName is
-    the \l{Attribute Names}{scripting name} of the attribute.
-
-    You can target the command to a specific sub-presentation by adding "SubPresentationId:" in
-    front of the element path, for example \c{"SubPresentationOne:Scene.Mesh.Material"}.
+    \qmlmethod variant Presentation::getAttribute(string elementPath, string attributeName)
 
-    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}.
+    Returns the value of an attribute (property) on the object specified by \a
+    elementPath. The \a attributeName is the \l{Attribute Names}{scripting
+    name} of the attribute.
 */
 
 /*!
-    \qmlmethod void Presentation::setPresentationActive(string id, bool active)
-
-    Stops or starts updates to a sub-presentation based on the \a active flag. The presentation is
-    referenced to by the \a id, which is the name of the presentation without the \c{.uip}.
+    \qmlmethod void Presentation::setAttribute(string elementPath, string attributeName,
+                                               variant value)
 
-    Making a presentation inactive prevents any elements, behaviors, and animations within it from
-    updating. It also prevents any events within that presentation from being processed. It does
-    not, however, prevent the presentation from rendering. An inactive presentation will continue
-    to render using its last-updated information.
+    Sets the \a value of an attribute (property) on the Qt 3D Studio scene
+    object specified by \a elementPath. The \a attributeName is the
+    \l{Attribute Names}{scripting name} of the attribute.
 
-    Explicitly inactivating presentations can provide a significant performance increase, depending
-    on the number and size of the presentations that are inactive. Inactive presentations are not
-    ‘paused’. When the presentation is re-activated, animations will resume at the time they should
-    be had they been running, not where they were when the presentation was made inactive.
-*/
+    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.
 
-/*!
-    \qmlmethod void Presentation::fireEvent(string elementPath, string eventName)
+    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}).
 
-    Dispatches an event with \a eventName on a specific element found in \a elementPath. Appropriate
-    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.
+    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.
 
-    You can target the command to a specific sub-presentation by adding "SubPresentationId:" in
-    front of the element path, for example \c{"SubPresentationOne:Scene.Mesh"}.
+    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 Presentation::setGlobalAnimationTime(int64 milliseconds)
+    \qmlmethod void Presentation::fireEvent(string elementPath, string eventName)
 
-    Sets the global animation time to \a milliseconds. Setting the global animation time to a
-    non-zero value will disable the automatic animation timer. Setting the value to zero
-    resumes automatic animation timer.
+    Dispatches an event with \a eventName on a specific element found in \a
+    elementPath. 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.
 */
 
 /*!
     \qmlmethod void Presentation::setDataInputValue(string name, variant value)
-    \since QtStudio3D 1.1
 
     Sets the \a value of a data input element \a name in the presentation.
-*/
 
-/*!
-    \qmlsignal Presentation::slideEntered(string elementPath, int index, string name)
+    Data input provides a higher level, designer-driven alternative to
+    setAttribute or Element. Instead of exposing a large set of properties with
+    their intenal engine names, data input allows designers to decide which
+    properties should be writable by the application, and can assign custom
+    names to these data input entries, thus forming a well-defined contract
+    between the designer and the developer.
 
-    This signal is emitted when a slide is entered in the presentation.
-    The \a elementPath specifies the time context (a Scene or a Component element) owning the
-    entered slide.
-    The \a index and \a name contain the index and the name of the entered slide.
+    In addition, data input also allows controlling the time line and the
+    current slide for time context objects (Scene or Component). Therefore it
+    is also an alternative to the goToSlide, goToTime, and SceneElement.
+
+    As an alternative to this method, the \l DataInput type can be used. That
+    approach has the advantage of being able to use QML property bindings for
+    the value, instead of having to resort to JavaScript function calls for
+    every value change.
 */
 
 /*!
-    \qmlsignal Presentation::slideExited(string elementPath, int index, string name)
+    \qmlsignal Presentation::slideEntered(string elementPath, int index, string name)
 
-    This signal is emitted when a slide is exited in the presentation.
-    The \a elementPath specifies the time context (a Scene or a Component element) owning the
-    exited slide.
-    The \a index and \a name contain the index and the name of the exited slide.
+    This signal is emitted when a slide is entered in the presentation. The \a
+    elementPath specifies the time context (a Scene or a Component element)
+    owning the entered slide. The \a index and \a name contain the index and
+    the name of the entered slide.
 */
 
 /*!
-    \qmlsignal Presentation::sourceChanged(url source)
-
-    This signal is emitted when the source property has changed.
-    The new value is provided in the \a source parameter.
+    \qmlsignal Presentation::slideExited(string elementPath, int index, string name)
 
-    The corresponding handler is \c onSourceChanged.
+    This signal is emitted when a slide is exited in the presentation. The \a
+    elementPath specifies the time context (a Scene or a Component element)
+    owning the exited slide. The \a index and \a name contain the index and the
+    name of the exited slide.
 */
 
 QT_END_NAMESPACE
-- 
cgit v1.2.3


From 556fa62d1fa03ad0e216d12c9ffdeec81b55bfa8 Mon Sep 17 00:00:00 2001
From: Laszlo Agocs <laszlo.agocs@qt.io>
Date: Tue, 22 May 2018 10:24:00 +0200
Subject: doc: finish up the C++ docs

Change-Id: I26abc856bba4c150b918e1800a2eb34b44bc9f81
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
---
 src/runtime/api/q3dspresentation.cpp | 227 +++++++++++++++++++++++++++++++++--
 1 file changed, 219 insertions(+), 8 deletions(-)

(limited to 'src/runtime/api/q3dspresentation.cpp')

diff --git a/src/runtime/api/q3dspresentation.cpp b/src/runtime/api/q3dspresentation.cpp
index 9525422..3a8a055 100644
--- a/src/runtime/api/q3dspresentation.cpp
+++ b/src/runtime/api/q3dspresentation.cpp
@@ -128,6 +128,25 @@ void Q3DSPresentation::setSource(const QUrl &source)
     emit sourceChanged();
 }
 
+/*!
+    \property Q3DSPresentation::profilingEnabled
+
+    When enabled, Qt 3D objects managed by the runtime get tracked,
+    and various statistics get collected internally. These are then
+    exposed in the views that can be toggled by profileUiVisible.
+
+    The default value is \c false.
+
+    \note Changing the value after the presentation has been loaded
+    has no effect for the already loaded presentation. Therefore the
+    changing of this property must happen before calling setSource().
+
+    \note In the Qt 3D Studio Viewer application presentations are
+    opened with profiling enabled by default. Therefore, applications
+    wishing to have an experience comparable to the Viewer, when it
+    comes to the debug and profile views, should set this property to
+    \c true.
+*/
 bool Q3DSPresentation::isProfilingEnabled() const
 {
     Q_D(const Q3DSPresentation);
@@ -149,6 +168,17 @@ void Q3DSPresentation::setProfilingEnabled(bool enable)
     }
 }
 
+/*!
+    \property Q3DSPresentation::profileUiVisible
+
+    When this property is \c{true}, the interactive statistics and profile
+    view is displayed in-scene, on top of the 3D content.
+
+    \note This feature can be disabled at build time, in which case this
+    property has no effect.
+
+    Default value is \c{false}.
+*/
 bool Q3DSPresentation::isProfileUiVisible() const
 {
     Q_D(const Q3DSPresentation);
@@ -166,6 +196,13 @@ void Q3DSPresentation::setProfileUiVisible(bool visible)
     }
 }
 
+/*!
+    \property Q3DSPresentation::profileUiScale
+
+    Controls the scale factor of the in-scene debug and profile views.
+
+    The default value is 1.0.
+*/
 float Q3DSPresentation::profileUiScale() const
 {
     Q_D(const Q3DSPresentation);
@@ -216,10 +253,11 @@ void Q3DSPresentation::setDataInputValue(const QString &name, const QVariant &va
 }
 
 /*!
-    Dispatches an event with \a eventName on a specific element found in \a
-    elementPath. Appropriate actions created in Qt 3D Studio or callbacks
-    registered using the registerForEvent() method in attached (behavior)
-    scripts will be executed in response to the event.
+    Dispatches a Qt 3D Studio presentation event with \a eventName on
+    scene object specified by \a elementPath. These events provide a
+    way to communicate with the \c .qml based \c{behavior scripts}
+    attached to scene objects since they can register to be notified
+    via Behavior::registerForEvent().
 
     See setAttribute() for a description of \a elementPath.
  */
@@ -371,10 +409,54 @@ void Q3DSPresentation::setAttribute(const QString &elementPath, const QString &a
         d->controller->handleSetAttribute(elementPath, attributeName, value);
 }
 
+/*!
+    \fn void Q3DSPresentation::customSignalEmitted(const QString &elementPath, const QString &name)
+
+    This signal is emitted when an action with the \c{Emit Signal}
+    handler is executed in the Qt 3D Studio presentation. \a
+    elementPath specifies the scene object on which the (Qt 3D Studio)
+    "signal" \a name was triggered.
+
+    Connecting to this signal offers a way of reacting upon certain
+    events in the Qt 3D Studio presentation.
+
+    \image customsignal.png
+
+    In this example, pressing or tapping on the Cluster object will result in
+    emitting \c{customSignalEmitted("Cluster", "clusterPressed")}.
+*/
+
+/*!
+    \fn Q3DSPresentation::slideEntered(const QString &elementPath, int index, const QString &name)
+
+    This signal is emitted when a slide is entered in the presentation. The \a
+    elementPath specifies the time context (a Scene or a Component element)
+    owning the entered slide. The \a index and \a name contain the index and
+    the name of the entered slide.
+*/
+
+/*!
+    \fn Q3DSPresentation::slideExited(const QString &elementPath, int index, const QString &name)
+
+    This signal is emitted when a slide is exited in the presentation. The \a
+    elementPath specifies the time context (a Scene or a Component element)
+    owning the exited slide. The \a index and \a name contain the index and the
+    name of the exited slide.
+*/
+
 // These event forwarders are not stricly needed, Studio3D et al are fine
 // without them. However, they are there in 3DS1 and can become handy to feed
 // arbitrary, application-generated events into the engine.
 
+/*!
+    Passes a key press event \a e to the presentation.
+
+    \note The event forwarders in Q3DSPresentation are not normally
+    needed since Q3DSWidget and Studio3D both pass mouse, keyboard and
+    touch input on to the Qt 3D Studio engine. They may become useful
+    however with Q3DSSurfaceViewer, or in special situations, in order
+    to inject input events.
+*/
 void Q3DSPresentation::keyPressEvent(QKeyEvent *e)
 {
     Q_D(Q3DSPresentation);
@@ -382,6 +464,15 @@ void Q3DSPresentation::keyPressEvent(QKeyEvent *e)
         d->controller->handlePresentationKeyPressEvent(e);
 }
 
+/*!
+    Passes a key release event \a e to the presentation.
+
+    \note The event forwarders in Q3DSPresentation are not normally
+    needed since Q3DSWidget and Studio3D both pass mouse, keyboard and
+    touch input on to the Qt 3D Studio engine. They may become useful
+    however with Q3DSSurfaceViewer, or in special situations, in order
+    to inject input events.
+*/
 void Q3DSPresentation::keyReleaseEvent(QKeyEvent *e)
 {
     Q_D(Q3DSPresentation);
@@ -389,6 +480,15 @@ void Q3DSPresentation::keyReleaseEvent(QKeyEvent *e)
         d->controller->handlePresentationKeyReleaseEvent(e);
 }
 
+/*!
+    Passes a mouse press event \a e to the presentation.
+
+    \note The event forwarders in Q3DSPresentation are not normally
+    needed since Q3DSWidget and Studio3D both pass mouse, keyboard and
+    touch input on to the Qt 3D Studio engine. They may become useful
+    however with Q3DSSurfaceViewer, or in special situations, in order
+    to inject input events.
+*/
 void Q3DSPresentation::mousePressEvent(QMouseEvent *e)
 {
     Q_D(Q3DSPresentation);
@@ -396,6 +496,15 @@ void Q3DSPresentation::mousePressEvent(QMouseEvent *e)
         d->controller->handlePresentationMousePressEvent(e);
 }
 
+/*!
+    Passes a mouse move event \a e to the presentation.
+
+    \note The event forwarders in Q3DSPresentation are not normally
+    needed since Q3DSWidget and Studio3D both pass mouse, keyboard and
+    touch input on to the Qt 3D Studio engine. They may become useful
+    however with Q3DSSurfaceViewer, or in special situations, in order
+    to inject input events.
+*/
 void Q3DSPresentation::mouseMoveEvent(QMouseEvent *e)
 {
     Q_D(Q3DSPresentation);
@@ -403,6 +512,15 @@ void Q3DSPresentation::mouseMoveEvent(QMouseEvent *e)
         d->controller->handlePresentationMouseMoveEvent(e);
 }
 
+/*!
+    Passes a mouse release event \a e to the presentation.
+
+    \note The event forwarders in Q3DSPresentation are not normally
+    needed since Q3DSWidget and Studio3D both pass mouse, keyboard and
+    touch input on to the Qt 3D Studio engine. They may become useful
+    however with Q3DSSurfaceViewer, or in special situations, in order
+    to inject input events.
+*/
 void Q3DSPresentation::mouseReleaseEvent(QMouseEvent *e)
 {
     Q_D(Q3DSPresentation);
@@ -410,6 +528,15 @@ void Q3DSPresentation::mouseReleaseEvent(QMouseEvent *e)
         d->controller->handlePresentationMouseReleaseEvent(e);
 }
 
+/*!
+    Passes a mouse double click event \a e to the presentation.
+
+    \note The event forwarders in Q3DSPresentation are not normally
+    needed since Q3DSWidget and Studio3D both pass mouse, keyboard and
+    touch input on to the Qt 3D Studio engine. They may become useful
+    however with Q3DSSurfaceViewer, or in special situations, in order
+    to inject input events.
+*/
 void Q3DSPresentation::mouseDoubleClickEvent(QMouseEvent *e)
 {
     Q_D(Q3DSPresentation);
@@ -418,6 +545,15 @@ void Q3DSPresentation::mouseDoubleClickEvent(QMouseEvent *e)
 }
 
 #if QT_CONFIG(wheelevent)
+/*!
+    Passes a mouse wheel event \a e to the presentation.
+
+    \note The event forwarders in Q3DSPresentation are not normally
+    needed since Q3DSWidget and Studio3D both pass mouse, keyboard and
+    touch input on to the Qt 3D Studio engine. They may become useful
+    however with Q3DSSurfaceViewer, or in special situations, in order
+    to inject input events.
+*/
 void Q3DSPresentation::wheelEvent(QWheelEvent *e)
 {
     Q_D(Q3DSPresentation);
@@ -426,6 +562,15 @@ void Q3DSPresentation::wheelEvent(QWheelEvent *e)
 }
 #endif
 
+/*!
+    Passes a touch event \a e to the presentation.
+
+    \note The event forwarders in Q3DSPresentation are not normally
+    needed since Q3DSWidget and Studio3D both pass mouse, keyboard and
+    touch input on to the Qt 3D Studio engine. They may become useful
+    however with Q3DSSurfaceViewer, or in special situations, in order
+    to inject input events.
+*/
 void Q3DSPresentation::touchEvent(QTouchEvent *e)
 {
     Q_D(Q3DSPresentation);
@@ -434,6 +579,15 @@ void Q3DSPresentation::touchEvent(QTouchEvent *e)
 }
 
 #if QT_CONFIG(tabletevent)
+/*!
+    Passes a tablet (pen) event \a e to the presentation.
+
+    \note The event forwarders in Q3DSPresentation are not normally
+    needed since Q3DSWidget and Studio3D both pass mouse, keyboard and
+    touch input on to the Qt 3D Studio engine. They may become useful
+    however with Q3DSSurfaceViewer, or in special situations, in order
+    to inject input events.
+*/
 void Q3DSPresentation::tabletEvent(QTabletEvent *e)
 {
     Q_D(Q3DSPresentation);
@@ -557,6 +711,45 @@ void Q3DSPresentationPrivate::registerInlineQmlSubPresentations(const QVector<Q3
     May be either a file URL or a qrc URL.
 */
 
+/*!
+    \qmlproperty bool Presentation::profilingEnabled
+
+    When enabled, Qt 3D objects managed by the runtime get tracked,
+    and various statistics get collected internally. These are then
+    exposed in the views that can be toggled by profileUiVisible.
+
+    The default value is \c false.
+
+    \note Changing the value after the presentation has been loaded
+    has no effect for the already loaded presentation.
+
+    \note In the Qt 3D Studio Viewer application presentations are
+    opened with profiling enabled by default. Therefore, applications
+    wishing to have an experience comparable to the Viewer, when it
+    comes to the debug and profile views, should set this property to
+    \c true.
+*/
+
+/*!
+    \qmlproperty bool Presentation::profileUiVisible
+
+    When this property is \c{true}, the interactive statistics and profile
+    view is displayed in-scene, on top of the 3D content.
+
+    \note This feature can be disabled at build time, in which case this
+    property has no effect.
+
+    Default value is \c{false}.
+*/
+
+/*!
+    \qmlproperty real Presentation::profileUiScale
+
+    Controls the scale factor of the in-scene debug and profile views.
+
+    The default value is 1.0.
+*/
+
 /*!
     \qmlmethod void Presentation::goToSlide(string elementPath, string name)
 
@@ -660,10 +853,11 @@ void Q3DSPresentationPrivate::registerInlineQmlSubPresentations(const QVector<Q3
 /*!
     \qmlmethod void Presentation::fireEvent(string elementPath, string eventName)
 
-    Dispatches an event with \a eventName on a specific element found in \a
-    elementPath. 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.
+    Dispatches a Qt 3D Studio presentation event with \a eventName on
+    scene object specified by \a elementPath. These events provide a
+    way to communicate with the \c .qml based \c{behavior scripts}
+    attached to scene objects since they can register to be notified
+    via Behavior::registerForEvent().
 */
 
 /*!
@@ -688,6 +882,23 @@ void Q3DSPresentationPrivate::registerInlineQmlSubPresentations(const QVector<Q3
     every value change.
 */
 
+/*!
+    \qmlsignal Presentation::customSignalEmitted(string elementPath, string name)
+
+    This signal is emitted when an action with the \c{Emit Signal}
+    handler is executed in the Qt 3D Studio presentation. \a
+    elementPath specifies the scene object on which the (Qt 3D Studio)
+    "signal" \a name was triggered.
+
+    Connecting to this signal offers a way of reacting upon certain
+    events in the Qt 3D Studio presentation.
+
+    \image customsignal.png
+
+    In this example, pressing or tapping on the Cluster object will result in
+    emitting \c{customSignalEmitted("Cluster", "clusterPressed")}.
+*/
+
 /*!
     \qmlsignal Presentation::slideEntered(string elementPath, int index, string name)
 
-- 
cgit v1.2.3