Bugfixed duplicate entry in dictionary error. Now can manually select canvas to spawn slider.

Author: Glauz

Assets/Scripts/CharacterCustomization.cs

@@ -76,11 +76,13 @@ private SkinnedMeshRenderer GetSkinnedMeshRenderer()
 
         private void ParseBlendShapesToDictionary()
         {
+            //Get all blendshape names
             List<string> blendshapeNames = Enumerable.Range(0, mesh.blendShapeCount).Select(x => mesh.GetBlendShapeName(x)).ToList();
 
             for (int i = 0; blendshapeNames.Count > 0;)
             {
                 string altSuffix, noSuffix;
+                //Removes the max and min suffixes 
                 noSuffix = blendshapeNames[i].TrimEnd(suffixMax.ToCharArray()).TrimEnd(suffixMin.ToCharArray()).Trim();
 
                 string positiveName = string.Empty, negativeName = string.Empty;
@@ -119,11 +121,22 @@ private void ParseBlendShapesToDictionary()
                     if (exists)
                         postiveIndex = mesh.GetBlendShapeIndex(altSuffix);
                 }
+
+                //Doesn't have a suffix
                 else
+                {
                     postiveIndex = mesh.GetBlendShapeIndex(blendshapeNames[i]);
+                    positiveName = noSuffix;    //This is here so it will remove it (for condition) so its not infinite loop
+                    //print(postiveIndex + " of " + noSuffix);                    
+                }
+
+
+                if (blendShapeDatabase.ContainsKey(noSuffix))
+                    Debug.LogError(noSuffix + " already exists within the Database!");
 
                 blendShapeDatabase.Add(noSuffix, new Blendshape(postiveIndex, negativeIndex));
 
+
                 //Remove Selected Indexes From the List
                 if (positiveName != string.Empty) blendshapeNames.Remove(positiveName);
                 if (negativeName != string.Empty) blendshapeNames.Remove(negativeName);

Assets/Scripts/Editor/CharacterCustomizationEditor.cs

@@ -13,6 +13,8 @@ public class CharacterCustomizationEditor : Editor
         private int shapeBlendSelectedIndex = 0;
         private bool runOnce;
 
+        public Canvas canvas;
+
         public override void OnInspectorGUI()
         {
 
@@ -64,10 +66,14 @@ public override void OnInspectorGUI()
 
             shapeBlendSelectedIndex = EditorGUILayout.Popup("BlendShapeName", shapeBlendSelectedIndex, blendShapeNames);
 
+            //Canvas selector
+            canvas = EditorGUILayout.ObjectField("Manual Cavas Selection:", canvas, typeof(Canvas), true) as Canvas;
 
             if (GUILayout.Button("Create Slider"))
             {
-                var canvas = GameObject.FindObjectOfType<Canvas>();
+                //Auto Find one if canvas is null
+                if (canvas == null)
+                    canvas = GameObject.FindObjectOfType<Canvas>();
 
                 //If canvas doesn't exist, then make one
                 if (canvas == null)
@@ -96,12 +102,21 @@ public override void OnInspectorGUI()
                 //Slider Component Properties
                 var slider = BShapeSlider.GetComponent<Slider>();
 
-                Debug.Log(blendShape.negativeIndex);
+                //Debug.Log(blendShape.negativeIndex);
 
-                if (blendShape.negativeIndex == -1)
-                {
+                if (blendShape.negativeIndex == -1)                
                     slider.minValue = 0f;
-                }
+
+
+                else if (blendShape.positiveIndex == -1)
+                    slider.maxValue = 0f;
+
+                else                
+                    Debug.Log("Both Values for Blendshape are -1!?");
+
+                slider.value = 0f;
+
+
 
                 Debug.Log("Slider \"" + BShapeSlider.blendShapeName + "\" Created!");
             }