Skip to content

Commit ff05b55

Browse files
mtschoen-unitymtschoen-unity
authored
Merge pull request #546 from Unity-Technologies/staging
0.2.1 staging -> master
2 parents 786fdb3 + 57918e5 commit ff05b55

File tree

182 files changed

+2190
-1722
lines changed

Some content is hidden

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

182 files changed

+2190
-1722
lines changed

‎Actions/BaseAction.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@ namespace UnityEditor.Experimental.EditorVR.Actions
77
/// </summary>
88
abstract class BaseAction : MonoBehaviour, IAction
99
{
10+
#pragma warning disable 649
11+
[SerializeField]
12+
Sprite m_Icon;
13+
#pragma warning restore 649
14+
1015
public Sprite icon
1116
{
1217
get { return m_Icon; }
1318
}
1419

15-
[SerializeField]
16-
Sprite m_Icon;
17-
1820
public abstract void ExecuteAction();
1921
}
2022
}

‎Editor/LockableHierarchyGUI.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@
44
[InitializeOnLoad]
55
class LockableHierarchyGUI : ScriptableSingleton<LockableHierarchyGUI>
66
{
7+
#pragma warning disable 649
78
[SerializeField]
89
Texture2D m_LockIcon;
910

1011
[SerializeField]
1112
Texture2D m_UnlockIcon;
13+
#pragma warning restore 649
1214

1315
static LockableHierarchyGUI()
1416
{

‎Fonts/Roboto/Roboto-Medium SDF Alternate Menu Text.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
7-
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabParentObject: {fileID: 0}
88
m_PrefabInternal: {fileID: 0}
99
m_Name: Roboto-Medium SDF Alternate Menu Text
1010
m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}

‎Manipulators/BaseManipulator.cs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ namespace UnityEditor.Experimental.EditorVR.Manipulators
88
{
99
class BaseManipulator : MonoBehaviour, IManipulator
1010
{
11-
protected const float k_BaseManipulatorSize = 0.3f;
12-
const float k_MinHandleTipDirectionDelta = 0.01f;
13-
const float k_LazyFollow = 40f;
14-
1511
class HandleTip
1612
{
1713
public Renderer renderer;
@@ -20,6 +16,12 @@ class HandleTip
2016
public Vector3? positionOffset;
2117
}
2218

19+
const float k_MinHandleTipDirectionDelta = 0.01f;
20+
const float k_LazyFollow = 40f;
21+
22+
protected const float k_BaseManipulatorSize = 0.3f;
23+
24+
#pragma warning disable 649
2325
[SerializeField]
2426
Renderer m_HandleTip;
2527

@@ -40,6 +42,7 @@ class HandleTip
4042

4143
[SerializeField]
4244
float m_HandleHoverAlpha = 0.8f;
45+
#pragma warning restore 649
4346

4447
readonly Dictionary<Type, float> m_ScaleBumps = new Dictionary<Type, float>();
4548
readonly Dictionary<Transform, HandleTip> m_HandleTips = new Dictionary<Transform, HandleTip>();

‎Manipulators/ScaleManipulator.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ namespace UnityEditor.Experimental.EditorVR.Manipulators
55
{
66
sealed class ScaleManipulator : BaseManipulator
77
{
8+
#pragma warning disable 649
89
[SerializeField]
910
BaseHandle m_UniformHandle;
11+
#pragma warning restore 649
1012

1113
protected override void OnHandleDragging(BaseHandle handle, HandleEventData eventData)
1214
{

‎Manipulators/ScaleManipulator.prefab

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -429,8 +429,8 @@ MonoBehaviour:
429429
m_Enabled: 1
430430
m_EditorHideFlags: 0
431431
m_Script: {fileID: 11500000, guid: 410244f902f0bbc47a023d4a93ffeea9, type: 3}
432-
m_Name:
433-
m_EditorClassIdentifier:
432+
m_Name:
433+
m_EditorClassIdentifier:
434434
m_SelectionFlags: 3
435435
m_OrientDragPlaneToRay: 1
436436
m_Constraints: 0
@@ -443,8 +443,8 @@ MonoBehaviour:
443443
m_Enabled: 1
444444
m_EditorHideFlags: 0
445445
m_Script: {fileID: 11500000, guid: 410244f902f0bbc47a023d4a93ffeea9, type: 3}
446-
m_Name:
447-
m_EditorClassIdentifier:
446+
m_Name:
447+
m_EditorClassIdentifier:
448448
m_SelectionFlags: 3
449449
m_OrientDragPlaneToRay: 1
450450
m_Constraints: 0
@@ -457,8 +457,8 @@ MonoBehaviour:
457457
m_Enabled: 1
458458
m_EditorHideFlags: 0
459459
m_Script: {fileID: 11500000, guid: 410244f902f0bbc47a023d4a93ffeea9, type: 3}
460-
m_Name:
461-
m_EditorClassIdentifier:
460+
m_Name:
461+
m_EditorClassIdentifier:
462462
m_SelectionFlags: 3
463463
m_OrientDragPlaneToRay: 1
464464
m_Constraints: 0
@@ -471,8 +471,8 @@ MonoBehaviour:
471471
m_Enabled: 1
472472
m_EditorHideFlags: 0
473473
m_Script: {fileID: 11500000, guid: 410244f902f0bbc47a023d4a93ffeea9, type: 3}
474-
m_Name:
475-
m_EditorClassIdentifier:
474+
m_Name:
475+
m_EditorClassIdentifier:
476476
m_SelectionFlags: 3
477477
m_OrientDragPlaneToRay: 1
478478
m_Constraints: 0
@@ -485,8 +485,8 @@ MonoBehaviour:
485485
m_Enabled: 1
486486
m_EditorHideFlags: 0
487487
m_Script: {fileID: 11500000, guid: 4dbf941c00473034b89a9acd39176c7f, type: 3}
488-
m_Name:
489-
m_EditorClassIdentifier:
488+
m_Name:
489+
m_EditorClassIdentifier:
490490
m_HandleTip: {fileID: 23000013012300180}
491491
m_AllHandles:
492492
- {fileID: 114000010053947466}

‎Manipulators/StandardManipulator.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ namespace UnityEditor.Experimental.EditorVR.Manipulators
66
{
77
sealed class StandardManipulator : BaseManipulator
88
{
9+
#pragma warning disable 649
910
[SerializeField]
1011
Transform m_PlaneHandlesParent;
1112

@@ -17,6 +18,7 @@ sealed class StandardManipulator : BaseManipulator
1718

1819
[SerializeField]
1920
float m_SphereHandleHideScale = 0.1f;
21+
#pragma warning restore 649
2022

2123
void Update()
2224
{

‎Menus/MainMenu/MainMenu.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ sealed class MainMenu : MonoBehaviour, IMainMenu, IConnectInterfaces, IInstantia
1818
const string k_SettingsMenuSectionName = "Settings";
1919
const float k_MaxFlickDuration = 0.3f;
2020

21+
#pragma warning disable 649
2122
[SerializeField]
2223
ActionMap m_ActionMap;
2324

@@ -38,6 +39,7 @@ sealed class MainMenu : MonoBehaviour, IMainMenu, IConnectInterfaces, IInstantia
3839

3940
[SerializeField]
4041
HapticPulse m_ButtonHoverPulse;
42+
#pragma warning restore 649
4143

4244
Transform m_AlternateMenuOrigin;
4345
Transform m_MenuOrigin;

‎Menus/MainMenu/Scripts/MainMenuButton.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ namespace UnityEditor.Experimental.EditorVR.Menus
1212
{
1313
sealed class MainMenuButton : MainMenuSelectable, ITooltip, IRayEnterHandler, IRayExitHandler, IPointerClickHandler
1414
{
15+
#pragma warning disable 649
1516
[SerializeField]
1617
Button m_Button;
18+
#pragma warning restore 649
1719

1820
CanvasGroup m_CanvasGroup;
1921

‎Menus/MainMenu/Scripts/MainMenuFace.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ sealed class MainMenuFace : MonoBehaviour
2020
{
2121
static readonly Vector3 k_LocalOffset = Vector3.down * 0.15f;
2222

23+
#pragma warning disable 649
2324
[SerializeField]
2425
MeshRenderer m_BorderOutline;
2526

@@ -39,6 +40,7 @@ sealed class MainMenuFace : MonoBehaviour
3940

4041
[SerializeField]
4142
ScrollRect m_ScrollRect;
43+
#pragma warning restore 649
4244

4345
Material m_BorderOutlineMaterial;
4446
Vector3 m_BorderOutlineOriginalLocalScale;

0 commit comments

Comments
 (0)