From 937bd0c1bea53ed3cd3954b91f138a8cce46f16c Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Tue, 21 Jun 2016 13:54:21 -0700
Subject: [PATCH] SHAPE_TYPE_MESH --> SHAPE_TYPE_STATIC_MESH

---
 .../entities-renderer/src/RenderableModelEntityItem.cpp     | 6 +++---
 libraries/entities/src/EntityItemProperties.cpp             | 2 +-
 libraries/physics/src/ShapeFactory.cpp                      | 4 ++--
 libraries/shared/src/ShapeInfo.cpp                          | 4 ++--
 libraries/shared/src/ShapeInfo.h                            | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index 7b1dddfcab..ab91edd294 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -593,7 +593,7 @@ bool RenderableModelEntityItem::isReadyToComputeShape() {
 
         // the model is still being downloaded.
         return false;
-    } else if (type == SHAPE_TYPE_MESH) {
+    } else if (type == SHAPE_TYPE_STATIC_MESH) {
         return (_model && _model->isLoaded());
     }
     return true;
@@ -706,7 +706,7 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& info) {
         }
 
         info.setParams(type, dimensions, _compoundShapeURL);
-    } else if (type == SHAPE_TYPE_MESH) {
+    } else if (type == SHAPE_TYPE_STATIC_MESH) {
         // compute meshPart local transforms
         QVector<glm::mat4> localTransforms;
         const FBXGeometry& geometry = _model->getFBXGeometry();
@@ -820,7 +820,7 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& info) {
         }
 
         pointCollection.push_back(points);
-        info.setParams(SHAPE_TYPE_MESH, 0.5f * dimensions, _modelURL);
+        info.setParams(SHAPE_TYPE_STATIC_MESH, 0.5f * dimensions, _modelURL);
     } else {
         ModelEntityItem::computeShapeInfo(info);
         info.setParams(type, 0.5f * dimensions);
diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index c521962976..a62f4b182a 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -123,7 +123,7 @@ void buildStringToShapeTypeLookup() {
     addShapeType(SHAPE_TYPE_HULL);
     addShapeType(SHAPE_TYPE_PLANE);
     addShapeType(SHAPE_TYPE_COMPOUND);
-    addShapeType(SHAPE_TYPE_MESH);
+    addShapeType(SHAPE_TYPE_STATIC_MESH);
 }
 
 QString getCollisionGroupAsString(uint8_t group) {
diff --git a/libraries/physics/src/ShapeFactory.cpp b/libraries/physics/src/ShapeFactory.cpp
index 4d5f56853d..3afc170a8c 100644
--- a/libraries/physics/src/ShapeFactory.cpp
+++ b/libraries/physics/src/ShapeFactory.cpp
@@ -161,7 +161,7 @@ btConvexHullShape* createConvexHull(const ShapeInfo::PointList& points) {
 
 // util method
 btTriangleIndexVertexArray* createStaticMeshArray(const ShapeInfo& info) {
-    assert(info.getType() == SHAPE_TYPE_MESH); // should only get here for mesh shapes
+    assert(info.getType() == SHAPE_TYPE_STATIC_MESH); // should only get here for mesh shapes
 
     const ShapeInfo::PointCollection& pointCollection = info.getPointCollection();
     assert(pointCollection.size() == 1); // should only have one mesh
@@ -274,7 +274,7 @@ btCollisionShape* ShapeFactory::createShapeFromInfo(const ShapeInfo& info) {
             }
         }
         break;
-        case SHAPE_TYPE_MESH: {
+        case SHAPE_TYPE_STATIC_MESH: {
             btTriangleIndexVertexArray* dataArray = createStaticMeshArray(info);
             shape = new StaticMeshShape(dataArray);
         }
diff --git a/libraries/shared/src/ShapeInfo.cpp b/libraries/shared/src/ShapeInfo.cpp
index af81a0f96b..e0f4cc18b2 100644
--- a/libraries/shared/src/ShapeInfo.cpp
+++ b/libraries/shared/src/ShapeInfo.cpp
@@ -41,7 +41,7 @@ void ShapeInfo::setParams(ShapeType type, const glm::vec3& halfExtents, QString
             break;
         }
         case SHAPE_TYPE_COMPOUND:
-        case SHAPE_TYPE_MESH:
+        case SHAPE_TYPE_STATIC_MESH:
             _url = QUrl(url);
             break;
         default:
@@ -224,7 +224,7 @@ const DoubleHashKey& ShapeInfo::getHash() const {
         }
         _doubleHashKey.setHash2(hash);
 
-        if (_type == SHAPE_TYPE_COMPOUND || _type == SHAPE_TYPE_MESH) {
+        if (_type == SHAPE_TYPE_COMPOUND || _type == SHAPE_TYPE_STATIC_MESH) {
             QString url = _url.toString();
             if (!url.isEmpty()) {
                 // fold the urlHash into both parts
diff --git a/libraries/shared/src/ShapeInfo.h b/libraries/shared/src/ShapeInfo.h
index 794f31a987..96132a4b23 100644
--- a/libraries/shared/src/ShapeInfo.h
+++ b/libraries/shared/src/ShapeInfo.h
@@ -39,7 +39,7 @@ enum ShapeType {
     SHAPE_TYPE_HULL,
     SHAPE_TYPE_PLANE,
     SHAPE_TYPE_COMPOUND,
-    SHAPE_TYPE_MESH
+    SHAPE_TYPE_STATIC_MESH
 };
 
 class ShapeInfo {