Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-05-04 16:53:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

sort ShapeInfo data members

Browse source
This commit is contained in:
Andrew Meadows 2016-06-08 16:35:38 -07:00
parent 10d79945d1
commit 57760bca7d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/shared/src/ShapeInfo.h
View file

@ -74,12 +74,12 @@ public:
const DoubleHashKey& getHash() const; const DoubleHashKey& getHash() const;
protected: protected:
ShapeType _type = SHAPE_TYPE_NONE; QUrl _url; // url for model of convex collision hulls
QVector<QVector<glm::vec3>> _points; // points for convex collision hulls
glm::vec3 _halfExtents = glm::vec3(0.0f); glm::vec3 _halfExtents = glm::vec3(0.0f);
glm::vec3 _offset = glm::vec3(0.0f); glm::vec3 _offset = glm::vec3(0.0f);
DoubleHashKey _doubleHashKey; DoubleHashKey _doubleHashKey;
QVector<QVector<glm::vec3>> _points; // points for convex collision hulls ShapeType _type = SHAPE_TYPE_NONE;
QUrl _url; // url for model of convex collision hulls
}; };
#endif // hifi_ShapeInfo_h #endif // hifi_ShapeInfo_h