Skip to content

Missed renaming of existing inline Vector1 for rename Vector1 to Float #2159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 12, 2020
Merged

Missed renaming of existing inline Vector1 for rename Vector1 to Float #2159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4b1c47
Missed renaming of existing inline Vector1 for rename Vector1 to Floa…
sebastienlagarde Oct 9, 2020
341542f
Rename Vector1 to Float in EnumPopup for custom function
sebastienlagarde Oct 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/Vector1Node.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,13 @@ public AbstractShaderProperty AsShaderProperty()
return new Vector1ShaderProperty { value = slot.value };
}

public override void OnAfterDeserialize()
{
base.OnAfterDeserialize();

name = "Float";
}

int IPropertyFromNode.outputSlotId { get { return OutputSlotId; } }
}
}
20 changes: 20 additions & 0 deletions com.unity.shadergraph/Editor/Data/Nodes/SlotValue.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,26 @@ enum ConcreteSlotValueType
VirtualTexture
}

// This enum must match ConcreteSlotValueType enum and is used to give friendly name in the enum popup used for custom function
enum ConcreteSlotValueTypePopupName
{
SamplerState = ConcreteSlotValueType.SamplerState,
Matrix4 = ConcreteSlotValueType.Matrix4,
Matrix3 = ConcreteSlotValueType.Matrix3,
Matrix2 = ConcreteSlotValueType.Matrix2,
Texture2D = ConcreteSlotValueType.Texture2D,
Texture2DArray = ConcreteSlotValueType.Texture2DArray,
Texture3D = ConcreteSlotValueType.Texture3D,
Cubemap = ConcreteSlotValueType.Cubemap,
Gradient = ConcreteSlotValueType.Gradient,
Vector4 = ConcreteSlotValueType.Vector4,
Vector3 = ConcreteSlotValueType.Vector3,
Vector2 = ConcreteSlotValueType.Vector2,
Float = ConcreteSlotValueType.Vector1, // This is currently the only renaming we need - rename Vector1 to Float
Boolean = ConcreteSlotValueType.Boolean,
VirtualTexture = ConcreteSlotValueType.VirtualTexture
}

static class SlotValueHelper
{
public static bool AllowedAsSubgraphOutput(this ConcreteSlotValueType type)
Expand Down
2 changes: 1 addition & 1 deletion com.unity.shadergraph/Editor/Drawing/Views/ReorderableSlotListView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ private void AddCallbacks()
var concreteValueType = (ConcreteSlotValueType) EditorGUI.EnumPopup(
new Rect(rect.x + rect.width / 2, rect.y, rect.width - rect.width / 2, EditorGUIUtility.singleLineHeight),
GUIContent.none,
oldSlot.concreteValueType,
(ConcreteSlotValueTypePopupName)oldSlot.concreteValueType, // Force ConcreteSlotValueTypePopupName enum which match ConcreteSlotValueType to provide a friendly named in Popup
e => (AllowedTypeCallback == null) ? true : AllowedTypeCallback((ConcreteSlotValueType) e));

if(EditorGUI.EndChangeCheck())
Expand Down