Merge pull request #204 from umasteeringgroup/fix-CleanupExamples

cleanup examples

Author: Jaimi

UMAProject/Assets/UMA/Core/Extensions/DynamicCharacterSystem/Scripts/DynamicDNAConverterBehaviour.cs

@@ -380,7 +380,9 @@ public DynamicDNAConverterController DoUpgrade()
 			//The RaceDatas and SlotDataAssets will warn the user if they are using a legacy DynamicDNAConverterBehaviour
 			var DCBFilename = System.IO.Path.GetFileName(DCBPath);
 			string moveAssetResult = "";
+#pragma warning disable 0219
 			string newDCBPath = DCBPath;
+#pragma warning restore
 			if (DCBPath.IndexOf("LegacyDNA" + "/" + DCBFilename) == -1)
 			{
 				var DCBDir = System.IO.Path.GetDirectoryName(DCBPath);

UMAProject/Assets/UMA/Core/StandardAssets/UMA/Scripts/CustomAssetUtility.cs

@@ -35,7 +35,11 @@ public static void CreatePrefab(string name, params System.Type[] types)
             {
                 go.AddComponent(t);
             }
+#if UNITY_2018_3_OR_NEWER
+            PrefabUtility.SaveAsPrefabAsset(go, assetPathAndName );
+#else
             PrefabUtility.CreatePrefab(assetPathAndName, go);
+#endif
             GameObject.DestroyImmediate(go,false);
         }
 
@@ -55,7 +59,11 @@ public static GameObject ClonePrefab(GameObject other, string newName = "")
 			string assetPathAndName = AssetDatabase.GenerateUniqueAssetPath(path + "/" + name + ".prefab");
 
 			GameObject go = GameObject.Instantiate(other);
+#if UNITY_2018_3_OR_NEWER
+			var prefab = PrefabUtility.SaveAsPrefabAsset(go, assetPathAndName);
+#else
 			var prefab = PrefabUtility.CreatePrefab(assetPathAndName, go);
+#endif
 			GameObject.DestroyImmediate(go, false);
 			return prefab;
 		}

UMAProject/Assets/UMA/Core/StandardAssets/UMA/Scripts/DNARangeAsset.cs

@@ -19,7 +19,7 @@ namespace UMA
 	[System.Serializable]
 	public class DNARangeAsset : ScriptableObject, ISerializationCallbackReceiver
 	{
-#pragma warning.disable 649
+#pragma warning disable 649
 		//UMA 2.8 FixDNAPrefabs: this needs to use the new DNAConverterField
 		//we need this so we can get the data out of it on deserialize
 		/// <summary>

UMAProject/Assets/UMA/Core/StandardAssets/UMA/Scripts/Editor/GeometrySelectorWindow.cs

@@ -19,6 +19,7 @@ public class GeometrySelectorWindow : Editor
         private Vector3 _occluderPosition = Vector3.zero;
         private Vector3 _occluderRotation = new Vector3(270.0f, 0.0f, 0.0f);
         private Vector3 _occluderScale = Vector3.one;
+        private bool bothDirections = false;
 
         private bool isMirroring = false;
         private bool doneEditing = false; //set to true to end editing this objects
@@ -217,6 +218,10 @@ public override void OnInspectorGUI()
                 changed = true;
             }
 
