From 68b86963d4c616413279f21a5ec2adf2845f4580 Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Wed, 22 Aug 2018 15:27:28 -0700 Subject: [PATCH] Add CollisionRegion copy constructor --- libraries/shared/src/RegisteredMetaTypes.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libraries/shared/src/RegisteredMetaTypes.h b/libraries/shared/src/RegisteredMetaTypes.h index e78dbafd75..3c8ee2ed7d 100644 --- a/libraries/shared/src/RegisteredMetaTypes.h +++ b/libraries/shared/src/RegisteredMetaTypes.h @@ -264,6 +264,18 @@ public: class CollisionRegion : public MathPick { public: CollisionRegion() { } + + CollisionRegion(const CollisionRegion& collisionRegion) : + modelURL(collisionRegion.modelURL), + shapeInfo(std::make_shared()), + transform(collisionRegion.transform), + parentID(collisionRegion.parentID), + parentJointIndex(collisionRegion.parentJointIndex), + joint(collisionRegion.joint) + { + shapeInfo->setParams(collisionRegion.shapeInfo->getType(), collisionRegion.shapeInfo->getHalfExtents(), collisionRegion.modelURL.toString()); + } + CollisionRegion(const QVariantMap& pickVariant) { if (pickVariant["shape"].isValid()) { auto shape = pickVariant["shape"].toMap();