Added SerializedReferenceUI as a dependency.

naelstrof · naelstrof · commit 39ba0c6f48fa · 2022-07-18T00:13:02.000-06:00
diff --git a/Naelstrof.PenetrationTech.asmdef b/Naelstrof.PenetrationTech.asmdef
@@ -1,7 +1,9 @@
 {
     "name": "Naelstrof.PenetrationTech",
     "rootNamespace": "",
-    "references": [],
+    "references": [
+        "GUID:73106583b323919458c1e05166706ce3"
+    ],
     "includePlatforms": [],
     "excludePlatforms": [],
     "allowUnsafeCode": true,
diff --git a/Scripts/Penetrable.cs b/Scripts/Penetrable.cs
@@ -15,7 +15,7 @@ namespace PenetrationTech {
     [CanEditMultipleObjects]
     [CustomEditor(typeof(Penetrable))]
     public class PenetrableEditor : Editor {
-        static IEnumerable<PenetrableListenerAttribute> GetPenetrableListenerAttributes() {
+        /*static IEnumerable<PenetrableListenerAttribute> GetPenetrableListenerAttributes() {
             foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies()) {
                 foreach (Type type in assembly.GetTypes()) {
                     var attributes =
@@ -26,7 +26,7 @@ static IEnumerable<PenetrableListenerAttribute> GetPenetrableListenerAttributes(
                     }
                 }
             }
-        }
+        }*/
         public override void OnInspectorGUI() {
             string lastError = ((Penetrable)target).GetLastError();
             if (!string.IsNullOrEmpty(lastError)) {
@@ -35,7 +35,7 @@ public override void OnInspectorGUI() {
 
             DrawDefaultInspector();
             
-            if (!EditorGUILayout.DropdownButton(new GUIContent("Add listener"), FocusType.Passive)) {
+            /*if (!EditorGUILayout.DropdownButton(new GUIContent("Add listener"), FocusType.Passive)) {
                 return;
             }
 
@@ -54,7 +54,7 @@ public override void OnInspectorGUI() {
                     }
                 });
             }
-            menu.ShowAsContext();
+            menu.ShowAsContext();*/
         }
     }
     #endif
@@ -69,7 +69,7 @@ public class Penetrable : CatmullDisplay {
         [SerializeField, Range(0f,1f)] private float splineTension = 0.5f;
         private List<Vector3> worldPoints;
         // Keep this on the bottom, so it lines up with the custom inspector.
-        [SerializeReference]
+        [SerializeReference,SerializeReferenceButton]
         public List<PenetrableListener> listeners;
 
         private GameObject colliderEntrance;
@@ -242,6 +242,9 @@ void OnValidate() {
             valid = false;
             reinitialize = true;
             foreach(PenetrableListener listener in listeners) {
+                if (listener == null) {
+                    continue;
+                }
                 listener.OnValidate(this);
             }
         }
diff --git a/Scripts/PenetrableListener.cs b/Scripts/PenetrableListener.cs
@@ -1,9 +1,12 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
 
 namespace PenetrationTech {
+    
+    [Obsolete("Currently this feature has been replaced by https://github.com/TextusGames/UnitySerializedReferenceUI with its handy SerializedReferenceButton attribute.")]
     public class PenetrableListenerAttribute : System.Attribute {
         public System.Type type;
         public string name;
diff --git a/Scripts/PenetrableListeners/BoneTransformListener.cs b/Scripts/PenetrableListeners/BoneTransformListener.cs
@@ -6,7 +6,7 @@
 
 namespace PenetrationTech {
     [System.Serializable]
-    [PenetrableListener(typeof(BoneTransformListener), "Simple Bone Offset Correction Listener")]
+    //[PenetrableListener(typeof(BoneTransformListener), "Simple Bone Offset Correction Listener")]
     public class BoneTransformListener : PenetrableListener {
         [FormerlySerializedAs("targetBone")] [SerializeField]
         protected Transform offsetCorrectionBone;
diff --git a/Scripts/PenetrableListeners/ClipListener.cs b/Scripts/PenetrableListeners/ClipListener.cs
@@ -5,7 +5,7 @@
 
 namespace PenetrationTech {
     [System.Serializable]
-    [PenetrableListener(typeof(ClipListener), "Clip range listener")]
+    //[PenetrableListener(typeof(ClipListener), "Clip range listener")]
     public class ClipListener : PenetrableListener {
         [SerializeField]
         private bool allowForAllTheWayThrough = true;
diff --git a/Scripts/PenetrableListeners/LengthwiseBlendshapeListener.cs b/Scripts/PenetrableListeners/LengthwiseBlendshapeListener.cs
@@ -6,7 +6,7 @@
 
 namespace PenetrationTech {
     [System.Serializable]
-    [PenetrableListener(typeof(LengthwiseBlendshapeListener), "Lengthwise Blendshape Listener (depth rather than girth)")]
+    //[PenetrableListener(typeof(LengthwiseBlendshapeListener), "Lengthwise Blendshape Listener (depth rather than girth)")]
     public class LengthwiseBlendshapeListener : PenetrableListener {
         [SerializeField]
         SkinnedMeshBlendshapePair[] targets;
diff --git a/Scripts/PenetrableListeners/LengthwiseBoneDepthPenetrableListener.cs b/Scripts/PenetrableListeners/LengthwiseBoneDepthPenetrableListener.cs
@@ -5,7 +5,7 @@
 
 namespace PenetrationTech {
     [System.Serializable]
-    [PenetrableListener(typeof(LengthwiseBoneDepthPenetrableListener), "Lengthwise Bone Depth Penetrable")]
+    //[PenetrableListener(typeof(LengthwiseBoneDepthPenetrableListener), "Lengthwise Bone Depth Penetrable")]
     public class LengthwiseBoneDepthPenetrableListener : PenetrableListener {
         [SerializeField]
         private Transform targetTransform;
diff --git a/Scripts/PenetrableListeners/PushPullExpandBlendshapeListener.cs b/Scripts/PenetrableListeners/PushPullExpandBlendshapeListener.cs
@@ -8,7 +8,7 @@
 
 namespace PenetrationTech {
     [System.Serializable]
-    [PenetrableListener(typeof(PushPullExpandBlendshapeListener), "Push Pull Expand Blendshape Listener")]
+    //[PenetrableListener(typeof(PushPullExpandBlendshapeListener), "Push Pull Expand Blendshape Listener")]
     public class PushPullExpandBlendshapeListener : BoneTransformListener {
         [SerializeField]
         private SkinnedMeshBlendshapePushPullExpandSet[] targets;
diff --git a/Scripts/PenetrableListeners/SimpleBlendshapeListener.cs b/Scripts/PenetrableListeners/SimpleBlendshapeListener.cs
@@ -6,7 +6,7 @@
 
 namespace PenetrationTech {
     [System.Serializable]
-    [PenetrableListener(typeof(SimpleBlendshapeListener), "Simple Blendshape Listener")]
+    //[PenetrableListener(typeof(SimpleBlendshapeListener), "Simple Blendshape Listener")]
     public class SimpleBlendshapeListener : BoneTransformListener {
         [SerializeField]
         SkinnedMeshBlendshapePair[] targets;
diff --git a/Scripts/Penetrator.cs b/Scripts/Penetrator.cs
@@ -15,7 +15,7 @@ namespace PenetrationTech {
     [CanEditMultipleObjects]
     [CustomEditor(typeof(Penetrator))]
     public class PenetratorEditor : Editor {
-        static IEnumerable<PenetratorListenerAttribute> GetPenetratorListenerAttributes() {
+        /*static IEnumerable<PenetratorListenerAttribute> GetPenetratorListenerAttributes() {
             foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies()) {
                 foreach (Type type in assembly.GetTypes()) {
                     var attributes =
@@ -26,7 +26,7 @@ static IEnumerable<PenetratorListenerAttribute> GetPenetratorListenerAttributes(
                     }
                 }
             }
-        }
+        }*/
         public override void OnInspectorGUI() {
             string lastError = ((Penetrator)target).GetLastError();
             if (!string.IsNullOrEmpty(lastError)) {
@@ -38,7 +38,7 @@ public override void OnInspectorGUI() {
             }
 
             DrawDefaultInspector();
-            
+            /*
             if (!EditorGUILayout.DropdownButton(new GUIContent("Add listener"), FocusType.Passive)) {
                 return;
             }
@@ -59,7 +59,7 @@ public override void OnInspectorGUI() {
                     }
                 });
             }
-            menu.ShowAsContext();
+            menu.ShowAsContext();*/
         }
     }
     #endif
@@ -87,7 +87,7 @@ [SerializeField] [Range(0.001f,5f)] [Tooltip("How lenient we are with penetrator
         private float penetrationMarginOfError = 0.5f;
         [SerializeField] [Tooltip("Automate discovery of penetrables, and automatically penetrate with them if some basic conditions are met (roughly the right angle, and distance). Also decouple automatically if basic conditions are met (penetrator is certain distance away).")]
         private AutoPenetrateMode autoPenetrate = AutoPenetrateMode.AutoSeek | AutoPenetrateMode.AutoDecouple;
-        [SerializeReference] [Tooltip("Programmable listeners, they can respond to penetrations in a variety of ways. Great for triggering audio and such.")]
+        [SerializeReference,SerializeReferenceButton] [Tooltip("Programmable listeners, they can respond to penetrations in a variety of ways. Great for triggering audio and such.")]
         public List<PenetratorListener> listeners;
         
 
diff --git a/Scripts/PenetratorListener.cs b/Scripts/PenetratorListener.cs
@@ -1,8 +1,10 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
 namespace PenetrationTech {
+    [Obsolete("Currently this feature has been replaced by https://github.com/TextusGames/UnitySerializedReferenceUI with its handy SerializedReferenceButton attribute.")]
     public class PenetratorListenerAttribute : System.Attribute {
         public System.Type type;
         public string name;
diff --git a/Scripts/PenetratorListeners/PenetratorKnotSquisher.cs b/Scripts/PenetratorListeners/PenetratorKnotSquisher.cs
@@ -6,7 +6,8 @@
 using UnityEngine.UIElements;
 
 namespace PenetrationTech {
-    [System.Serializable] [PenetratorListener(typeof(PenetratorKnotSquisher), "Knot Squisher listener")]
+    [System.Serializable]
+    //[PenetratorListener(typeof(PenetratorKnotSquisher), "Knot Squisher listener")]
     public class PenetratorKnotSquisher : PenetratorListener {
         [Range(0f,1f)]
         [SerializeField] private float knotForceFactor = 0.1f;
diff --git a/Scripts/PenetratorListeners/PenetratorNoCollideListener.cs b/Scripts/PenetratorListeners/PenetratorNoCollideListener.cs
@@ -5,7 +5,8 @@
 using UnityEngine.Events;
 
 namespace PenetrationTech {
-    [System.Serializable] [PenetratorListener(typeof(PenetratorNoCollideListener), "Rigidbody NoCollide listener")]
+    [System.Serializable]
+    //[PenetratorListener(typeof(PenetratorNoCollideListener), "Rigidbody NoCollide listener")]
     public class PenetratorNoCollideListener : PenetratorListener {
         [SerializeField]
         private Rigidbody body;
diff --git a/Scripts/PenetratorListeners/PenetratorPassiveAudioListener.cs b/Scripts/PenetratorListeners/PenetratorPassiveAudioListener.cs
@@ -7,7 +7,8 @@
 using UnityEngine.Events;
 
 namespace PenetrationTech {
-    [System.Serializable] [PenetratorListener(typeof(PenetratorPassiveAudioListener), "Passive audio listener")]
+    [System.Serializable]
+    //[PenetratorListener(typeof(PenetratorPassiveAudioListener), "Passive audio listener")]
     public class PenetratorPassiveAudioListener : PenetratorListener {
         private float lastDepth;
         [SerializeField]
diff --git a/Scripts/PenetratorListeners/PenetratorRigidbodyListener.cs b/Scripts/PenetratorListeners/PenetratorRigidbodyListener.cs
@@ -5,7 +5,8 @@
 using UnityEngine.Events;
 
 namespace PenetrationTech {
-    [System.Serializable] [PenetratorListener(typeof(PenetratorRigidbodyListener), "Rigidbody Apply Force listener")]
+    [System.Serializable]
+    //[PenetratorListener(typeof(PenetratorRigidbodyListener), "Rigidbody Apply Force listener")]
     public class PenetratorRigidbodyListener : PenetratorListener {
         [SerializeField]
         private Rigidbody body;
diff --git a/Scripts/PenetratorListeners/PenetratorUnityEventListener.cs b/Scripts/PenetratorListeners/PenetratorUnityEventListener.cs
@@ -5,7 +5,8 @@
 using UnityEngine.Events;
 
 namespace PenetrationTech {
-    [System.Serializable] [PenetratorListener(typeof(PenetratorUnityEventListener), "Event listener")]
+    [System.Serializable]
+    //[PenetratorListener(typeof(PenetratorUnityEventListener), "Event listener")]
     public class PenetratorUnityEventListener : PenetratorListener {
         [SerializeField]
         private UnityEvent penetrationStart;
diff --git a/package.json b/package.json
@@ -1,7 +1,10 @@
 {
     "name": "com.naelstrof.penetrationtech",
     "displayName": "Penetration Tech",
-    "version": "3.5.5",
+    "version": "3.5.6",
     "unity": "2020.3",
+    "dependencies": {
+        "com.textus-games.serialized-reference-ui": "https://github.com/TextusGames/UnitySerializedReferenceUI.git"
+    },
     "description": "Tools that help analyze, animate, and work with penetrators and orifices for sexual activities."
 }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ namespace PenetrationTech {`
`15`	`15`	`[CanEditMultipleObjects]`
`16`	`16`	`[CustomEditor(typeof(Penetrable))]`
`17`	`17`	`public class PenetrableEditor : Editor {`
`18`		`- static IEnumerable<PenetrableListenerAttribute> GetPenetrableListenerAttributes() {`
	`18`	`+ /*static IEnumerable<PenetrableListenerAttribute> GetPenetrableListenerAttributes() {`
`19`	`19`	`foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies()) {`
`20`	`20`	`foreach (Type type in assembly.GetTypes()) {`
`21`	`21`	`var attributes =`
`@@ -26,7 +26,7 @@ static IEnumerable<PenetrableListenerAttribute> GetPenetrableListenerAttributes(`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`	`}`
`29`		`- }`
	`29`	`+ }*/`
`30`	`30`	`public override void OnInspectorGUI() {`
`31`	`31`	`string lastError = ((Penetrable)target).GetLastError();`
`32`	`32`	`if (!string.IsNullOrEmpty(lastError)) {`
`@@ -35,7 +35,7 @@ public override void OnInspectorGUI() {`
`35`	`35`
`36`	`36`	`DrawDefaultInspector();`
`37`	`37`
`38`		`- if (!EditorGUILayout.DropdownButton(new GUIContent("Add listener"), FocusType.Passive)) {`
	`38`	`+ /*if (!EditorGUILayout.DropdownButton(new GUIContent("Add listener"), FocusType.Passive)) {`
`39`	`39`	`return;`
`40`	`40`	`}`
`41`	`41`
`@@ -54,7 +54,7 @@ public override void OnInspectorGUI() {`
`54`	`54`	`}`
`55`	`55`	`});`
`56`	`56`	`}`
`57`		`- menu.ShowAsContext();`
	`57`	`+ menu.ShowAsContext();*/`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`	`#endif`
`@@ -69,7 +69,7 @@ public class Penetrable : CatmullDisplay {`
`69`	`69`	`[SerializeField, Range(0f,1f)] private float splineTension = 0.5f;`
`70`	`70`	`private List<Vector3> worldPoints;`
`71`	`71`	`// Keep this on the bottom, so it lines up with the custom inspector.`
`72`		`- [SerializeReference]`
	`72`	`+ [SerializeReference,SerializeReferenceButton]`
`73`	`73`	`public List<PenetrableListener> listeners;`
`74`	`74`
`75`	`75`	`private GameObject colliderEntrance;`
`@@ -242,6 +242,9 @@ void OnValidate() {`
`242`	`242`	`valid = false;`
`243`	`243`	`reinitialize = true;`
`244`	`244`	`foreach(PenetrableListener listener in listeners) {`
	`245`	`+ if (listener == null) {`
	`246`	`+ continue;`
	`247`	`+ }`
`245`	`248`	`listener.OnValidate(this);`
`246`	`249`	`}`
`247`	`250`	`}`