From 098930cc1a7a88383665467c2ce3e9e4fa46a33d Mon Sep 17 00:00:00 2001
From: Paul-Walcher <paulwalcher12@gmail.com>
Date: Sat, 4 May 2024 16:21:54 +0200
Subject: [PATCH] dc
---
.../InteractionEngine/FactHandling/Facts/CircleFact.cs | 10 +---------
.../MMTServer/CommunicationProtocoll/MMTConstants.cs | 3 ++-
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/Assets/Scripts/InteractionEngine/FactHandling/Facts/CircleFact.cs b/Assets/Scripts/InteractionEngine/FactHandling/Facts/CircleFact.cs
index 78893f65..5066dac5 100644
--- a/Assets/Scripts/InteractionEngine/FactHandling/Facts/CircleFact.cs
+++ b/Assets/Scripts/InteractionEngine/FactHandling/Facts/CircleFact.cs
@@ -98,7 +98,7 @@ public CircleFact(string Pid1, string Pid2, float radius, Vector3 normal, SOMDoc
Vector3 normal;
// Getting the plane
// IN case of a normale plane
- if (planeApplicant.Equals(MMTConstants.pointNormalPlane))
+ if (planeApplicant.Equals(MMTConstants.PointsToPlaneNormal))
{
//OMA pointAOMA = (OMA)planeOMA.arguments[0];
//normal = SOMDoc.MakeVector3((OMA)planeOMA.arguments[1]);
@@ -120,14 +120,6 @@ public CircleFact(string Pid1, string Pid2, float radius, Vector3 normal, SOMDoc
normal = Vector3.Cross(v1, v2);
- }
- // In case of parametrized plane
- else if (planeApplicant.Equals(MMTConstants.ParametrizedPlane))
- {
- Vector3 v = SOMDoc.MakeVector3((OMA)planeOMA.arguments[1]);
- Vector3 w = SOMDoc.MakeVector3((OMA)planeOMA.arguments[2]);
-
- normal = Vector3.Cross(v, w).normalized;
}
// incase of smth else. Shouldn't hapepen unless there is an error
else throw new ArgumentException("Invalid planeApplicant: " + planeApplicant);
diff --git a/Assets/Scripts/MMTServer/CommunicationProtocoll/MMTConstants.cs b/Assets/Scripts/MMTServer/CommunicationProtocoll/MMTConstants.cs
index 8c4ff7d4..52412bca 100644
--- a/Assets/Scripts/MMTServer/CommunicationProtocoll/MMTConstants.cs
+++ b/Assets/Scripts/MMTServer/CommunicationProtocoll/MMTConstants.cs
@@ -44,12 +44,13 @@ public static class MMTConstants
public static readonly string TriangleMiddlePoint = "http://mathhub.info/FrameIT/frameworld?FrameITTriangles?triangleMidPointWrapper";
public static readonly string RadiusCircleMetric = "http://mathhub.info/FrameIT/frameworld?FrameITCircle?circleRadius";
+ public static readonly string PointsToPlaneNormal = "http://mathhub.info/FrameIT/frameworld?FrameITCircle?pointsToPlaneNormal";
public static readonly string AreaCircle = "http://mathhub.info/FrameIT/frameworld?FrameITCircle?areaCircle";
public static readonly string VolumeCone = "http://mathhub.info/FrameIT/frameworld?FrameITCone?volumeCone";
public static readonly string ConeOfCircleApex = "http://mathhub.info/FrameIT/frameworld?FrameITCone?circleConeOf";
public static readonly string ParametrizedPlane = "http://mathhub.info/MitM/core/geometry?Planes?ParametrizedPlane";
- public static readonly string pointNormalPlane = "http://mathhub.info/FrameIT/frameworld?FrameITCircle?pointsToPlaneNormal";
+ public static readonly string pointNormalPlane = "http://mathhub.info/MitM/core/geometry?Planes?pointNormalPlane";
public static readonly string OnCircle = "http://mathhub.info/FrameIT/frameworld?FrameITCircle?pointOnCircle";
public static readonly string AnglePlaneLine = "http://mathhub.info/FrameIT/frameworld?FrameITCircle?angleCircleLine";
public static readonly string OrthoCircleLine = "http://mathhub.info/FrameIT/frameworld?FrameITCircle?orthogonalCircleLine";
--
GitLab