From 5d9e320dd749d3e14ea7b672f49c76c5ff9367df Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 1 Jun 2016 10:48:02 -0700 Subject: [PATCH] purge SHAPE_TYPE_LINE --- libraries/entities/src/LineEntityItem.h | 2 -- libraries/entities/src/PolyLineEntityItem.h | 2 -- libraries/shared/src/ShapeInfo.h | 3 +-- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/libraries/entities/src/LineEntityItem.h b/libraries/entities/src/LineEntityItem.h index 4d63562cf7..a37d17262e 100644 --- a/libraries/entities/src/LineEntityItem.h +++ b/libraries/entities/src/LineEntityItem.h @@ -60,8 +60,6 @@ class LineEntityItem : public EntityItem { const QVector& getLinePoints() const{ return _points; } - virtual ShapeType getShapeType() const { return SHAPE_TYPE_LINE; } - // never have a ray intersection pick a LineEntityItem. virtual bool supportsDetailedRayIntersection() const { return true; } virtual bool findDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction, diff --git a/libraries/entities/src/PolyLineEntityItem.h b/libraries/entities/src/PolyLineEntityItem.h index cf7b14dbf1..59c4ec592c 100644 --- a/libraries/entities/src/PolyLineEntityItem.h +++ b/libraries/entities/src/PolyLineEntityItem.h @@ -78,8 +78,6 @@ class PolyLineEntityItem : public EntityItem { virtual bool needsToCallUpdate() const { return true; } - virtual ShapeType getShapeType() const { return SHAPE_TYPE_LINE; } - // never have a ray intersection pick a PolyLineEntityItem. virtual bool supportsDetailedRayIntersection() const { return true; } virtual bool findDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction, diff --git a/libraries/shared/src/ShapeInfo.h b/libraries/shared/src/ShapeInfo.h index 6d1edbc261..86a6c410de 100644 --- a/libraries/shared/src/ShapeInfo.h +++ b/libraries/shared/src/ShapeInfo.h @@ -38,8 +38,7 @@ enum ShapeType { SHAPE_TYPE_CAPSULE_Z, SHAPE_TYPE_CYLINDER_X, SHAPE_TYPE_CYLINDER_Y, - SHAPE_TYPE_CYLINDER_Z, - SHAPE_TYPE_LINE + SHAPE_TYPE_CYLINDER_Z }; class ShapeInfo {