Skip to content

Commit 3e88272

Browse files
author
David Kline
authored
Merge pull request #9353 from MaxWang-MS/ui_fix
Fix two bounds control related issues
2 parents 27dac55 + e46e837 commit 3e88272

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

Assets/MRTK/SDK/Features/UX/Prefabs/Slate/Slate.prefab

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,6 +1026,7 @@ GameObject:
10261026
- component: {fileID: 1720691180653164336}
10271027
- component: {fileID: 8573989461166582953}
10281028
- component: {fileID: 8306022778500059610}
1029+
- component: {fileID: 8892923248051100357}
10291030
m_Layer: 0
10301031
m_Name: Slate
10311032
m_TagString: Untagged
@@ -1262,6 +1263,20 @@ MonoBehaviour:
12621263
scaleMinimum: 0.3
12631264
scaleMaximum: 5
12641265
relativeToInitialState: 1
1266+
--- !u!114 &8892923248051100357
1267+
MonoBehaviour:
1268+
m_ObjectHideFlags: 0
1269+
m_CorrespondingSourceObject: {fileID: 0}
1270+
m_PrefabInstance: {fileID: 0}
1271+
m_PrefabAsset: {fileID: 0}
1272+
m_GameObject: {fileID: 7779420039263858270}
1273+
m_Enabled: 1
1274+
m_EditorHideFlags: 0
1275+
m_Script: {fileID: 11500000, guid: 5afd5316c63705643b3daba5a6e923bd, type: 3}
1276+
m_Name:
1277+
m_EditorClassIdentifier:
1278+
ShowTetherWhenManipulating: 0
1279+
IsBoundsHandles: 0
12651280
--- !u!1 &8623592401023769555
12661281
GameObject:
12671282
m_ObjectHideFlags: 0

Assets/MRTK/SDK/Features/UX/Scripts/BoundsControl/Visuals/TranslationHandles.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ protected override Quaternion GetRotationRealignment(int handleIndex)
4646
// Align handle with its edge assuming that the prefab is initially aligned with the up direction
4747
if (VisualUtils.FaceAxisType[handleIndex] == CardinalAxisType.X)
4848
{
49-
return Quaternion.FromToRotation(Vector3.up, directionSign * Vector3.right);
49+
return Quaternion.FromToRotation(Vector3.forward, directionSign * Vector3.right);
5050
}
5151
else if (VisualUtils.FaceAxisType[handleIndex] == CardinalAxisType.Z)
5252
{
53-
return Quaternion.FromToRotation(Vector3.up, directionSign * Vector3.forward);
53+
return Quaternion.FromToRotation(Vector3.forward, directionSign * Vector3.forward);
5454
}
5555
else // y axis
5656
{

0 commit comments

Comments
 (0)