diff --git a/.gitignore b/.gitignore index fef368c3ceeb41d16390df60bdf9cd1b0c26634b..bbf307cd06a4ef697e37e0d160c9d7c77d426996 100644 --- a/.gitignore +++ b/.gitignore @@ -22,9 +22,6 @@ # ProBuilder/ProGrid files [Aa]ssets/ProCore/ -#StreamingAssetsFolder -[Aa]ssets/StreamingAssets - # Autogenerated Jetbrains Rider plugin [Aa]ssets/Plugins/Editor/JetBrains* diff --git a/Assets/Scenes/Release/TreeWorld_Release_02.unity b/Assets/Scenes/Release/TreeWorld_Release_02.unity index 30a748d65beaea0c03b491c529787e0ee52c4864..303118f9c1ff486f72b688191979dd25ab0d1697 100644 --- a/Assets/Scenes/Release/TreeWorld_Release_02.unity +++ b/Assets/Scenes/Release/TreeWorld_Release_02.unity @@ -44133,7 +44133,7 @@ PrefabInstance: - target: {fileID: 798194300310305303, guid: b996060e27da25c498842defc1996d84, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: -0.00024414062 objectReference: {fileID: 0} - target: {fileID: 798194301124356650, guid: b996060e27da25c498842defc1996d84, type: 3} diff --git a/Assets/Scripts/InventoryStuff/DisplayScrolls.cs b/Assets/Scripts/InventoryStuff/DisplayScrolls.cs index 9d31aa2ed098ce491d5e1dddadabc99fee58e5f4..32227f0a2c0d666037e14bdfa91818b7f7267ea0 100644 --- a/Assets/Scripts/InventoryStuff/DisplayScrolls.cs +++ b/Assets/Scripts/InventoryStuff/DisplayScrolls.cs @@ -64,7 +64,7 @@ IEnumerator getScrollsfromServer() { if (request.isNetworkError || request.isHttpError) { Debug.LogWarning(request.error); - string jsonString = File.ReadAllText(Application.dataPath + "/scrolls.json"); + string jsonString = File.ReadAllText(Application.streamingAssetsPath + "/scrolls.json"); Debug.Log(jsonString); BuildScrolls(jsonString); } @@ -72,7 +72,10 @@ IEnumerator getScrollsfromServer() { { CommunicationEvents.ServerRunning = true; string jsonString = request.downloadHandler.text; - Debug.Log(jsonString); + Debug.Log("JsonString from Server: \n" + jsonString); + if(jsonString.Equals("[]")) + jsonString = File.ReadAllText(Application.streamingAssetsPath + "/scrolls.json"); + Debug.Log("Used JsonString: \n" + jsonString); //scroll display not yet implemented; //buildScrollSelection(jsonString); BuildScrolls(jsonString); diff --git a/Assets/Scripts/Restart.cs b/Assets/Scripts/Restart.cs index 2ae23b0efaf5a01bf7c598685611aa738c580ec7..830a318b001f1691c439555d070a77a502b99082 100644 --- a/Assets/Scripts/Restart.cs +++ b/Assets/Scripts/Restart.cs @@ -1,12 +1,18 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; +using UnityEngine; +using static StartServer; public class Restart : MonoBehaviour { public void LoadStartScreen() { + process.Kill(); + Level.solved = false; CommunicationEvents.Facts.Clear(); UnityEngine.SceneManagement.SceneManager.LoadScene(0); } + + public void OnApplicationQuit() + { + process.Kill(); + } } diff --git a/Assets/Scripts/StartServer.cs b/Assets/Scripts/StartServer.cs index 5d0b2ac66e026dea7c6f044c4267c542258b56b5..ae9af88b25d7723bd284c8e84132ec8b33f0cedc 100644 --- a/Assets/Scripts/StartServer.cs +++ b/Assets/Scripts/StartServer.cs @@ -11,7 +11,10 @@ public class StartServer : MonoBehaviour [SerializeField] TMPro.TextMeshProUGUI WaitingText; - + public static Process process; + public static ProcessStartInfo processInfo; + + // Start is called before the first frame update void Start() { @@ -85,9 +88,6 @@ IEnumerator ServerRoutine() #if!UNITY_WEBGL - // int exitCode; - ProcessStartInfo processInfo; - Process process; #if UNITY_STANDALONE_LINUX @@ -121,20 +121,12 @@ IEnumerator ServerRoutine() process = Process.Start(proc); #else - string command = ""; - command = "\"" + Application.streamingAssetsPath + "\"/start.BAT " + "\"" + Application.streamingAssetsPath + "\""; - command = command.Replace("/", @"\"); - command = "\"" + command + "\""; - - - processInfo = new ProcessStartInfo("cmd.exe", "/c " + command); - processInfo.CreateNoWindow = false; - processInfo.UseShellExecute = true; - // *** Redirect the output *** - // processInfo.RedirectStandardError = true; - //processInfo.RedirectStandardOutput = true; - - + processInfo = new ProcessStartInfo(); + processInfo.FileName = "java"; + processInfo.Arguments = @"-jar " + Application.streamingAssetsPath + "/frameit.jar" + " -bind :8085 -archive-root " + Application.streamingAssetsPath + "/archives"; + //set "UseShellExecute = true" AND "CreateNoWindow = false" to see the mmt-server output + processInfo.UseShellExecute = false; + processInfo.CreateNoWindow = true; process = Process.Start(processInfo); #endif @@ -169,10 +161,6 @@ IEnumerator ServerRoutine() // Console.WriteLine("output>>" + (String.IsNullOrEmpty(output) ? "(none)" : output)); // Console.WriteLine("error>>" + (String.IsNullOrEmpty(error) ? "(none)" : error)); // Console.WriteLine("ExitCode: " + exitCode.ToString(), "ExecuteCommand"); -#if !UNITY_WEBGL - - process.Close(); -#endif } PrepareGame(); diff --git a/Assets/StreamingAssets.meta b/Assets/StreamingAssets.meta new file mode 100644 index 0000000000000000000000000000000000000000..d1dc52d2ff15e760d0aaead1b87066b13fca58af --- /dev/null +++ b/Assets/StreamingAssets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b50933d8f78b79044977f61539ac1b40 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/scrolls.json b/Assets/StreamingAssets/scrolls.json new file mode 100644 index 0000000000000000000000000000000000000000..0666f7109f68165a286348d90b60eef49c00f795 --- /dev/null +++ b/Assets/StreamingAssets/scrolls.json @@ -0,0 +1,1232 @@ +[ + { + "ref": "http://mathhub.info/FrameIT/frameworld?Midpoint", + "label": "MidPoint", + "description": "Our MidPoint scroll that given two points P and Q computes the midpoint of the line PQ.", + "requiredFacts": [ + { + "ref": { + "uri": "http://mathhub.info/FrameIT/frameworld?Midpoint/Problem?P" + }, + "label": "P", + "tp": { + "uri": "http://mathhub.info/MitM/core/geometry?3DGeometry?point", + "kind": "OMS" + }, + "df": null, + "kind": "general" + }, + { + "ref": { + "uri": "http://mathhub.info/FrameIT/frameworld?Midpoint/Problem?Q" + }, + "label": "Q", + "tp": { + "uri": "http://mathhub.info/MitM/core/geometry?3DGeometry?point", + "kind": "OMS" + }, + "df": null, + "kind": "general" + } + ], + "acquiredFacts": [ + { + "ref": { + "uri": "http://mathhub.info/FrameIT/frameworld?Midpoint/Solution?midpoint" + }, + "label": "Mid[PQ]", + "tp": { + "uri": "http://mathhub.info/MitM/core/geometry?3DGeometry?point", + "kind": "OMS" + }, + "df": { + "applicant": { + "uri": "http://gl.mathhub.info/MMT/LFX/Sigma?Symbols?Tuple", + "kind": "OMS" + }, + "arguments": [ + { + "applicant": { + "uri": "http://mathhub.info/MitM/core/arithmetics?RealArithmetics?multiplication", + "kind": "OMS" + }, + "arguments": [ + { + "float": 0.5, + "kind": "OMF" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/core/arithmetics?RealArithmetics?addition", + "kind": "OMS" + }, + "arguments": [ + { + "applicant": { + "uri": "http://mathhub.info/MitM/core/geometry?3DGeometry?xofpoint", + "kind": "OMS" + }, + "arguments": [ + { + "uri": "http://mathhub.info/FrameIT/frameworld?Midpoint/Problem?P", + "kind": "OMS" + } + ], + "kind": "OMA" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/core/geometry?3DGeometry?xofpoint", + "kind": "OMS" + }, + "arguments": [ + { + "uri": "http://mathhub.info/FrameIT/frameworld?Midpoint/Problem?Q", + "kind": "OMS" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/core/arithmetics?RealArithmetics?multiplication", + "kind": "OMS" + }, + "arguments": [ + { + "float": 0.5, + "kind": "OMF" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/core/arithmetics?RealArithmetics?addition", + "kind": "OMS" + }, + "arguments": [ + { + "applicant": { + "uri": "http://mathhub.info/MitM/core/geometry?3DGeometry?yofpoint", + "kind": "OMS" + }, + "arguments": [ + { + "uri": "http://mathhub.info/FrameIT/frameworld?Midpoint/Problem?P", + "kind": "OMS" + } + ], + "kind": "OMA" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/core/geometry?3DGeometry?yofpoint", + "kind": "OMS" + }, + "arguments": [ + { + "uri": "http://mathhub.info/FrameIT/frameworld?Midpoint/Problem?Q", + "kind": "OMS" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/core/arithmetics?RealArithmetics?multiplication", + "kind": "OMS" + }, + "arguments": [ + { + "float": 0.5, + "kind": "OMF" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/core/arithmetics?RealArithmetics?addition", + "kind": "OMS" + }, + "arguments": [ + { + "applicant": { + "uri": "http://mathhub.info/MitM/core/geometry?3DGeometry?zofpoint", + "kind": "OMS" + }, + "arguments": [ + { + "uri": "http://mathhub.info/FrameIT/frameworld?Midpoint/Problem?P", + "kind": "OMS" + } + ], + "kind": "OMA" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/core/geometry?3DGeometry?zofpoint", + "kind": "OMS" + }, + "arguments": [ + { + "uri": "http://mathhub.info/FrameIT/frameworld?Midpoint/Problem?Q", + "kind": "OMS" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + }, + "kind": "general" + } + ] + }, + { + "ref": "http://mathhub.info/FrameIT/frameworld?OppositeLen", + "label": "OppositeLen", + "description": "Given a triangle △ABC right-angled at ⊾C, the opposide side has length CA = tan(∠ABC) ⋅ BC.", + "requiredFacts": [ + { + "ref": { + "uri": "http://mathhub.info/FrameIT/frameworld?TriangleProblem?A" + }, + "label": "A", + "tp": { + "uri": "http://mathhub.info/MitM/core/geometry?3DGeometry?point", + "kind": "OMS" + }, + "df": null, + "kind": "general" + }, + { + "ref": { + "uri": "http://mathhub.info/FrameIT/frameworld?TriangleProblem?B" + }, + "label": "B", + "tp": { + "uri": "http://mathhub.info/MitM/core/geometry?3DGeometry?point", + "kind": "OMS" + }, + "df": null, + "kind": "general" + }, + { + "ref": { + "uri": "http://mathhub.info/FrameIT/frameworld?TriangleProblem?C" + }, + "label": "C", + "tp": { + "uri": "http://mathhub.info/MitM/core/geometry?3DGeometry?point", + "kind": "OMS" + }, + "df": null, + "kind": "general" + }, + { + "ref": { + "uri": "http://mathhub.info/FrameIT/frameworld?TriangleProblem_RightAngleAtC?rightAngleC" + }, + "label": "⊾C", + "tp": { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?Logic?ded", + "kind": "OMS" + }, + "arguments": [ + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?Logic?eq", + "kind": "OMS" + }, + "arguments": [ + { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?real_lit", + "kind": "OMS" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/core/geometry?Geometry/Common?angle_between", + "kind": "OMS" + }, + "arguments": [ + { + "uri": "http://mathhub.info/FrameIT/frameworld?TriangleProblem?B", + "kind": "OMS" + }, + { + "uri": "http://mathhub.info/FrameIT/frameworld?TriangleProblem?C", + "kind": "OMS" + }, + { + "uri": "http://mathhub.info/FrameIT/frameworld?TriangleProblem?A", + "kind": "OMS" + } + ], + "kind": "OMA" + }, + { + "float": 90.0, + "kind": "OMF" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + }, + "df": null, + "kind": "general" + }, + { + "ref": { + "uri": "http://mathhub.info/FrameIT/frameworld?OppositeLen/Problem?distanceBC" + }, + "label": "BC", + "lhs": { + "applicant": { + "uri": "http://mathhub.info/MitM/core/geometry?Geometry/Common?metric", + "kind": "OMS" + }, + "arguments": [ + { + "uri": "http://mathhub.info/FrameIT/frameworld?TriangleProblem?B", + "kind": "OMS" + }, + { + "uri": "http://mathhub.info/FrameIT/frameworld?TriangleProblem?C", + "kind": "OMS" + } + ], + "kind": "OMA" + }, + "valueTp": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?real_lit", + "kind": "OMS" + }, + "value": null, + "proof": null, + "kind": "veq" + }, + { + "ref": { + "uri": "http://mathhub.info/FrameIT/frameworld?TriangleProblem_AngleAtB?angleB" + }, + "label": "∠ABC", + "lhs": { + "applicant": { + "uri": "http://mathhub.info/MitM/core/geometry?Geometry/Common?angle_between", + "kind": "OMS" + }, + "arguments": [ + { + "uri": "http://mathhub.info/FrameIT/frameworld?TriangleProblem?A", + "kind": "OMS" + }, + { + "uri": "http://mathhub.info/FrameIT/frameworld?TriangleProblem?B", + "kind": "OMS" + }, + { + "uri": "http://mathhub.info/FrameIT/frameworld?TriangleProblem?C", + "kind": "OMS" + } + ], + "kind": "OMA" + }, + "valueTp": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?real_lit", + "kind": "OMS" + }, + "value": null, + "proof": null, + "kind": "veq" + } + ], + "acquiredFacts": [ + { + "ref": { + "uri": "http://mathhub.info/FrameIT/frameworld?OppositeLen/Solution?deducedLineCA" + }, + "label": "CA", + "lhs": { + "applicant": { + "uri": "http://mathhub.info/MitM/core/geometry?Geometry/Common?metric", + "kind": "OMS" + }, + "arguments": [ + { + "uri": "http://mathhub.info/FrameIT/frameworld?TriangleProblem?C", + "kind": "OMS" + }, + { + "uri": "http://mathhub.info/FrameIT/frameworld?TriangleProblem?A", + "kind": "OMS" + } + ], + "kind": "OMA" + }, + "valueTp": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?real_lit", + "kind": "OMS" + }, + "value": { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?times_real_lit", + "kind": "OMS" + }, + "arguments": [ + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?Trigonometry?tan", + "kind": "OMS" + }, + "arguments": [ + { + "xml": "no raw OMDoc XML here for performance reasons", + "kind": "RAW" + } + ], + "kind": "OMA" + }, + { + "xml": "no raw OMDoc XML here for performance reasons", + "kind": "RAW" + } + ], + "kind": "OMA" + }, + "proof": { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?InformalProofs?proofsketch", + "kind": "OMS" + }, + "arguments": [ + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?Logic?eq", + "kind": "OMS" + }, + "arguments": [ + { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?real_lit", + "kind": "OMS" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?DescriptionOperator?that", + "kind": "OMS" + }, + "arguments": [ + { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?real_lit", + "kind": "OMS" + }, + { + "xml": "no raw OMDoc XML here for performance reasons", + "kind": "RAW" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?Logic?ImplicitProof", + "kind": "OMS" + }, + "arguments": [ + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?Logic?exists", + "kind": "OMS" + }, + "arguments": [ + { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?real_lit", + "kind": "OMS" + }, + { + "xml": "no raw OMDoc XML here for performance reasons", + "kind": "RAW" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?times_real_lit", + "kind": "OMS" + }, + "arguments": [ + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?Trigonometry?tan", + "kind": "OMS" + }, + "arguments": [ + { + "xml": "no raw OMDoc XML here for performance reasons", + "kind": "RAW" + } + ], + "kind": "OMA" + }, + { + "xml": "no raw OMDoc XML here for performance reasons", + "kind": "RAW" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + }, + { + "string": "OppositeLen Scroll", + "kind": "OMSTR" + } + ], + "kind": "OMA" + }, + "kind": "veq" + } + ] + }, + { + "ref": "http://mathhub.info/FrameIT/frameworld?AngleSum", + "label": "AngleSum", + "description": "Given a triangle △ABC and two known angles, we can deduce the missing angle by: ∠BCA = 180° - ∠BAC - ∠ABC.", + "requiredFacts": [ + { + "ref": { + "uri": "http://mathhub.info/FrameIT/frameworld?TriangleProblem?A" + }, + "label": "A", + "tp": { + "uri": "http://mathhub.info/MitM/core/geometry?3DGeometry?point", + "kind": "OMS" + }, + "df": null, + "kind": "general" + }, + { + "ref": { + "uri": "http://mathhub.info/FrameIT/frameworld?TriangleProblem?B" + }, + "label": "B", + "tp": { + "uri": "http://mathhub.info/MitM/core/geometry?3DGeometry?point", + "kind": "OMS" + }, + "df": null, + "kind": "general" + }, + { + "ref": { + "uri": "http://mathhub.info/FrameIT/frameworld?TriangleProblem?C" + }, + "label": "C", + "tp": { + "uri": "http://mathhub.info/MitM/core/geometry?3DGeometry?point", + "kind": "OMS" + }, + "df": null, + "kind": "general" + }, + { + "ref": { + "uri": "http://mathhub.info/FrameIT/frameworld?TriangleProblem_AngleAtA?angleA" + }, + "label": "∠BAC", + "lhs": { + "applicant": { + "uri": "http://mathhub.info/MitM/core/geometry?Geometry/Common?angle_between", + "kind": "OMS" + }, + "arguments": [ + { + "uri": "http://mathhub.info/FrameIT/frameworld?TriangleProblem?B", + "kind": "OMS" + }, + { + "uri": "http://mathhub.info/FrameIT/frameworld?TriangleProblem?A", + "kind": "OMS" + }, + { + "uri": "http://mathhub.info/FrameIT/frameworld?TriangleProblem?C", + "kind": "OMS" + } + ], + "kind": "OMA" + }, + "valueTp": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?real_lit", + "kind": "OMS" + }, + "value": null, + "proof": null, + "kind": "veq" + }, + { + "ref": { + "uri": "http://mathhub.info/FrameIT/frameworld?TriangleProblem_AngleAtB?angleB" + }, + "label": "∠ABC", + "lhs": { + "applicant": { + "uri": "http://mathhub.info/MitM/core/geometry?Geometry/Common?angle_between", + "kind": "OMS" + }, + "arguments": [ + { + "uri": "http://mathhub.info/FrameIT/frameworld?TriangleProblem?A", + "kind": "OMS" + }, + { + "uri": "http://mathhub.info/FrameIT/frameworld?TriangleProblem?B", + "kind": "OMS" + }, + { + "uri": "http://mathhub.info/FrameIT/frameworld?TriangleProblem?C", + "kind": "OMS" + } + ], + "kind": "OMA" + }, + "valueTp": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?real_lit", + "kind": "OMS" + }, + "value": null, + "proof": null, + "kind": "veq" + } + ], + "acquiredFacts": [ + { + "ref": { + "uri": "http://mathhub.info/FrameIT/frameworld?AngleSum/Solution?angleC" + }, + "label": "∠BCA", + "lhs": { + "applicant": { + "uri": "http://mathhub.info/MitM/core/geometry?Geometry/Common?angle_between", + "kind": "OMS" + }, + "arguments": [ + { + "uri": "http://mathhub.info/FrameIT/frameworld?TriangleProblem?B", + "kind": "OMS" + }, + { + "uri": "http://mathhub.info/FrameIT/frameworld?TriangleProblem?C", + "kind": "OMS" + }, + { + "uri": "http://mathhub.info/FrameIT/frameworld?TriangleProblem?A", + "kind": "OMS" + } + ], + "kind": "OMA" + }, + "valueTp": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?real_lit", + "kind": "OMS" + }, + "value": { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?plus_real_lit", + "kind": "OMS" + }, + "arguments": [ + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?plus_real_lit", + "kind": "OMS" + }, + "arguments": [ + { + "float": 180.0, + "kind": "OMF" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?minus_real_lit", + "kind": "OMS" + }, + "arguments": [ + { + "xml": "no raw OMDoc XML here for performance reasons", + "kind": "RAW" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?minus_real_lit", + "kind": "OMS" + }, + "arguments": [ + { + "xml": "no raw OMDoc XML here for performance reasons", + "kind": "RAW" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + }, + "proof": { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?InformalProofs?proofsketch", + "kind": "OMS" + }, + "arguments": [ + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?Logic?eq", + "kind": "OMS" + }, + "arguments": [ + { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?real_lit", + "kind": "OMS" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?Trigonometry?acos", + "kind": "OMS" + }, + "arguments": [ + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?times_real_lit", + "kind": "OMS" + }, + "arguments": [ + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?plus_real_lit", + "kind": "OMS" + }, + "arguments": [ + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?plus_real_lit", + "kind": "OMS" + }, + "arguments": [ + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?times_real_lit", + "kind": "OMS" + }, + "arguments": [ + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?plus_real_lit", + "kind": "OMS" + }, + "arguments": [ + { + "xml": "no raw OMDoc XML here for performance reasons", + "kind": "RAW" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?minus_real_lit", + "kind": "OMS" + }, + "arguments": [ + { + "xml": "no raw OMDoc XML here for performance reasons", + "kind": "RAW" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?plus_real_lit", + "kind": "OMS" + }, + "arguments": [ + { + "xml": "no raw OMDoc XML here for performance reasons", + "kind": "RAW" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?minus_real_lit", + "kind": "OMS" + }, + "arguments": [ + { + "xml": "no raw OMDoc XML here for performance reasons", + "kind": "RAW" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?times_real_lit", + "kind": "OMS" + }, + "arguments": [ + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?plus_real_lit", + "kind": "OMS" + }, + "arguments": [ + { + "xml": "no raw OMDoc XML here for performance reasons", + "kind": "RAW" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?minus_real_lit", + "kind": "OMS" + }, + "arguments": [ + { + "xml": "no raw OMDoc XML here for performance reasons", + "kind": "RAW" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?plus_real_lit", + "kind": "OMS" + }, + "arguments": [ + { + "xml": "no raw OMDoc XML here for performance reasons", + "kind": "RAW" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?minus_real_lit", + "kind": "OMS" + }, + "arguments": [ + { + "xml": "no raw OMDoc XML here for performance reasons", + "kind": "RAW" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?times_real_lit", + "kind": "OMS" + }, + "arguments": [ + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?plus_real_lit", + "kind": "OMS" + }, + "arguments": [ + { + "xml": "no raw OMDoc XML here for performance reasons", + "kind": "RAW" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?minus_real_lit", + "kind": "OMS" + }, + "arguments": [ + { + "xml": "no raw OMDoc XML here for performance reasons", + "kind": "RAW" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?plus_real_lit", + "kind": "OMS" + }, + "arguments": [ + { + "xml": "no raw OMDoc XML here for performance reasons", + "kind": "RAW" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?minus_real_lit", + "kind": "OMS" + }, + "arguments": [ + { + "xml": "no raw OMDoc XML here for performance reasons", + "kind": "RAW" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/core/arithmetics?RealArithmetics?inverse", + "kind": "OMS" + }, + "arguments": [ + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?times_real_lit", + "kind": "OMS" + }, + "arguments": [ + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?DescriptionOperator?that", + "kind": "OMS" + }, + "arguments": [ + { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?real_lit", + "kind": "OMS" + }, + { + "xml": "no raw OMDoc XML here for performance reasons", + "kind": "RAW" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?Logic?ImplicitProof", + "kind": "OMS" + }, + "arguments": [ + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?Logic?exists", + "kind": "OMS" + }, + "arguments": [ + { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?real_lit", + "kind": "OMS" + }, + { + "xml": "no raw OMDoc XML here for performance reasons", + "kind": "RAW" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?DescriptionOperator?that", + "kind": "OMS" + }, + "arguments": [ + { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?real_lit", + "kind": "OMS" + }, + { + "xml": "no raw OMDoc XML here for performance reasons", + "kind": "RAW" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?Logic?ImplicitProof", + "kind": "OMS" + }, + "arguments": [ + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?Logic?exists", + "kind": "OMS" + }, + "arguments": [ + { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?real_lit", + "kind": "OMS" + }, + { + "xml": "no raw OMDoc XML here for performance reasons", + "kind": "RAW" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?Logic?ImplicitProof", + "kind": "OMS" + }, + "arguments": [ + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?Logic?not", + "kind": "OMS" + }, + "arguments": [ + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?Logic?eq", + "kind": "OMS" + }, + "arguments": [ + { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?real_lit", + "kind": "OMS" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?times_real_lit", + "kind": "OMS" + }, + "arguments": [ + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?DescriptionOperator?that", + "kind": "OMS" + }, + "arguments": [ + { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?real_lit", + "kind": "OMS" + }, + { + "xml": "no raw OMDoc XML here for performance reasons", + "kind": "RAW" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?Logic?ImplicitProof", + "kind": "OMS" + }, + "arguments": [ + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?Logic?exists", + "kind": "OMS" + }, + "arguments": [ + { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?real_lit", + "kind": "OMS" + }, + { + "xml": "no raw OMDoc XML here for performance reasons", + "kind": "RAW" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?DescriptionOperator?that", + "kind": "OMS" + }, + "arguments": [ + { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?real_lit", + "kind": "OMS" + }, + { + "xml": "no raw OMDoc XML here for performance reasons", + "kind": "RAW" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?Logic?ImplicitProof", + "kind": "OMS" + }, + "arguments": [ + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?Logic?exists", + "kind": "OMS" + }, + "arguments": [ + { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?real_lit", + "kind": "OMS" + }, + { + "xml": "no raw OMDoc XML here for performance reasons", + "kind": "RAW" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + }, + { + "xml": "no raw OMDoc XML here for performance reasons", + "kind": "RAW" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?plus_real_lit", + "kind": "OMS" + }, + "arguments": [ + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?plus_real_lit", + "kind": "OMS" + }, + "arguments": [ + { + "float": 180.0, + "kind": "OMF" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?minus_real_lit", + "kind": "OMS" + }, + "arguments": [ + { + "xml": "no raw OMDoc XML here for performance reasons", + "kind": "RAW" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + }, + { + "applicant": { + "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?minus_real_lit", + "kind": "OMS" + }, + "arguments": [ + { + "xml": "no raw OMDoc XML here for performance reasons", + "kind": "RAW" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + } + ], + "kind": "OMA" + }, + { + "string": "By sum of interior angles = 180° in triangles", + "kind": "OMSTR" + } + ], + "kind": "OMA" + }, + "kind": "veq" + } + ] + } +] \ No newline at end of file diff --git a/Assets/scrolls.json.meta b/Assets/StreamingAssets/scrolls.json.meta similarity index 62% rename from Assets/scrolls.json.meta rename to Assets/StreamingAssets/scrolls.json.meta index 076ba2dd81b886e238dcc7df3b8b89b77b53b59b..4665eb1c42210200a9e2e27bc0f114a2a36431b0 100644 --- a/Assets/scrolls.json.meta +++ b/Assets/StreamingAssets/scrolls.json.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 4069fe7e4a7672e47834935275b3aa8c -TextScriptImporter: +guid: 610110843770eb7468fad8b79ec7fdfa +DefaultImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/scrolls.json b/Assets/scrolls.json deleted file mode 100644 index adfe310e0415e0419751fc8a4a24f338e051a134..0000000000000000000000000000000000000000 --- a/Assets/scrolls.json +++ /dev/null @@ -1,248 +0,0 @@ -[ - { - "problemTheory": "http://mathhub.info/FrameIT/frameworld?OppositeLen_Problem", - "solutionTheory": "http://mathhub.info/FrameIT/frameworld?OppositeLen_Solution", - "label": "OppositeLen", - "description": "Given a triangle $0$1$2 right angled at $2, the distance $0$1 can be computed from the angle at $1 and the distance $1$2", - "requiredFacts": [ - { - "uri": "http://mathhub.info/FrameIT/frameworld?OppositeLen_Problem?pA", - "label": "a", - "tp": { - "original": { - "uri": "http://mathhub.info/MitM/core/geometry?3DGeometry?point", - "kind": "OMS" - }, - "simplified": { - "uri": "http://mathhub.info/MitM/core/geometry?3DGeometry?point", - "kind": "OMS" - } - }, - "df": null - }, - { - "uri": "http://mathhub.info/FrameIT/frameworld?OppositeLen_Problem?pB", - "label": "b", - "tp": { - "original": { - "uri": "http://mathhub.info/MitM/core/geometry?3DGeometry?point", - "kind": "OMS" - }, - "simplified": { - "uri": "http://mathhub.info/MitM/core/geometry?3DGeometry?point", - "kind": "OMS" - } - }, - "df": null - }, - { - "uri": "http://mathhub.info/FrameIT/frameworld?OppositeLen_Problem?pC", - "label": "c", - "tp": { - "original": { - "uri": "http://mathhub.info/MitM/core/geometry?3DGeometry?point", - "kind": "OMS" - }, - "simplified": { - "uri": "http://mathhub.info/MitM/core/geometry?3DGeometry?point", - "kind": "OMS" - } - }, - "df": null - }, - { - "uri": "http://mathhub.info/FrameIT/frameworld?OppositeLen_Problem?pdistBC_v", - "label": "pdist$1$2_v", - "tp": { - "original": { - "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?real_lit", - "kind": "OMS" - }, - "simplified": { - "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?real_lit", - "kind": "OMS" - } - }, - "df": null - }, - { - "uri": "http://mathhub.info/FrameIT/frameworld?OppositeLen_Problem?pdistBC", - "label": "pdistt$1$2", - "tp": { - "original": { - "applicant": { - "uri": "http://mathhub.info/FrameIT/frameworld?DistanceFact?distanceFact", - "kind": "OMS" - }, - "arguments": [ - { - "uri": "http://mathhub.info/FrameIT/frameworld?OppositeLen_Problem?pB", - "kind": "OMS" - }, - { - "uri": "http://mathhub.info/FrameIT/frameworld?OppositeLen_Problem?pC", - "kind": "OMS" - }, - { - "uri": "http://mathhub.info/FrameIT/frameworld?OppositeLen_Problem?pdistBC_v", - "kind": "OMS" - } - ], - "kind": "OMA" - }, - "simplified": { - "applicant": { - "uri": "http://mathhub.info/FrameIT/frameworld?DistanceFact?distanceFact", - "kind": "OMS" - }, - "arguments": [ - { - "uri": "http://mathhub.info/FrameIT/frameworld?OppositeLen_Problem?pB", - "kind": "OMS" - }, - { - "uri": "http://mathhub.info/FrameIT/frameworld?OppositeLen_Problem?pC", - "kind": "OMS" - }, - { - "uri": "http://mathhub.info/FrameIT/frameworld?OppositeLen_Problem?pdistBC_v", - "kind": "OMS" - } - ], - "kind": "OMA" - } - }, - "df": null - }, - { - "uri": "http://mathhub.info/FrameIT/frameworld?OppositeLen_Problem?pangleABC_v", - "label": "pangleAt$0$1$2_v", - "tp": { - "original": { - "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?real_lit", - "kind": "OMS" - }, - "simplified": { - "uri": "http://mathhub.info/MitM/Foundation?RealLiterals?real_lit", - "kind": "OMS" - } - }, - "df": null - }, - { - "uri": "http://mathhub.info/FrameIT/frameworld?OppositeLen_Problem?pangleABC", - "label": "pangle$0$1$2", - "tp": { - "original": { - "applicant": { - "uri": "http://mathhub.info/FrameIT/frameworld?AngleFact?angleFact", - "kind": "OMS" - }, - "arguments": [ - { - "uri": "http://mathhub.info/FrameIT/frameworld?OppositeLen_Problem?pA", - "kind": "OMS" - }, - { - "uri": "http://mathhub.info/FrameIT/frameworld?OppositeLen_Problem?pB", - "kind": "OMS" - }, - { - "uri": "http://mathhub.info/FrameIT/frameworld?OppositeLen_Problem?pC", - "kind": "OMS" - }, - { - "uri": "http://mathhub.info/FrameIT/frameworld?OppositeLen_Problem?pangleABC_v", - "kind": "OMS" - } - ], - "kind": "OMA" - }, - "simplified": { - "applicant": { - "uri": "http://mathhub.info/FrameIT/frameworld?AngleFact?angleFact", - "kind": "OMS" - }, - "arguments": [ - { - "uri": "http://mathhub.info/FrameIT/frameworld?OppositeLen_Problem?pA", - "kind": "OMS" - }, - { - "uri": "http://mathhub.info/FrameIT/frameworld?OppositeLen_Problem?pB", - "kind": "OMS" - }, - { - "uri": "http://mathhub.info/FrameIT/frameworld?OppositeLen_Problem?pC", - "kind": "OMS" - }, - { - "uri": "http://mathhub.info/FrameIT/frameworld?OppositeLen_Problem?pangleABC_v", - "kind": "OMS" - } - ], - "kind": "OMA" - } - }, - "df": null - }, - { - "uri": "http://mathhub.info/FrameIT/frameworld?OppositeLen_Problem?pangleBCA", - "label": "pangle$1$2$0", - "tp": { - "original": { - "applicant": { - "uri": "http://mathhub.info/FrameIT/frameworld?AngleFact?angleFact", - "kind": "OMS" - }, - "arguments": [ - { - "uri": "http://mathhub.info/FrameIT/frameworld?OppositeLen_Problem?pB", - "kind": "OMS" - }, - { - "uri": "http://mathhub.info/FrameIT/frameworld?OppositeLen_Problem?pC", - "kind": "OMS" - }, - { - "uri": "http://mathhub.info/FrameIT/frameworld?OppositeLen_Problem?pA", - "kind": "OMS" - }, - { - "float": 90.0, - "kind": "OMF" - } - ], - "kind": "OMA" - }, - "simplified": { - "applicant": { - "uri": "http://mathhub.info/FrameIT/frameworld?AngleFact?angleFact", - "kind": "OMS" - }, - "arguments": [ - { - "uri": "http://mathhub.info/FrameIT/frameworld?OppositeLen_Problem?pB", - "kind": "OMS" - }, - { - "uri": "http://mathhub.info/FrameIT/frameworld?OppositeLen_Problem?pC", - "kind": "OMS" - }, - { - "uri": "http://mathhub.info/FrameIT/frameworld?OppositeLen_Problem?pA", - "kind": "OMS" - }, - { - "float": 90.0, - "kind": "OMF" - } - ], - "kind": "OMA" - } - }, - "df": null - } - ] - } -] \ No newline at end of file