Rename also all enum which a Vector1 inside to get correct string conversion as float

sebastienlagarde · sebastienlagarde · commit 3d5fe9b48a1c · 2020-09-25T19:14:59.000+02:00
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/DynamicValueMaterialSlot.cs b/com.unity.shadergraph/Editor/Data/Graphs/DynamicValueMaterialSlot.cs
@@ -79,7 +79,7 @@ public override void GetPreviewProperties(List<PreviewProperty> properties, stri
         {
             var propType = concreteValueType.ToPropertyType();
             var pp = new PreviewProperty(propType) { name = name };
-            if (propType == PropertyType.Vector1)
+            if (propType == PropertyType.Float)
                 pp.floatValue = value.m00;
             else
                 pp.vector4Value = new Vector4(value.m00, value.m01, value.m02, value.m03);
@@ -118,7 +118,7 @@ public override void AddDefaultProperty(PropertyCollector properties, Generation
                 case ConcreteSlotValueType.Vector2:
                     property = new Vector2ShaderProperty();
                     break;
-                case ConcreteSlotValueType.Vector1:
+                case ConcreteSlotValueType.Float:
                     property = new Vector1ShaderProperty();
                     break;
                 case ConcreteSlotValueType.Matrix4:
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/DynamicVectorMaterialSlot.cs b/com.unity.shadergraph/Editor/Data/Graphs/DynamicVectorMaterialSlot.cs
@@ -72,7 +72,7 @@ public override void GetPreviewProperties(List<PreviewProperty> properties, stri
         {
             var propType = concreteValueType.ToPropertyType();
             var pp = new PreviewProperty(propType) { name = name };
-            if (propType == PropertyType.Vector1)
+            if (propType == PropertyType.Float)
                 pp.floatValue = value.x;
             else
                 pp.vector4Value = new Vector4(value.x, value.y, value.z, value.w);
@@ -111,7 +111,7 @@ public override void AddDefaultProperty(PropertyCollector properties, Generation
                 case ConcreteSlotValueType.Vector2:
                     property = new Vector2ShaderProperty();
                     break;
-                case ConcreteSlotValueType.Vector1:
+                case ConcreteSlotValueType.Float:
                     property = new Vector1ShaderProperty();
                     break;
                 default:
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/MaterialSlot.cs b/com.unity.shadergraph/Editor/Data/Graphs/MaterialSlot.cs
@@ -70,7 +70,7 @@ static string ConcreteSlotValueTypeAsString(ConcreteSlotValueType type)
         {
             switch (type)
             {
-                case ConcreteSlotValueType.Vector1:
+                case ConcreteSlotValueType.Float:
                     return "(1)";
                 case ConcreteSlotValueType.Vector2:
                     return "(2)";
@@ -162,7 +162,7 @@ public static MaterialSlot CreateMaterialSlot(SlotValueType type, int slotId, st
                     return new Vector3MaterialSlot(slotId, displayName, shaderOutputName, slotType, defaultValue, shaderStageCapability, hidden: hidden);
                 case SlotValueType.Vector2:
                     return new Vector2MaterialSlot(slotId, displayName, shaderOutputName, slotType, defaultValue, shaderStageCapability, hidden: hidden);
-                case SlotValueType.Vector1:
+                case SlotValueType.Float:
                     return new Vector1MaterialSlot(slotId, displayName, shaderOutputName, slotType, defaultValue.x, shaderStageCapability, hidden: hidden);
                 case SlotValueType.Dynamic:
                     return new DynamicValueMaterialSlot(slotId, displayName, shaderOutputName, slotType, new Matrix4x4(defaultValue, Vector4.zero, Vector4.zero, Vector4.zero), shaderStageCapability, hidden);
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/PreviewProperty.cs b/com.unity.shadergraph/Editor/Data/Graphs/PreviewProperty.cs
@@ -148,14 +148,14 @@ public float floatValue
         {
             get
             {
-                if (propType != PropertyType.Vector1)
-                    throw new ArgumentException(string.Format(k_GetErrorMessage, PropertyType.Vector1, propType));
+                if (propType != PropertyType.Float)
+                    throw new ArgumentException(string.Format(k_GetErrorMessage, PropertyType.Float, propType));
                 return m_StructData.floatValue;
             }
             set
             {
-                if (propType != PropertyType.Vector1)
-                    throw new ArgumentException(string.Format(k_SetErrorMessage, PropertyType.Vector1, propType));
+                if (propType != PropertyType.Float)
+                    throw new ArgumentException(string.Format(k_SetErrorMessage, PropertyType.Float, propType));
                 m_StructData.floatValue = value;
             }
         }
@@ -228,7 +228,7 @@ public void SetValueOnMaterialPropertyBlock(MaterialPropertyBlock mat)
                 mat.SetColor(name, m_StructData.colorValue);
             else if (propType == PropertyType.Vector2 || propType == PropertyType.Vector3 || propType == PropertyType.Vector4)
                 mat.SetVector(name, m_StructData.vector4Value);
-            else if (propType == PropertyType.Vector1)
+            else if (propType == PropertyType.Float)
                 mat.SetFloat(name, m_StructData.floatValue);
             else if (propType == PropertyType.Boolean)
                 mat.SetFloat(name, m_StructData.booleanValue ? 1 : 0);
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Vector1MaterialSlot.cs b/com.unity.shadergraph/Editor/Data/Graphs/Vector1MaterialSlot.cs
@@ -90,12 +90,12 @@ public override void AddDefaultProperty(PropertyCollector properties, Generation
             properties.AddShaderProperty(property);
         }
 
-        public override SlotValueType valueType { get { return SlotValueType.Vector1; } }
-        public override ConcreteSlotValueType concreteValueType { get { return ConcreteSlotValueType.Vector1; } }
+        public override SlotValueType valueType { get { return SlotValueType.Float; } }
+        public override ConcreteSlotValueType concreteValueType { get { return ConcreteSlotValueType.Float; } }
 
         public override void GetPreviewProperties(List<PreviewProperty> properties, string name)
         {
-            var pp = new PreviewProperty(PropertyType.Vector1)
+            var pp = new PreviewProperty(PropertyType.Float)
             {
                 name = name,
                 floatValue = value,
diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Vector1ShaderProperty.cs b/com.unity.shadergraph/Editor/Data/Graphs/Vector1ShaderProperty.cs
@@ -17,7 +17,7 @@ internal Vector1ShaderProperty()
             displayName = "Float";
         }
         
-        public override PropertyType propertyType => PropertyType.Vector1;
+        public override PropertyType propertyType => PropertyType.Float;
         
         internal override bool isBatchable => true;
         internal override bool isExposable => true;
diff --git a/com.unity.shadergraph/Editor/Data/Implementation/NodeUtils.cs b/com.unity.shadergraph/Editor/Data/Implementation/NodeUtils.cs
@@ -526,7 +526,7 @@ public static string GetSlotDimension(ConcreteSlotValueType slotValue)
         {
             switch (slotValue)
             {
-                case ConcreteSlotValueType.Vector1:
+                case ConcreteSlotValueType.Float:
                     return String.Empty;
                 case ConcreteSlotValueType.Vector2:
                     return "2";
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/AbstractMaterialNode.cs b/com.unity.shadergraph/Editor/Data/Nodes/AbstractMaterialNode.cs
@@ -454,20 +454,20 @@ public static ConcreteSlotValueType ConvertDynamicVectorInputTypeToConcrete(IEnu
             switch (inputTypesDistinct.Count)
             {
                 case 0:
-                    return ConcreteSlotValueType.Vector1;
+                    return ConcreteSlotValueType.Float;
                 case 1:
                     if(SlotValueHelper.AreCompatible(SlotValueType.DynamicVector, inputTypesDistinct.First()))
                         return inputTypesDistinct.First();
                     break;
                 default:
                     // find the 'minumum' channel width excluding 1 as it can promote
-                    inputTypesDistinct.RemoveAll(x => x == ConcreteSlotValueType.Vector1);
+                    inputTypesDistinct.RemoveAll(x => x == ConcreteSlotValueType.Float);
                     var ordered = inputTypesDistinct.OrderByDescending(x => x);
                     if (ordered.Any())
                         return ordered.FirstOrDefault();
                     break;
             }
-            return ConcreteSlotValueType.Vector1;
+            return ConcreteSlotValueType.Float;
         }
 
         public static ConcreteSlotValueType ConvertDynamicMatrixInputTypeToConcrete(IEnumerable<ConcreteSlotValueType> inputTypes)
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Channel/SwizzleNode.cs b/com.unity.shadergraph/Editor/Data/Nodes/Channel/SwizzleNode.cs
@@ -131,7 +131,7 @@ public void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMo
             var outputName = GetVariableNameForSlot(OutputSlotId);
             var inputValue = GetSlotValue(InputSlotId, generationMode);
             var inputValueType = FindInputSlot<MaterialSlot>(InputSlotId).concreteValueType;
-            if (inputValueType == ConcreteSlotValueType.Vector1)
+            if (inputValueType == ConcreteSlotValueType.Float)
                 sb.AppendLine(string.Format("{0} {1} = {2};", outputSlotType, outputName, inputValue));
             else if (generationMode == GenerationMode.ForReals)
                 sb.AppendLine("{0} {1} = {2}.{3}{4}{5}{6};",
@@ -163,7 +163,7 @@ public override void CollectPreviewMaterialProperties(List<PreviewProperty> prop
             base.CollectPreviewMaterialProperties(properties);
             // Encode swizzle values into an integer
             var value = ((int)redChannel) | ((int)greenChannel << 2) | ((int)blueChannel << 4) | ((int)alphaChannel << 6);
-            properties.Add(new PreviewProperty(PropertyType.Vector1)
+            properties.Add(new PreviewProperty(PropertyType.Float)
             {
                 name = GetVariableNameForNode(),
                 floatValue = value
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/CodeFunctionNode.cs b/com.unity.shadergraph/Editor/Data/Nodes/CodeFunctionNode.cs
@@ -153,7 +153,7 @@ private static SlotValueType ConvertTypeToSlotValueType(ParameterInfo p)
             }
             if (t == typeof(Vector1))
             {
-                return SlotValueType.Vector1;
+                return SlotValueType.Float;
             }
             if (t == typeof(Vector2))
             {
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/IntegerNode.cs b/com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/IntegerNode.cs
@@ -72,7 +72,7 @@ public override string GetVariableNameForSlot(int slotId)
 
         public override void CollectPreviewMaterialProperties(List<PreviewProperty> properties)
         {
-            properties.Add(new PreviewProperty(PropertyType.Vector1)
+            properties.Add(new PreviewProperty(PropertyType.Float)
             {
                 name = GetVariableNameForNode(),
                 floatValue = m_Value
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/SliderNode.cs b/com.unity.shadergraph/Editor/Data/Nodes/Input/Basic/SliderNode.cs
@@ -74,7 +74,7 @@ public override string GetVariableNameForSlot(int slotId)
 
         public override void CollectPreviewMaterialProperties(List<PreviewProperty> properties)
         {
-            properties.Add(new PreviewProperty(PropertyType.Vector1)
+            properties.Add(new PreviewProperty(PropertyType.Float)
             {
                 name = GetVariableNameForNode(),
                 floatValue = m_Value.x
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/PBR/DielectricSpecularNode.cs b/com.unity.shadergraph/Editor/Data/Nodes/Input/PBR/DielectricSpecularNode.cs
@@ -123,15 +123,15 @@ public override void CollectPreviewMaterialProperties(List<PreviewProperty> prop
 
             if (material.type == DielectricMaterialType.Common)
             {
-                properties.Add(new PreviewProperty(PropertyType.Vector1)
+                properties.Add(new PreviewProperty(PropertyType.Float)
                 {
                     name = string.Format("_{0}_Range", GetVariableNameForNode()),
                     floatValue = material.range
                 });
             }
             else if (material.type == DielectricMaterialType.Custom)
             {
-                properties.Add(new PreviewProperty(PropertyType.Vector1)
+                properties.Add(new PreviewProperty(PropertyType.Float)
                 {
                     name = string.Format("_{0}_IOR", GetVariableNameForNode()),
                     floatValue = material.indexOfRefraction
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Input/PropertyNode.cs b/com.unity.shadergraph/Editor/Data/Nodes/Input/PropertyNode.cs
@@ -70,7 +70,7 @@ void AddOutputSlot()
                     AddSlot(new BooleanMaterialSlot(OutputSlotId, property.displayName, "Out", SlotType.Output, false));
                     RemoveSlotsNameNotMatching(new[] { OutputSlotId });
                     break;
-                case ConcreteSlotValueType.Vector1:
+                case ConcreteSlotValueType.Float:
                     AddSlot(new Vector1MaterialSlot(OutputSlotId, property.displayName, "Out", SlotType.Output, 0));
                     RemoveSlotsNameNotMatching(new[] {OutputSlotId});
                     break;
@@ -138,7 +138,7 @@ public void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMo
                 case PropertyType.Boolean:
                     sb.AppendLine($"$precision {GetVariableNameForSlot(OutputSlotId)} = {property.referenceName};");
                     break;
-                case PropertyType.Vector1:
+                case PropertyType.Float:
                     sb.AppendLine($"$precision {GetVariableNameForSlot(OutputSlotId)} = {property.referenceName};");
                     break;
                 case PropertyType.Vector2:
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Math/Basic/MultiplyNode.cs b/com.unity.shadergraph/Editor/Data/Nodes/Math/Basic/MultiplyNode.cs
@@ -264,7 +264,7 @@ private MultiplyType GetMultiplyType(IEnumerable<ConcreteSlotValueType> inputTyp
                 if (concreteSlotValueTypes[i] == ConcreteSlotValueType.Vector4
                     || concreteSlotValueTypes[i] == ConcreteSlotValueType.Vector3
                     || concreteSlotValueTypes[i] == ConcreteSlotValueType.Vector2
-                    || concreteSlotValueTypes[i] == ConcreteSlotValueType.Vector1)
+                    || concreteSlotValueTypes[i] == ConcreteSlotValueType.Float)
                 {
                     vectorCount++;
                 }
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/SlotValue.cs b/com.unity.shadergraph/Editor/Data/Nodes/SlotValue.cs
@@ -21,7 +21,7 @@ enum SlotValueType
         Vector4,
         Vector3,
         Vector2,
-        Vector1,
+        Float,
         Dynamic,
         Boolean,
         VirtualTexture
@@ -41,7 +41,7 @@ enum ConcreteSlotValueType
         Vector4,
         Vector3,
         Vector2,
-        Vector1,
+        Float,
         Boolean,
         VirtualTexture
     }
@@ -58,7 +58,7 @@ public static int GetChannelCount(this ConcreteSlotValueType type)
                     return 3;
                 case ConcreteSlotValueType.Vector2:
                     return 2;
-                case ConcreteSlotValueType.Vector1:
+                case ConcreteSlotValueType.Float:
                     return 1;
                 default:
                     return 0;
@@ -102,13 +102,13 @@ public static bool AreCompatible(SlotValueType inputType, ConcreteSlotValueType
                 var validVectors = new List<SlotValueType>()
                 {
                     SlotValueType.Dynamic, SlotValueType.DynamicVector,
-                    SlotValueType.Vector1, SlotValueType.Vector2, SlotValueType.Vector3, SlotValueType.Vector4
+                    SlotValueType.Float, SlotValueType.Vector2, SlotValueType.Vector3, SlotValueType.Vector4
                 };
 
                 s_ValidConversions = new Dictionary<ConcreteSlotValueType, List<SlotValueType>>()
                 {
                     {ConcreteSlotValueType.Boolean, new List<SlotValueType>() {SlotValueType.Boolean}},
-                    {ConcreteSlotValueType.Vector1, validVectors},
+                    {ConcreteSlotValueType.Float, validVectors},
                     {ConcreteSlotValueType.Vector2, validVectors},
                     {ConcreteSlotValueType.Vector3, validVectors},
                     {ConcreteSlotValueType.Vector4, validVectors},
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/RedirectNodeData.cs b/com.unity.shadergraph/Editor/Data/Nodes/Utility/RedirectNodeData.cs
@@ -47,7 +47,7 @@ void AddSlots(SlotValueType edgeType)
                     AddSlot(new BooleanMaterialSlot(kInputSlotID, "", "", SlotType.Input, false));
                     AddSlot(new BooleanMaterialSlot(kOutputSlotID, "", "", SlotType.Output, false));
                     break;
-                case SlotValueType.Vector1:
+                case SlotValueType.Float:
                     AddSlot(new DynamicVectorMaterialSlot(kInputSlotID, "", "", SlotType.Input, Vector4.zero));
                     AddSlot(new DynamicVectorMaterialSlot(kOutputSlotID, "", "", SlotType.Output, Vector4.zero));
                     break;
diff --git a/com.unity.shadergraph/Editor/Data/Nodes/Utility/SubGraphNode.cs b/com.unity.shadergraph/Editor/Data/Nodes/Utility/SubGraphNode.cs
@@ -391,7 +391,7 @@ public virtual void UpdateSlots()
                                 tSlot.value = tProp.value;
                         }
                         break;
-                    case ConcreteSlotValueType.Vector1:
+                    case ConcreteSlotValueType.Float:
                         {
                             var tSlot = slot as Vector1MaterialSlot;
                             var tProp = prop as Vector1ShaderProperty;
diff --git a/com.unity.shadergraph/Editor/Data/SubGraph/SubGraphOutputNode.cs b/com.unity.shadergraph/Editor/Data/SubGraph/SubGraphOutputNode.cs
@@ -16,7 +16,7 @@ class SubGraphOutputNode : AbstractMaterialNode
         static string s_MissingOutputSlot = "A Sub Graph must have at least one output slot";
         static List<ConcreteSlotValueType> s_ValidSlotTypes = new List<ConcreteSlotValueType>()
         {
-            ConcreteSlotValueType.Vector1,
+            ConcreteSlotValueType.Float,
             ConcreteSlotValueType.Vector2,
             ConcreteSlotValueType.Vector3,
             ConcreteSlotValueType.Vector4,
diff --git a/com.unity.shadergraph/Editor/Data/Util/KeywordUtil.cs b/com.unity.shadergraph/Editor/Data/Util/KeywordUtil.cs
@@ -46,7 +46,7 @@ public static ConcreteSlotValueType ToConcreteSlotValueType(this KeywordType key
                 case KeywordType.Boolean:
                     return ConcreteSlotValueType.Boolean;
                 case KeywordType.Enum:
-                    return ConcreteSlotValueType.Vector1;
+                    return ConcreteSlotValueType.Float;
                 default:
                     throw new ArgumentOutOfRangeException();
             }
diff --git a/com.unity.shadergraph/Editor/Data/Util/PropertyUtil.cs b/com.unity.shadergraph/Editor/Data/Util/PropertyUtil.cs
@@ -34,8 +34,8 @@ public static ConcreteSlotValueType ToConcreteShaderValueType(this PropertyType
                     return ConcreteSlotValueType.Vector3;
                 case PropertyType.Vector2:
                     return ConcreteSlotValueType.Vector2;
-                case PropertyType.Vector1:
-                    return ConcreteSlotValueType.Vector1;
+                case PropertyType.Float:
+                    return ConcreteSlotValueType.Float;
                 case PropertyType.Boolean:
                     return ConcreteSlotValueType.Boolean;
                 case PropertyType.Color:
diff --git a/com.unity.shadergraph/Editor/Data/Util/SlotValueTypeUtil.cs b/com.unity.shadergraph/Editor/Data/Util/SlotValueTypeUtil.cs
@@ -34,8 +34,8 @@ public static SlotValueType ToSlotValueType(this ConcreteSlotValueType concreteV
                     return SlotValueType.Vector3;
                 case ConcreteSlotValueType.Vector2:
                     return SlotValueType.Vector2;
-                case ConcreteSlotValueType.Vector1:
-                    return SlotValueType.Vector1;
+                case ConcreteSlotValueType.Float:
+                    return SlotValueType.Float;
                 case ConcreteSlotValueType.Boolean:
                     return SlotValueType.Boolean;
                 case ConcreteSlotValueType.VirtualTexture:
@@ -73,8 +73,8 @@ public static ConcreteSlotValueType ToConcreteSlotValueType(this SlotValueType s
                     return ConcreteSlotValueType.Vector3;
                 case SlotValueType.Vector2:
                     return ConcreteSlotValueType.Vector2;
-                case SlotValueType.Vector1:
-                    return ConcreteSlotValueType.Vector1;
+                case SlotValueType.Float:
+                    return ConcreteSlotValueType.Float;
                 case SlotValueType.Boolean:
                     return ConcreteSlotValueType.Boolean;
                 case SlotValueType.VirtualTexture:
@@ -112,8 +112,8 @@ public static PropertyType ToPropertyType(this ConcreteSlotValueType concreteVal
                     return PropertyType.Vector3;
                 case ConcreteSlotValueType.Vector2:
                     return PropertyType.Vector2;
-                case ConcreteSlotValueType.Vector1:
-                    return PropertyType.Vector1;
+                case ConcreteSlotValueType.Float:
+                    return PropertyType.Float;
                 case ConcreteSlotValueType.Boolean:
                     return PropertyType.Boolean;
                 case ConcreteSlotValueType.VirtualTexture:
@@ -157,7 +157,7 @@ public static string ToShaderString(this ConcreteSlotValueType type, string prec
                     return precisionToken + "3";
                 case ConcreteSlotValueType.Vector2:
                     return precisionToken + "2";
-                case ConcreteSlotValueType.Vector1:
+                case ConcreteSlotValueType.Float:
                     return precisionToken;
                 case ConcreteSlotValueType.Boolean:
                     return precisionToken;
diff --git a/com.unity.shadergraph/Editor/Drawing/MaterialGraphEditWindow.cs b/com.unity.shadergraph/Editor/Drawing/MaterialGraphEditWindow.cs
@@ -669,7 +669,7 @@ public void ToSubGraph()
                     case ConcreteSlotValueType.Vector2:
                         prop = new Vector2ShaderProperty();
                         break;
-                    case ConcreteSlotValueType.Vector1:
+                    case ConcreteSlotValueType.Float:
                         prop = new Vector1ShaderProperty();
                         break;
                     case ConcreteSlotValueType.Boolean:
diff --git a/com.unity.shadergraph/Editor/Drawing/Views/ReorderableSlotListView.cs b/com.unity.shadergraph/Editor/Drawing/Views/ReorderableSlotListView.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Enumerations/PropertyType.cs b/com.unity.shadergraph/Editor/Generation/Enumerations/PropertyType.cs
diff --git a/com.unity.shadergraph/Editor/Generation/Processors/GenerationUtils.cs b/com.unity.shadergraph/Editor/Generation/Processors/GenerationUtils.cs
diff --git a/com.unity.shadergraph/Tests/Editor/UnitTests/DynamicSlotTests.cs b/com.unity.shadergraph/Tests/Editor/UnitTests/DynamicSlotTests.cs
diff --git a/com.unity.shadergraph/Tests/Editor/UnitTests/MaterialNodeTests.cs b/com.unity.shadergraph/Tests/Editor/UnitTests/MaterialNodeTests.cs
diff --git a/com.unity.shadergraph/Tests/Editor/UnitTests/MaterialSlotTests.cs b/com.unity.shadergraph/Tests/Editor/UnitTests/MaterialSlotTests.cs
diff --git a/com.unity.shadergraph/Tests/Editor/UnitTests/ShaderGeneratorTests.cs b/com.unity.shadergraph/Tests/Editor/UnitTests/ShaderGeneratorTests.cs
diff --git a/com.unity.visualeffectgraph/Editor/ShaderGraph/VFXShaderGraphParticleOutput.cs b/com.unity.visualeffectgraph/Editor/ShaderGraph/VFXShaderGraphParticleOutput.cs

Original file line number	Diff line number	Diff line change
`@@ -148,14 +148,14 @@ public float floatValue`
`148`	`148`	`{`
`149`	`149`	`get`
`150`	`150`	`{`
`151`		`- if (propType != PropertyType.Vector1)`
`152`		`- throw new ArgumentException(string.Format(k_GetErrorMessage, PropertyType.Vector1, propType));`
	`151`	`+ if (propType != PropertyType.Float)`
	`152`	`+ throw new ArgumentException(string.Format(k_GetErrorMessage, PropertyType.Float, propType));`
`153`	`153`	`return m_StructData.floatValue;`
`154`	`154`	`}`
`155`	`155`	`set`
`156`	`156`	`{`
`157`		`- if (propType != PropertyType.Vector1)`
`158`		`- throw new ArgumentException(string.Format(k_SetErrorMessage, PropertyType.Vector1, propType));`
	`157`	`+ if (propType != PropertyType.Float)`
	`158`	`+ throw new ArgumentException(string.Format(k_SetErrorMessage, PropertyType.Float, propType));`
`159`	`159`	`m_StructData.floatValue = value;`
`160`	`160`	`}`
`161`	`161`	`}`
`@@ -228,7 +228,7 @@ public void SetValueOnMaterialPropertyBlock(MaterialPropertyBlock mat)`
`228`	`228`	`mat.SetColor(name, m_StructData.colorValue);`
`229`	`229`	`else if (propType == PropertyType.Vector2 \|\| propType == PropertyType.Vector3 \|\| propType == PropertyType.Vector4)`
`230`	`230`	`mat.SetVector(name, m_StructData.vector4Value);`
`231`		`- else if (propType == PropertyType.Vector1)`
	`231`	`+ else if (propType == PropertyType.Float)`
`232`	`232`	`mat.SetFloat(name, m_StructData.floatValue);`
`233`	`233`	`else if (propType == PropertyType.Boolean)`
`234`	`234`	`mat.SetFloat(name, m_StructData.booleanValue ? 1 : 0);`
Original file line number	Diff line number	Diff line change
`@@ -90,12 +90,12 @@ public override void AddDefaultProperty(PropertyCollector properties, Generation`
`90`	`90`	`properties.AddShaderProperty(property);`
`91`	`91`	`}`
`92`	`92`
`93`		`- public override SlotValueType valueType { get { return SlotValueType.Vector1; } }`
`94`		`- public override ConcreteSlotValueType concreteValueType { get { return ConcreteSlotValueType.Vector1; } }`
	`93`	`+ public override SlotValueType valueType { get { return SlotValueType.Float; } }`
	`94`	`+ public override ConcreteSlotValueType concreteValueType { get { return ConcreteSlotValueType.Float; } }`
`95`	`95`
`96`	`96`	`public override void GetPreviewProperties(List<PreviewProperty> properties, string name)`
`97`	`97`	`{`
`98`		`- var pp = new PreviewProperty(PropertyType.Vector1)`
	`98`	`+ var pp = new PreviewProperty(PropertyType.Float)`
`99`	`99`	`{`
`100`	`100`	`name = name,`
`101`	`101`	`floatValue = value,`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ internal Vector1ShaderProperty()`
`17`	`17`	`displayName = "Float";`
`18`	`18`	`}`
`19`	`19`
`20`		`- public override PropertyType propertyType => PropertyType.Vector1;`
	`20`	`+ public override PropertyType propertyType => PropertyType.Float;`
`21`	`21`
`22`	`22`	`internal override bool isBatchable => true;`
`23`	`23`	`internal override bool isExposable => true;`
Original file line number	Diff line number	Diff line change
`@@ -526,7 +526,7 @@ public static string GetSlotDimension(ConcreteSlotValueType slotValue)`
`526`	`526`	`{`
`527`	`527`	`switch (slotValue)`
`528`	`528`	`{`
`529`		`- case ConcreteSlotValueType.Vector1:`
	`529`	`+ case ConcreteSlotValueType.Float:`
`530`	`530`	`return String.Empty;`
`531`	`531`	`case ConcreteSlotValueType.Vector2:`
`532`	`532`	`return "2";`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ private static SlotValueType ConvertTypeToSlotValueType(ParameterInfo p)`
`153`	`153`	`}`
`154`	`154`	`if (t == typeof(Vector1))`
`155`	`155`	`{`
`156`		`- return SlotValueType.Vector1;`
	`156`	`+ return SlotValueType.Float;`
`157`	`157`	`}`
`158`	`158`	`if (t == typeof(Vector2))`
`159`	`159`	`{`