diff options
author | Mike Krus <mike.krus@kdab.com> | 2018-02-22 21:31:56 -0500 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2018-02-23 19:05:44 +0000 |
commit | ff8f7eb89ec09376fa18d56e519782a926c91937 (patch) | |
tree | 63e798d70998b7c0217b7b8a1f25f646a33d50cd /src/render/raycasting | |
parent | 2b20e5e02d3266725dbbb3cb3b534d1c3658c19c (diff) |
Update QRay3D stream IO
for debugging and streaming
Change-Id: Id9924fa9a99c6412069e6907473d0dfe083e3107
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/raycasting')
-rw-r--r-- | src/render/raycasting/qray3d.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/render/raycasting/qray3d.cpp b/src/render/raycasting/qray3d.cpp index 40d16bc73..e26e1e38c 100644 --- a/src/render/raycasting/qray3d.cpp +++ b/src/render/raycasting/qray3d.cpp @@ -334,7 +334,7 @@ QDebug operator<<(QDebug dbg, const QRay3D &ray) << ray.origin().x() << ", " << ray.origin().y() << ", " << ray.origin().z() << ") - direction(" << ray.direction().x() << ", " << ray.direction().y() << ", " - << ray.direction().z() << "))"; + << ray.direction().z() << ") - distance(" << ray.distance() << "))"; return dbg; } @@ -352,6 +352,8 @@ QDataStream &operator<<(QDataStream &stream, const QRay3D &ray) { stream << convertToQVector3D(ray.origin()); stream << convertToQVector3D(ray.direction()); + if (stream.version() >= QDataStream::Qt_5_11) + stream << ray.distance(); return stream; } @@ -364,10 +366,13 @@ QDataStream &operator<<(QDataStream &stream, const QRay3D &ray) QDataStream &operator>>(QDataStream &stream, QRay3D &ray) { QVector3D origin, direction; + float distance = 1.f; stream >> origin; stream >> direction; - ray = QRay3D(Vector3D(origin), Vector3D(direction)); + if (stream.version() >= QDataStream::Qt_5_11) + stream >> distance; + ray = QRay3D(Vector3D(origin), Vector3D(direction), distance); return stream; } |