Add ObstacleDetection option to DetectTargetRadius 2D and 3D decisions.

Author: marcosecchi

Common/Scripts/AI/Graph/Decisions/AIDecisionDetectTargetRadius2DNode.cs

@@ -14,6 +14,7 @@ public class AIDecisionDetectTargetRadius2DNode : AIDecisionNode
         public float radius = 3f;
         public Vector3 detectionOriginOffset = new Vector3(0, 0, 0);
         public LayerMask targetLayer;
+        public bool obstacleDetection = true;
         public LayerMask obstacleMask;
 
         public override AIDecision AddDecisionComponent(GameObject go)
@@ -23,6 +24,7 @@ public override AIDecision AddDecisionComponent(GameObject go)
             decision.Radius = radius;
             decision.DetectionOriginOffset = detectionOriginOffset;
             decision.TargetLayer = targetLayer;
+            decision.ObstacleDetection = obstacleDetection;
             decision.ObstacleMask = obstacleMask;
             return decision;
         }

Common/Scripts/AI/Graph/Decisions/AIDecisionDetectTargetRadius3DNode.cs

@@ -14,6 +14,7 @@ public class AIDecisionDetectTargetRadius3DNode : AIDecisionNode
         public float radius = 3f;
         public Vector3 detectionOriginOffset = new Vector3(0, 0, 0);
         public LayerMask targetLayerMask;
+        public bool obstacleDetection = true;
         public LayerMask obstacleMask;
         public float targetCheckFrequency = 1f;
 
@@ -23,6 +24,7 @@ public override AIDecision AddDecisionComponent(GameObject go)
             decision.Label = label;
             decision.Radius = radius;
             decision.DetectionOriginOffset = detectionOriginOffset;
+            decision.ObstacleDetection = obstacleDetection;
             decision.TargetLayerMask = targetLayerMask;
             decision.ObstacleMask = obstacleMask;
             decision.TargetCheckFrequency = targetCheckFrequency;

Common/Scripts/AI/Graph/Decisions/Editor/AIDecisionDetectTargetRadius2DNodeEditor.cs

@@ -10,6 +10,7 @@ public class AIDecisionDetectTargetRadius2DNodeEditor : AIDecisionNodeEditor
         private SerializedProperty _radius;
         private SerializedProperty _detectionOriginOffset;
         private SerializedProperty _targetLayer;
+        private SerializedProperty _obstacleDetection;
         private SerializedProperty _obstacleMask;
 
         public override void OnBodyGUI()
@@ -19,13 +20,15 @@ public override void OnBodyGUI()
             _radius = serializedObject.FindProperty("radius");
             _detectionOriginOffset = serializedObject.FindProperty("detectionOriginOffset");
             _targetLayer = serializedObject.FindProperty("targetLayer");
+            _obstacleDetection = serializedObject.FindProperty("obstacleDetection");
             _obstacleMask = serializedObject.FindProperty("obstacleMask");
 
             serializedObject.Update();
             EditorGUIUtility.labelWidth = 120;
             NodeEditorGUILayout.PropertyField(_radius);
             NodeEditorGUILayout.PropertyField(_detectionOriginOffset);
             NodeEditorGUILayout.PropertyField(_targetLayer);
+            NodeEditorGUILayout.PropertyField(_obstacleDetection);
             NodeEditorGUILayout.PropertyField(_obstacleMask);
             serializedObject.ApplyModifiedProperties();
         }

Common/Scripts/AI/Graph/Decisions/Editor/AIDecisionDetectTargetRadius3DNodeEditor.cs

@@ -10,13 +10,15 @@ public class AIDecisionDetectTargetRadius3DNodeEditor : AIDecisionNodeEditor
         private SerializedProperty _radius;
         private SerializedProperty _detectionOriginOffset;
         private SerializedProperty _targetLayerMask;
+        private SerializedProperty _obstacleDetection;
         private SerializedProperty _obstacleMask;
         private SerializedProperty _targetCheckFrequency;
 
         protected override void SerializeAdditionalProperties()
         {
             _radius = serializedObject.FindProperty("radius");
             _detectionOriginOffset = serializedObject.FindProperty("detectionOriginOffset");
+            _obstacleDetection = serializedObject.FindProperty("obstacleDetection");
             _targetLayerMask = serializedObject.FindProperty("targetLayerMask");
             _obstacleMask = serializedObject.FindProperty("obstacleMask");
             _targetCheckFrequency = serializedObject.FindProperty("targetCheckFrequency");
@@ -25,6 +27,7 @@ protected override void SerializeAdditionalProperties()
             EditorGUIUtility.labelWidth = 150;
             NodeEditorGUILayout.PropertyField(_radius);
             NodeEditorGUILayout.PropertyField(_detectionOriginOffset);
+            NodeEditorGUILayout.PropertyField(_obstacleDetection);
             NodeEditorGUILayout.PropertyField(_targetLayerMask);
             NodeEditorGUILayout.PropertyField(_obstacleMask);
             NodeEditorGUILayout.PropertyField(_targetCheckFrequency);