From 71ddf1e7c11ffa17c5065bd7a0446dc9daaa6dc4 Mon Sep 17 00:00:00 2001
From: utkarshgautamnyu <utkarsh.gautam@nyu.edu>
Date: Wed, 26 Jul 2017 10:20:17 -0700
Subject: [PATCH] Removed Compound Collision type

---
 interface/resources/qml/AssetServer.qml               | 11 ++---------
 .../resources/qml/hifi/dialogs/TabletAssetServer.qml  |  8 +-------
 .../resources/qml/hifi/tablet/NewModelDialog.qml      |  3 +--
 scripts/system/edit.js                                |  5 -----
 4 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/interface/resources/qml/AssetServer.qml b/interface/resources/qml/AssetServer.qml
index 11cab8b8de..a400897276 100644
--- a/interface/resources/qml/AssetServer.qml
+++ b/interface/resources/qml/AssetServer.qml
@@ -153,9 +153,7 @@ ScrollingWindow {
         var SHAPE_TYPE_STATIC_MESH = 3;
         var SHAPE_TYPE_BOX = 4;
         var SHAPE_TYPE_SPHERE = 5;
-        var SHAPE_TYPE_COMPOUND = 6;
-
-
+        
         var SHAPE_TYPES = [];
         SHAPE_TYPES[SHAPE_TYPE_NONE] = "No Collision";
         SHAPE_TYPES[SHAPE_TYPE_SIMPLE_HULL] = "Basic - Whole model";
@@ -163,9 +161,7 @@ ScrollingWindow {
         SHAPE_TYPES[SHAPE_TYPE_STATIC_MESH] = "Exact - All polygons";
         SHAPE_TYPES[SHAPE_TYPE_BOX] = "Box";
         SHAPE_TYPES[SHAPE_TYPE_SPHERE] = "Sphere";
-        SHAPE_TYPES[SHAPE_TYPE_COMPOUND] = "Compound";
-
-
+        
         var SHAPE_TYPE_DEFAULT = SHAPE_TYPE_STATIC_MESH;
         var DYNAMIC_DEFAULT = false;
         var prompt = desktop.customInputDialog({
@@ -210,9 +206,6 @@ ScrollingWindow {
                     case SHAPE_TYPE_SPHERE:
                         shapeType = "sphere";
                         break;
-                    case SHAPE_TYPE_COMPOUND:
-                        shapeType = "compound";
-                        break;
                     default:
                         shapeType = "none";
                 }
diff --git a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
index 15f72cfbcb..55c2c71c61 100644
--- a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
@@ -154,9 +154,7 @@ Rectangle {
         var SHAPE_TYPE_STATIC_MESH = 3;
         var SHAPE_TYPE_BOX = 4;
         var SHAPE_TYPE_SPHERE = 5;
-        var SHAPE_TYPE_COMPOUND = 6;
         
-
         var SHAPE_TYPES = [];
         SHAPE_TYPES[SHAPE_TYPE_NONE] = "No Collision";
         SHAPE_TYPES[SHAPE_TYPE_SIMPLE_HULL] = "Basic - Whole model";
@@ -164,8 +162,7 @@ Rectangle {
         SHAPE_TYPES[SHAPE_TYPE_STATIC_MESH] = "Exact - All polygons";
         SHAPE_TYPES[SHAPE_TYPE_BOX] = "Box";
         SHAPE_TYPES[SHAPE_TYPE_SPHERE] = "Sphere";
-        SHAPE_TYPES[SHAPE_TYPE_COMPOUND] = "Compound";
-
+        
         var SHAPE_TYPE_DEFAULT = SHAPE_TYPE_STATIC_MESH;
         var DYNAMIC_DEFAULT = false;
         var prompt = tabletRoot.customInputDialog({
@@ -210,9 +207,6 @@ Rectangle {
                 case SHAPE_TYPE_SPHERE:
                     shapeType = "sphere";
                     break;
-                case SHAPE_TYPE_COMPOUND:
-                    shapeType = "compound";
-                    break;
                 default:
                     shapeType = "none";
                 }
diff --git a/interface/resources/qml/hifi/tablet/NewModelDialog.qml b/interface/resources/qml/hifi/tablet/NewModelDialog.qml
index f0c9c3c14a..47d28486a9 100644
--- a/interface/resources/qml/hifi/tablet/NewModelDialog.qml
+++ b/interface/resources/qml/hifi/tablet/NewModelDialog.qml
@@ -147,8 +147,7 @@ Rectangle {
                             "Good - Sub-meshes",
                             "Exact - All polygons", 
                             "Box", 
-                            "Sphere", 
-                            "Compound"]
+                            "Sphere"]
                 }
 
                 Row {
diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index fbd1732b0b..390bd5beb3 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -339,7 +339,6 @@ var toolBar = (function () {
     var SHAPE_TYPE_STATIC_MESH = 3;
     var SHAPE_TYPE_BOX = 4;
     var SHAPE_TYPE_SPHERE = 5;
-    var SHAPE_TYPE_COMPOUND = 6;
     var DYNAMIC_DEFAULT = false;
 
     function handleNewModelDialogResult(result) {
@@ -362,9 +361,6 @@ var toolBar = (function () {
             case SHAPE_TYPE_SPHERE:
                 shapeType = "sphere";
                 break;
-            case SHAPE_TYPE_COMPOUND:
-                shapeType = "compound";
-                break;
             default:
                 shapeType = "none";
             }
@@ -464,7 +460,6 @@ var toolBar = (function () {
             SHAPE_TYPES[SHAPE_TYPE_STATIC_MESH] = "Exact - All polygons";
             SHAPE_TYPES[SHAPE_TYPE_BOX] = "Box";
             SHAPE_TYPES[SHAPE_TYPE_SPHERE] = "Sphere";
-            SHAPE_TYPES[SHAPE_TYPE_COMPOUND] = "Compound";
             var SHAPE_TYPE_DEFAULT = SHAPE_TYPE_STATIC_MESH;
 
             // tablet version of new-model dialog