Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
U
UFrameIT
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
FrameIT
UFrameIT
Commits
098930cc
Commit
098930cc
authored
10 months ago
by
Paul-Walcher
Browse files
Options
Downloads
Patches
Plain Diff
dc
parent
38f115d9
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Assets/Scripts/InteractionEngine/FactHandling/Facts/CircleFact.cs
+1
-9
1 addition, 9 deletions
...cripts/InteractionEngine/FactHandling/Facts/CircleFact.cs
Assets/Scripts/MMTServer/CommunicationProtocoll/MMTConstants.cs
+2
-1
2 additions, 1 deletion
.../Scripts/MMTServer/CommunicationProtocoll/MMTConstants.cs
with
3 additions
and
10 deletions
Assets/Scripts/InteractionEngine/FactHandling/Facts/CircleFact.cs
+
1
−
9
View file @
098930cc
...
@@ -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
.
p
ointNormal
Plane
))
if
(
planeApplicant
.
Equals
(
MMTConstants
.
P
oint
sToPlane
Normal
))
{
{
//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
);
...
...
This diff is collapsed.
Click to expand it.
Assets/Scripts/MMTServer/CommunicationProtocoll/MMTConstants.cs
+
2
−
1
View file @
098930cc
...
@@ -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"
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment