Updates with new settings system

Author: jackbrookes

Assets/ExpMngr/Example.unity

@@ -1,4 +1,5 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using System.IO;
@@ -16,7 +17,7 @@ public void GenerateAndRunExperiment() {
         /// This function can be called using the ExperimentSession inspector OnSessionStart() event, or otherwise
 
 
-        // / In the example_output/experiment_name/ folder we have a settings.json
+        // / In the StreamingAssets folder we have a several .json files that contain settings, e.g.
         // / that looks like this:
         // 
         //  {
@@ -35,29 +36,31 @@ public void GenerateAndRunExperiment() {
 
         // practice block
         var practiceBlock = new ExpMngr.Block(exp); // block 1
-        for (int i = 0; i < (long)exp.settings["n_practice_trials"]; i++)
+        for (int i = 0; i < Convert.ToInt32(exp.settings["n_practice_trials"]); i++)
             new ExpMngr.Trial(practiceBlock);
         // main block
         var mainBlock = new ExpMngr.Block(exp); // block 2
-        for (int i = 0; i < (long) exp.settings["n_main_trials"]; i++)
+        for (int i = 0; i < Convert.ToInt32(exp.settings["n_main_trials"]); i++)
             new ExpMngr.Trial(mainBlock);
 
 
         // here we set a setting for the 2nd trial of the main block as an example.
-        exp.GetBlock(2).GetRelativeTrial(2).settings["size"] = 2;
+        exp.GetBlock(2).GetRelativeTrial(2).settings["size"] = 10;
 
-        // start first trial
-        RunNextTrial();
+        // begin first trial
+        exp.BeginNextTrial();
     }
 
     void Update()
     {
-        // here we are mimicking some experiment behaviour 
+        // here we are mimicking some experiment behaviour, e.g waiting for user to interact with scene
         if (Time.time > startNextTime && exp.inTrial)
         {
-            exp.currentTrial.End();
+            Debug.Log("Ending trial");
             if (exp.currentTrial == exp.lastTrial)
             {
+                // end, then quit
+                exp.currentTrial.End();
                 #if UNITY_EDITOR
                     UnityEditor.EditorApplication.isPlaying = false;
                 #elif UNITY_WEBPLAYER
@@ -68,16 +71,19 @@ void Update()
             }
             else
             {
-                RunNextTrial();
-            }            
+                // end trial
+                exp.currentTrial.End();
+            }
         }
     }
 
-    void RunNextTrial()
+    public void RunTrial()
     {
-        Debug.Log("Starting trial!");
-        exp.nextTrial.Begin();
+        Debug.Log("Running trial!");
 
+        // we can access our settings to (e.g.) modify our scene
+        Debug.LogFormat("The 'size' for this trial is: {0}", Convert.ToSingle(exp.currentTrial.settings["size"]));
+
         // record custom values...
         string observation = UnityEngine.Random.value.ToString();
         Debug.Log(string.Format("We observed: {0}", observation));