Skip to content

Commit 6cbc043

Browse files
GlassToeStudioGlassToeStudio
committed
Update button size and spacing.
1 parent 22f4cfe commit 6cbc043

File tree

7 files changed

+104
-22
lines changed

7 files changed

+104
-22
lines changed

‎Assets/CustomMethodButton/Editor/Drawers/MethodButtonAttributeDrawer.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
public class MethodButtonAttributeDrawer : PropertyDrawer
77
{
88
private int buttonCount;
9-
private float buttonHeight = EditorGUIUtility.singleLineHeight;
9+
private readonly float buttonHeight = EditorGUIUtility.singleLineHeight * 2;
1010
private MethodButtonAttribute attr;
1111

1212
public override void OnGUI(Rect position, SerializedProperty editorFoldout, GUIContent label)
@@ -19,7 +19,7 @@ public override void OnGUI(Rect position, SerializedProperty editorFoldout, GUIC
1919

2020
buttonCount = 0;
2121

22-
Rect foldoutRect = new Rect(position.x, position.y, position.width, buttonHeight);
22+
Rect foldoutRect = new Rect(position.x, position.y, position.width, 5 + buttonHeight);
2323

2424
editorFoldout.boolValue = EditorGUI.Foldout(foldoutRect, editorFoldout.boolValue, "Buttons", true);
2525

@@ -33,8 +33,7 @@ public override void OnGUI(Rect position, SerializedProperty editorFoldout, GUIC
3333
{
3434
buttonCount++;
3535

36-
Rect buttonRect = new Rect(position.x, position.y + (buttonHeight * buttonCount), position.width, buttonHeight);
37-
36+
Rect buttonRect = new Rect(position.x, position.y + ((1 + buttonHeight) * (buttonCount - 1)), position.width, buttonHeight - 1);
3837
if (GUI.Button(buttonRect, name))
3938
{
4039
InvokeMethod(editorFoldout, name);
@@ -45,7 +44,7 @@ public override void OnGUI(Rect position, SerializedProperty editorFoldout, GUIC
4544

4645
public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
4746
{
48-
return EditorGUI.GetPropertyHeight(property, label, true) + buttonHeight * buttonCount + 2;
47+
return EditorGUI.GetPropertyHeight(property, label, true) + (buttonHeight) * (buttonCount);
4948
}
5049

5150
private void InvokeMethod(SerializedProperty property, string name)

‎Assets/Demo/Scenes/MethodButton.unity

Lines changed: 55 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,19 @@ LightmapSettings:
5050
m_BounceScale: 1
5151
m_IndirectOutputScale: 1
5252
m_AlbedoBoost: 1
53-
m_TemporalCoherenceThreshold: 1
5453
m_EnvironmentLightingMode: 0
5554
m_EnableBakedLightmaps: 1
5655
m_EnableRealtimeLightmaps: 1
5756
m_LightmapEditorSettings:
58-
serializedVersion: 10
57+
serializedVersion: 12
5958
m_Resolution: 2
6059
m_BakeResolution: 40
6160
m_AtlasSize: 1024
6261
m_AO: 0
6362
m_AOMaxDistance: 1
6463
m_CompAOExponent: 1
6564
m_CompAOExponentDirect: 0
65+
m_ExtractAmbientOcclusion: 0
6666
m_Padding: 2
6767
m_LightmapParameters: {fileID: 0}
6868
m_LightmapsBakeMode: 1
@@ -77,10 +77,16 @@ LightmapSettings:
7777
m_PVRDirectSampleCount: 32
7878
m_PVRSampleCount: 500
7979
m_PVRBounces: 2
80+
m_PVREnvironmentSampleCount: 500
81+
m_PVREnvironmentReferencePointCount: 2048
82+
m_PVRFilteringMode: 2
83+
m_PVRDenoiserTypeDirect: 0
84+
m_PVRDenoiserTypeIndirect: 0
85+
m_PVRDenoiserTypeAO: 0
8086
m_PVRFilterTypeDirect: 0
8187
m_PVRFilterTypeIndirect: 0
8288
m_PVRFilterTypeAO: 0
83-
m_PVRFilteringMode: 1
89+
m_PVREnvironmentMIS: 0
8490
m_PVRCulling: 1
8591
m_PVRFilteringGaussRadiusDirect: 1
8692
m_PVRFilteringGaussRadiusIndirect: 5
@@ -89,6 +95,7 @@ LightmapSettings:
8995
m_PVRFilteringAtrousPositionSigmaIndirect: 2
9096
m_PVRFilteringAtrousPositionSigmaAO: 1
9197
m_ShowResolutionOverlay: 1
98+
m_ExportTrainingData: 0
9299
m_LightingDataAsset: {fileID: 0}
93100
m_UseShadowmask: 1
94101
--- !u!196 &4
@@ -117,7 +124,8 @@ NavMeshSettings:
117124
GameObject:
118125
m_ObjectHideFlags: 0
119126
m_CorrespondingSourceObject: {fileID: 0}
120-
m_PrefabInternal: {fileID: 0}
127+
m_PrefabInstance: {fileID: 0}
128+
m_PrefabAsset: {fileID: 0}
121129
serializedVersion: 6
122130
m_Component:
123131
- component: {fileID: 398710250}
@@ -133,7 +141,8 @@ GameObject:
133141
MonoBehaviour:
134142
m_ObjectHideFlags: 0
135143
m_CorrespondingSourceObject: {fileID: 0}
136-
m_PrefabInternal: {fileID: 0}
144+
m_PrefabInstance: {fileID: 0}
145+
m_PrefabAsset: {fileID: 0}
137146
m_GameObject: {fileID: 398710248}
138147
m_Enabled: 1
139148
m_EditorHideFlags: 0
@@ -147,7 +156,8 @@ MonoBehaviour:
147156
Transform:
148157
m_ObjectHideFlags: 0
149158
m_CorrespondingSourceObject: {fileID: 0}
150-
m_PrefabInternal: {fileID: 0}
159+
m_PrefabInstance: {fileID: 0}
160+
m_PrefabAsset: {fileID: 0}
151161
m_GameObject: {fileID: 398710248}
152162
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
153163
m_LocalPosition: {x: -3.04, y: 0.99, z: 0}
@@ -160,7 +170,8 @@ Transform:
160170
GameObject:
161171
m_ObjectHideFlags: 0
162172
m_CorrespondingSourceObject: {fileID: 0}
163-
m_PrefabInternal: {fileID: 0}
173+
m_PrefabInstance: {fileID: 0}
174+
m_PrefabAsset: {fileID: 0}
164175
serializedVersion: 6
165176
m_Component:
166177
- component: {fileID: 476468111}
@@ -177,20 +188,24 @@ GameObject:
177188
AudioListener:
178189
m_ObjectHideFlags: 0
179190
m_CorrespondingSourceObject: {fileID: 0}
180-
m_PrefabInternal: {fileID: 0}
191+
m_PrefabInstance: {fileID: 0}
192+
m_PrefabAsset: {fileID: 0}
181193
m_GameObject: {fileID: 476468108}
182194
m_Enabled: 1
183195
--- !u!20 &476468110
184196
Camera:
185197
m_ObjectHideFlags: 0
186198
m_CorrespondingSourceObject: {fileID: 0}
187-
m_PrefabInternal: {fileID: 0}
199+
m_PrefabInstance: {fileID: 0}
200+
m_PrefabAsset: {fileID: 0}
188201
m_GameObject: {fileID: 476468108}
189202
m_Enabled: 1
190203
serializedVersion: 2
191204
m_ClearFlags: 1
192205
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
193206
m_projectionMatrixMode: 1
207+
m_GateFitMode: 2
208+
m_FOVAxisMode: 0
194209
m_SensorSize: {x: 36, y: 24}
195210
m_LensShift: {x: 0, y: 0}
196211
m_FocalLength: 50
@@ -224,7 +239,8 @@ Camera:
224239
Transform:
225240
m_ObjectHideFlags: 0
226241
m_CorrespondingSourceObject: {fileID: 0}
227-
m_PrefabInternal: {fileID: 0}
242+
m_PrefabInstance: {fileID: 0}
243+
m_PrefabAsset: {fileID: 0}
228244
m_GameObject: {fileID: 476468108}
229245
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
230246
m_LocalPosition: {x: 0, y: 1, z: -10}
@@ -237,7 +253,8 @@ Transform:
237253
GameObject:
238254
m_ObjectHideFlags: 0
239255
m_CorrespondingSourceObject: {fileID: 0}
240-
m_PrefabInternal: {fileID: 0}
256+
m_PrefabInstance: {fileID: 0}
257+
m_PrefabAsset: {fileID: 0}
241258
serializedVersion: 6
242259
m_Component:
243260
- component: {fileID: 1116937700}
@@ -253,15 +270,17 @@ GameObject:
253270
Light:
254271
m_ObjectHideFlags: 0
255272
m_CorrespondingSourceObject: {fileID: 0}
256-
m_PrefabInternal: {fileID: 0}
273+
m_PrefabInstance: {fileID: 0}
274+
m_PrefabAsset: {fileID: 0}
257275
m_GameObject: {fileID: 1116937698}
258276
m_Enabled: 1
259-
serializedVersion: 8
277+
serializedVersion: 9
260278
m_Type: 1
261279
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
262280
m_Intensity: 1
263281
m_Range: 10
264282
m_SpotAngle: 30
283+
m_InnerSpotAngle: 21.80208
265284
m_CookieSize: 10
266285
m_Shadows:
267286
m_Type: 2
@@ -271,26 +290,48 @@ Light:
271290
m_Bias: 0.05
272291
m_NormalBias: 0.4
273292
m_NearPlane: 0.2
293+
m_CullingMatrixOverride:
294+
e00: 1
295+
e01: 0
296+
e02: 0
297+
e03: 0
298+
e10: 0
299+
e11: 1
300+
e12: 0
301+
e13: 0
302+
e20: 0
303+
e21: 0
304+
e22: 1
305+
e23: 0
306+
e30: 0
307+
e31: 0
308+
e32: 0
309+
e33: 1
310+
m_UseCullingMatrixOverride: 0
274311
m_Cookie: {fileID: 0}
275312
m_DrawHalo: 0
276313
m_Flare: {fileID: 0}
277314
m_RenderMode: 0
278315
m_CullingMask:
279316
serializedVersion: 2
280317
m_Bits: 4294967295
318+
m_RenderingLayerMask: 1
281319
m_Lightmapping: 4
282320
m_LightShadowCasterMode: 0
283321
m_AreaSize: {x: 1, y: 1}
284322
m_BounceIntensity: 1
285323
m_ColorTemperature: 6570
286324
m_UseColorTemperature: 0
325+
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
326+
m_UseBoundingSphereOverride: 0
287327
m_ShadowRadius: 0
288328
m_ShadowAngle: 0
289329
--- !u!4 &1116937700
290330
Transform:
291331
m_ObjectHideFlags: 0
292332
m_CorrespondingSourceObject: {fileID: 0}
293-
m_PrefabInternal: {fileID: 0}
333+
m_PrefabInstance: {fileID: 0}
334+
m_PrefabAsset: {fileID: 0}
294335
m_GameObject: {fileID: 1116937698}
295336
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
296337
m_LocalPosition: {x: 0, y: 3, z: 0}

‎Logs/Packages-Update.log

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
2+
=== Thu Jun 6 18:18:35 2019
3+
4+
Packages were changed.
5+
Update Mode: updateDependencies
6+
7+
The following packages were added:
8+
[email protected]
9+
[email protected]
10+
[email protected]
11+
[email protected]
12+
[email protected]
13+
[email protected]
14+
[email protected]
15+
[email protected]
16+
[email protected]
17+
[email protected]
18+
[email protected]
19+
[email protected]
20+
[email protected]
21+
The following packages were updated:
22+
com.unity.package-manager-ui from version 1.9.11 to 2.1.2

‎Packages/manifest.json

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
{
22
"dependencies": {
3-
"com.unity.package-manager-ui": "1.9.11",
3+
"com.unity.package-manager-ui": "2.1.2",
4+
"com.unity.modules.animation": "1.0.0",
5+
"com.unity.modules.audio": "1.0.0",
6+
"com.unity.modules.director": "1.0.0",
47
"com.unity.modules.imgui": "1.0.0",
8+
"com.unity.modules.jsonserialize": "1.0.0",
9+
"com.unity.modules.particlesystem": "1.0.0",
510
"com.unity.modules.ui": "1.0.0",
6-
"com.unity.modules.uielements": "1.0.0"
11+
"com.unity.modules.uielements": "1.0.0",
12+
"com.unity.modules.unitywebrequest": "1.0.0",
13+
"com.unity.modules.video": "1.0.0",
14+
"com.unity.modules.vr": "1.0.0",
15+
"com.unity.modules.xr": "1.0.0"
716
}
817
}

‎ProjectSettings/ProjectVersion.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
m_EditorVersion: 2018.2.0f2
1+
m_EditorVersion: 2019.1.3f1
2+
m_EditorVersionWithRevision: 2019.1.3f1 (dc414eb9ed43)

‎ProjectSettings/VFXManager.asset

4.05 KB
Binary file not shown.

‎ProjectSettings/XRSettings.asset

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"m_SettingKeys": [
3+
"VR Device Disabled",
4+
"VR Device User Alert"
5+
],
6+
"m_SettingValues": [
7+
"False",
8+
"False"
9+
]
10+
}

0 commit comments

Comments
 (0)