Merge pull request #982 from allenai/erick/jsinterface-enable

Enable JavascriptInterface within AgentManager
allenai · Mar 23, 2022 · f8a3f78 · f8a3f78
2 parents bac38b9 + 216f00a
commit f8a3f78
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/unity/Assets/Scripts/AgentManager.cs b/unity/Assets/Scripts/AgentManager.cs
@@ -130,6 +130,10 @@ void Start() {
 #if UNITY_WEBGL
         physicsSceneManager.UnpausePhysicsAutoSim();
         primaryAgent.InitializeBody();
+        JavaScriptInterface jsInterface = primaryAgent.GetComponent<JavaScriptInterface>();
+        if (jsInterface != null) {
+            jsInterface.enabled = true;
+        }
 #endif
 
         StartCoroutine(EmitFrame());

diff --git a/unity/Assets/Scripts/DebugInputField.cs b/unity/Assets/Scripts/DebugInputField.cs
@@ -132,7 +132,6 @@ void SelectPlayerControl() {
 #if UNITY_WEBGL
                 Debug.Log("Player Control Set To:Webgl");
                 setControlMode(ControlMode.FPS);
-                CurrentActiveController().GetComponent<JavaScriptInterface>().enabled = true;
 #endif
 #if CROWDSOURCE_TASK
                 Debug.Log("CROWDSOURCE_TASK");