slings: Make coil arm primitive-independent.

Author: freezy

VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Surface/SlingshotInspector.cs

@@ -30,7 +30,9 @@ public class SlingshotInspector : ItemInspector
 		private SerializedProperty _animationDurationProperty;
 		private SerializedProperty _animationCurveProperty;
 		private SerializedProperty _coilArmProperty;
-		private SerializedProperty _coilArmAngleProperty;
+		private SerializedProperty _coilArmEndAngleProperty;
+		private SerializedProperty _coilArmStartAngleProperty;
+		private SerializedProperty _coilArmRotationAxis;
 
 		protected override MonoBehaviour UndoTarget => target as MonoBehaviour;
 
@@ -44,7 +46,9 @@ protected override void OnEnable()
 			_rubberOffProperty = serializedObject.FindProperty(nameof(SlingshotComponent.RubberOff));
 			_rubberOnProperty = serializedObject.FindProperty(nameof(SlingshotComponent.RubberOn));
 			_coilArmProperty = serializedObject.FindProperty(nameof(SlingshotComponent.CoilArm));
-			_coilArmAngleProperty = serializedObject.FindProperty(nameof(SlingshotComponent.CoilArmAngle));
+			_coilArmStartAngleProperty = serializedObject.FindProperty(nameof(SlingshotComponent.CoilArmStartAngle));
+			_coilArmEndAngleProperty = serializedObject.FindProperty(nameof(SlingshotComponent.CoilArmEndAngle));
+			_coilArmRotationAxis = serializedObject.FindProperty(nameof(SlingshotComponent.CoilArmRotationAxis));
 			_animationDurationProperty = serializedObject.FindProperty(nameof(SlingshotComponent.AnimationDuration));
 			_animationCurveProperty = serializedObject.FindProperty(nameof(SlingshotComponent.AnimationCurve));
 		}
@@ -66,7 +70,9 @@ public override void OnInspectorGUI()
 
 			EditorGUILayout.Space(10f);
 			PropertyField(_coilArmProperty, "Coil Arm");
-			PropertyField(_coilArmAngleProperty, "Arm Angle");
+			PropertyField(_coilArmStartAngleProperty, "Start Angle");
+			PropertyField(_coilArmEndAngleProperty, "End Angle");
+			PropertyField(_coilArmRotationAxis, "Rotation Axis");
 
 			EditorGUILayout.Space(10f);
 			PropertyField(_animationDurationProperty, "Animation Duration");

VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/Rock.cs

@@ -152,8 +152,8 @@ private static void SetupLeftSlingshot(GameObject go)
 			ss.SlingshotSurface = go.GetComponent<SurfaceColliderComponent>();
 			ss.RubberOff = playfieldGo.transform.Find("Rubbers/LeftSling1").GetComponent<RubberComponent>();
 			ss.RubberOn = playfieldGo.transform.Find("Rubbers/LeftSling4").GetComponent<RubberComponent>();
-			ss.CoilArm = playfieldGo.transform.Find("Primitives/Lemk").GetComponent<PrimitiveComponent>();
-			ss.CoilArmAngle = 22f;
+			ss.CoilArm = playfieldGo.transform.Find("Primitives/Lemk").gameObject;
+			ss.CoilArmEndAngle = 22f;
 
 			EditorUtility.SetDirty(ssGo);
 			PrefabUtility.RecordPrefabInstancePropertyModifications(ss);
@@ -173,8 +173,8 @@ private static void SetupRightSlingshot(GameObject go)
 			ss.SlingshotSurface = go.GetComponent<SurfaceColliderComponent>();
 			ss.RubberOff = playfieldGo.transform.Find("Rubbers/RightSling1").GetComponent<RubberComponent>();
 			ss.RubberOn = playfieldGo.transform.Find("Rubbers/RightSling3").GetComponent<RubberComponent>();
-			ss.CoilArm = playfieldGo.transform.Find("Primitives/Remk").GetComponent<PrimitiveComponent>();
-			ss.CoilArmAngle = 22f;
+			ss.CoilArm = playfieldGo.transform.Find("Primitives/Remk").gameObject;
+			ss.CoilArmEndAngle = 22f;
 
 			EditorUtility.SetDirty(ssGo);
 			PrefabUtility.RecordPrefabInstancePropertyModifications(ss);

VisualPinball.Unity/VisualPinball.Unity/VPT/Surface/SlingshotComponent.cs

@@ -22,12 +22,18 @@
 using Unity.Entities;
 using Unity.Mathematics;
 using UnityEngine;
+using UnityEngine.Serialization;
 using VisualPinball.Engine.Math;
 using VisualPinball.Engine.VPT.Rubber;
 using VisualPinball.Engine.Game.Engines;
 
 namespace VisualPinball.Unity
 {
+	public enum Axis
+	{
+		X, Y, Z
+	}
+
 	[AddComponentMenu("Visual Pinball/Game Item/Slingshot")]
 	public class SlingshotComponent : MonoBehaviour, IMeshComponent, IMainRenderableComponent, IRubberData, ISwitchDeviceComponent
 	{
@@ -41,11 +47,19 @@ public class SlingshotComponent : MonoBehaviour, IMeshComponent, IMainRenderable
 		public RubberComponent RubberOff;
 
 		[Tooltip("Reference to the arm attached to the coil. Rotates around X.")]
-		public PrimitiveComponent CoilArm;
+		public GameObject CoilArm;
 
+		[Range(-180f, 180f)]
+		[Tooltip("Angle of the coil arm when off.")]
+		public float CoilArmStartAngle;
+
+		[FormerlySerializedAs("CoilArmAngle")]
 		[Range(-180f, 180f)]
 		[Tooltip("Angle of the coil arm when on.")]
-		public float CoilArmAngle;
+		public float CoilArmEndAngle;
+
+		[Tooltip("Which axis to rotate.")]
+		public Axis CoilArmRotationAxis;
 
 		[Min(0f)]
 		[Tooltip("Total duration of the animation in milliseconds.")]
@@ -174,8 +188,18 @@ public void RebuildMeshes()
 			}
 
 			if (CoilArm) {
-				CoilArm.Rotation.x = CoilArmAngle * Position;
-				CoilArm.UpdateTransforms();
+				var currentRot = CoilArm.transform.rotation.eulerAngles;
+				switch (CoilArmRotationAxis) {
+					case Axis.X:
+						CoilArm.transform.rotation = Quaternion.Euler(CoilArmStartAngle + CoilArmEndAngle * Position, currentRot.y, currentRot.z);
+						break;
+					case Axis.Y:
+						CoilArm.transform.rotation = Quaternion.Euler(currentRot.x, CoilArmStartAngle + CoilArmEndAngle * Position, currentRot.z);
+						break;
+					case Axis.Z:
+						CoilArm.transform.rotation = Quaternion.Euler(currentRot.x, currentRot.y, CoilArmStartAngle + CoilArmEndAngle * Position);
+						break;
+				}
 			}
 		}