Added FractureDemo, fixed custom property drawers not being used

MetalOath · Dec 24, 2021 · ca3b1a8 · ca3b1a8
1 parent cc7ddfe
commit ca3b1a8
Show file tree

Hide file tree

Showing 43 changed files with 2,456 additions and 1,893 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,53 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Unity Editor",
+            "type": "unity",
+            "request": "launch"
+        },
+        {
+            "name": "Windows Player",
+            "type": "unity",
+            "request": "launch"
+        },
+        {
+            "name": "OSX Player",
+            "type": "unity",
+            "request": "launch"
+        },
+        {
+            "name": "Linux Player",
+            "type": "unity",
+            "request": "launch"
+        },
+        {
+            "name": "iOS Player",
+            "type": "unity",
+            "request": "launch"
+        },
+        {
+            "name": "Android Player",
+            "type": "unity",
+            "request": "launch"
+        },
+        {
+            "name": "Xbox One Player",
+            "type": "unity",
+            "request": "launch"
+        },
+        {
+            "name": "PS4 Player",
+            "type": "unity",
+            "request": "launch"
+        },
+        {
+            "name": "SwitchPlayer",
+            "type": "unity",
+            "request": "launch"
+        }
+    ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,56 @@
+{
+    "files.exclude":
+    {
+        "**/.DS_Store":true,
+        "**/.git":true,
+        "**/.gitignore":true,
+        "**/.gitmodules":true,
+        "**/*.booproj":true,
+        "**/*.pidb":true,
+        "**/*.suo":true,
+        "**/*.user":true,
+        "**/*.userprefs":true,
+        "**/*.unityproj":true,
+        "**/*.dll":true,
+        "**/*.exe":true,
+        "**/*.pdf":true,
+        "**/*.mid":true,
+        "**/*.midi":true,
+        "**/*.wav":true,
+        "**/*.gif":true,
+        "**/*.ico":true,
+        "**/*.jpg":true,
+        "**/*.jpeg":true,
+        "**/*.png":true,
+        "**/*.psd":true,
+        "**/*.tga":true,
+        "**/*.tif":true,
+        "**/*.tiff":true,
+        "**/*.3ds":true,
+        "**/*.3DS":true,
+        "**/*.fbx":true,
+        "**/*.FBX":true,
+        "**/*.lxo":true,
+        "**/*.LXO":true,
+        "**/*.ma":true,
+        "**/*.MA":true,
+        "**/*.obj":true,
+        "**/*.OBJ":true,
+        "**/*.asset":true,
+        "**/*.cubemap":true,
+        "**/*.flare":true,
+        "**/*.mat":true,
+        "**/*.meta":true,
+        "**/*.prefab":true,
+        "**/*.unity":true,
+        "build/":true,
+        "Build/":true,
+        "Library/":true,
+        "library/":true,
+        "obj/":true,
+        "Obj/":true,
+        "ProjectSettings/":true,
+        "temp/":true,
+        "Temp/":true
+    }
+}
diff --git a/Editor/FractureEditor.cs b/Editor/FractureEditor.cs
@@ -0,0 +1,7 @@
+using UnityEditor;
+
+[CustomEditor(typeof(Fracture))]
+public class FractureEditor : Editor
+{
+    // Empty editor required for custom property drawers to work properly
+}
diff --git a/Editor/FractureEditor.cs.meta b/Editor/FractureEditor.cs.meta
diff --git a/Editor/OpenFracture.Editor.asmdef b/Editor/OpenFracture.Editor.asmdef
@@ -0,0 +1,18 @@
+{
+    "name": "OpenFracture.Editor",
+    "rootNamespace": "",
+    "references": [
+        "GUID:7b1a8d9f4355a214f9a95471fa510c86"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
diff --git a/Runtime/Scripts/ProFracture.asmdef.meta → Editor/OpenFracture.Editor.asmdef.meta b/Runtime/Scripts/ProFracture.asmdef.meta → Editor/OpenFracture.Editor.asmdef.meta
diff --git a/Editor/PrefractureEditor.cs b/Editor/PrefractureEditor.cs
@@ -0,0 +1,7 @@
+using UnityEditor;
+
+[CustomEditor(typeof(Prefracture))]
+public class PreractureEditor : Editor
+{
+    // Empty editor required for custom property drawers to work properly
+}
diff --git a/Editor/PrefractureEditor.cs.meta b/Editor/PrefractureEditor.cs.meta
diff --git a/Editor/RefractureOptionsPropertyDrawer.cs b/Editor/RefractureOptionsPropertyDrawer.cs
@@ -5,7 +5,7 @@
 [CustomPropertyDrawer(typeof(RefractureOptions))]
 public class RefractureOptionsPropertyDrawer : PropertyDrawer
 {   
-    private static bool foldout = false;
+    private static bool foldout = true;
 
     // Draw the property inside the given rect
     public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)

diff --git a/Editor/SliceEditor.cs b/Editor/SliceEditor.cs
@@ -0,0 +1,7 @@
+using UnityEditor;
+
+[CustomEditor(typeof(SliceEditor))]
+public class SliceEditor : Editor
+{
+    // Empty editor required for custom property drawers to work properly
+}
diff --git a/Editor/SliceEditor.cs.meta b/Editor/SliceEditor.cs.meta
diff --git a/Editor/TriggerOptionsPropertyDrawer.cs b/Editor/TriggerOptionsPropertyDrawer.cs
@@ -29,11 +29,11 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
             {
                 case ((int)TriggerType.Collision):
                     EditorGUILayout.PropertyField(minimumCollisionForce);
-                    EditorGUILayout.PropertyField(filterCollisionsByTag);
+                    EditorGUILayout.PropertyField(filterCollisionsByTag, new GUIContent("Limit collisions to selected tags?"));
                     if (filterCollisionsByTag.boolValue)
                     {
                         EditorGUILayout.EndFoldoutHeaderGroup();
-                        EditorGUILayout.PropertyField(triggerAllowedTags);
+                        EditorGUILayout.PropertyField(triggerAllowedTags, new GUIContent("Included Tags"));
                     }
                     break;
                 case ((int)TriggerType.Trigger):

diff --git a/Runtime/Audio/rocks.mp3 b/Runtime/Audio/rocks.mp3
diff --git a/...ime/Materials/SlicedObject.physicMaterial → Runtime/Materials/Default.physicMaterial b/...ime/Materials/SlicedObject.physicMaterial → Runtime/Materials/Default.physicMaterial
@@ -6,9 +6,9 @@ PhysicMaterial:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: SlicedObject
+  m_Name: Default
   dynamicFriction: 0.12
   staticFriction: 0.3
-  bounciness: 0.1
+  bounciness: 0.8
   frictionCombine: 2
   bounceCombine: 2
diff --git a/...aterials/SlicedObject.physicMaterial.meta → ...ime/Materials/Default.physicMaterial.meta b/...aterials/SlicedObject.physicMaterial.meta → ...ime/Materials/Default.physicMaterial.meta
diff --git a/Runtime/Materials/Blue.mat → Runtime/Materials/Inside.mat b/Runtime/Materials/Blue.mat → Runtime/Materials/Inside.mat
@@ -20,7 +20,7 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Blue
+  m_Name: Inside
   m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
   m_ShaderKeywords: 
   m_LightmapFlags: 4
@@ -34,7 +34,7 @@ Material:
     serializedVersion: 3
     m_TexEnvs:
     - _BaseMap:
-        m_Texture: {fileID: 0}
+        m_Texture: {fileID: 10309, guid: 0000000000000000f000000000000000, type: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BumpMap:
@@ -58,7 +58,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 0}
+        m_Texture: {fileID: 10309, guid: 0000000000000000f000000000000000, type: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:

diff --git a/Runtime/Materials/Blue.mat.meta → Runtime/Materials/Inside.mat.meta b/Runtime/Materials/Blue.mat.meta → Runtime/Materials/Inside.mat.meta
diff --git a/Runtime/Materials/Red.mat → Runtime/Materials/Outside.mat b/Runtime/Materials/Red.mat → Runtime/Materials/Outside.mat
@@ -20,7 +20,7 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Red
+  m_Name: Outside
   m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
   m_ShaderKeywords: 
   m_LightmapFlags: 4
@@ -34,7 +34,7 @@ Material:
     serializedVersion: 3
     m_TexEnvs:
     - _BaseMap:
-        m_Texture: {fileID: 0}
+        m_Texture: {fileID: 10309, guid: 0000000000000000f000000000000000, type: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BumpMap:
@@ -58,7 +58,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 0}
+        m_Texture: {fileID: 10309, guid: 0000000000000000f000000000000000, type: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:

diff --git a/Runtime/Materials/Red.mat.meta → Runtime/Materials/Outside.mat.meta b/Runtime/Materials/Red.mat.meta → Runtime/Materials/Outside.mat.meta
diff --git a/Runtime/Materials/Projectile.physicMaterial b/Runtime/Materials/Projectile.physicMaterial
@@ -9,6 +9,6 @@ PhysicMaterial:
   m_Name: Projectile
   dynamicFriction: 0.6
   staticFriction: 0.6
-  bounciness: 0.8
+  bounciness: 1
   frictionCombine: 0
   bounceCombine: 0
diff --git a/Runtime/Meshes/horse_statue_01_1k.blend b/Runtime/Meshes/horse_statue_01_1k.blend
diff --git a/Runtime/Meshes/horse_statue_01_1k.blend.meta b/Runtime/Meshes/horse_statue_01_1k.blend.meta
diff --git a/Runtime/Meshes/horse_statue_01_1k.blend1 b/Runtime/Meshes/horse_statue_01_1k.blend1