You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/BoundsControl.cs
+8-14Lines changed: 8 additions & 14 deletions
Original file line number
Diff line number
Diff line change
@@ -105,8 +105,7 @@ public bool OverrideBounds
105
105
}
106
106
}
107
107
108
-
[SerializeField]
109
-
[DrawIf("overrideBounds")]
108
+
[SerializeField,DrawIf("overrideBounds")]
110
109
[Tooltip("The bounds will be calculated from this object and this object only, instead of the entire hierarchy.")]
111
110
privateTransformboundsOverride;
112
111
@@ -196,8 +195,7 @@ public bool ToggleHandlesOnClick
196
195
set=>toggleHandlesOnClick=value;
197
196
}
198
197
199
-
[SerializeField]
200
-
[DrawIf("toggleHandlesOnClick")]
198
+
[SerializeField,DrawIf("toggleHandlesOnClick")]
201
199
[Tooltip("During a selection of the associated interactable, if the interactable is dragged/moved a smaller distance than this value, the handles will be activated/deactivated.")]
202
200
privatefloatdragToggleThreshold=0.02f;
203
201
@@ -331,8 +329,7 @@ public bool SmoothingActive
331
329
set=>smoothingActive=value;
332
330
}
333
331
334
-
[SerializeField]
335
-
[DrawIf("smoothingActive")]
332
+
[SerializeField,DrawIf("smoothingActive")]
336
333
[Tooltip("Enter amount representing amount of smoothing to apply to the rotation. Smoothing of 0 means no smoothing. Max value means no change to value.")]
337
334
privatefloatrotateLerpTime=0.00001f;
338
335
@@ -345,8 +342,7 @@ public float RotateLerpTime
345
342
set=>rotateLerpTime=value;
346
343
}
347
344
348
-
[SerializeField]
349
-
[DrawIf("smoothingActive")]
345
+
[SerializeField,DrawIf("smoothingActive")]
350
346
[Tooltip("Enter amount representing amount of smoothing to apply to the scale. Smoothing of 0 means no smoothing. Max value means no change to value.")]
351
347
privatefloatscaleLerpTime=0.00001f;
352
348
@@ -359,8 +355,7 @@ public float ScaleLerpTime
359
355
set=>scaleLerpTime=value;
360
356
}
361
357
362
-
[SerializeField]
363
-
[DrawIf("smoothingActive")]
358
+
[SerializeField,DrawIf("smoothingActive")]
364
359
[Tooltip("Enter amount representing amount of smoothing to apply to the translation. "+
365
360
"Smoothing of 0 means no smoothing. Max value means no change to value.")]
366
361
privatefloattranslateLerpTime=0.00001f;
@@ -390,8 +385,7 @@ public bool EnableConstraints
390
385
set=>enableConstraints=value;
391
386
}
392
387
393
-
[SerializeField]
394
-
[DrawIf("enableConstraints")]
388
+
[SerializeField,DrawIf("enableConstraints")]
395
389
[Tooltip("Constraint manager slot to enable constraints when manipulating the object.")]
396
390
privateConstraintManagerconstraintsManager;
397
391
/// <summary>
@@ -434,7 +428,7 @@ public LogicType ManipulationLogicTypes
Copy file name to clipboardExpand all lines: org.mixedrealitytoolkit.spatialmanipulation/ObjectManipulator/ObjectManipulator.cs
+10-18Lines changed: 10 additions & 18 deletions
Original file line number
Diff line number
Diff line change
@@ -70,7 +70,7 @@ public enum RotateAnchorType
70
70
/// This enumeration describing the type of behavior to apply when a
71
71
/// <see cref="ObjectManipulator"/> is released by a controller.
72
72
/// </summary>
73
-
[System.Flags]
73
+
[Flags]
74
74
publicenumReleaseBehaviorType
75
75
{
76
76
/// <summary>
@@ -206,8 +206,7 @@ public bool ApplyTorque
206
206
set=>applyTorque=value;
207
207
}
208
208
209
-
[SerializeField]
210
-
[Range(0.001f,2.0f)]
209
+
[SerializeField,Range(0.001f,2.0f)]
211
210
[Tooltip("The time scale at which a Rigidbody reacts to input movement defined as oscillation period of the dampened spring force.")]
212
211
privatefloatspringForceSoftness=0.1f;
213
212
@@ -220,8 +219,7 @@ public float SpringForceSoftness
220
219
set=>springForceSoftness=value;
221
220
}
222
221
223
-
[SerializeField]
224
-
[Range(0.001f,2.0f)]
222
+
[SerializeField,Range(0.001f,2.0f)]
225
223
[Tooltip("The time scale at which a Rigidbody reacts to input rotation defined as oscillation period of the dampened spring torque.")]
226
224
privatefloatspringTorqueSoftness=0.1f;
227
225
@@ -234,9 +232,8 @@ public float SpringTorqueSoftness
234
232
set=>springTorqueSoftness=value;
235
233
}
236
234
237
-
[SerializeField]
238
-
[Range(0,2.0f)]
239
-
[Tooltip("The damping of the spring force&torque. A value of one corresponds to critical damping, lower values lead to under damping or oscillation.")]
235
+
[SerializeField,Range(0,2.0f)]
236
+
[Tooltip("The damping of the spring force & torque. A value of one corresponds to critical damping, lower values lead to under damping or oscillation.")]
240
237
privatefloatspringDamping=1.0f;
241
238
242
239
/// <summary>
@@ -248,8 +245,7 @@ public float SpringDamping
248
245
set=>springDamping=value;
249
246
}
250
247
251
-
[SerializeField]
252
-
[Range(0,10000f)]
248
+
[SerializeField,Range(0,10000f)]
253
249
[Tooltip("The maximum acceleration applied by the spring force to avoid trembling when pushing a body against a static object.")]
254
250
privatefloatspringForceLimit=100.0f;
255
251
@@ -324,8 +320,7 @@ public SystemType TransformSmoothingLogicType
[Tooltip("Frame-rate independent smoothing for far interactions. Far smoothing is enabled by default.")]
330
325
privateboolsmoothingFar=true;
331
326
@@ -357,8 +352,7 @@ public bool SmoothingNear
357
352
set=>smoothingNear=value;
358
353
}
359
354
360
-
[SerializeField]
361
-
[Range(0,1)]
355
+
[SerializeField,Range(0,1)]
362
356
[Tooltip("Enter amount representing amount of smoothing to apply to the movement. Smoothing of 0 means no smoothing. Max value means no change to value.")]
363
357
privatefloatmoveLerpTime=0.001f;
364
358
@@ -371,8 +365,7 @@ public float MoveLerpTime
371
365
set=>moveLerpTime=value;
372
366
}
373
367
374
-
[SerializeField]
375
-
[Range(0,1)]
368
+
[SerializeField,Range(0,1)]
376
369
[Tooltip("Enter amount representing amount of smoothing to apply to the rotation. Smoothing of 0 means no smoothing. Max value means no change to value.")]
377
370
privatefloatrotateLerpTime=0.001f;
378
371
@@ -385,8 +378,7 @@ public float RotateLerpTime
385
378
set=>rotateLerpTime=value;
386
379
}
387
380
388
-
[SerializeField]
389
-
[Range(0,1)]
381
+
[SerializeField,Range(0,1)]
390
382
[Tooltip("Enter amount representing amount of smoothing to apply to the scale. Smoothing of 0 means no smoothing. Max value means no change to value.")]
0 commit comments