Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-23 12:14:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Check if pick result is null when building visual pick result

Browse source
This commit is contained in:
sabrina-shanman 2018-09-25 09:56:11 -07:00
parent 8dd36e465b
commit 660bdf36d0
3 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/raypick/LaserPointer.cpp
View file

@ -36,6 +36,9 @@ void LaserPointer::editRenderStatePath(const std::string& state, const QVariant&
}
PickResultPointer LaserPointer::getPickResultCopy(const PickResultPointer& pickResult) const {
if (!pickResult) {
std::make_shared<RayPickResult>();
}
auto rayPickResult = std::static_pointer_cast<RayPickResult>(pickResult);
return std::make_shared<RayPickResult>(*rayPickResult.get());
}

3
interface/src/raypick/ParabolaPointer.cpp
View file

@ -31,6 +31,9 @@ ParabolaPointer::ParabolaPointer(const QVariant& rayProps, const RenderStateMap&
}
PickResultPointer ParabolaPointer::getPickResultCopy(const PickResultPointer& pickResult) const {
if (!pickResult) {
std::make_shared<ParabolaPickResult>();
}
auto stylusPickResult = std::static_pointer_cast<ParabolaPickResult>(pickResult);
return std::make_shared<ParabolaPickResult>(*stylusPickResult.get());
}

3
interface/src/raypick/StylusPointer.cpp
View file

@ -148,6 +148,9 @@ bool StylusPointer::shouldTrigger(const PickResultPointer& pickResult) {
}
PickResultPointer StylusPointer::getPickResultCopy(const PickResultPointer& pickResult) const {
if (!pickResult) {
std::make_shared<StylusPickResult>();
}
auto stylusPickResult = std::static_pointer_cast<StylusPickResult>(pickResult);
return std::make_shared<StylusPickResult>(*stylusPickResult.get());
}