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

Remove storage of parenting information from CollisionRegion

Browse source
This commit is contained in:
sabrina-shanman 2018-08-27 10:16:09 -07:00
parent cce62f4d92
commit 51683b0b53
1 changed files with 1 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -271,10 +271,7 @@ public:
CollisionRegion(const CollisionRegion& collisionRegion) : CollisionRegion(const CollisionRegion& collisionRegion) :
modelURL(collisionRegion.modelURL), modelURL(collisionRegion.modelURL),
shapeInfo(std::make_shared<ShapeInfo>()), shapeInfo(std::make_shared<ShapeInfo>()),
transform(collisionRegion.transform), transform(collisionRegion.transform)
parentID(collisionRegion.parentID),
parentJointIndex(collisionRegion.parentJointIndex),
joint(collisionRegion.joint)
{ {
shapeInfo->setParams(collisionRegion.shapeInfo->getType(), collisionRegion.shapeInfo->getHalfExtents(), collisionRegion.modelURL.toString()); shapeInfo->setParams(collisionRegion.shapeInfo->getType(), collisionRegion.shapeInfo->getHalfExtents(), collisionRegion.modelURL.toString());
} }
@ -308,15 +305,6 @@ public:
if (pickVariant["orientation"].isValid()) { if (pickVariant["orientation"].isValid()) {
transform.setRotation(quatFromVariant(pickVariant["orientation"])); transform.setRotation(quatFromVariant(pickVariant["orientation"]));
} }
if (pickVariant["parentID"].isValid()) {
parentID = pickVariant["parentID"].toString();
}
if (pickVariant["parentJointIndex"].isValid()) {
parentJointIndex = pickVariant["parentJointIndex"].toInt();
}
if (pickVariant["joint"].isValid()) {
joint = pickVariant["joint"].toString();
}
} }
QVariantMap toVariantMap() const override { QVariantMap toVariantMap() const override {
@ -332,14 +320,6 @@ public:
collisionRegion["position"] = vec3toVariant(transform.getTranslation()); collisionRegion["position"] = vec3toVariant(transform.getTranslation());
collisionRegion["orientation"] = quatToVariant(transform.getRotation()); collisionRegion["orientation"] = quatToVariant(transform.getRotation());
if (!parentID.isNull()) {
collisionRegion["parentID"] = parentID;
}
collisionRegion["parentJointIndex"] = parentJointIndex;
if (!joint.isNull()) {
collisionRegion["joint"] = joint;
}
return collisionRegion; return collisionRegion;
} }
@ -374,11 +354,6 @@ public:
// We can't compute the shapeInfo here without loading the model first, so we delegate that responsibility to the owning CollisionPick // We can't compute the shapeInfo here without loading the model first, so we delegate that responsibility to the owning CollisionPick
std::shared_ptr<ShapeInfo> shapeInfo = std::make_shared<ShapeInfo>(); std::shared_ptr<ShapeInfo> shapeInfo = std::make_shared<ShapeInfo>();
Transform transform; Transform transform;
// Parenting information
QUuid parentID;
int parentJointIndex = 0;
QString joint;
}; };
namespace std { namespace std {