Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 03:04:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify a RayPick and StylusTip constructor

Browse source
This commit is contained in:
sabrina-shanman 2018-10-01 09:19:56 -07:00
parent f0de3ef31c
commit 0cf7e954cc
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/raypick/RayPick.h
View file

@ -71,7 +71,7 @@ class RayPick : public Pick<PickRay> {
public: public:
RayPick(const PickFilter& filter, float maxDistance, bool enabled) : RayPick(const PickFilter& filter, float maxDistance, bool enabled) :
Pick(PickRay(Vectors::ZERO, Vectors::UP), filter, maxDistance, enabled) { Pick(PickRay(), filter, maxDistance, enabled) {
} }
RayPick(glm::vec3 position, glm::vec3 direction, const PickFilter& filter, float maxDistance, bool enabled) : RayPick(glm::vec3 position, glm::vec3 direction, const PickFilter& filter, float maxDistance, bool enabled) :

2
libraries/shared/src/RegisteredMetaTypes.h
View file

@ -198,7 +198,7 @@ void pickRayFromScriptValue(const QScriptValue& object, PickRay& pickRay);
class StylusTip : public MathPick { class StylusTip : public MathPick {
public: public:
StylusTip() : position(NAN), velocity(NAN) {} StylusTip() : position(NAN), velocity(NAN) {}
StylusTip(bilateral::Side side, glm::vec3 position = Vectors::ZERO, glm::quat orientation = Quaternions::IDENTITY, glm::vec3 velocity = Vectors::ZERO) : StylusTip(const bilateral::Side& side, const glm::vec3& position = Vectors::ZERO, const glm::quat& orientation = Quaternions::IDENTITY, const glm::vec3& velocity = Vectors::ZERO) :
side(side), position(position), orientation(orientation), velocity(velocity) {} side(side), position(position), orientation(orientation), velocity(velocity) {}
StylusTip(const QVariantMap& pickVariant) : side(bilateral::Side(pickVariant["side"].toInt())), position(vec3FromVariant(pickVariant["position"])), StylusTip(const QVariantMap& pickVariant) : side(bilateral::Side(pickVariant["side"].toInt())), position(vec3FromVariant(pickVariant["position"])),
orientation(quatFromVariant(pickVariant["orientation"])), velocity(vec3FromVariant(pickVariant["velocity"])) {} orientation(quatFromVariant(pickVariant["orientation"])), velocity(vec3FromVariant(pickVariant["velocity"])) {}