CBD2 - Changed PhysicsMaterialComponent to PhysicsMaterialAsset, finding properties by nameof()

Author: Cupiii

VisualPinball.Unity/VisualPinball.Unity.Editor/Import/VpxSceneConverter.cs

@@ -77,7 +77,7 @@ public class VpxSceneConverter : ITextureProvider, IMaterialProvider, IMeshProvi
 		private readonly Dictionary<string, GameObject> _groupParents = new Dictionary<string, GameObject>();
 		private readonly Dictionary<string, Texture> _textures = new Dictionary<string, Texture>();
 		private readonly Dictionary<string, Material> _materials = new Dictionary<string, Material>();
-		private readonly Dictionary<string, PhysicsMaterialComponent> _physicalMaterials = new Dictionary<string, PhysicsMaterialComponent>();
+		private readonly Dictionary<string, PhysicsMaterialAsset> _physicalMaterials = new Dictionary<string, PhysicsMaterialAsset>();
 
 		private readonly IPatcher _patcher;
 		private bool _applyPatch = true;
@@ -375,7 +375,7 @@ private void ExtractPhysicsMaterials()
 			}
 
 			foreach (var material in _sourceTable.Data.Materials) {
-				_physicalMaterials[material.Name] = AssetDatabase.LoadAssetAtPath<PhysicsMaterialComponent>($"{_assetsPhysicsMaterials}/{material.Name}.asset");
+				_physicalMaterials[material.Name] = AssetDatabase.LoadAssetAtPath<PhysicsMaterialAsset>($"{_assetsPhysicsMaterials}/{material.Name}.asset");
 			}
 		}
 
@@ -386,7 +386,7 @@ private string SavePhysicsMaterial(Engine.VPT.Material material)
 				return path;
 			}
 
-			var mat = ScriptableObject.CreateInstance<PhysicsMaterialComponent>();
+			var mat = ScriptableObject.CreateInstance<PhysicsMaterialAsset>();
 			mat.Elasticity = material.Elasticity;
 			mat.ElasticityFalloff = material.ElasticityFalloff;
 			mat.ScatterAngle = material.ScatterAngle;
@@ -618,7 +618,7 @@ public Material GetMaterial(PbrMaterial material)
 			}
 			return null;
 		}
