Skip to content

Commit 7254d60

Browse files
amirebrahimiamirebrahimi
authored
Merge pull request #183 from Unity-Technologies/staging
0.0.7 staging -> master
2 parents 1253841 + d7c4a73 commit 7254d60

File tree

263 files changed

+19202
-24754
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

263 files changed

+19202
-24754
lines changed

‎Action Maps/DirectSelectInput.asset

-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ MonoBehaviour:
1111
m_Script: {fileID: 11500000, guid: 24e5bc088c9caeb44bc4283dc321b033, type: 3}
1212
m_Name: DirectSelectInput
1313
m_EditorClassIdentifier:
14-
m_RunInEditMode: 0
1514
m_Actions:
1615
- {fileID: 114000012349872818}
1716
- {fileID: 114000013014554554}
@@ -67,7 +66,6 @@ MonoBehaviour:
6766
m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
6867
m_Name: Cancel
6968
m_EditorClassIdentifier:
70-
m_RunInEditMode: 0
7169
m_ActionMap: {fileID: 11400000}
7270
m_ActionIndex: 2
7371
m_ControlData:
@@ -88,7 +86,6 @@ MonoBehaviour:
8886
m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
8987
m_Name: Select
9088
m_EditorClassIdentifier:
91-
m_RunInEditMode: 0
9289
m_ActionMap: {fileID: 11400000}
9390
m_ActionIndex: 0
9491
m_ControlData:
@@ -109,7 +106,6 @@ MonoBehaviour:
109106
m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
110107
m_Name: Multi Select
111108
m_EditorClassIdentifier:
112-
m_RunInEditMode: 0
113109
m_ActionMap: {fileID: 11400000}
114110
m_ActionIndex: 1
115111
m_ControlData:

‎Action Maps/Standard.asset

-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ MonoBehaviour:
1111
m_Script: {fileID: 11500000, guid: 24e5bc088c9caeb44bc4283dc321b033, type: 3}
1212
m_Name: Standard
1313
m_EditorClassIdentifier:
14-
m_RunInEditMode: 0
1514
m_Actions:
1615
- {fileID: 114000013893770434}
1716
m_ControlSchemes:
@@ -46,7 +45,6 @@ MonoBehaviour:
4645
m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
4746
m_Name: Standard
4847
m_EditorClassIdentifier:
49-
m_RunInEditMode: 0
5048
m_ActionMap: {fileID: 11400000}
5149
m_ActionIndex: 0
5250
m_ControlData:

‎Action Maps/TrackedObject.asset

