Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-07 01:54:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Finalize on using 'rotation' in Collision Pick API and add missing jsdoc for CollisionRegion

Browse source
This commit is contained in:
sabrina-shanman 2018-08-10 08:55:29 -07:00
parent 660178e5bb
commit f902552309
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -253,6 +253,14 @@ public:
}
};
/**jsdoc
* A CollisionPick defines a volume for checking collisions in the physics simulation.
* @typedef {object} CollisionPick
* @property {Shape} shape - The information about the collision region's size and shape.
* @property {Vec3} position - The position of the collision region.
* @property {Quat} rotation - The orientation of the collision region.
*/
class CollisionRegion : public MathPick {
public:
CollisionRegion() { }
@ -284,8 +292,6 @@ public:
}
if (pickVariant["rotation"].isValid()) {
transform.setRotation(quatFromVariant(pickVariant["rotation"]));
} else if (pickVariant["orientation"].isValid()) {
transform.setRotation(quatFromVariant(pickVariant["orientation"]));
}
}
@ -300,7 +306,7 @@ public:
collisionRegion["shape"] = shape;
collisionRegion["position"] = vec3toVariant(transform.getTranslation());
collisionRegion["orientation"] = quatToVariant(transform.getRotation());
collisionRegion["rotation"] = quatToVariant(transform.getRotation());
return collisionRegion;
}