Bux fixes, new JSON deserialzation, and block/trial creation syntax

Author: Jack Brookes

Assets/ExpMngr/Examples/Basic/BasicExample.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1}
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
@@ -150,7 +150,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 42531501}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e984d0e88572a55418cdacaa553127a8, type: 3}
+  m_Script: {fileID: 11500000, guid: 990162a155419244291a1b13c7cb9f2b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
 --- !u!1 &184480070
@@ -213,145 +213,8 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &376669025
-Prefab:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 114734091223803794, guid: 628989ad7601cc449aa1a5ad29d1d483,
-        type: 2}
-      propertyPath: _customHeaders.Array.size
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 114734091223803794, guid: 628989ad7601cc449aa1a5ad29d1d483,
-        type: 2}
-      propertyPath: _trackedObjects.Array.size
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 114734091223803794, guid: 628989ad7601cc449aa1a5ad29d1d483,
-        type: 2}
-      propertyPath: onTrialBegin.m_PersistentCalls.m_Calls.Array.size
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 114734091223803794, guid: 628989ad7601cc449aa1a5ad29d1d483,
-        type: 2}
-      propertyPath: onSessionStart.m_PersistentCalls.m_Calls.Array.size
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4522850482104986, guid: 628989ad7601cc449aa1a5ad29d1d483, type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4522850482104986, guid: 628989ad7601cc449aa1a5ad29d1d483, type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4522850482104986, guid: 628989ad7601cc449aa1a5ad29d1d483, type: 2}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4522850482104986, guid: 628989ad7601cc449aa1a5ad29d1d483, type: 2}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4522850482104986, guid: 628989ad7601cc449aa1a5ad29d1d483, type: 2}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4522850482104986, guid: 628989ad7601cc449aa1a5ad29d1d483, type: 2}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4522850482104986, guid: 628989ad7601cc449aa1a5ad29d1d483, type: 2}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4522850482104986, guid: 628989ad7601cc449aa1a5ad29d1d483, type: 2}
-      propertyPath: m_RootOrder
-      value: 4
-      objectReference: {fileID: 0}
-    - target: {fileID: 114734091223803794, guid: 628989ad7601cc449aa1a5ad29d1d483,
-        type: 2}
-      propertyPath: _trackedObjects.Array.data[0]
-      value: 
-      objectReference: {fileID: 1294342340}
-    - target: {fileID: 224130118367839794, guid: 628989ad7601cc449aa1a5ad29d1d483,
-        type: 2}
-      propertyPath: m_AnchorMax.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 224130118367839794, guid: 628989ad7601cc449aa1a5ad29d1d483,
-        type: 2}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 224546371281550106, guid: 628989ad7601cc449aa1a5ad29d1d483,
-        type: 2}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 114734091223803794, guid: 628989ad7601cc449aa1a5ad29d1d483,
-        type: 2}
-      propertyPath: onSessionStart.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 114734091223803794, guid: 628989ad7601cc449aa1a5ad29d1d483,
-        type: 2}
-      propertyPath: onSessionStart.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 114734091223803794, guid: 628989ad7601cc449aa1a5ad29d1d483,
-        type: 2}
-      propertyPath: onSessionStart.m_PersistentCalls.m_Calls.Array.data[0].m_Target
-      value: 
-      objectReference: {fileID: 42531503}
-    - target: {fileID: 114734091223803794, guid: 628989ad7601cc449aa1a5ad29d1d483,
-        type: 2}
-      propertyPath: onSessionStart.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
-      value: GenerateAndRunExperiment
-      objectReference: {fileID: 0}
-    - target: {fileID: 114734091223803794, guid: 628989ad7601cc449aa1a5ad29d1d483,
-        type: 2}
-      propertyPath: onSessionStart.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
-      value: UnityEngine.Object, UnityEngine
-      objectReference: {fileID: 0}
-    - target: {fileID: 114734091223803794, guid: 628989ad7601cc449aa1a5ad29d1d483,
-        type: 2}
-      propertyPath: _customHeaders.Array.data[0]
-      value: some_variable
-      objectReference: {fileID: 0}
-    - target: {fileID: 114734091223803794, guid: 628989ad7601cc449aa1a5ad29d1d483,
-        type: 2}
-      propertyPath: onTrialBegin.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 114734091223803794, guid: 628989ad7601cc449aa1a5ad29d1d483,
-        type: 2}
-      propertyPath: onTrialBegin.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 114734091223803794, guid: 628989ad7601cc449aa1a5ad29d1d483,
-        type: 2}
-      propertyPath: onTrialBegin.m_PersistentCalls.m_Calls.Array.data[0].m_Target
-      value: 
-      objectReference: {fileID: 42531503}
-    - target: {fileID: 114734091223803794, guid: 628989ad7601cc449aa1a5ad29d1d483,
-        type: 2}
-      propertyPath: onTrialBegin.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
-      value: RunTrial
-      objectReference: {fileID: 0}
-    - target: {fileID: 114734091223803794, guid: 628989ad7601cc449aa1a5ad29d1d483,
-        type: 2}
-      propertyPath: onTrialBegin.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
-      value: UnityEngine.Object, UnityEngine
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 100100000, guid: 628989ad7601cc449aa1a5ad29d1d483, type: 2}
-  m_IsPrefabParent: 0
 --- !u!1 &411377147
 GameObject:
   m_ObjectHideFlags: 0