-19
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ MonoBehaviour:
1111
m_Script: {fileID: 11500000, guid: 24e5bc088c9caeb44bc4283dc321b033, type: 3}
1212
m_Name: TrackedObject
1313
m_EditorClassIdentifier:
14-
m_RunInEditMode: 0
1514
m_Actions:
1615
- {fileID: 114000012697452144}
1716
- {fileID: 114000013037932804}
@@ -221,7 +220,6 @@ MonoBehaviour:
221220
m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
222221
m_Name: TrackedObject
223222
m_EditorClassIdentifier:
224-
m_RunInEditMode: 0
225223
m_ActionMap: {fileID: 11400000}
226224
m_ActionIndex: 4
227225
m_ControlData:
@@ -242,7 +240,6 @@ MonoBehaviour:
242240
m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
243241
m_Name: TrackedObject
244242
m_EditorClassIdentifier:
245-
m_RunInEditMode: 0
246243
m_ActionMap: {fileID: 11400000}
247244
m_ActionIndex: 6
248245
m_ControlData:
@@ -263,7 +260,6 @@ MonoBehaviour:
263260
m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
264261
m_Name: TrackedObject
265262
m_EditorClassIdentifier:
266-
m_RunInEditMode: 0
267263
m_ActionMap: {fileID: 11400000}
268264
m_ActionIndex: 7
269265
m_ControlData:
@@ -284,7 +280,6 @@ MonoBehaviour:
284280
m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
285281
m_Name: TrackedObject
286282
m_EditorClassIdentifier:
287-
m_RunInEditMode: 0
288283
m_ActionMap: {fileID: 11400000}
289284
m_ActionIndex: 12
290285
m_ControlData:
@@ -305,7 +300,6 @@ MonoBehaviour:
305300
m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
306301
m_Name: TrackedObject
307302
m_EditorClassIdentifier:
308-
m_RunInEditMode: 0
309303
m_ActionMap: {fileID: 11400000}
310304
m_ActionIndex: 17
311305
m_ControlData:
@@ -326,7 +320,6 @@ MonoBehaviour:
326320
m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
327321
m_Name: TrackedObject
328322
m_EditorClassIdentifier:
329-
m_RunInEditMode: 0
330323
m_ActionMap: {fileID: 11400000}
331324
m_ActionIndex: 11
332325
m_ControlData:
@@ -347,7 +340,6 @@ MonoBehaviour:
347340
m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
348341
m_Name: TrackedObject
349342
m_EditorClassIdentifier:
350-
m_RunInEditMode: 0
351343
m_ActionMap: {fileID: 11400000}
352344
m_ActionIndex: 9
353345
m_ControlData:
@@ -368,7 +360,6 @@ MonoBehaviour:
368360
m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
369361
m_Name: TrackedObject
370362
m_EditorClassIdentifier:
371-
m_RunInEditMode: 0
372363
m_ActionMap: {fileID: 11400000}
373364
m_ActionIndex: 5
374365
m_ControlData:
@@ -389,7 +380,6 @@ MonoBehaviour:
389380
m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
390381
m_Name: TrackedObject
391382
m_EditorClassIdentifier:
392-
m_RunInEditMode: 0
393383
m_ActionMap: {fileID: 11400000}
394384
m_ActionIndex: 13
395385
m_ControlData:
@@ -410,7 +400,6 @@ MonoBehaviour:
410400
m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
411401
m_Name: TrackedObject
412402
m_EditorClassIdentifier:
413-
m_RunInEditMode: 0
414403
m_ActionMap: {fileID: 11400000}
415404
m_ActionIndex: 14
416405
m_ControlData:
@@ -431,7 +420,6 @@ MonoBehaviour:
431420
m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
432421
m_Name: TrackedObject
433422
m_EditorClassIdentifier:
434-
m_RunInEditMode: 0
435423
m_ActionMap: {fileID: 11400000}
436424
m_ActionIndex: 15
437425
m_ControlData:
@@ -452,7 +440,6 @@ MonoBehaviour:
452440
m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
453441
m_Name: TrackedObject
454442
m_EditorClassIdentifier:
455-
m_RunInEditMode: 0
456443
m_ActionMap: {fileID: 11400000}
457444
m_ActionIndex: 0
458445
m_ControlData:
@@ -473,7 +460,6 @@ MonoBehaviour:
473460
m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
474461
m_Name: TrackedObject
475462
m_EditorClassIdentifier:
476-
m_RunInEditMode: 0
477463
m_ActionMap: {fileID: 11400000}
478464
m_ActionIndex: 1
479465
m_ControlData:
@@ -494,7 +480,6 @@ MonoBehaviour:
494480
m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
495481
m_Name: TrackedObject
496482
m_EditorClassIdentifier:
497-
m_RunInEditMode: 0
498483
m_ActionMap: {fileID: 11400000}
499484
m_ActionIndex: 3
500485
m_ControlData:
@@ -515,7 +500,6 @@ MonoBehaviour:
515500
m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
516501
m_Name: TrackedObject
517502
m_EditorClassIdentifier:
518-
m_RunInEditMode: 0
519503
m_ActionMap: {fileID: 11400000}
520504
m_ActionIndex: 10
521505
m_ControlData:
@@ -536,7 +520,6 @@ MonoBehaviour:
536520
m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
537521
m_Name: TrackedObject
538522
m_EditorClassIdentifier:
539-
m_RunInEditMode: 0
540523
m_ActionMap: {fileID: 11400000}
541524
m_ActionIndex: 16
542525
m_ControlData:
@@ -557,7 +540,6 @@ MonoBehaviour:
557540
m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
558541
m_Name: TrackedObject
559542
m_EditorClassIdentifier:
560-
m_RunInEditMode: 0
561543
m_ActionMap: {fileID: 11400000}
562544
m_ActionIndex: 2
563545
m_ControlData:
@@ -578,7 +560,6 @@ MonoBehaviour:
578560
m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
579561
m_Name: TrackedObject
580562
m_EditorClassIdentifier:
581-
m_RunInEditMode: 0
582563
m_ActionMap: {fileID: 11400000}
583564
m_ActionIndex: 8
584565
m_ControlData:

‎Action Maps/UIActions.asset

-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ MonoBehaviour:
1111
m_Script: {fileID: 11500000, guid: 24e5bc088c9caeb44bc4283dc321b033, type: 3}
1212
m_Name: UIActions
1313
m_EditorClassIdentifier:
14-
m_RunInEditMode: 0
1514
m_Actions:
1615
- {fileID: 114000012573131854}
1716
- {fileID: 114000010783367338}
@@ -66,7 +65,6 @@ MonoBehaviour:
6665
m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
6766
m_Name: VerticalScroll
6867
m_EditorClassIdentifier:
69-
m_RunInEditMode: 0
7068
m_ActionMap: {fileID: 11400000}
7169
m_ActionIndex: 1
7270
m_ControlData:
@@ -87,7 +85,6 @@ MonoBehaviour:
8785
m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
8886
m_Name: HorizontalScroll
8987
m_EditorClassIdentifier:
90-
m_RunInEditMode: 0
9188
m_ActionMap: {fileID: 11400000}
9289
m_ActionIndex: 2
9390
m_ControlData:
@@ -108,7 +105,6 @@ MonoBehaviour:
108105
m_Script: {fileID: 11500000, guid: 5eba7b4b2e3ea134991ccbff5f47c2c8, type: 3}
109106
m_Name: UIActions
110107
m_EditorClassIdentifier:
111-
m_RunInEditMode: 0
112108
m_ActionMap: {fileID: 11400000}
113109
m_ActionIndex: 0
114110
m_ControlData:

