Skip to content

Commit 2fb860a

Browse files
committed
Cleanup
1 parent fb8de1f commit 2fb860a

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

ToySerialController.sln

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29318.209
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.7.34003.232
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ToySerialController", "ToySerialController.csproj", "{86C32DA8-DA52-47FB-AC78-B6BBFC7963F5}"
77
EndProject

src/MotionSource/AbstractAssetBase.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ public virtual void CreateUI(IUIBuilder builder)
3131
AssetChooser = builder.CreateScrollablePopup("MotionSource:Asset", "Select Asset", null, null, AssetChooserCallback);
3232
ComponentChooser = builder.CreateScrollablePopup("MotionSource:Component", "Select Component", null, null, ComponentChooserCallback);
3333
UpDirectionChooser = builder.CreateScrollablePopup("MotionSource:UpDirection", "Select Up Direction", new List<string> { "+Up", "+Right", "+Forward", "-Up", "-Right", "-Forward" }, "+Up", null);
34-
UpOffsetSlider = builder.CreateSlider("MotionSource:UpOffset", "Up Offset", -0.5f, -1, 1, true, true);
35-
RightOffsetSlider = builder.CreateSlider("MotionSource:RightOffset", "Right Offset", 0, -1, 1, true, true);
36-
ForwardOffsetSlider = builder.CreateSlider("MotionSource:ForwardOffset", "Forward Offset", 0, -1, 1, true, true);
34+
UpOffsetSlider = builder.CreateSlider("MotionSource:UpOffset", "Up Offset (%)", -0.5f, -1, 1, true, true, valueFormat: "P0");
35+
RightOffsetSlider = builder.CreateSlider("MotionSource:RightOffset", "Right Offset (%)", 0, -1, 1, true, true, valueFormat: "P0");
36+
ForwardOffsetSlider = builder.CreateSlider("MotionSource:ForwardOffset", "Forward Offset (%)", 0, -1, 1, true, true, valueFormat: "P0");
3737

3838
FindAssets();
3939
}
@@ -114,10 +114,10 @@ public virtual bool Update()
114114
}
115115

116116
Extents = transform.rotation * bounds.extents;
117-
var offsetUp = Up * Vector3.Project(Extents, Up).magnitude * UpOffsetSlider.val * 2;
118-
var offsetRight = Right * Vector3.Project(Extents, Right).magnitude * RightOffsetSlider.val * 2;
119-
var offsetForward = Forward * Vector3.Project(Extents, Forward).magnitude * ForwardOffsetSlider.val * 2;
120117

118+
var offsetUp = Vector3.Project(Extents, Up) * UpOffsetSlider.val * 2;
119+
var offsetRight = Vector3.Project(Extents, Right) * RightOffsetSlider.val * 2;
120+
var offsetForward = Vector3.Project(Extents, Forward) * ForwardOffsetSlider.val * 2;
121121
Position = transform.position + transform.rotation * bounds.center + offsetUp + offsetRight + offsetForward;
122122

123123
return true;

src/MotionSource/References/AssetReference.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class AssetReference : AbstractAssetBase, IMotionSourceReference
1616
public override void CreateUI(IUIBuilder builder)
1717
{
1818
base.CreateUI(builder);
19-
LengthScaleSlider = builder.CreateSlider("MotionSource:LengthScale", "Length Scale", 1, 0, 2, true, true);
19+
LengthScaleSlider = builder.CreateSlider("MotionSource:LengthScale", "Length Scale (%)", 1, 0, 2, true, true, valueFormat: "P0");
2020
}
2121

2222
public override void DestroyUI(IUIBuilder builder)

0 commit comments

Comments
 (0)