diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2017-01-28 15:56:26 +0000 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-01-29 10:17:49 +0000 |
commit | 8ef8c094dd55d198c5601689e0f1cc9fcc14274b (patch) | |
tree | fbdd6c1e35a6f2606286752a98a9018213fdb789 /src/render/jobs/pickboundingvolumeutils.cpp | |
parent | 9c5bf588ab310e274fddffb252962e8abfa66bd2 (diff) | |
parent | 2f3cfb7f19911f29e6ea7c0528b26f9263d38121 (diff) |
Merge branch 'wip/qtquickintegration' into dev
Conflicts:
src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
src/render/backend/triangleboundingvolume.cpp
src/render/backend/triangleboundingvolume_p.h
src/render/frontend/qrenderaspect.cpp
src/render/frontend/sphere.cpp
src/render/frontend/sphere_p.h
src/render/jobs/pickboundingvolumejob.cpp
src/render/jobs/pickboundingvolumejob_p.h
src/render/picking/objectpicker.cpp
src/render/raycasting/qcollisionqueryresult_p.h
src/render/render.pro
src/src.pro
tests/auto/render/objectpicker/tst_objectpicker.cpp
tests/auto/render/render.pro
Change-Id: I95717c7855887850d5c90e7ad8f19f1ffb37a545
Diffstat (limited to 'src/render/jobs/pickboundingvolumeutils.cpp')
-rw-r--r-- | src/render/jobs/pickboundingvolumeutils.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/render/jobs/pickboundingvolumeutils.cpp b/src/render/jobs/pickboundingvolumeutils.cpp index 1573aa112..8609906e9 100644 --- a/src/render/jobs/pickboundingvolumeutils.cpp +++ b/src/render/jobs/pickboundingvolumeutils.cpp @@ -175,6 +175,7 @@ bool CollisionVisitor::intersectsSegmentTriangle(uint andx, const QVector3D &a, queryResult.m_vertexIndex[0] = andx; queryResult.m_vertexIndex[1] = bndx; queryResult.m_vertexIndex[2] = cndx; + queryResult.m_uvw = uvw; queryResult.m_intersection = m_ray.point(t * m_ray.distance()); queryResult.m_distance = m_ray.projectedDistance(queryResult.m_intersection); hits.push_back(queryResult); |