Skip to content
Snippets Groups Projects
Commit 098930cc authored by Paul-Walcher's avatar Paul-Walcher
Browse files

dc

parent 38f115d9
No related branches found
No related tags found
No related merge requests found
...@@ -98,7 +98,7 @@ public CircleFact(string Pid1, string Pid2, float radius, Vector3 normal, SOMDoc ...@@ -98,7 +98,7 @@ public CircleFact(string Pid1, string Pid2, float radius, Vector3 normal, SOMDoc
Vector3 normal; Vector3 normal;
// Getting the plane // Getting the plane
// IN case of a normale plane // IN case of a normale plane
if (planeApplicant.Equals(MMTConstants.pointNormalPlane)) if (planeApplicant.Equals(MMTConstants.PointsToPlaneNormal))
{ {
//OMA pointAOMA = (OMA)planeOMA.arguments[0]; //OMA pointAOMA = (OMA)planeOMA.arguments[0];
//normal = SOMDoc.MakeVector3((OMA)planeOMA.arguments[1]); //normal = SOMDoc.MakeVector3((OMA)planeOMA.arguments[1]);
...@@ -120,14 +120,6 @@ public CircleFact(string Pid1, string Pid2, float radius, Vector3 normal, SOMDoc ...@@ -120,14 +120,6 @@ public CircleFact(string Pid1, string Pid2, float radius, Vector3 normal, SOMDoc
normal = Vector3.Cross(v1, v2); 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 // incase of smth else. Shouldn't hapepen unless there is an error
else throw new ArgumentException("Invalid planeApplicant: " + planeApplicant); else throw new ArgumentException("Invalid planeApplicant: " + planeApplicant);
......
...@@ -44,12 +44,13 @@ public static class MMTConstants ...@@ -44,12 +44,13 @@ public static class MMTConstants
public static readonly string TriangleMiddlePoint = "http://mathhub.info/FrameIT/frameworld?FrameITTriangles?triangleMidPointWrapper"; 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 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 AreaCircle = "http://mathhub.info/FrameIT/frameworld?FrameITCircle?areaCircle";
public static readonly string VolumeCone = "http://mathhub.info/FrameIT/frameworld?FrameITCone?volumeCone"; 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 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 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 OnCircle = "http://mathhub.info/FrameIT/frameworld?FrameITCircle?pointOnCircle";
public static readonly string AnglePlaneLine = "http://mathhub.info/FrameIT/frameworld?FrameITCircle?angleCircleLine"; public static readonly string AnglePlaneLine = "http://mathhub.info/FrameIT/frameworld?FrameITCircle?angleCircleLine";
public static readonly string OrthoCircleLine = "http://mathhub.info/FrameIT/frameworld?FrameITCircle?orthogonalCircleLine"; public static readonly string OrthoCircleLine = "http://mathhub.info/FrameIT/frameworld?FrameITCircle?orthogonalCircleLine";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment