Merge pull request #4 from xavierpuigf/dev

Added functionality to the simulator to specify x,y,z or x,z coordinates when placing objects

Author: xavierpuigf

Assets/Story Generator/Scripts/GameObjectUtils.cs

@@ -207,15 +207,15 @@ public static List<Vector3> GetWalkLocation(Vector3[] points, out Vector3 curren
         }
 
         public static List<Vector3> CalculatePutPositions(Vector3 intPos, GameObject go, GameObject goDest, bool putInside,
-            bool ignoreObstacles)
+            bool ignoreObstacles, Vector2? destPos = null, float yPos = -1)
         {
 
-            return CalculatePutPositions(intPos, GetBounds(go), go.transform.position, goDest, putInside, ignoreObstacles);
+            return CalculatePutPositions(intPos, GetBounds(go), go.transform.position, goDest, putInside, ignoreObstacles, destPos, yPos);
         }
 
         // Put object go to goDest, character is at interaction position
         public static List<Vector3> CalculatePutPositions(Vector3 intPos, Bounds srcBounds, Vector3 srcPos, GameObject goDest, 
-            bool putInside, bool ignoreObstacles)
+            bool putInside, bool ignoreObstacles, Vector2? destPos = null, float yPos = -1)
         {
 
             // "Optimal" distance from character to search for space (0.5 meters)
@@ -266,37 +266,68 @@ public static List<Vector3> CalculatePutPositions(Vector3 intPos, Bounds srcBoun
             }
 
             Vector3 center = new Vector3(intPos.x + dir.x, 0, intPos.z + dir.z);
+            // If position specified
+            if (destPos == null)
+                for (float r = min_center_distance; r <= putCenterDistance; r += 0.1f) {  // advance radii by 10 cm
+                    for (int i = 0; i < 20; i++) {                      // angle quantization is 360/20 = 18 degrees
+                        float phi = 2 * Mathf.PI * i / 20;
+                        float x = center.x + r * Mathf.Cos(phi);
+                        float z = center.z + r * Mathf.Sin(phi);
+                        Vector3 srcDelta;
 
-            for (float r = min_center_distance; r <= putCenterDistance; r += 0.1f) {  // advance radii by 10 cm
-                for (int i = 0; i < 20; i++) {                      // angle quantization is 360/20 = 18 degrees
-                    float phi = 2 * Mathf.PI * i / 20;
-                    float x = center.x + r * Mathf.Cos(phi);
-                    float z = center.z + r * Mathf.Sin(phi);
-                    Vector3 srcDelta;
-
-                    if (putInside)
-                        srcDelta = new Vector3(x - srcCenter.x, destMax.y - srcBounds.size.y - 0.03f - srcBounds.min.y, z - srcCenter.z);
-                    else
-                        srcDelta = new Vector3(x - srcCenter.x, destMax.y - srcBounds.min.y, z - srcCenter.z);
+                        if (putInside)
+                            srcDelta = new Vector3(x - srcCenter.x, destMax.y - srcBounds.size.y - 0.03f - srcBounds.min.y, z - srcCenter.z);
+                        else
+                            srcDelta = new Vector3(x - srcCenter.x, destMax.y - srcBounds.min.y, z - srcCenter.z);
 
-                    // Check if placement is sufficiently far from boundary
-                    // bool ok = x > destMin.x + 0.1f && z > destMin.z + 0.1f && x < destMax.x - 0.1f && z < destMax.z - 0.1f;
+                        // Check if placement is sufficiently far from boundary
+                        // bool ok = x > destMin.x + 0.1f && z > destMin.z + 0.1f && x < destMax.x - 0.1f && z < destMax.z - 0.1f;
 
-                    //if (!ok)
-                    //    continue;
+                        //if (!ok)
+                        //    continue;
 
-                    float hity;
+                        float hity;
 
-                    if (HitFlatSurface(srcBounds, srcDelta, goDest, out hity)) {
+                        if (HitFlatSurface(srcBounds, srcDelta, goDest, out hity)) {
 
-                        float yDelta = hity - (srcBounds.min.y + srcDelta.y);
-                        Vector3 delta = srcDelta + new Vector3(0, yDelta, 0);
+                            float yDelta = hity - (srcBounds.min.y + srcDelta.y);
+                            Vector3 delta = srcDelta + new Vector3(0, yDelta, 0);
 
-                        if (putInside || ignoreObstacles || !CheckBox(srcBounds, delta, 0.01f, goDest)) {
-                            result.Add(srcPos + delta);
+                            if (putInside || ignoreObstacles || !CheckBox(srcBounds, delta, 0.01f, goDest)) {
+                                result.Add(srcPos + delta);
+                            }
                         }
                     }
                 }
+            else
+            {
+                // obtain x and z values from the destination
+                float x = destPos.Value.x;
+                float z = destPos.Value.y;
+
+                Vector3 srcDelta;
+
+                if (yPos != -1) {
+                    srcDelta = new Vector3(x - srcCenter.x, yPos, z - srcCenter.z);
+                }
+                else if (putInside)
+                    srcDelta = new Vector3(x - srcCenter.x, destMax.y - srcBounds.size.y - 0.03f - srcBounds.min.y, z - srcCenter.z);
+                else
+                    srcDelta = new Vector3(x - srcCenter.x, destMax.y - srcBounds.min.y, z - srcCenter.z);
+
+                float hity;
+
+                if (HitFlatSurface(srcBounds, srcDelta, goDest, out hity))
+                {
+
+                    float yDelta = hity - (srcBounds.min.y + srcDelta.y);
+                    Vector3 delta = srcDelta + new Vector3(0, yDelta, 0);
+
+                    if (putInside || ignoreObstacles || !CheckBox(srcBounds, delta, 0.01f, goDest))
+                    {
+                        result.Add(srcPos + delta);
+                    }
+                }
             }
             return result;
         }

Assets/Story Generator/Scripts/ScriptExecution.cs

@@ -18,6 +18,7 @@
 using System.Text;
 using StoryGenerator.DoorProperties;
 using System.Threading;
+using System.Globalization;
 
 
 namespace StoryGenerator.Utilities
@@ -343,16 +344,20 @@ public class PutAction : IAction
     {
         public ScriptObjectName Name { get; private set; }
         public ScriptObjectName DestName { get; private set; }
+        public Vector2? DestPos { get; private set; } // put destination position
+        public float Y { get; private set; }
         public int ScriptLine { get; private set; }
         public bool PutInside { get; private set; }
         public IObjectSelector Selector;
 
 
-        public PutAction(int scriptLine, IObjectSelector selector, string name, int instance, string destName, int destInstance, bool putInside)
+        public PutAction(int scriptLine, IObjectSelector selector, string name, int instance, string destName, int destInstance, bool putInside, Vector2? destPos, float y = -1)
         {
             ScriptLine = scriptLine;
             Name = new ScriptObjectName(name, instance);
             DestName = new ScriptObjectName(destName, destInstance);
+            DestPos = destPos;
+            Y = y;
             PutInside = putInside;
             Selector = selector;
 
@@ -2463,7 +2468,7 @@ private IEnumerable<IStateGroup> ProcessPutAction(PutAction a, State current)
                 if (fbbe != null)
                 {
                     // We need to calculate putback position
-                    foreach (Vector3 pos in GameObjectUtils.CalculatePutPositions(current.InteractionPosition, sod.GameObject, sodDest.GameObject, a.PutInside, false))
+                    foreach (Vector3 pos in GameObjectUtils.CalculatePutPositions(current.InteractionPosition, sod.GameObject, sodDest.GameObject, a.PutInside, false, a.DestPos, a.Y))
                     {
                         State s = new State(current, a, current.InteractionPosition, ExecutePut);
                         s.AddScriptGameObject(a.Name, sod.GameObject, pos, current.InteractionPosition, false);
@@ -4000,7 +4005,7 @@ public static void ParseScript(List<ScriptExecutor> sExecutors, IList<string> sc
                 ParseScriptForChar(sExecutors[i], scriptLines, i, actionEquivProvider);
             }
         }
-
+            
         private static void ParseScriptForChar(ScriptExecutor sExecutor, IList<string> scriptLines, int charIndex,
             ActionEquivalenceProvider actionEquivProvider)
         {
@@ -4014,7 +4019,7 @@ private static void ParseScriptForChar(ScriptExecutor sExecutor, IList<string> s
                 if (sl != null)
                     sLines.Add(sl);
             }
-            sExecutor.sLines = new List<ScriptLine>(sLines);
+            //sExecutor.sLines = new List<ScriptLine>(sLines);
             for (int i = 0; i < sLines.Count; i++)
             {
                 ScriptLineToAction(sExecutor, i, sLines);
@@ -4124,7 +4129,37 @@ private static void ScriptLineToAction(ScriptExecutor sExecutor, int index, ILis
                 case InteractionType.PUTIN:
                     if (string.IsNullOrEmpty(name1))
                         throw new ScriptReaderException($"No second argument for [{sl.Interaction}]");
-                    sExecutor.AddAction(new PutAction(sl.LineNumber, sExecutor.GetObjectSelector(name1, instance1), name0, instance0, name1, instance1, sl.Interaction == InteractionType.PUTIN));
+                    
+                    if (sl.Parameters.Count > 2)
+                    {
+                        string strpos = sl.Parameters[sl.Parameters.Count-1].Item1;
+                        Debug.Log("POSITION: " + strpos);
+                        string[] positions = strpos.Split(',');
+                        if (positions.Length == 3)
+                        {
+                            NumberFormatInfo fmt = new NumberFormatInfo();
+                            fmt.NegativeSign = "-";
+                            Vector2 pos = new Vector2(float.Parse(positions[0], fmt), float.Parse(positions[2], fmt));
+                            float y = float.Parse(positions[1], fmt);
+                            sExecutor.AddAction(new PutAction(sl.LineNumber, sExecutor.GetObjectSelector(name1, instance1), name0, instance0, name1, instance1, sl.Interaction == InteractionType.PUTIN, pos, y)); //TODO: add destPos
+                        }
+                        else if (positions.Length == 2)
+                        {
+                            NumberFormatInfo fmt = new NumberFormatInfo();
+                            fmt.NegativeSign = "-";
+                            Vector2 pos = new Vector2(float.Parse(positions[0], fmt), float.Parse(positions[1], fmt));
+                            sExecutor.AddAction(new PutAction(sl.LineNumber, sExecutor.GetObjectSelector(name1, instance1), name0, instance0, name1, instance1, sl.Interaction == InteractionType.PUTIN, pos, -1)); //TODO: add destPos
+                        }
+                        else
+                        {
+                            sExecutor.AddAction(new PutAction(sl.LineNumber, sExecutor.GetObjectSelector(name1, instance1), name0, instance0, name1, instance1, sl.Interaction == InteractionType.PUTIN, null, -1));
+                        }
+                    }
+                    else
+                    {
+                        sExecutor.AddAction(new PutAction(sl.LineNumber, sExecutor.GetObjectSelector(name1, instance1), name0, instance0, name1, instance1, sl.Interaction == InteractionType.PUTIN, null, -1));
+                    }
+                    
                     break;
                 case InteractionType.PUTOBJBACK:
                     sExecutor.AddAction(new PutBackAction(sl.LineNumber, name0, instance0));
@@ -4215,6 +4250,8 @@ private static ScriptLine ParseLineForChar(int charIndex, string line, int lineN
             string pattAction = @"\[(\w+)\]";
             string pattParams = @"<([\w\s]+)>\s*\((\d+)\)\s*(:\d+:)?";
             string pattchar = @"<char(\d+)>";
+            string pattPos = @"(-?\d+\.?\d*(E-\d+)?),(-?\d+\.?\d*(E-\d+)?),(-?\d+\.?\d*(E-\d+)?)";
+            string pattPosXZ = @"(-?\d+\.?\d*(E-\d+)?),(-?\d+\.?\d*(E-\d+)?)";
 
             string[] sentences = line.Split('|');
 
@@ -4237,7 +4274,6 @@ private static ScriptLine ParseLineForChar(int charIndex, string line, int lineN
                 //				Debug.Log (lineNo + ',' + sentence);
 
 
-
                 // Parse action
                 r = new Regex(pattAction);
                 m = r.Match(sentence);
@@ -4263,7 +4299,6 @@ private static ScriptLine ParseLineForChar(int charIndex, string line, int lineN
                     }
                     m = m.NextMatch();
                 }
-
                 if (paramList.Count == 1)
                 {
                     string newActionStr;
@@ -4278,6 +4313,36 @@ private static ScriptLine ParseLineForChar(int charIndex, string line, int lineN
                     if (actionEquivProvider.TryGetEquivalentAction(actionStr, paramList[0].Item1, paramList[1].Item1, out newActionStr))
                         actionStr = newActionStr;
                 }
+                /*else if (paramList.Count == 3) //TODO: either continue with this or remove/use parse position
+                {
+                    string newActionStr;
+                    if (actionEquivProvider.TryGetEquivalentAction(actionStr, paramList[0].Item1, paramList[1].Item1, paramList[2].Item1, out newActionStr))
+                        actionStr = newActionStr;
+                }*/
+
+                // Parse position x,y,z
+                r = new Regex(pattPos);
+                m = r.Match(sentence);
+
+                if (m.Success)
+                {
+                    // 2.5,3.4,1.5
+                    paramList.Add(Tuple.Create(m.Groups[0].Value, 0));
+                } else
+                {
+                    // Parse position x,z
+                    r = new Regex(pattPosXZ);
+                    m = r.Match(sentence);
+
+                    if (m.Success)
+                    {
+                        // 2.5,3.4
+                        paramList.Add(Tuple.Create(m.Groups[0].Value, 0));
+                    }
+                }
+
+              
+
 
                 InteractionType action = (InteractionType)Enum.Parse(typeof(InteractionType), actionStr, true);
                 return new ScriptLine() { Interaction = action, Parameters = paramList, LineNumber = lineNo, modifier = modifier };