This repository has been archived by the owner on Feb 11, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 137
Make vertex paint experimental #216
Merged
Henry00IS
merged 4 commits into
sabresaurus:master
from
jmickle66666666:make-vertex-paint-experimental
Feb 1, 2019
Merged
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
c03e189
Merge pull request #5 from sabresaurus/master
jmickle66666666 e2f13d5
Move vertex paint mode to experimental option
jmickle66666666 035026b
Replace EditorGUI.indentLevel with EditorGUI.IndentLevelScope
jmickle66666666 b0732d0
Add summaries to DrawEnumGrid and DrawPartialEnumGrid
jmickle66666666 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -347,6 +347,54 @@ public static T DrawEnumGrid<T>(T value, params GUILayoutOption[] options) where | |
return value; | ||
} | ||
|
||
public static T DrawPartialEnumGrid<T>(T value, T[] enabled, params GUILayoutOption[] options) where T : struct, IConvertible | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. A /// summary would be handy here indicating how this differs from DrawEnumGrid |
||
{ | ||
if (!typeof(T).IsEnum) | ||
{ | ||
throw new ArgumentException("DrawEnumGrid must be passed an enum"); | ||
} | ||
GUILayout.BeginHorizontal(); | ||
|
||
T[] enabledList = enabled; | ||
T[] baseList = (T[]) Enum.GetValues(value.GetType()); | ||
|
||
for (int i = 0; i < baseList.Length; i++) | ||
{ | ||
if (Array.IndexOf(enabledList, baseList[i]) == -1) { | ||
continue; | ||
} | ||
|
||
GUIStyle activeStyle; | ||
if (baseList.Length == 1) // Only one button | ||
{ | ||
activeStyle = EditorStyles.miniButton; | ||
} | ||
else if (i == 0) // Left-most button | ||
{ | ||
activeStyle = EditorStyles.miniButtonLeft; | ||
} | ||
else if (i == baseList.Length - 1) // Right-most button | ||
{ | ||
activeStyle = EditorStyles.miniButtonRight; | ||
} | ||
else // Normal mid button | ||
{ | ||
activeStyle = EditorStyles.miniButtonMid; | ||
} | ||
|
||
bool isActive = (Convert.ToInt32(value) == i); | ||
// string displayName = StringHelper.ParseDisplayString(names[i]); | ||
string displayName = baseList[i].ToString(); | ||
if (GUILayout.Toggle(isActive, displayName, activeStyle, options)) | ||
{ | ||
value = (T)Enum.ToObject(typeof(T), i); | ||
} | ||
} | ||
|
||
GUILayout.EndHorizontal(); | ||
return value; | ||
} | ||
|
||
public static bool DrawUVField(Rect rect, float? sourceFloat, ref string floatString, string controlName, GUIStyle style) | ||
{ | ||
if (!sourceFloat.HasValue) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Modifying indent level directly like this is probably bad practice, I'd suggest instead using IndentLevelScope