From 96d94e1b0973ef5e587cd01ae0333892814990e4 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Sat, 7 Mar 2015 20:31:04 -0800
Subject: [PATCH] collision model url

---
 libraries/entities/src/ModelEntityItem.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libraries/entities/src/ModelEntityItem.h b/libraries/entities/src/ModelEntityItem.h
index 94d262fc9f..081cb429ed 100644
--- a/libraries/entities/src/ModelEntityItem.h
+++ b/libraries/entities/src/ModelEntityItem.h
@@ -57,10 +57,14 @@ public:
     const rgbColor& getColor() const { return _color; }
     xColor getXColor() const { xColor color = { _color[RED_INDEX], _color[GREEN_INDEX], _color[BLUE_INDEX] }; return color; }
     bool hasModel() const { return !_modelURL.isEmpty(); }
+    bool hasCollisionModel() const { return !_collisionModelURL.isEmpty(); }
 
     static const QString DEFAULT_MODEL_URL;
     const QString& getModelURL() const { return _modelURL; }
 
+    static const QString DEFAULT_COLLISION_MODEL_URL;
+    const QString& getCollisionModelURL() const { return _collisionModelURL; }
+
     bool hasAnimation() const { return !_animationURL.isEmpty(); }
     static const QString DEFAULT_ANIMATION_URL;
     const QString& getAnimationURL() const { return _animationURL; }
@@ -74,6 +78,7 @@ public:
     
     // model related properties
     void setModelURL(const QString& url) { _modelURL = url; }
+    void setCollisionModelURL(const QString& url) { _collisionModelURL = url; }
     void setAnimationURL(const QString& url);
     static const float DEFAULT_ANIMATION_FRAME_INDEX;
     void setAnimationFrameIndex(float value);
@@ -121,6 +126,7 @@ protected:
 
     rgbColor _color;
     QString _modelURL;
+    QString _collisionModelURL;
 
     quint64 _lastAnimated;
     QString _animationURL;