‎Actions/Clone.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
namespace UnityEditor.Experimental.EditorVR.Actions
77
{
88
[ActionMenuItem("Clone", ActionMenuItemAttribute.DefaultActionSectionName, 3)]
9-
sealed class Clone : BaseAction, IUsesSpatialHash
9+
sealed class Clone : BaseAction, IUsesSpatialHash, IUsesViewerScale
1010
{
1111
public override void ExecuteAction()
1212
{
13-
var selection = Selection.gameObjects;
13+
var selection = Selection.transforms;
1414
var clones = new GameObject[selection.Length];
1515
var index = 0;
1616
var bounds = ObjectUtils.GetBounds(selection);
@@ -21,7 +21,7 @@ public override void ExecuteAction()
2121
var cloneTransform = clone.transform;
2222
var cameraTransform = CameraUtils.GetMainCamera().transform;
2323
var viewDirection = cloneTransform.position - cameraTransform.position;
24-
cloneTransform.position = cameraTransform.TransformPoint(Vector3.forward * viewDirection.magnitude)
24+
cloneTransform.position = cameraTransform.TransformPoint(Vector3.forward * viewDirection.magnitude / this.GetViewerScale())
2525
+ cloneTransform.position - bounds.center;
2626
this.AddToSpatialHash(clone);
2727
clones[index++] = clone;

‎Actions/Copy.cs

+1-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@ sealed class Copy : BaseAction
66
{
77
public override void ExecuteAction()
88
{
9-
//bug (case 451825)
10-
//http://forum.unity3d.com/threads/editorapplication-ExecuteActionmenuitem-dont-include-edit-menu.148215/
11-
//return EditorApplication.ExecuteActionMenuItem("Edit/Copy");
12-
13-
Paste.buffer = Selection.gameObjects;
9+
Paste.buffer = Selection.transforms;
1410
}
1511
}
1612
}

‎Actions/Cut.cs

+3-6
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,12 @@ sealed class Cut : BaseAction
88
{
99
public override void ExecuteAction()
1010
{
11-
//bug (case 451825)
12-
//http://forum.unity3d.com/threads/editorapplication-ExecuteActionmenuitem-dont-include-edit-menu.148215/
13-
//return EditorApplication.ExecuteActionMenuItem("Edit/Cut");
14-
15-
var selection = Selection.gameObjects;
11+
var selection = Selection.transforms;
1612
if (selection != null)
1713
{
18-
foreach (var go in selection)
14+
foreach (var transform in selection)
1915
{
16+
var go = transform.gameObject;
2017
go.hideFlags = HideFlags.HideAndDontSave;
2118
go.SetActive(false);
2219
}

‎Actions/Paste.cs

+8-9
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
namespace UnityEditor.Experimental.EditorVR.Actions
77
{
88
[ActionMenuItem("Paste", ActionMenuItemAttribute.DefaultActionSectionName, 6)]
9-
sealed class Paste : BaseAction, IUsesSpatialHash
9+
sealed class Paste : BaseAction, IUsesSpatialHash, IUsesViewerScale
1010
{
11-
public static GameObject[] buffer
11+
public static Transform[] buffer
1212
{
1313
get
1414
{
@@ -22,26 +22,25 @@ public static GameObject[] buffer
2222
{
2323
var bounds = ObjectUtils.GetBounds(value);
2424

25-
s_BufferDistance = bounds.size == Vector3.zero ? (bounds.center - CameraUtils.GetMainCamera().transform.position).magnitude : 0f;
25+
s_BufferDistance = bounds.size != Vector3.zero ? (bounds.center - CameraUtils.GetMainCamera().transform.position).magnitude : 0f;
26+
s_BufferDistance /= IUsesViewerScaleMethods.getViewerScale(); // Normalize this value, so if viewer scale changes when pasted
2627
}
2728
}
2829
}
29-
static GameObject[] s_Buffer;
30+
static Transform[] s_Buffer;
3031

3132
static float s_BufferDistance;
3233

3334
public override void ExecuteAction()
3435
{
35-
//return EditorApplication.ExecuteActionMenuItem("Edit/Paste");
36-
3736
if (buffer != null)
3837
{
3938
var pastedGameObjects = new GameObject[buffer.Length];
4039
var index = 0;
4140
var bounds = ObjectUtils.GetBounds(buffer);
42-
foreach (var go in buffer)
41+
foreach (var transform in buffer)
4342
{
44-
var pasted = Instantiate(go);
43+
var pasted = Instantiate(transform.gameObject);
4544
var pastedTransform = pasted.transform;
4645
pasted.hideFlags = HideFlags.None;
4746
var cameraTransform = CameraUtils.GetMainCamera().transform;
@@ -53,7 +52,7 @@ public override void ExecuteAction()
5352
}
5453

5554
if (pastedGameObjects.Length > 0)
56-
Selection.objects = pastedGameObjects;
55+
Selection.objects = pastedGameObjects;
5756
}
5857
}
5958
}

0 commit comments

Comments
 (0)