summaryrefslogtreecommitdiffstats
path: root/src/quick3d/quick3d/qt3dquickvaluetypes.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/quick3d/quick3d/qt3dquickvaluetypes.cpp')
-rw-r--r--src/quick3d/quick3d/qt3dquickvaluetypes.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/quick3d/quick3d/qt3dquickvaluetypes.cpp b/src/quick3d/quick3d/qt3dquickvaluetypes.cpp
index a4084fec3..d126acccb 100644
--- a/src/quick3d/quick3d/qt3dquickvaluetypes.cpp
+++ b/src/quick3d/quick3d/qt3dquickvaluetypes.cpp
@@ -302,7 +302,7 @@ QVector4D QQuick3DMatrix4x4ValueType::times(const QVector4D &vec) const
QVector3D QQuick3DMatrix4x4ValueType::times(const QVector3D &vec) const
{
- return v * vec;
+ return v.map(vec);
}
QMatrix4x4 QQuick3DMatrix4x4ValueType::times(qreal factor) const
@@ -422,7 +422,7 @@ qreal QQuick3DVector3DValueType::dotProduct(const QVector3D &vec) const
QVector3D QQuick3DVector3DValueType::times(const QMatrix4x4 &m) const
{
- return v * m;
+ return (QVector4D(v, 1.f) * m).toVector3DAffine();
}
QVector3D QQuick3DVector3DValueType::times(const QVector3D &vec) const
@@ -765,3 +765,5 @@ void QQuick3DQuaternionValueType::setZ(qreal z)
} // namespace Qt3DCore
QT_END_NAMESPACE
+
+#include "moc_qt3dquickvaluetypes_p.cpp"