From 5e397da6f3af17911bed19dfb064ad6d452016e4 Mon Sep 17 00:00:00 2001
From: Marius Kern <mariusskern@gmail.com>
Date: Sun, 23 Jun 2024 15:26:14 +0200
Subject: [PATCH] Rectangle and Triangle fact changed
---
.../InteractionEngine/FactHandling/Facts/RectangleFact.cs | 6 +++---
.../InteractionEngine/FactHandling/Facts/TriangleFact2.cs | 7 +------
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/Assets/Scripts/InteractionEngine/FactHandling/Facts/RectangleFact.cs b/Assets/Scripts/InteractionEngine/FactHandling/Facts/RectangleFact.cs
index b3790380..a66035f2 100644
--- a/Assets/Scripts/InteractionEngine/FactHandling/Facts/RectangleFact.cs
+++ b/Assets/Scripts/InteractionEngine/FactHandling/Facts/RectangleFact.cs
@@ -53,13 +53,11 @@ public RectangleFact() : base(){
[JsonConstructor]
public RectangleFact( string PidA, string PidB, string PidC) : base()
{
-
this.PidA = PidA;
this.PidB = PidB;
this.PidC = PidC;
calculate_vectors();
-
}
/// <summary>
@@ -74,6 +72,8 @@ public RectangleFact(string PidA, string PidB, string PidC, SOMDoc ServerDefinit
this.PidB = PidB;
this.PidC = PidC;
+ this.ServerDefinition = ServerDefinition;
+
calculate_vectors();
}
@@ -95,7 +95,7 @@ public RectangleFact(string PidA, string PidB, string PidC, SOMDoc ServerDefinit
- ret.Add(new RectangleFact(PidA, PidB, PidC, fact.@ref));
+ ret.Add(new RectangleFact(PidA, PidB, PidC));
//ParsingDictionary.parseTermsToId.TryAdd(defines.ToString(), fact.@ref.uri);
//ret.Add(new PointFact(SOMDoc.MakeVector3(defines), fact.@ref));
diff --git a/Assets/Scripts/InteractionEngine/FactHandling/Facts/TriangleFact2.cs b/Assets/Scripts/InteractionEngine/FactHandling/Facts/TriangleFact2.cs
index a38c2747..6b77cac4 100644
--- a/Assets/Scripts/InteractionEngine/FactHandling/Facts/TriangleFact2.cs
+++ b/Assets/Scripts/InteractionEngine/FactHandling/Facts/TriangleFact2.cs
@@ -76,13 +76,11 @@ public TriangleFact2() : base(){
[JsonConstructor]
public TriangleFact2( string PidA, string PidB, string PidC) : base()
{
-
this.PidA = PidA;
this.PidB = PidB;
this.PidC = PidC;
calculate_vectors();
-
}
/// <summary>
@@ -93,8 +91,6 @@ public TriangleFact2( string PidA, string PidB, string PidC) : base()
/// <param name="ServerDefinition">MMT URI as OMS</param>
public TriangleFact2(string PidA, string PidB, string PidC, SOMDoc ServerDefinition) : base()
{
-
-
this.PidA = PidA;
this.PidB = PidB;
this.PidC = PidC;
@@ -102,7 +98,6 @@ public TriangleFact2(string PidA, string PidB, string PidC, SOMDoc ServerDefinit
this.ServerDefinition = ServerDefinition;
calculate_vectors();
-
}
/// \copydoc Fact.parseFact(ScrollFact)
@@ -123,7 +118,7 @@ public TriangleFact2(string PidA, string PidB, string PidC, SOMDoc ServerDefinit
- ret.Add(new TriangleFact2(PidA, PidB, PidC, fact.@ref));
+ ret.Add(new TriangleFact2(PidA, PidB, PidC));
//ParsingDictionary.parseTermsToId.TryAdd(defines.ToString(), fact.@ref.uri);
//ret.Add(new PointFact(SOMDoc.MakeVector3(defines), fact.@ref));
--
GitLab