Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
Failframeit
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
Failframeit
Commits
39fe6ed1
Commit
39fe6ed1
authored
5 years ago
by
John Schihada
Browse files
Options
Downloads
Patches
Plain Diff
Adjusted Global CultureInfo(en-US)
parent
acfc025c
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/InteractionEngine/FactSpawner.cs
+2
-2
2 additions, 2 deletions
Assets/InteractionEngine/FactSpawner.cs
Assets/InteractionEngine/WorldCursor.cs
+2
-1
2 additions, 1 deletion
Assets/InteractionEngine/WorldCursor.cs
with
4 additions
and
3 deletions
Assets/InteractionEngine/FactSpawner.cs
+
2
−
2
View file @
39fe6ed1
...
...
@@ -92,7 +92,7 @@ public void SpawnLine(LineFact lineFact)
//string letter = ((Char)(64 + lineFact.Id + 1)).ToString();
//line.GetComponentInChildren<TextMeshPro>().text = letter;
line
.
GetComponentInChildren
<
TextMeshPro
>().
text
=
((
Char
)(
64
+
pointFact1
.
Id
+
1
)).
ToString
()
+
((
Char
)(
64
+
pointFact2
.
Id
+
1
)).
ToString
();
line
.
GetComponentInChildren
<
TextMeshPro
>().
text
+=
" = "
+
Math
.
Round
((
point1
-
point2
).
magnitude
,
2
)
.
ToString
().
Replace
(
","
,
"."
)
+
" m"
;
line
.
GetComponentInChildren
<
TextMeshPro
>().
text
+=
" = "
+
Math
.
Round
((
point1
-
point2
).
magnitude
,
2
)
+
" m"
;
line
.
GetComponentInChildren
<
FactObject
>().
Id
=
lineFact
.
Id
;
//If a new Line was spawned -> We are in CreateLineMode -> Then we want the collider to be disabled
if
(
CommunicationEvents
.
ActiveToolMode
!=
ToolMode
.
ExtraMode
)
...
...
@@ -226,7 +226,7 @@ public void SpawnAngle(AngleFact angleFact)
TextMeshPro
[]
texts
=
angle
.
GetComponentsInChildren
<
TextMeshPro
>();
foreach
(
TextMeshPro
t
in
texts
)
{
//Change Text not to the id, but to the angle-value (from both sides) AND change font-size relative to length of the angle (from both sides)
t
.
text
=
Math
.
Abs
(
Math
.
Round
(
Vector3
.
Angle
((
point1
-
point2
).
normalized
,
(
point3
-
point2
).
normalized
),
1
))
.
ToString
().
Replace
(
","
,
"."
)
+
"°"
;
t
.
text
=
Math
.
Abs
(
Math
.
Round
(
Vector3
.
Angle
((
point1
-
point2
).
normalized
,
(
point3
-
point2
).
normalized
),
1
))
+
"°"
;
t
.
fontSize
=
angle
.
GetComponentInChildren
<
TextMeshPro
>().
fontSize
*
angle
.
transform
.
GetChild
(
0
).
transform
.
GetChild
(
0
).
localScale
.
x
;
}
...
...
This diff is collapsed.
Click to expand it.
Assets/InteractionEngine/WorldCursor.cs
+
2
−
1
View file @
39fe6ed1
using
System
;
using
System.Globalization
;
using
System.Collections
;
using
System.Collections.Generic
;
using
UnityEngine
;
...
...
@@ -18,7 +19,7 @@ void Start()
//Set MarkPointMode as the default ActiveToolMode
// ActiveToolMode = ToolMode.ExtraMode;//ToolMode.MarkPointMode;
CommunicationEvents
.
ToolModeChangedEvent
.
Invoke
(
ActiveToolMode
);
CultureInfo
.
CurrentCulture
=
new
CultureInfo
(
"en-US"
);
}
...
...
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