changed: fov and better offset. parallelized grapple change.

Assets/Scripts/Core/Graph Tasks/ChangeCameraSettings.cs

@@ -38,6 +38,24 @@ public enum CameraSettingsToggle{
 	ResetValue,
 }
 
+public struct Vector3CameraValueGroup{
+	public string label;
+	public Vector3 newValue;
+	
+	public CameraSettingsToggle changeX;
+	public CameraSettingsToggle changeY;
+	public CameraSettingsToggle changeZ;
+	
+	public Vector3CameraValueGroup(string newLabel){
+		changeX = CameraSettingsToggle.NoChange;
+		changeY = CameraSettingsToggle.NoChange;
+		changeZ = CameraSettingsToggle.NoChange;
+
+		newValue = Vector3.zero;
+		label = newLabel;
+	}
+}
+
 public struct Vector2CameraValueGroup{
 	public string label;
 	public Vector2 newValue;
@@ -54,6 +72,135 @@ public struct Vector2CameraValueGroup{
 	}
 }
 
+public struct FloatCameraValueGroup{
+	public string label;
+	public float value;
+
+	public CameraSettingsToggle changeValue;
+
+	public FloatCameraValueGroup(string newLabel){
+		label = newLabel;
+		value = 0f;
+		changeValue = CameraSettingsToggle.NoChange;
+	}
+}
+
+public class FloatCameraValueGroupDrawer : ObjectDrawer<FloatCameraValueGroup>  {
+	public override FloatCameraValueGroup OnGUI(GUIContent _content, FloatCameraValueGroup _instance){
+		// Remove label for floats
+		EditorGUIUtility.labelWidth = 50;
+		
+		// Set layout options for the label and the float fields
+		GUILayoutOption[] floatOptions = new GUILayoutOption[] {
+			GUILayout.Width(80.0f), 
+			GUILayout.MinWidth(20.0f), 
+			GUILayout.ExpandWidth(true), 
+		};
+
+		GUILayoutOption[] labelOptions = new GUILayoutOption[]{
+			GUILayout.Width(200.0f),
+		};
+		
+		// Start the Vertical layout then add the label before adding a horizontal so the label will be on top of side-by-side options
+		GUILayout.BeginVertical();
+		GUILayout.Label(_instance.ToString(), labelOptions);
+		GUILayout.BeginHorizontal();
+		
+		// Create the x settings enum
+		_instance.changeValue = (CameraSettingsToggle)EditorGUILayout.EnumPopup("", instance.changeValue);
+		
+		// Create the value/disabled information field
+		if (_instance.changeValue == CameraSettingsToggle.NewValue){
+			_instance.value = EditorGUILayout.FloatField(_instance.value, floatOptions);
+		} else {
+			EditorGUI.BeginDisabledGroup(true);
+			EditorGUILayout.TextField(_instance.changeValue == CameraSettingsToggle.NoChange ? "Unchanged" : "Reset", floatOptions);
+			EditorGUI.EndDisabledGroup();
+		}
+		
+		// Close this line up
+		GUILayout.EndHorizontal();
+		GUILayout.EndVertical();
+		
+		// Reset to default so the rest of things don't get messed up
+		EditorGUIUtility.labelWidth = 0;
+		return _instance;
+	}
+}
+
+public class Vector3CameraValueGroupDrawer : ObjectDrawer<Vector3CameraValueGroup>  {
+	public override Vector3CameraValueGroup OnGUI(GUIContent _content, Vector3CameraValueGroup _instance){
+		// Remove label for floats
+		EditorGUIUtility.labelWidth = 20;
+		
+		// Set layout options for the label and the float fields
+		GUILayoutOption[] floatOptions = new GUILayoutOption[] {
+			GUILayout.Width(300.0f), 
+			GUILayout.MinWidth(20.0f), 
+			GUILayout.ExpandWidth(true), 
+		};
+
+		GUILayoutOption[] labelOptions = new GUILayoutOption[]{
+			GUILayout.Width(200.0f),
+		};
+		
+		// Start the Vertical layout then add the label before adding a horizontal so the label will be on top of side-by-side options
+		GUILayout.BeginVertical();
+		GUILayout.Label(_instance.ToString(), labelOptions);
+		GUILayout.BeginHorizontal();
+		
+		// Create the x settings enum
+		_instance.changeX = (CameraSettingsToggle)EditorGUILayout.EnumPopup("", instance.changeX);
+		
+		// Create the value/disabled information field
+		if (_instance.changeX == CameraSettingsToggle.NewValue){
+			_instance.newValue.x = EditorGUILayout.FloatField(_instance.newValue.x, floatOptions);
+		} else {
+			EditorGUI.BeginDisabledGroup(true);
+			EditorGUILayout.TextField(_instance.changeX == CameraSettingsToggle.NoChange ? "Unchanged" : "Reset", floatOptions);
+			EditorGUI.EndDisabledGroup();
+		}
+		  
+		// It do what it do.
+		GUILayout.Space(5);
+		
+		// Create the y settings enum
+		_instance.changeY = (CameraSettingsToggle)EditorGUILayout.EnumPopup("", _instance.changeY);
+		
+		// Create the value/disabled information field
+		if (_instance.changeY == CameraSettingsToggle.NewValue){
+			_instance.newValue.y = EditorGUILayout.FloatField(_instance.newValue.y, floatOptions);
+		} else {
+			EditorGUI.BeginDisabledGroup(true);
+			EditorGUILayout.TextField(_instance.changeY == CameraSettingsToggle.NoChange ? "Unchanged" : "Reset", floatOptions);
+			EditorGUI.EndDisabledGroup();
+		}
+		
+		// It do what it do.
+		GUILayout.Space(5);
+		
+		// Create the y settings enum
+		_instance.changeZ = (CameraSettingsToggle)EditorGUILayout.EnumPopup("", _instance.changeZ);
+		
+		// Create the value/disabled information field
+		if (_instance.changeZ == CameraSettingsToggle.NewValue){
+			_instance.newValue.z = EditorGUILayout.FloatField(_instance.newValue.z, floatOptions);
+		} else {
+			EditorGUI.BeginDisabledGroup(true);
+			EditorGUILayout.TextField(_instance.changeZ == CameraSettingsToggle.NoChange ? "Unchanged" : "Reset", floatOptions);
+			EditorGUI.EndDisabledGroup();
+		}
+		
+		// Close this line up
+		GUILayout.EndHorizontal();
+		GUILayout.EndVertical();
+		
+		// Reset to default so the rest of things don't get messed up
+		EditorGUIUtility.labelWidth = 0;
+		return _instance;
+	}
+}
+
 public class Vector2CameraValueGroupDrawer : ObjectDrawer<Vector2CameraValueGroup>  {
 	public override Vector2CameraValueGroup OnGUI(GUIContent _content, Vector2CameraValueGroup _instance){
 		// Remove label for floats
@@ -175,16 +322,20 @@ namespace NodeCanvas.Tasks.Actions {
 	[Category("Reset")]
 	[Description("Change Cinemachine camera settings for the player")]
 	public class ChangeCameraSettings : ActionTask{
+		[ParadoxNotion.Design.Header("Main Settings")]
+		public FloatCameraValueGroup fieldOfView = new (newLabel: "FOV");
+		
 		[ParadoxNotion.Design.Header("Orbit Follow Ring Settings")]
-		public OrbitalFollowValueGroup orbitFollowTop = new OrbitalFollowValueGroup(newLabel: "Top");
-		public OrbitalFollowValueGroup orbitFollowCenter = new OrbitalFollowValueGroup(newLabel: "Center");
-		public OrbitalFollowValueGroup orbitFollowBottom = new OrbitalFollowValueGroup(newLabel: "Bottom");
+		public OrbitalFollowValueGroup orbitFollowTop = new (newLabel: "Top");
+		public OrbitalFollowValueGroup orbitFollowCenter = new (newLabel: "Center");
+		public OrbitalFollowValueGroup orbitFollowBottom = new (newLabel: "Bottom");
 		
 		[ParadoxNotion.Design.Header("Rotation Composer Settings")]
-		public Vector2CameraValueGroup screenPosition = new Vector2CameraValueGroup(newLabel: "Screen Position");
+		public Vector2CameraValueGroup screenPosition = new (newLabel: "Screen Position");
+		
+		[ParadoxNotion.Design.Header("Camera Offset Settings")]
+		public Vector3CameraValueGroup cameraOffset = new (newLabel: "Screen Position");
 		
-		private CinemachineOrbitalFollow orbitalFollow;
-
 		//Use for initialization. This is called only once in the lifetime of the task.
 		//Return null if init was successfull. Return an error string otherwise
 		protected override string OnInit(){
@@ -196,6 +347,17 @@ namespace NodeCanvas.Tasks.Actions {
 		//EndAction can be called from anywhere.
 		protected override void OnExecute(){
 			// Switch case farm for checking if values should be changed and what to
+			// Field of view
+			switch (fieldOfView.changeValue) {
+				case CameraSettingsToggle.NewValue:
+					CameraSettingsProcessor.values.mainFieldOfView.targetValue = fieldOfView.value;
+					break;
+				case CameraSettingsToggle.ResetValue:
+					CameraSettingsProcessor.values.mainFieldOfView.Reset();
+					break;
+			}
+			
+			// Orbit follow rings
 			switch (orbitFollowTop.changeHeight) {
 				case CameraSettingsToggle.NewValue:
 					CameraSettingsProcessor.values.orbitFollowTopHeight.targetValue = orbitFollowTop.height;
@@ -250,29 +412,50 @@ namespace NodeCanvas.Tasks.Actions {
 					break;
 			}
 
+			// Screen Position
 			switch (screenPosition.changeX) {
 				case CameraSettingsToggle.NewValue:
-					CameraSettingsProcessor.values.rotationComposerScreenPos.targetValue = new Vector2(
-						screenPosition.newValue.x,
-						CameraSettingsProcessor.values.rotationComposerScreenPos.originalValue.y);
-						break;
+					CameraSettingsProcessor.values.rotationComposerScreenPos.targetValue.x = screenPosition.newValue.x;
+					break;
 				case CameraSettingsToggle.ResetValue:
-					CameraSettingsProcessor.values.rotationComposerScreenPos.targetValue = new Vector2(
-						CameraSettingsProcessor.values.rotationComposerScreenPos.originalValue.x, 
-						CameraSettingsProcessor.values.rotationComposerScreenPos.originalValue.y);
+					CameraSettingsProcessor.values.rotationComposerScreenPos.targetValue.x = CameraSettingsProcessor.values.rotationComposerScreenPos.originalValue.x;
 					break;
 			}
 			
 			switch (screenPosition.changeY) {
 				case CameraSettingsToggle.NewValue:
-					CameraSettingsProcessor.values.rotationComposerScreenPos.targetValue = new Vector2(
-						CameraSettingsProcessor.values.rotationComposerScreenPos.originalValue.x, 
-						screenPosition.newValue.y);
+					CameraSettingsProcessor.values.rotationComposerScreenPos.targetValue.y = screenPosition.newValue.y;
 					break;
 				case CameraSettingsToggle.ResetValue:
-					CameraSettingsProcessor.values.rotationComposerScreenPos.targetValue = new Vector2(
-						CameraSettingsProcessor.values.rotationComposerScreenPos.originalValue.x,
-						CameraSettingsProcessor.values.rotationComposerScreenPos.originalValue.y);
+					CameraSettingsProcessor.values.rotationComposerScreenPos.targetValue.y = CameraSettingsProcessor.values.rotationComposerScreenPos.originalValue.y;
+					break;
+			}
+			
+			// Camera Offset
+			switch (cameraOffset.changeX) {
+				case CameraSettingsToggle.NewValue:
+					CameraSettingsProcessor.values.cameraOffsetOffset.targetValue.x = cameraOffset.newValue.x;
+					break;
+				case CameraSettingsToggle.ResetValue:
+					CameraSettingsProcessor.values.cameraOffsetOffset.targetValue.x = CameraSettingsProcessor.values.cameraOffsetOffset.originalValue.x;
+					break;
+			}
+			
+			switch (cameraOffset.changeY) {
+				case CameraSettingsToggle.NewValue:
+					CameraSettingsProcessor.values.cameraOffsetOffset.targetValue.y = cameraOffset.newValue.y;
+					break;
+				case CameraSettingsToggle.ResetValue:
+					CameraSettingsProcessor.values.cameraOffsetOffset.targetValue.y = CameraSettingsProcessor.values.cameraOffsetOffset.originalValue.y;
+					break;
+			}
+			
+			switch (cameraOffset.changeZ) {
+				case CameraSettingsToggle.NewValue:
+					CameraSettingsProcessor.values.cameraOffsetOffset.targetValue.z = cameraOffset.newValue.z;
+					break;
+				case CameraSettingsToggle.ResetValue:
+					CameraSettingsProcessor.values.cameraOffsetOffset.targetValue.z = CameraSettingsProcessor.values.cameraOffsetOffset.originalValue.z;
 					break;
 			}