+            bothDirections = EditorGUILayout.Toggle( new GUIContent("RayCast Both Directions", 
+                "Determines whether to raycast only outward along the normal from the source mesh or in both directions.  Both directions can be helpful if the occlusion slot is close to the surface of the source mesh or even slightly under it."),
+                bothDirections);
+
             if (changed)
             {
                 if(_OccluderSlotData)
@@ -227,7 +232,7 @@ public override void OnInspectorGUI()
 
             if (GUILayout.Button(new GUIContent("Raycast Hidden Faces", "Warning! This will clear the current selection.")))
             {
-                RaycastHide();
+                RaycastHide(bothDirections);
             }
             EditorGUI.EndDisabledGroup();
 
@@ -700,7 +705,7 @@ public static bool RayTriIntersect(Ray ray, Vector3 p1, Vector3 p2, Vector3 p3,
             return false;
         }
 
-        private void RaycastHide()
+        private void RaycastHide(bool bothDirections = false)
         {
             if (_Source == null)
                 return;
@@ -738,6 +743,7 @@ private void RaycastHide()
                 EditorUtility.DisplayProgressBar("Progress", "calculating...", ((float)i / (float)targetVerts.Length));
 
                 Ray testRay = new Ray(targetVerts[i], targetNorms[i] );
+                Ray oppositeTestRay = new Ray(targetVerts[i], -targetNorms[i]);
                 for (int j = 0; j < occlusionTriangles.Count; j++)
                 {
                     int[] triVerts = occlusionTriangles[j];
@@ -756,6 +762,22 @@ private void RaycastHide()
                                 break;
                             }
                         }
+
+                        if(bothDirections)
+                        {
+                            if (RayTriIntersect(oppositeTestRay,
+                                occlusionVerts[triVerts[k + 0]],
+                                occlusionVerts[triVerts[k + 1]],
+                                occlusionVerts[triVerts[k + 2]],
+                                out dist))
+                            {
+                                if (dist <= _Source.normalsLength)
+                                {
+                                    vertexOccluded[i] = true;
+                                    break;
+                                }
+                            }
+                        }
                     }
 
                     if (vertexOccluded[i])

UMAProject/Assets/UMA/Core/StandardAssets/UMA/Scripts/Editor/UMADNAToBonePoseWindow.cs

@@ -220,7 +220,11 @@ protected void CreateBonePoseCallback(UMAData umaData)
 				morphSet.objectReferenceValue = AssetDatabase.LoadAssetAtPath<MorphSetDnaAsset>(assetPath);
 
 				serializedConverter.ApplyModifiedPropertiesWithoutUndo();
+#if UNITY_2018_3_OR_NEWER
+				PrefabUtility.SaveAsPrefabAsset(tempConverterPrefab, prefabPath);
+#else
 				PrefabUtility.CreatePrefab(prefabPath, tempConverterPrefab);
+#endif
 				DestroyImmediate(tempConverterPrefab, false);
 			}
 		}

UMAProject/Assets/UMA/Core/StandardAssets/UMA/Scripts/Editor/UMASlotProcessingUtil.cs

@@ -86,8 +86,11 @@ public static void UpdateSlotData( SlotDataAsset slot, SkinnedMeshRenderer mesh,
                 }
                 resultingSkinnedMesh.sharedMesh = resultingMesh;
             }
-
+#if UNITY_2018_3_OR_NEWER
+            var skinnedResult = PrefabUtility.SaveAsPrefabAsset(newObject, path + '/' + assetName + "_Skinned.prefab");
+#else
             var skinnedResult = UnityEditor.PrefabUtility.CreatePrefab(path + '/' + assetName + "_Skinned.prefab", newObject);
+#endif
             GameObject.DestroyImmediate(newObject);
 
             var meshgo = skinnedResult.transform.Find(mesh.name);
@@ -186,7 +189,11 @@ public static SlotDataAsset CreateSlotData(string slotFolder, string assetFolder
 				resultingSkinnedMesh.sharedMesh = resultingMesh;
 			}
 
+#if UNITY_2018_3_OR_NEWER
+			var skinnedResult = PrefabUtility.SaveAsPrefabAsset(newObject, slotFolder + '/' + assetName + '/' + assetName + "_Skinned.prefab");
+#else
 			var skinnedResult = UnityEditor.PrefabUtility.CreatePrefab(slotFolder + '/' + assetName + '/' + assetName + "_Skinned.prefab", newObject);
+#endif
 			GameObject.DestroyImmediate(newObject);
 
 			var meshgo = skinnedResult.transform.Find(mesh.name);