webgl fixes #20

Author: jackbrookes

Assets/UXF/Examples/1a_SpaceShuttle/SpaceShuttleExample.unity

@@ -26,7 +26,7 @@ public class HTTPPost : DataHandler
         [BasteRainGames.HideIf("httpBasicAuthentication", false)]
         public string username = "susan";
         [BasteRainGames.HideIf("httpBasicAuthentication", false)]
-        public string password = "hello";
+        public string password = "password";
 
 
         public override bool CheckIfRiskOfOverwrite(string experiment, string ppid, int sessionNum, string rootPath = "")

Assets/UXF/Scripts/DataHandling/HTTPPost.cs

@@ -142,21 +142,28 @@ public void OnGUI()
 
             GUILayout.Label("WebGL", EditorStyles.boldLabel);
 
-            if (PlayerSettings.WebGL.template == "PROJECT:UXF WebGL")
+            string expected;
+
+#if UNITY_2020_1_OR_NEWER
+            expected = "PROJECT:UXF WebGL 2020";
+#else
+            expected = "PROJECT:UXF WebGL 2019";
+#endif
+
+            if (PlayerSettings.WebGL.template == expected)
             {
-                EditorGUILayout.HelpBox("UXF WebGL template is set correctly.", MessageType.Info);
+                EditorGUILayout.HelpBox("UXF WebGL template is set correctly. You may still need to enable WebGL in build settings.", MessageType.Info);
             }
             else
             {
-                EditorGUILayout.HelpBox("UXF WebGL template is not selected as the WebGL Template in Player Settings.", MessageType.Warning);
+                EditorGUILayout.HelpBox("Do you plan to run your experiment in a web browser? UXF WebGL template is not selected as the WebGL Template in Player Settings.", MessageType.Warning);
                 if (GUILayout.Button("Fix"))
                 {
-                    PlayerSettings.WebGL.template = "PROJECT:UXF WebGL";
+                    PlayerSettings.WebGL.template = expected;
                 }
             }
 
 
-
             EditorGUILayout.Separator();
             EditorGUILayout.HelpBox("To show this window again go to UXF -> Show setup wizard in the menubar.", MessageType.None);
 

Assets/UXF/Scripts/Etc/Editor/UXFWizard.cs

@@ -18,7 +18,16 @@ public static class Utilities
         public static void UXFDebugLogErrorFormat(string format, params object[] args) { Debug.LogErrorFormat(UXFFormatString(format), args); }
 
 
-        private static string UXFFormatString(string message) { return string.Format("[<b><color=#AD477C>UXF</color></b>] {0}", message); }
+        private static string UXFFormatString(string message)
+        {
+            return string.Format(
+                "{0} {1}",
+                Application.platform != RuntimePlatform.WebGLPlayer ?
+                    "[<b><color=#AD477C>UXF</color></b>]" :
+                    "[UXF]",
+                message
+            );
+        }
 
     }       
 

Assets/UXF/Scripts/Etc/Utilities.cs

@@ -1 +1 @@
-2.2.2
+2.2.3