@@ -417,6 +280,68 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!1001 &448968640
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4522850482104986, guid: 0a3b6392f04558844bd340e68ced1ff9, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4522850482104986, guid: 0a3b6392f04558844bd340e68ced1ff9, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4522850482104986, guid: 0a3b6392f04558844bd340e68ced1ff9, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4522850482104986, guid: 0a3b6392f04558844bd340e68ced1ff9, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4522850482104986, guid: 0a3b6392f04558844bd340e68ced1ff9, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4522850482104986, guid: 0a3b6392f04558844bd340e68ced1ff9, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4522850482104986, guid: 0a3b6392f04558844bd340e68ced1ff9, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4522850482104986, guid: 0a3b6392f04558844bd340e68ced1ff9, type: 2}
+      propertyPath: m_RootOrder
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 114916036141644208, guid: 0a3b6392f04558844bd340e68ced1ff9,
+        type: 2}
+      propertyPath: onSessionBegin.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 42531503}
+    - target: {fileID: 114916036141644208, guid: 0a3b6392f04558844bd340e68ced1ff9,
+        type: 2}
+      propertyPath: onTrialBegin.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 42531503}
+    - target: {fileID: 224130118367839794, guid: 0a3b6392f04558844bd340e68ced1ff9,
+        type: 2}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224130118367839794, guid: 0a3b6392f04558844bd340e68ced1ff9,
+        type: 2}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 0a3b6392f04558844bd340e68ced1ff9, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1 &1294342339
 GameObject:
   m_ObjectHideFlags: 0
@@ -441,10 +366,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 1294342339}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9e3a2cc66bfc0464ab17c2b52f43036a, type: 3}
+  m_Script: {fileID: 11500000, guid: c4f3a3956a7d23649a55f93fefa9f7b3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  objectName: my_game_object
+  objectName: mygameobjects
 --- !u!4 &1294342341
 Transform:
   m_ObjectHideFlags: 0

Assets/ExpMngr/Examples/Basic/BasicExampleScript.cs

@@ -9,7 +9,7 @@
 /// </summary>
 public class BasicExampleScript : MonoBehaviour {
 
-    ExpMngr.ExperimentSession exp;
+    ExpMngr.ExperimentSession session;
     float startNextTime;
 
 
@@ -19,11 +19,11 @@ void Start()
         enabled = false;
     }
 
-    public void GenerateAndRunExperiment(ExpMngr.ExperimentSession expSession)
+    public void GenerateExperiment(ExpMngr.ExperimentSession expSession)
     {
-
-        exp = expSession;
-        /// This function can be called using the ExperimentSession inspector OnSessionStart() event, or otherwise
+        // save reference to session
+        session = expSession;
+        /// This function can be called using the ExperimentSession inspector OnSessionBegin() event, or otherwise
 
 
         // / In the StreamingAssets folder we have a several .json files that contain settings, e.g.
@@ -44,65 +44,67 @@ public void GenerateAndRunExperiment(ExpMngr.ExperimentSession expSession)
         // create our blocks & trials
 
         // practice block
-        var practiceBlock = new ExpMngr.Block(exp); // block 1
-        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 < Convert.ToInt32(exp.settings["n_main_trials"]); i++)
-            new ExpMngr.Trial(mainBlock);
 
+        // retrieve the n_practice_trials setting, which was loaded from our .json file
+        int numPracticeTrials = Convert.ToInt32(session.settings["n_practice_trials"]);
+        // create block 1
+        ExpMngr.Block practiceBlock = session.CreateBlock(numPracticeTrials);
+
+
+        // retrieve the n_main_trials setting, which was loaded from our .json file
+        int numMainTrials = Convert.ToInt32(session.settings["n_main_trials"]);
+        // create block 2
+        ExpMngr.Block mainBlock = session.CreateBlock(numMainTrials); // block 2
 
         // here we set a setting for the 2nd trial of the main block as an example.
-        exp.GetBlock(2).GetRelativeTrial(2).settings["size"] = 10;
+        mainBlock.GetRelativeTrial(2).settings["size"] = 10;
 
         // setting this script to enabled allows the MonoBehaviour scripts to run e.g. Update()
         enabled = true;
-
-        // begin first trial
-        exp.BeginNextTrial();
     }
 
     void Update()
     {
         // here we are mimicking some experiment behaviour, e.g waiting for user to interact with scene
-        if (Time.time > startNextTime && exp.inTrial)
+        if (Time.time > startNextTime && session.inTrial)
         {
             Debug.Log("Ending trial");
-            exp.currentTrial.End();
+            session.EndCurrentTrial();
 
-            if (exp.currentTrial == exp.lastTrial)
+            if (session.currentTrial == session.lastTrial)
             {
-                // end, then quit
-                #if UNITY_EDITOR
-                    UnityEditor.EditorApplication.isPlaying = false;
-                #elif UNITY_WEBPLAYER
-                    Application.OpenURL(webplayerQuitURL);
-                #else
-                    Application.Quit();
-                #endif
+#if UNITY_EDITOR
+                UnityEditor.EditorApplication.isPlaying = false;
+#elif UNITY_WEBPLAYER
+                Application.OpenURL(webplayerQuitURL);
+#else
+                Application.Quit();
+#endif
             }
             else
             {
                 // start next trial
-                exp.BeginNextTrial();
+                session.BeginNextTrial();
             }
         }
     }
 
-    public void RunTrial()
+    public void PresentStimulus(ExpMngr.Trial trial)
     {
+        // we can call this function via the event "On Trial Begin", which is called when the trial starts
+        // here we can imagine presentation of some stimulus
+
 
-        // we call this function via the event "On Trial Begin", which is called when the trial starts
         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"]));
+        int size = (int) trial.settings["size"];
+        Debug.LogFormat("The 'size' for this trial is: {0}", size);
 
         // record custom values...
         string observation = UnityEngine.Random.value.ToString();
         Debug.Log(string.Format("We observed: {0}", observation));
-        exp.currentTrial.result["some_variable"] = observation;
+        trial.result["some_variable"] = observation;
 
         // wait 1 second until we end trial and run the next one
         startNextTime = Time.time + 1;