Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-12 19:15:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

purge SHAPE_TYPE_ELLIPSOID which wasn't used

Browse source
This commit is contained in:
Andrew Meadows 2016-06-01 11:44:25 -07:00
parent 7858ef84b3
commit 211bbb88e6
3 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/entities/src/EntityItemProperties.cpp
View file

@ -88,7 +88,7 @@ void EntityItemProperties::setLastEdited(quint64 usecTime) {
_lastEdited = usecTime > _created ? usecTime : _created; _lastEdited = usecTime > _created ? usecTime : _created;
} }
const char* shapeTypeNames[] = {"none", "box", "sphere", "ellipsoid", "plane", "compound", "capsule-x", const char* shapeTypeNames[] = {"none", "box", "sphere", "plane", "compound", "capsule-x",
"capsule-y", "capsule-z", "cylinder-x", "cylinder-y", "cylinder-z"}; "capsule-y", "capsule-z", "cylinder-x", "cylinder-y", "cylinder-z"};
QHash<QString, ShapeType> stringToShapeTypeLookup; QHash<QString, ShapeType> stringToShapeTypeLookup;
@ -101,7 +101,6 @@ void buildStringToShapeTypeLookup() {
addShapeType(SHAPE_TYPE_NONE); addShapeType(SHAPE_TYPE_NONE);
addShapeType(SHAPE_TYPE_BOX); addShapeType(SHAPE_TYPE_BOX);
addShapeType(SHAPE_TYPE_SPHERE); addShapeType(SHAPE_TYPE_SPHERE);
addShapeType(SHAPE_TYPE_ELLIPSOID);
addShapeType(SHAPE_TYPE_PLANE); addShapeType(SHAPE_TYPE_PLANE);
addShapeType(SHAPE_TYPE_COMPOUND); addShapeType(SHAPE_TYPE_COMPOUND);
addShapeType(SHAPE_TYPE_CAPSULE_X); addShapeType(SHAPE_TYPE_CAPSULE_X);

12
libraries/shared/src/ShapeInfo.cpp
View file

@ -64,14 +64,6 @@ void ShapeInfo::setSphere(float radius) {
_doubleHashKey.clear(); _doubleHashKey.clear();
} }
void ShapeInfo::setEllipsoid(const glm::vec3& halfExtents) {
_url = "";
_type = SHAPE_TYPE_ELLIPSOID;
_halfExtents = halfExtents;
_points.clear();
_doubleHashKey.clear();
}
void ShapeInfo::setConvexHulls(const QVector<QVector<glm::vec3>>& points) { void ShapeInfo::setConvexHulls(const QVector<QVector<glm::vec3>>& points) {
_points = points; _points = points;
_type = (_points.size() > 0) ? SHAPE_TYPE_COMPOUND : SHAPE_TYPE_NONE; _type = (_points.size() > 0) ? SHAPE_TYPE_COMPOUND : SHAPE_TYPE_NONE;
@ -146,10 +138,6 @@ bool ShapeInfo::contains(const glm::vec3& point) const {
switch(_type) { switch(_type) {
case SHAPE_TYPE_SPHERE: case SHAPE_TYPE_SPHERE:
return glm::length(point) <= _halfExtents.x; return glm::length(point) <= _halfExtents.x;
case SHAPE_TYPE_ELLIPSOID: {
glm::vec3 scaledPoint = glm::abs(point) / _halfExtents;
return glm::length(scaledPoint) <= 1.0f;
}
case SHAPE_TYPE_CYLINDER_X: case SHAPE_TYPE_CYLINDER_X:
return glm::length(glm::vec2(point.y, point.z)) <= _halfExtents.z; return glm::length(glm::vec2(point.y, point.z)) <= _halfExtents.z;
case SHAPE_TYPE_CYLINDER_Y: case SHAPE_TYPE_CYLINDER_Y:

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

@ -30,7 +30,6 @@ enum ShapeType {
SHAPE_TYPE_NONE, SHAPE_TYPE_NONE,
SHAPE_TYPE_BOX, SHAPE_TYPE_BOX,
SHAPE_TYPE_SPHERE, SHAPE_TYPE_SPHERE,
SHAPE_TYPE_ELLIPSOID,
SHAPE_TYPE_PLANE, SHAPE_TYPE_PLANE,
SHAPE_TYPE_COMPOUND, SHAPE_TYPE_COMPOUND,
SHAPE_TYPE_CAPSULE_X, SHAPE_TYPE_CAPSULE_X,
@ -38,7 +37,8 @@ enum ShapeType {
SHAPE_TYPE_CAPSULE_Z, SHAPE_TYPE_CAPSULE_Z,
SHAPE_TYPE_CYLINDER_X, SHAPE_TYPE_CYLINDER_X,
SHAPE_TYPE_CYLINDER_Y, SHAPE_TYPE_CYLINDER_Y,
SHAPE_TYPE_CYLINDER_Z SHAPE_TYPE_CYLINDER_Z,
SHAPE_TYPE_STATIC_MESH
}; };
class ShapeInfo { class ShapeInfo {
@ -49,7 +49,6 @@ public:
void setParams(ShapeType type, const glm::vec3& halfExtents, QString url=""); void setParams(ShapeType type, const glm::vec3& halfExtents, QString url="");
void setBox(const glm::vec3& halfExtents); void setBox(const glm::vec3& halfExtents);
void setSphere(float radius); void setSphere(float radius);
void setEllipsoid(const glm::vec3& halfExtents);
void setConvexHulls(const QVector<QVector<glm::vec3>>& points); void setConvexHulls(const QVector<QVector<glm::vec3>>& points);
void setCapsuleY(float radius, float halfHeight); void setCapsuleY(float radius, float halfHeight);
void setOffset(const glm::vec3& offset); void setOffset(const glm::vec3& offset);