Skip to content

Commit 5ca3e5d

Browse files
committed
Change variable naming convention
1 parent 55c772f commit 5ca3e5d

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

Editor/ShaderPropertyPropertyDrawer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ public sealed class ShaderPropertyPropertyDrawer : PropertyDrawer
88
{
99
public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
1010
{
11-
SerializedProperty name = property.FindPropertyRelative("_name");
12-
SerializedProperty id = property.FindPropertyRelative("_id");
11+
SerializedProperty id = property.FindPropertyRelative("m_Id");
12+
SerializedProperty name = property.FindPropertyRelative("m_Name");
1313

1414
EditorGUI.BeginProperty(position, label, property);
1515
position = EditorGUI.PrefixLabel(position, GUIUtility.GetControlID(FocusType.Passive), label);

Runtime/CubeMesh.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace Zigurous.Graphics
1010
[AddComponentMenu("Zigurous/Graphics/Cube Mesh")]
1111
public sealed class CubeMesh : MonoBehaviour
1212
{
13-
private static Mesh _sharedMesh;
13+
private static Mesh m_SharedMesh;
1414

1515
/// <summary>
1616
/// A cube mesh that can be shared across many objects (Read only).
@@ -20,20 +20,20 @@ public static Mesh sharedMesh
2020
{
2121
get
2222
{
23-
if (_sharedMesh == null)
23+
if (m_SharedMesh == null)
2424
{
2525
GameObject cube = GameObject.CreatePrimitive(PrimitiveType.Cube);
2626

2727
if (Application.isPlaying) {
28-
_sharedMesh = cube.GetComponent<MeshFilter>().mesh.Copy();
28+
m_SharedMesh = cube.GetComponent<MeshFilter>().mesh.Copy();
2929
} else {
30-
_sharedMesh = cube.GetComponent<MeshFilter>().sharedMesh.Copy();
30+
m_SharedMesh = cube.GetComponent<MeshFilter>().sharedMesh.Copy();
3131
}
3232

3333
DestroyImmediate(cube);
3434
}
3535

36-
return _sharedMesh;
36+
return m_SharedMesh;
3737
}
3838
}
3939

Runtime/ShaderProperty.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public struct ShaderProperty
1111
{
1212
[SerializeField]
1313
[HideInInspector]
14-
private int _id;
14+
private int m_Id;
1515

1616
/// <summary>
1717
/// The id of the shader property (Read only).
@@ -20,27 +20,27 @@ public int id
2020
{
2121
get
2222
{
23-
if (_id == 0) {
24-
_id = Shader.PropertyToID(_name);
23+
if (m_Id == 0) {
24+
m_Id = Shader.PropertyToID(m_Name);
2525
}
26-
return _id;
26+
return m_Id;
2727
}
2828
}
2929

3030
[SerializeField]
3131
[Tooltip("The name of the shader property.")]
32-
private string _name;
32+
private string m_Name;
3333

3434
/// <summary>
3535
/// The name of the shader property.
3636
/// </summary>
3737
public string name
3838
{
39-
get => _name;
39+
get => m_Name;
4040
set
4141
{
42-
_name = value;
43-
_id = Shader.PropertyToID(value);
42+
m_Name = value;
43+
m_Id = Shader.PropertyToID(value);
4444
}
4545
}
4646

@@ -50,8 +50,8 @@ public string name
5050
/// <param name="name">The name of the shader property.</param>
5151
public ShaderProperty(string name)
5252
{
53-
_name = name;
54-
_id = Shader.PropertyToID(name);
53+
m_Name = name;
54+
m_Id = Shader.PropertyToID(name);
5555
}
5656

5757
/// <summary>

0 commit comments

Comments
 (0)