summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2017-08-07 12:21:22 +0200
committerPaul Lemire <paul.lemire@kdab.com>2017-08-18 04:44:22 +0000
commit9d8c9ada161ad97634992c444196add0abb4f9d1 (patch)
tree6a3a15b7f7858a53a2b484c54d0645c60044719f
parent58ad54a7a8f4656d370c71a6b5b78a380306aa9f (diff)
Complete QML documentation for QAxisAccumulator
Change-Id: I839196116a5b4d70fa0545c0c6fd28079efeebca Task-number: QTBUG-61993 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r--src/input/frontend/qaxisaccumulator.cpp18
1 files changed, 18 insertions, 0 deletions
diff --git a/src/input/frontend/qaxisaccumulator.cpp b/src/input/frontend/qaxisaccumulator.cpp
index 5f10d81a7..d656ad2de 100644
--- a/src/input/frontend/qaxisaccumulator.cpp
+++ b/src/input/frontend/qaxisaccumulator.cpp
@@ -199,6 +199,16 @@ float QAxisAccumulator::value() const
}
/*!
+ \qmlproperty real Qt3D.Input::Axis::velocity
+ \readonly
+
+ Returns the velocity. If the sourceAxisType is set to Velocity this is
+ simply the value of the source axis multiplied by the scale. If the
+ sourceAxisType is set to Acceleration, the velocity is integrated using the
+ source axis' value as an acceleration.
+*/
+
+/*!
Returns the velocity. If the sourceAxisType is set to Velocity this is
simply the value of the source axis multiplied by the scale. If the
sourceAxisType is set to Acceleration, the velocity is integrated using
@@ -211,6 +221,14 @@ float QAxisAccumulator::velocity() const
}
/*!
+ \qmlproperty real Qt3D.Input::Axis::scale
+
+ The amount to scale the axis value by when accumulating. This can be
+ thought of as the maximum velocity or acceleration the axis can
+ control.
+*/
+
+/*!
The amount to scale the axis value by when accumulating. This can be
thought of as the maximum velocity or acceleration the axis can
control.