otw - Toying around with Behaviour trees again, trying to optimize fo…

…r goal discovery / tracking.

Assets/OpenCog Assets/Scripts/OpenCog/Actions/OCActionController.cs

@@ -165,7 +165,10 @@ public IEnumerator Start ()
 
 			foreach( OCAction action in actions)
 			{
-				if(action.FullName.Contains(treeName) || treeName.Contains("Behaviour"))
+				if(	   (action.FullName.Contains(treeName) || treeName.Contains("Behaviour")) 
+					&& !(treeName == "GhostBehaviour" && action.name.Contains("Create"))
+					&& !(treeName == "GhostBehaviour" && action.name.Contains("Destroy"))
+				  )
 				{
 					int actionTypeID = (int)Enum.Parse(typeof(BLOCBehaviours.ActionType), action.FullName);
 

Assets/OpenCog Assets/Scripts/OpenCog/Actions/OCGoalController.cs

@@ -93,7 +93,29 @@ public Vector3i GoalBlockPos
 		get { return _goalBlockPos;}
 		set { _goalBlockPos = value;}
 	}
-
+
+	public string BlockType 
+	{
+		get {
+			return this._blockType;
+		}
+		set {
+			_blockType = value;
+			if(_map != null)
+				_goalBlockType = _map.GetBlockSet().GetBlock(_blockType);
+		}
+	}	
+
+	public OCBlock GoalBlockType 
+	{
+		get {
+			return this._goalBlockType;
+		}
+		set {
+			_goalBlockType = value;
+		}
+	}		
+
 	//---------------------------------------------------------------------------
 
 	#endregion
@@ -122,8 +144,9 @@ public void UpdateGoal()
 	{
 
 		List3D<OCChunk> chunks = _map.GetChunks ();
-
-		FindGoalBlockPositionInChunks(chunks);
+
+		// Since this is probably bogging down the gameplay, switch it to block creation only.
+		//FindGoalBlockPositionInChunks(chunks);
 
 		Vector3 sourcePos = gameObject.transform.position;
 		Vector3 distanceVec = ((Vector3)GoalBlockPos) - sourcePos;
@@ -163,7 +186,7 @@ public void UpdateGoal()
 
 	//---------------------------------------------------------------------------
 
-	private void FindGoalBlockPositionInChunks(List3D<OCChunk> chunks)
+	public void FindGoalBlockPositionInChunks(List3D<OCChunk> chunks)
 	{
 		Vector3 sourcePos = gameObject.transform.position;
 		Vector3 distanceVec = ((Vector3)GoalBlockPos) - sourcePos;
@@ -215,16 +238,7 @@ private void FindGoalBlockPositionInChunks(List3D<OCChunk> chunks)
 												GoalBlockPos = candidatePos;
 												distanceVec = candidateVec;
 
-												if(_ShouldMoveTargets)
-												{
-													OCAction[] actions = gameObject.GetComponentsInChildren<OCAction>();
-
-													foreach(OCAction action in actions)
-													{
-														action.EndTarget.transform.position = new Vector3(GoalBlockPos.x, GoalBlockPos.y, GoalBlockPos.z);
-														action.StartTarget.transform.position = gameObject.transform.position;
-													}
-												}
+												MoveTargetsIfNecessary ();
 
 												Debug.Log("We found some " + _goalBlockType.GetName() + " nearby: " + GoalBlockPos + "!");
 											}
@@ -253,6 +267,23 @@ private void FindGoalBlockPositionInChunks(List3D<OCChunk> chunks)
 			}
 
 	}
+
+	/// <summary>
+	/// Moves the targets if necessary.
+	/// </summary>
+	public void MoveTargetsIfNecessary ()
+	{
+		if(_ShouldMoveTargets)
+		{
+			OCAction[] actions = gameObject.GetComponentsInChildren<OCAction>();
+
+			foreach(OCAction action in actions)
+			{
+				action.EndTarget.transform.position = new Vector3(GoalBlockPos.x, GoalBlockPos.y, GoalBlockPos.z);
+				action.StartTarget.transform.position = gameObject.transform.position;
+			}
+		}
+	}
 
 	//---------------------------------------------------------------------------
 

Assets/OpenCog Assets/Scripts/OpenCog/Builder/OCBuilder.cs

@@ -26,6 +26,7 @@
 using UnityEngine;
 using System.Linq;
 using OpenCog.Map;
