From bb945319736cd6af5e4228f853d744620404eb3f Mon Sep 17 00:00:00 2001 From: MaZiFAU <63099053+MaZiFAU@users.noreply.github.com> Date: Thu, 23 May 2024 16:03:15 +0200 Subject: [PATCH] Some comments/Refactoring --- Assets/Scripts/GenerateDemoFiles.cs | 12 +++++++----- .../InteractionEngine/FactHandling/Facts/Fact.cs | 3 +++ .../MMTServer/CommunicationProtocoll/SOMDocs.cs | 4 ++++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Assets/Scripts/GenerateDemoFiles.cs b/Assets/Scripts/GenerateDemoFiles.cs index 93c032f0..1d691910 100644 --- a/Assets/Scripts/GenerateDemoFiles.cs +++ b/Assets/Scripts/GenerateDemoFiles.cs @@ -246,10 +246,12 @@ public static void GenerateSlingShotStage() } // island - List<TriangleFact> Tris = new List<TriangleFact>(); - Tris.Add(new TriangleFact(new Vector3[] { verts[0], verts[3], verts[1] })); - Tris.Add(new TriangleFact(new Vector3[] { verts[0], verts[4], verts[3] })); - Tris.Add(new TriangleFact(new Vector3[] { verts[4], verts[2], verts[3] })); + List<TriangleFact> Tris = new List<TriangleFact> + { + new TriangleFact(new Vector3[] { verts[0], verts[3], verts[1] }), + new TriangleFact(new Vector3[] { verts[0], verts[4], verts[3] }), + new TriangleFact(new Vector3[] { verts[4], verts[2], verts[3] }) + }; // landing Zone Vector3[] plane = verts @@ -846,4 +848,4 @@ public static void GenerateCanonBallStage3D() StageStatic.SetMode(StageStatic.Mode.Create); StageStatic.stage.store(false, true); } -} +} \ No newline at end of file diff --git a/Assets/Scripts/InteractionEngine/FactHandling/Facts/Fact.cs b/Assets/Scripts/InteractionEngine/FactHandling/Facts/Fact.cs index 47361930..69d74d13 100644 --- a/Assets/Scripts/InteractionEngine/FactHandling/Facts/Fact.cs +++ b/Assets/Scripts/InteractionEngine/FactHandling/Facts/Fact.cs @@ -580,6 +580,9 @@ static string _SendAdd(string path, string body)//, Action<string> uriCallback) /// <exception cref="NotImplementedException">iff <paramref name="payload"/> is of unhandled type</exception> public static void MakeFact(List<Fact> ret, object payload, SOMDoc ServerDefinition, bool BypassServer, SOMDoc BypassURI = null) { + //TODO? cast per look-up via SOMDOc root type => every Fact has 2(?) constructors(object payload, string URI = null) + //Or: generic/universal fact serialization? + Type type = payload.GetType(); if (BypassServer diff --git a/Assets/Scripts/MMTServer/CommunicationProtocoll/SOMDocs.cs b/Assets/Scripts/MMTServer/CommunicationProtocoll/SOMDocs.cs index 5011c89e..be36ac17 100644 --- a/Assets/Scripts/MMTServer/CommunicationProtocoll/SOMDocs.cs +++ b/Assets/Scripts/MMTServer/CommunicationProtocoll/SOMDocs.cs @@ -71,6 +71,10 @@ public override int GetHashCode(object obj) [JsonSubtypes.FallBackSubType(typeof(FallbackWrapper))] //[JsonSubtypes.KnownSubType(typeof(FallbackWrapper), "SFunction")] //[JsonSubtypes.KnownSubTypeWithProperty(typeof(FallbackWrapper), "SFunction")] + + /// <summary> + /// Implements the Server REST API for Formats/SOMDoc from https://github.com/UniFormal/MMT/blob/devel/src/frameit-mmt/README.md#formats + /// </summary> abstract public partial class SOMDoc { public string kind; -- GitLab