diff --git a/Assets/Scripts/InteractionEngine/CommunicationEvents.cs b/Assets/Scripts/InteractionEngine/CommunicationEvents.cs index 60800e8aa832253c9ab35bbdf0e9840d58906eee..53ff4ad5a4bb18026adfd4c30e793dcc9b50ec54 100644 --- a/Assets/Scripts/InteractionEngine/CommunicationEvents.cs +++ b/Assets/Scripts/InteractionEngine/CommunicationEvents.cs @@ -75,6 +75,6 @@ public class SignalEvent : UnityEvent { public static List<Fact> Facts = new List<Fact>(); - public static bool ServerRunning = false; + public static bool ServerRunning = true; public static string ServerAdress = "localhost:8085"; } diff --git a/Assets/Scripts/JSONManager.cs b/Assets/Scripts/JSONManager.cs index a9040bc36a5238e14c052e139756deb6cb5ef8cd..8ae53b1fd9b1407b8908fcd1185198e8ee651ab5 100644 --- a/Assets/Scripts/JSONManager.cs +++ b/Assets/Scripts/JSONManager.cs @@ -1,4 +1,5 @@ -using JsonSubTypes; +using System; +using JsonSubTypes; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -13,8 +14,8 @@ public class MMTURICollection public string LineOf = "http://mathhub.info/MitM/core/geometry?Geometry?Common?lineOf"; public string Ded = "http://mathhub.info/MitM/Foundation?Logic?ded"; public string Eq = "http://mathhub.info/MitM/Foundation?Logic?eq"; - public string Metric = "http://mathhub.info/MitM/core/geometry?Geometry?Common?metric"; - public string Angle = "http://mathhub.info/MitM/core/geometry?Geometry?Common?angle_between"; + public string Metric = "http://mathhub.info/MitM/core/geometry?Geometry/Common?metric"; + public string Angle = "http://mathhub.info/MitM/core/geometry?Geometry/Common?angle_between"; public string Sketch = "http://mathhub.info/MitM/Foundation?InformalProofs?proofsketch"; } @@ -68,12 +69,12 @@ public OMSTR(string s) public class OMF : MMTTerm { [JsonProperty("float")] - public float f; + public decimal f; public string kind = "OMF"; public OMF(float f) { - this.f = f; + this.f = Convert.ToDecimal(f); } } @@ -96,6 +97,7 @@ public static string ToJson(MMTDeclaration mmtDecl) **/ public class MMTSymbolDeclaration : MMTDeclaration { + public string kind = "general"; public string label; public MMTTerm tp; public MMTTerm df; @@ -113,6 +115,7 @@ public MMTSymbolDeclaration(string label, MMTTerm tp, MMTTerm df) **/ public class MMTValueDeclaration : MMTDeclaration { + public string kind = "veq"; public string label; public MMTTerm lhs; public MMTTerm rhs; diff --git a/Assets/Scripts/StartServer.cs b/Assets/Scripts/StartServer.cs index 21ef057d3322cf5a3849e65775f916076b6f223e..5d0b2ac66e026dea7c6f044c4267c542258b56b5 100644 --- a/Assets/Scripts/StartServer.cs +++ b/Assets/Scripts/StartServer.cs @@ -15,6 +15,7 @@ public class StartServer : MonoBehaviour // Start is called before the first frame update void Start() { + CommunicationEvents.ServerRunning = false; StartCoroutine(ServerRoutine()); } void PrepareGame()