Skip to content

Commit a4515e7

Browse files
author
Takayuki MATSUOKA
committed
Cosmetic tweaks
- Soft tab - Simplifier declarations
1 parent dbd091b commit a4515e7

File tree

5 files changed

+72
-111
lines changed

5 files changed

+72
-111
lines changed

‎Assets/SceneViewFovControl/Editor/GUIClipExtension.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@ static class GUIClip {
1616
static readonly Type typeGuiClip = typeof(UnityEngine.Transform).Assembly.GetType("UnityEngine.GUIClip");
1717
static readonly MethodInfo mi_GetTopRect = typeGuiClip.GetMethod("GetTopRect", nonPublicStatic);
1818
static readonly MethodInfo mi_Push = typeGuiClip.GetMethod("Push", nonPublicStatic);
19-
static readonly MethodInfo mi_Pop = typeGuiClip.GetMethod("Pop", nonPublicStatic);
19+
static readonly MethodInfo mi_Pop = typeGuiClip.GetMethod("Pop", nonPublicStatic);
2020

2121
public static Rect GetTopRect() {
22-
// https://github.com/MattRix/UnityDecompiled/blob/753fde37d331b2100f93cc5f9eb343f1dcff5eee/UnityEngine/UnityEngine/GUIClip.cs#L76
22+
// https://github.com/MattRix/UnityDecompiled/blob/753fde37d331b2100f93cc5f9eb343f1dcff5eee/UnityEngine/UnityEngine/GUIClip.cs#L76
2323
return (Rect) mi_GetTopRect.Invoke(null, null);
2424
}
2525

2626
public static void Push(Rect rect, Vector2 v0, Vector2 v1, bool b) {
27-
// https://github.com/MattRix/UnityDecompiled/blob/753fde37d331b2100f93cc5f9eb343f1dcff5eee/UnityEngine/UnityEngine/GUIClip.cs#L65
27+
// https://github.com/MattRix/UnityDecompiled/blob/753fde37d331b2100f93cc5f9eb343f1dcff5eee/UnityEngine/UnityEngine/GUIClip.cs#L65
2828
mi_Push.Invoke(null, new object[] { rect, v0, v1, b });
2929
}
3030

3131
public static void Pop() {
32-
// https://github.com/MattRix/UnityDecompiled/blob/753fde37d331b2100f93cc5f9eb343f1dcff5eee/UnityEngine/UnityEngine/GUIClip.cs#L73
32+
// https://github.com/MattRix/UnityDecompiled/blob/753fde37d331b2100f93cc5f9eb343f1dcff5eee/UnityEngine/UnityEngine/GUIClip.cs#L73
3333
mi_Pop.Invoke(null, null);
3434
}
3535
}

