From 5b6916177c542e053fdd1eb76ad9afcefe8e1db8 Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Wed, 8 Aug 2018 10:47:13 -0700 Subject: [PATCH] Add support for rotation as CollisionRegion parameter and make it the default --- interface/src/raypick/PickScriptingInterface.cpp | 2 +- libraries/shared/src/RegisteredMetaTypes.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/interface/src/raypick/PickScriptingInterface.cpp b/interface/src/raypick/PickScriptingInterface.cpp index 72606c8da6..28bffb487e 100644 --- a/interface/src/raypick/PickScriptingInterface.cpp +++ b/interface/src/raypick/PickScriptingInterface.cpp @@ -255,7 +255,7 @@ unsigned int PickScriptingInterface::createParabolaPick(const QVariant& properti * @typedef {object} Picks.CollisionPickProperties * @property {Shape} shape - The information about the collision region's size and shape. * @property {Vec3} position - The position of the collision region. -* @property {Quat} orientation - The orientation of the collision region. +* @property {Quat} rotation - The orientation of the collision region. */ unsigned int PickScriptingInterface::createCollisionPick(const QVariant& properties) { QVariantMap propMap = properties.toMap(); diff --git a/libraries/shared/src/RegisteredMetaTypes.h b/libraries/shared/src/RegisteredMetaTypes.h index 204ee04baa..5f842ef066 100644 --- a/libraries/shared/src/RegisteredMetaTypes.h +++ b/libraries/shared/src/RegisteredMetaTypes.h @@ -282,7 +282,9 @@ public: if (pickVariant["position"].isValid()) { transform.setTranslation(vec3FromVariant(pickVariant["position"])); } - if (pickVariant["orientation"].isValid()) { + if (pickVariant["rotation"].isValid()) { + transform.setRotation(quatFromVariant(pickVariant["rotation"])); + } else if (pickVariant["orientation"].isValid()) { transform.setRotation(quatFromVariant(pickVariant["orientation"])); } }