Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 01:36:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add support for rotation as CollisionRegion parameter and make it the default

Browse source
This commit is contained in:
sabrina-shanman 2018-08-08 10:47:13 -07:00
parent 22142a84b8
commit 5b6916177c
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/raypick/PickScriptingInterface.cpp
View file

@ -255,7 +255,7 @@ unsigned int PickScriptingInterface::createParabolaPick(const QVariant& properti
* @typedef {object} Picks.CollisionPickProperties * @typedef {object} Picks.CollisionPickProperties
* @property {Shape} shape - The information about the collision region's size and shape. * @property {Shape} shape - The information about the collision region's size and shape.
* @property {Vec3} position - The position of the collision region. * @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) { unsigned int PickScriptingInterface::createCollisionPick(const QVariant& properties) {
QVariantMap propMap = properties.toMap(); QVariantMap propMap = properties.toMap();

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

@ -282,7 +282,9 @@ public:
if (pickVariant["position"].isValid()) { if (pickVariant["position"].isValid()) {
transform.setTranslation(vec3FromVariant(pickVariant["position"])); 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"])); transform.setRotation(quatFromVariant(pickVariant["orientation"]));
} }
} }