‎Assets/SceneViewFovControl/Editor/SceneViewExtension.cs

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -13,84 +13,84 @@ namespace UTJ.UnityEditor.Extension.SceneViewFovControl {
1313
static class SceneViewHiddenApiExtension {
1414
const BindingFlags nonPublicInstance = BindingFlags.NonPublic | BindingFlags.Instance;
1515

16-
static readonly Type typeSceneView = typeof(global::UnityEditor.SceneView);
16+
static readonly Type typeSceneView = typeof(global::UnityEditor.SceneView);
1717
static readonly MethodInfo mi_UseSceneFiltering = typeSceneView.GetMethod("UseSceneFiltering", nonPublicInstance);
1818
static readonly MethodInfo mi_SceneCameraRendersIntoRT = typeSceneView.GetMethod("SceneCameraRendersIntoRT", nonPublicInstance);
19-
static readonly FieldInfo fi_m_GizmosContent = typeSceneView.GetField("m_GizmosContent", nonPublicInstance);
20-
static readonly FieldInfo fi_m_RenderDocContent = typeSceneView.GetField("m_RenderDocContent", nonPublicInstance);
19+
static readonly FieldInfo fi_m_GizmosContent = typeSceneView.GetField("m_GizmosContent", nonPublicInstance);
20+
static readonly FieldInfo fi_m_RenderDocContent = typeSceneView.GetField("m_RenderDocContent", nonPublicInstance);
2121

2222
public static bool UseSceneFiltering(this SceneView sceneView) {
23-
// https://github.com/MattRix/UnityDecompiled/blob/753fde37d331b2100f93cc5f9eb343f1dcff5eee/UnityEditor/UnityEditor/SceneView.cs#L1033
23+
// https://github.com/MattRix/UnityDecompiled/blob/753fde37d331b2100f93cc5f9eb343f1dcff5eee/UnityEditor/UnityEditor/SceneView.cs#L1033
2424
return (bool) mi_UseSceneFiltering.Invoke(sceneView, null);
2525
}
2626

2727
public static bool SceneCameraRendersIntoRT(this SceneView sceneView) {
28-
// https://github.com/MattRix/UnityDecompiled/blob/753fde37d331b2100f93cc5f9eb343f1dcff5eee/UnityEditor/UnityEditor/SceneView.cs#L1200
28+
// https://github.com/MattRix/UnityDecompiled/blob/753fde37d331b2100f93cc5f9eb343f1dcff5eee/UnityEditor/UnityEditor/SceneView.cs#L1200
2929
return (bool) mi_SceneCameraRendersIntoRT.Invoke(sceneView, null);
3030
}
3131

32-
public static GUIContent Get_m_GizmosContent(this SceneView sceneView) {
33-
// https://github.com/MattRix/UnityDecompiled/blob/753fde37d331b2100f93cc5f9eb343f1dcff5eee/UnityEditor/UnityEditor/SceneView.cs#L215
34-
return fi_m_GizmosContent.GetValue(sceneView) as GUIContent;
35-
}
32+
public static GUIContent Get_m_GizmosContent(this SceneView sceneView) {
33+
// https://github.com/MattRix/UnityDecompiled/blob/753fde37d331b2100f93cc5f9eb343f1dcff5eee/UnityEditor/UnityEditor/SceneView.cs#L215
34+
return fi_m_GizmosContent.GetValue(sceneView) as GUIContent;
35+
}
3636

37-
public static GUIContent Get_m_RenderDocContent(this SceneView sceneView) {
38-
// https://github.com/MattRix/UnityDecompiled/blob/753fde37d331b2100f93cc5f9eb343f1dcff5eee/UnityEditor/UnityEditor/SceneView.cs#L219
39-
return fi_m_RenderDocContent.GetValue(sceneView) as GUIContent;
40-
}
37+
public static GUIContent Get_m_RenderDocContent(this SceneView sceneView) {
38+
// https://github.com/MattRix/UnityDecompiled/blob/753fde37d331b2100f93cc5f9eb343f1dcff5eee/UnityEditor/UnityEditor/SceneView.cs#L219
39+
return fi_m_RenderDocContent.GetValue(sceneView) as GUIContent;
40+
}
4141

42-
static Rect[] PopGUIClips(this SceneView sceneView) {
43-
int count = 1;
44-
if(!sceneView.UseSceneFiltering() && sceneView.SceneCameraRendersIntoRT()) {
45-
// https://github.com/MattRix/UnityDecompiled/blob/753fde37d331b2100f93cc5f9eb343f1dcff5eee/UnityEditor/UnityEditor/SceneView.cs#L1255
46-
++count;
47-
}
48-
Rect[] guiClips = new Rect[count];
49-
for(int i = 0; i < count; ++i) {
50-
guiClips[i] = GUIClip.GetTopRect();
51-
GUIClip.Pop();
52-
}
53-
return guiClips;
42+
static Rect[] PopGUIClips(this SceneView sceneView) {
43+
int count = 1;
44+
if(!sceneView.UseSceneFiltering() && sceneView.SceneCameraRendersIntoRT()) {
45+
// https://github.com/MattRix/UnityDecompiled/blob/753fde37d331b2100f93cc5f9eb343f1dcff5eee/UnityEditor/UnityEditor/SceneView.cs#L1255
46+
++count;
47+
}
48+
var guiClips = new Rect[count];
49+
for(int i = 0; i < count; ++i) {
50+
guiClips[i] = GUIClip.GetTopRect();
51+
GUIClip.Pop();
52+
}
53+
return guiClips;
5454
}
5555

56-
static void PushGUIClips(this SceneView sceneView, Rect[] guiClips) {
57-
for(int i = guiClips.Length-1; i >= 0; --i) {
56+
static void PushGUIClips(this SceneView sceneView, Rect[] guiClips) {
57+
for(int i = guiClips.Length-1; i >= 0; --i) {
5858
GUIClip.Push(guiClips[i], Vector2.zero, Vector2.zero, false);
59-
}
59+
}
6060
}
6161

6262
const float LeftMargin = 251f;
6363
const float TopOffset = -1f;
6464
const float MinGuiContentWidth = 16f;
65-
const float RightOffset = 300.0f;
65+
const float RightOffset = 300.0f;
6666

67-
// https://github.com/MattRix/UnityDecompiled/blob/753fde37d331b2100f93cc5f9eb343f1dcff5eee/UnityEditor/UnityEditor/SceneView.cs#L810
68-
//
69-
// If we can put the following function after above ^ line, there's no problem.
70-
// But since we don't have any hook in the toolbar, the following function emulates it.
71-
// note : This code doesn't coexistent with other user toolbar extensions such as "Scene View Bookmarks" [1]
72-
//
73-
// [1] Scene View Bookmarks https://www.assetstore.unity3d.com/en/#!/content/22302
74-
public static void DoToolbarRightSideGUI(this SceneView sceneView, GUIContent content, GUIStyle style, Action<Rect> action) {
67+
// https://github.com/MattRix/UnityDecompiled/blob/753fde37d331b2100f93cc5f9eb343f1dcff5eee/UnityEditor/UnityEditor/SceneView.cs#L810
68+
//
69+
// If we can put the following function after above ^ line, there's no problem.
70+
// But since we don't have any hook in the toolbar, the following function emulates it.
71+
// note : This code doesn't coexistent with other user toolbar extensions such as "Scene View Bookmarks" [1]
72+
//
73+
// [1] Scene View Bookmarks https://www.assetstore.unity3d.com/en/#!/content/22302
74+
public static void DoToolbarRightSideGUI(this SceneView sceneView, GUIContent content, GUIStyle style, Action<Rect> action) {
7575
Vector2 size = style.CalcSize(content);
76-
float wb = sceneView.position.width - RightOffset;
77-
float lx = wb - size.x;
78-
if(lx < LeftMargin) {
79-
lx = LeftMargin;
80-
size.x = wb - lx;
81-
}
82-
if(size.x > MinGuiContentWidth) {
83-
var rect = new Rect(lx, TopOffset, size.x, size.y);
84-
var active = RenderTexture.active;
85-
RenderTexture.active = null;
86-
Rect[] guiClips = sceneView.PopGUIClips();
76+
float wb = sceneView.position.width - RightOffset;
77+
float lx = wb - size.x;
78+
if(lx < LeftMargin) {
79+
lx = LeftMargin;
80+
size.x = wb - lx;
81+
}
82+
if(size.x > MinGuiContentWidth) {
83+
var rect = new Rect(lx, TopOffset, size.x, size.y);
84+
var active = RenderTexture.active;
85+
RenderTexture.active = null;
86+
Rect[] guiClips = sceneView.PopGUIClips();
8787

88-
action(rect);
88+
action(rect);
8989

90-
sceneView.PushGUIClips(guiClips);
91-
RenderTexture.active = active;
92-
}
93-
}
90+
sceneView.PushGUIClips(guiClips);
91+
RenderTexture.active = active;
92+
}
93+
}
9494
}
9595

9696
}

‎Assets/SceneViewFovControl/Editor/SceneViewHiddenApi.cs

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,42 +11,25 @@ namespace UTJ.UnityEditor.Extension.SceneViewFovControl {
1111

1212
static class SceneViewHiddenApi {
1313
static bool initialized = false;
14-
static FieldInfo fi;
15-
16-
static FieldInfo onPreSceneGUIDelegateFieldInfo {
17-
get {
18-
if(fi != null || initialized) {
19-
return fi;
20-
}
21-
22-
initialized = true;
23-
24-
// UnityEditor.SceneView.onPreSceneGUIDelegateFieldInfo
25-
fi = typeof(SceneView).GetField(
26-
"onPreSceneGUIDelegate",
27-
BindingFlags.Static
28-
| BindingFlags.NonPublic
29-
| BindingFlags.Public
30-
);
31-
return fi;
32-
}
33-
}
14+
static readonly Type typeSceneView = typeof(global::UnityEditor.SceneView);
15+
static readonly FieldInfo fi_onPreSceneGUIDelegateFieldInfo = typeSceneView.GetField(
16+
"onPreSceneGUIDelegate"
17+
, BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public
18+
);
3419

3520
static SceneView.OnSceneFunc onPreSceneGUIDelegate {
3621
get {
37-
var fi = onPreSceneGUIDelegateFieldInfo;
38-
if(fi == null) {
22+
if(fi_onPreSceneGUIDelegateFieldInfo == null) {
3923
return null;
4024
}
41-
return fi.GetValue(null) as SceneView.OnSceneFunc;
25+
return fi_onPreSceneGUIDelegateFieldInfo.GetValue(null) as SceneView.OnSceneFunc;
4226
}
4327

4428
set {
45-
var fi = onPreSceneGUIDelegateFieldInfo;
46-
if(fi == null) {
29+
if(fi_onPreSceneGUIDelegateFieldInfo == null) {
4730
return;
4831
}
49-
fi.SetValue(null, value);
32+
fi_onPreSceneGUIDelegateFieldInfo.SetValue(null, value);
5033
}
5134
}
5235

‎Assets/SceneViewFovControl/Editor/Settings.cs

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@
88

99
namespace UTJ.UnityEditor.Extension.SceneViewFovControl {
1010
static class Settings {
11-
static SettingsData data = new SettingsData();
12-
static SettingsData loadedData = new SettingsData();
13-
14-
public const string VersionString = "0.1.7";
11+
public const string VersionString = "0.1.8";
1512
public const string MenuItemName = "Edit/Scene View FoV Settings";
1613
public const string EditorPrefsKey = "UTJ.UnityEditor.Extension.SceneViewFovControl";
1714

@@ -26,27 +23,13 @@ static class Settings {
2623

2724
public const string WindowTitle = "FoV Control";
2825

29-
public static SettingsData Data {
30-
get {
31-
return data;
32-
}
33-
34-
set {
35-
data = value;
36-
}
37-
}
38-
39-
public static SettingsData LoadedData {
40-
get {
41-
return loadedData;
42-
}
43-
44-
set {
45-
loadedData = value;
46-
}
47-
}
26+
public static SettingsData Data { get; set; }
27+
public static SettingsData LoadedData { get; set; }
4828

4929
static Settings() {
30+
Data = new SettingsData();
31+
LoadedData = new SettingsData();
32+
5033
Reset();
5134

5235
if(EditorPrefs.HasKey(EditorPrefsKey)) {

‎Assets/SceneViewFovControl/Editor/Status.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -210,11 +210,6 @@ static void ActiveCameraCorrector() {
210210
}
211211
};
212212
}
213-
214-
// void Callback(object obj) {
215-
// var i = (MenuId) obj;
216-
// Debug.LogFormat("Callback = {0}", i);
217-
// }
218213
}
219214

220215
} // namespace

0 commit comments

Comments
 (0)