-		public PhysicsMaterialComponent GetPhysicsMaterial(string name)
+		public PhysicsMaterialAsset GetPhysicsMaterial(string name)
 		{
 			if (string.IsNullOrEmpty(name)) {
 				return null;
@@ -630,7 +630,7 @@ public PhysicsMaterialComponent GetPhysicsMaterial(string name)
 			var material = _tableComponent.LegacyContainer.TableData.Materials.FirstOrDefault(m => string.Equals(m.Name, name, StringComparison.CurrentCultureIgnoreCase));
 			if (material != null) {
 				var path = SavePhysicsMaterial(material);
-				_physicalMaterials[material.Name] = AssetDatabase.LoadAssetAtPath<PhysicsMaterialComponent>(path);
+				_physicalMaterials[material.Name] = AssetDatabase.LoadAssetAtPath<PhysicsMaterialAsset>(path);
 				return _physicalMaterials[material.Name];
 			}
 

VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/PhysicsMaterialInspector.cs

@@ -24,7 +24,7 @@
 
 namespace VisualPinball.Unity.Editor
 {
-	[CustomEditor(typeof(PhysicsMaterialComponent)), CanEditMultipleObjects]
+	[CustomEditor(typeof(PhysicsMaterialAsset)), CanEditMultipleObjects]
 	public class PhysicsMaterialInspector : UnityEditor.Editor
 	{
 		SerializedProperty Elasticity;
@@ -47,12 +47,12 @@ public class PhysicsMaterialInspector : UnityEditor.Editor
 
 		private void OnEnable()
 		{
-			Elasticity = serializedObject.FindProperty("Elasticity");
-			ElasticityFalloff = serializedObject.FindProperty("ElasticityFalloff");
-			ElasticityOverVelocity = serializedObject.FindProperty("ElasticityOverVelocity");
-			Friction = serializedObject.FindProperty("Friction");
-			ScatterAngle = serializedObject.FindProperty("ScatterAngle");
-			FrictionOverVelocity = serializedObject.FindProperty("FrictionOverVelocity");
+			Elasticity = serializedObject.FindProperty(nameof(PhysicsMaterialAsset.Elasticity));
+			ElasticityFalloff = serializedObject.FindProperty(nameof(PhysicsMaterialAsset.ElasticityFalloff));
+			ElasticityOverVelocity = serializedObject.FindProperty(nameof(PhysicsMaterialAsset.ElasticityOverVelocity));
+			Friction = serializedObject.FindProperty(nameof(PhysicsMaterialAsset.Friction));
+			ScatterAngle = serializedObject.FindProperty(nameof(PhysicsMaterialAsset.ScatterAngle));
+			FrictionOverVelocity = serializedObject.FindProperty(nameof(PhysicsMaterialAsset.FrictionOverVelocity));
 			//FrictionOverAngularMomentum = serializedObject.FindProperty("FrictionOverAngularMomentum");
 		}
 
@@ -71,7 +71,7 @@ public override void OnInspectorGUI()
 		{
 			//base.DrawDefaultInspector();
 
-			var physicsMaterial = (PhysicsMaterialComponent)target;  //casting from type object to type Physicsmaterial
+			var physicsMaterial = (PhysicsMaterialAsset)target;  //casting from type object to type Physicsmaterial
 
 
 			GUILayout.Label("Elasticity:");

VisualPinball.Unity/VisualPinball.Unity/Import/IMaterialProvider.cs

@@ -24,7 +24,7 @@ public interface IMaterialProvider
 		bool HasMaterial(PbrMaterial material);
 		void SaveMaterial(PbrMaterial vpxMaterial, Material material);
 		Material GetMaterial(PbrMaterial material);
-		PhysicsMaterialComponent GetPhysicsMaterial(string name);
+		PhysicsMaterialAsset GetPhysicsMaterial(string name);
 		Material MergeMaterials(string vpxMaterial, Material textureMaterial);
 	}
 }

VisualPinball.Unity/VisualPinball.Unity/VPT/ColliderComponent.cs

@@ -37,7 +37,7 @@ public abstract class ColliderComponent<TData, TMainComponent> : SubComponent<TD
 		where TMainComponent : MainComponent<TData>
 	{
 		[SerializeReference]
-		public PhysicsMaterialComponent PhysicsMaterial;
+		public PhysicsMaterialAsset PhysicsMaterial;
 
 		[NonSerialized]
 		public bool ShowGizmos;

VisualPinball.Unity/VisualPinball.Unity/VPT/PhysicsMaterialComponent.cs renamed to VisualPinball.Unity/VisualPinball.Unity/VPT/PhysicsMaterialAsset.cs

@@ -31,7 +31,7 @@ namespace VisualPinball.Unity
 	/// </summary>
 	[CreateAssetMenu(fileName = "PhysicsMaterial", menuName = "Visual Pinball/Physics Material", order = 100)]
 	//[CustomEditor(typeof(PhysicsMaterial))]
-	public class PhysicsMaterialComponent : ScriptableObject
+	public class PhysicsMaterialAsset : ScriptableObject
 	{
 
 		public float Elasticity;

VisualPinball.Unity/VisualPinball.Unity/VPT/Table/SceneTableContainer.cs

@@ -161,7 +161,7 @@ private void PrepareForExport()
 			var guids = AssetDatabase.FindAssets("t:PhysicsMaterial", null);
 			foreach (var guid in guids) {
 				var assetPath = AssetDatabase.GUIDToAssetPath(guid);
-				var matAsset = AssetDatabase.LoadAssetAtPath<PhysicsMaterialComponent>(assetPath);
+				var matAsset = AssetDatabase.LoadAssetAtPath<PhysicsMaterialAsset>(assetPath);
 				var name = Path.GetFileNameWithoutExtension(assetPath);
 				if (!_materials.ContainsKey(name.ToLower())) {
 					continue;