+using OpenCog.Actions;
 
 //The private field is assigned but its value is never used
 #pragma warning disable 0414
@@ -170,6 +171,23 @@ public void Update()
 					OpenCog.Map.OCBlockData block = OCBlockData.CreateInstance<OCBlockData>().Init(_selectedBlock, OpenCog.Utility.VectorUtil.Vector3ToVector3i(point.Value));
 					block.SetDirection(GetDirection(-transform.forward));
 					_map.SetBlockAndRecompute(block, point.Value);
+
+					OCGoalController[] goalControllers = (OCGoalController[])GameObject.FindObjectsOfType(typeof(OCGoalController));
+
+					foreach(OCGoalController goalController in goalControllers)
+					{
+						if(goalController.GoalBlockType == _selectedBlock)
+						{
+							Vector3 sourcePos = goalController.gameObject.transform.position;
+							Vector3 oldDistanceVec = ((Vector3)goalController.GoalBlockPos) - sourcePos;
+							Vector3 newDistanceVec = point.Value - sourcePos;
+							if(newDistanceVec.sqrMagnitude < oldDistanceVec.sqrMagnitude)
+							{
+								goalController.GoalBlockPos = point.Value;	
+								goalController.MoveTargetsIfNecessary();
+							}
+						}
+					}	
 				}
 			}
 		}

Assets/OpenCog Assets/Scripts/OpenCog/Extensions/OCCreateBlockEffect.cs

@@ -29,6 +29,7 @@
 using System.Linq;
 using OpenCog.Utility;
 using UnityEngine;
+using OpenCog.Actions;
 
 //The private field is assigned but its value is never used
 #pragma warning disable 0414
@@ -91,7 +92,7 @@ public void CreateBlock(Vector3i? point)
 					OCBlock block = map.GetBlockSet().GetBlock(_BlockType);
 
 					//block.SetDirection(GetDirection(-gameObject.transform.forward));
-
+				
 					OCBlockData blockData = OCBlockData.CreateInstance<OCBlockData>().Init(block, VectorUtil.Vector3ToVector3i(point.Value));
 					map.SetBlockAndRecompute(blockData, point.Value);
 				}

Assets/OpenCog Assets/Scripts/OpenCog/Extensions/OCDestroyBlockEffect.cs

@@ -27,6 +27,8 @@
 using GameObject = UnityEngine.GameObject;
 using System.Linq;
 using System.Collections.Generic;
+using OpenCog.Actions;
+using OpenCog.BlockSet.BaseBlockSet;
 
 //The private field is assigned but its value is never used
 #pragma warning disable 0414
@@ -84,6 +86,19 @@ public void DestroyBlock(Vector3i? point)
 			if(point.HasValue)
 			{
 				OCMap map = (OCMap)GameObject.FindSceneObjectsOfType(typeof(OCMap)).FirstOrDefault();
+
+				OCGoalController[] goalControllers = (OCGoalController[])GameObject.FindObjectsOfType(typeof(OCGoalController));
+
+				OCBlock blockType = map.GetBlock(point.Value).block;
+
+				foreach(OCGoalController goalController in goalControllers)
+				{
+					if(goalController.GoalBlockType == blockType)
+					{
+						goalController.FindGoalBlockPositionInChunks(map.GetChunks());
+					}
+				}
+
 				map.SetBlockAndRecompute(OCBlockData.CreateInstance<OCBlockData>().Init(null, point.Value), point.Value);
 			}
 		}

Assets/OpenCog Assets/Scripts/OpenCog/Utility/OCConfig.cs

@@ -242,6 +242,9 @@ public void LoadFromCommandLine()
 
 		foreach(string arg in args)
 		{
+			if(arg == args[0])
+				continue;
+
 			string[] keyValuePair = arg.Split(':');
 			if(keyValuePair != null && _settings.ContainsKey(keyValuePair[0]))
 			{

Assets/Plugins/OCBehavioursInfo.txt

@@ -17,7 +17,6 @@ Trees:
 	Character_ForwardMove
 	Character_BackwardMove
 	Character_DownMove
-	Character_EmoteShow
 	Character_FaceShow
 	Character_KickActivate
 	Character_LeftMove
@@ -32,7 +31,7 @@ Trees:
 	Character_TurnAndDestroy
 	Character_GirlBehaviour
 	Character_GhostBehaviour
-	Character_NewTree1
+	Character_EmoteShow
 	Unknown
 
 Contexts: