Skip to content

Commit 6e18f1c

Browse files
author
Jared Bienz
committed
Fixed bug in code to select related directions. Changed default rotate amount to 1.8.
1 parent d5839db commit 6e18f1c

File tree

4 files changed

+54
-54
lines changed

4 files changed

+54
-54
lines changed

SpatialAlignment-Unity/Assets/SpatialAlignment-Examples/Refinement/Scenes/SA-Refinement.unity

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ MonoBehaviour:
504504
type: 3}
505505
directionAmount: 0.01
506506
forwardDirection: 0
507-
rotationAmount: 3.6
507+
rotationAmount: 1.8
508508
space: 1
509509
upDirection: 5
510510
useController: 1

SpatialAlignment-Unity/Assets/SpatialAlignment-Examples/Refinement/Scenes/SA-RefinementBuilding.unity

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,13 +1017,13 @@ MonoBehaviour:
10171017
m_Script: {fileID: 11500000, guid: e2885058528f56942a057ce91bede070, type: 3}
10181018
m_Name:
10191019
m_EditorClassIdentifier:
1020-
refineOnStart: 0
1020+
refineOnStart: 1
10211021
targetTransform: {fileID: 0}
10221022
controllerPrefab: {fileID: 1469530028792937992, guid: f16944cb4f51ca045bc297eb5098241a,
10231023
type: 3}
10241024
directionAmount: 0.01
10251025
forwardDirection: 0
1026-
rotationAmount: 3.6
1026+
rotationAmount: 1.8
10271027
space: 1
10281028
upDirection: 5
10291029
useController: 1

SpatialAlignment-Unity/Assets/SpatialAlignment/Refinement/Scripts/NudgeRefinement.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public class NudgeRefinement : RefinementBase
7777

7878
[SerializeField]
7979
[Tooltip("The amount to rotate in rotational operations.")]
80-
private float rotationAmount = 3.6f;
80+
private float rotationAmount = 1.8f;
8181

8282
[SerializeField]
8383
[Tooltip("The coordinate system to use when performing operations.")]
@@ -327,7 +327,7 @@ public virtual bool IsControllerShown
327327
/// Gets or sets the amount to rotate in rotational operations.
328328
/// </summary>
329329
/// <remarks>
330-
/// The default is 3.6 Euler.
330+
/// The default is 1.8 Euler.
331331
/// </remarks>
332332
public float RotationAmount { get { return rotationAmount; } set { rotationAmount = value; } }
333333

SpatialAlignment-Unity/Assets/SpatialAlignment/Utilities/Scripts/SpatialExtensions.cs

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -104,118 +104,118 @@ static public void SetMeshesEnabled(this GameObject g, bool enabled, bool inChil
104104
/// </returns>
105105
static public RefinementDirection RelativeTo(this RefinementDirection direction, RefinementDirection relative)
106106
{
107-
switch (direction)
107+
switch (relative)
108108
{
109-
case RefinementDirection.Forward:
110-
switch (relative)
109+
case RefinementDirection.Forward: // Facing Forward
110+
switch (direction)
111111
{
112112
case RefinementDirection.Forward:
113-
return RefinementDirection.Forward;
113+
return RefinementDirection.Forward; // Facing Forward Looking Forward is Forward
114114
case RefinementDirection.Back:
115-
return RefinementDirection.Back;
115+
return RefinementDirection.Back; // Facing Forward Looking Back is Back
116116
case RefinementDirection.Down:
117-
return RefinementDirection.Down;
117+
return RefinementDirection.Down; // Facing Forward Looking Down is Down
118118
case RefinementDirection.Left:
119-
return RefinementDirection.Left;
119+
return RefinementDirection.Left; // Facing Forward Looking Left is Left
120120
case RefinementDirection.Right:
121-
return RefinementDirection.Right;
121+
return RefinementDirection.Right; // Facing Forward Looking Right is Right
122122
case RefinementDirection.Up:
123-
return RefinementDirection.Up;
123+
return RefinementDirection.Up; // Facing Forward Looking Up is Up
124124
default:
125125
throw new InvalidOperationException($"Unknown {nameof(RefinementDirection)}: {relative}");
126126
}
127127

128-
case RefinementDirection.Back:
129-
switch (relative)
128+
case RefinementDirection.Back: // Back Looking
129+
switch (direction)
130130
{
131131
case RefinementDirection.Forward:
132-
return RefinementDirection.Back;
132+
return RefinementDirection.Back; // Facing Back Looking Forward is Back
133133
case RefinementDirection.Back:
134-
return RefinementDirection.Forward;
134+
return RefinementDirection.Forward; // Facing Back Looking Back is Forward
135135
case RefinementDirection.Down:
136-
return RefinementDirection.Down;
136+
return RefinementDirection.Down; // Facing Back Looking Down is Down
137137
case RefinementDirection.Left:
138-
return RefinementDirection.Right;
138+
return RefinementDirection.Right; // Facing Back Looking Left is Right
139139
case RefinementDirection.Right:
140-
return RefinementDirection.Left;
140+
return RefinementDirection.Left; // Facing Back Looking Right is Left
141141
case RefinementDirection.Up:
142-
return RefinementDirection.Up;
142+
return RefinementDirection.Up; // Facing Back Looking Up is Up
143143
default:
144144
throw new InvalidOperationException($"Unknown {nameof(RefinementDirection)}: {relative}");
145145
}
146146

147-
case RefinementDirection.Down:
148-
switch (relative)
147+
case RefinementDirection.Down: // Facing Down
148+
switch (direction)
149149
{
150150
case RefinementDirection.Forward:
151-
return RefinementDirection.Down;
151+
return RefinementDirection.Down; // Facing Down Looking Forward is Down
152152
case RefinementDirection.Back:
153-
return RefinementDirection.Up;
153+
return RefinementDirection.Up; // Facing Back Looking Back is Up
154154
case RefinementDirection.Down:
155-
return RefinementDirection.Back;
155+
return RefinementDirection.Back; // Facing Down Looking Down is Back
156156
case RefinementDirection.Left:
157-
return RefinementDirection.Left;
157+
return RefinementDirection.Left; // Facing Down Looking Left is Left
158158
case RefinementDirection.Right:
159-
return RefinementDirection.Right;
159+
return RefinementDirection.Right; // Facing Down Looking Right is Right
160160
case RefinementDirection.Up:
161-
return RefinementDirection.Forward;
161+
return RefinementDirection.Forward; // Facing Down Looking Up is Forward
162162
default:
163163
throw new InvalidOperationException($"Unknown {nameof(RefinementDirection)}: {relative}");
164164
}
165165

166-
case RefinementDirection.Left:
167-
switch (relative)
166+
case RefinementDirection.Left: // Facing Left
167+
switch (direction)
168168
{
169169
case RefinementDirection.Forward:
170-
return RefinementDirection.Left;
170+
return RefinementDirection.Left; // Facing Left Looking Forward is Left
171171
case RefinementDirection.Back:
172-
return RefinementDirection.Right;
172+
return RefinementDirection.Right; // Facing Left Looking Back is Right
173173
case RefinementDirection.Down:
174-
return RefinementDirection.Down;
174+
return RefinementDirection.Down; // Facing Left Looking Down is Down
175175
case RefinementDirection.Left:
176-
return RefinementDirection.Back;
176+
return RefinementDirection.Back; // Facing Left Looking Left is Back
177177
case RefinementDirection.Right:
178-
return RefinementDirection.Forward;
178+
return RefinementDirection.Forward; // Facing Left Looking Right is Forward
179179
case RefinementDirection.Up:
180-
return RefinementDirection.Up;
180+
return RefinementDirection.Up; // Facing Left Looking Up is Up
181181
default:
182182
throw new InvalidOperationException($"Unknown {nameof(RefinementDirection)}: {relative}");
183183
}
184184

185-
case RefinementDirection.Right:
186-
switch (relative)
185+
case RefinementDirection.Right: // Facing Right
186+
switch (direction)
187187
{
188188
case RefinementDirection.Forward:
189-
return RefinementDirection.Right;
189+
return RefinementDirection.Right; // Facing Right Looking Forward is Forward
190190
case RefinementDirection.Back:
191-
return RefinementDirection.Left;
191+
return RefinementDirection.Left; // Facing Right Looking Back is Left
192192
case RefinementDirection.Down:
193-
return RefinementDirection.Down;
193+
return RefinementDirection.Down; // Facing Right Looking Down is Down
194194
case RefinementDirection.Left:
195-
return RefinementDirection.Forward;
195+
return RefinementDirection.Forward; // Facing Right Looking Left is Forward
196196
case RefinementDirection.Right:
197-
return RefinementDirection.Back;
197+
return RefinementDirection.Back; // Facing Right Looking Right is Back
198198
case RefinementDirection.Up:
199-
return RefinementDirection.Up;
199+
return RefinementDirection.Up; // Facing Right Looking Up is Up
200200
default:
201201
throw new InvalidOperationException($"Unknown {nameof(RefinementDirection)}: {relative}");
202202
}
203203

204-
case RefinementDirection.Up:
205-
switch (relative)
204+
case RefinementDirection.Up: // Facing Up
205+
switch (direction)
206206
{
207207
case RefinementDirection.Forward:
208-
return RefinementDirection.Up;
208+
return RefinementDirection.Up; // Facing Up Looking Forward is Up
209209
case RefinementDirection.Back:
210-
return RefinementDirection.Down;
210+
return RefinementDirection.Down; // Facing Up Looking Back is Down
211211
case RefinementDirection.Down:
212-
return RefinementDirection.Forward;
212+
return RefinementDirection.Forward; // Facing Up Looking Down is Forward
213213
case RefinementDirection.Left:
214-
return RefinementDirection.Left;
214+
return RefinementDirection.Left; // Facing Up Looking Left is Left
215215
case RefinementDirection.Right:
216-
return RefinementDirection.Right;
216+
return RefinementDirection.Right; // Facing Up Looking Right is Right
217217
case RefinementDirection.Up:
218-
return RefinementDirection.Back;
218+
return RefinementDirection.Back; // Facing Up Looking Up is Back
219219
default:
220220
throw new InvalidOperationException($"Unknown {nameof(RefinementDirection)}: {relative}");
221221
}

0 commit comments

Comments
 (0)