diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2018-02-15 12:44:27 +0000 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2018-02-15 20:59:03 +0000 |
commit | 6e82860f19bb28744c0d7f6ccc88ca89b187e3ce (patch) | |
tree | 1c8682d5bf06a0a03cefc3da5e3918056de78a04 /src/core/transforms | |
parent | 0bbccd492532786adc6816b992b85b4fdf162842 (diff) | |
parent | e1d1a59eb04f8b17582571275073a6cfa10e9e32 (diff) |
Merge remote-tracking branch 'origin/5.10' into 5.11
Conflicts:
src/animation/doc/src/qt3danimation-module.qdoc
src/render/backend/abstractrenderer_p.h
src/render/backend/buffervisitor_p.h
src/render/backend/renderer.cpp
src/render/backend/renderer_p.h
src/render/backend/triangleboundingvolume_p.h
src/render/backend/trianglesextractor_p.h
src/render/frontend/sphere_p.h
src/render/jobs/calcboundingvolumejob.cpp
src/render/jobs/job_common_p.h
src/render/jobs/pickboundingvolumejob.cpp
src/render/jobs/pickboundingvolumejob_p.h
src/render/jobs/pickboundingvolumeutils.cpp
src/render/jobs/renderviewjobutils_p.h
tests/auto/render/boundingsphere/tst_boundingsphere.cpp
tests/auto/render/commons/testrenderer.h
tests/auto/render/raycasting/tst_raycasting.cpp
tests/auto/render/render.pro
tests/auto/render/renderer/tst_renderer.cpp
Change-Id: I76633bc5a5a065e5f9ea62cc16563377e5c693a3
Diffstat (limited to 'src/core/transforms')
-rw-r--r-- | src/core/transforms/matrix4x4_p.h | 12 | ||||
-rw-r--r-- | src/core/transforms/vector3d_p.h | 12 | ||||
-rw-r--r-- | src/core/transforms/vector4d_p.h | 12 |
3 files changed, 36 insertions, 0 deletions
diff --git a/src/core/transforms/matrix4x4_p.h b/src/core/transforms/matrix4x4_p.h index 18f5db4c3..d100d3d3b 100644 --- a/src/core/transforms/matrix4x4_p.h +++ b/src/core/transforms/matrix4x4_p.h @@ -83,4 +83,16 @@ QT_END_NAMESPACE #endif +template<typename UsingType> +Q_ALWAYS_INLINE QMatrix4x4 convertToQMatrix4x4(const UsingType &v) +{ + return v.toQMatrix4x4(); +} + +template<> +Q_ALWAYS_INLINE QMatrix4x4 convertToQMatrix4x4<QMatrix4x4>(const QMatrix4x4 &v) +{ + return v; +} + #endif // QT3DCORE_MATRIX4X4_P_H diff --git a/src/core/transforms/vector3d_p.h b/src/core/transforms/vector3d_p.h index 6467d7686..80e936903 100644 --- a/src/core/transforms/vector3d_p.h +++ b/src/core/transforms/vector3d_p.h @@ -74,4 +74,16 @@ QT_END_NAMESPACE #endif +template<typename UsingType> +Q_ALWAYS_INLINE QVector3D convertToQVector3D(const UsingType &v) +{ + return v.toQVector3D(); +} + +template<> +Q_ALWAYS_INLINE QVector3D convertToQVector3D<QVector3D>(const QVector3D &v) +{ + return v; +} + #endif // QT3DCORE_VECTOR3D_P_H diff --git a/src/core/transforms/vector4d_p.h b/src/core/transforms/vector4d_p.h index a03dc234f..dbfaffffd 100644 --- a/src/core/transforms/vector4d_p.h +++ b/src/core/transforms/vector4d_p.h @@ -74,4 +74,16 @@ QT_END_NAMESPACE #endif +template<typename UsingType> +Q_ALWAYS_INLINE QVector4D convertToQVector4D(const UsingType &v) +{ + return v.toQVector4D(); +} + +template<> +Q_ALWAYS_INLINE QVector4D convertToQVector4D<QVector4D>(const QVector4D &v) +{ + return v; +} + #endif // QT3DCORE_VECTOR4D_P_H |