Merge branch 'master' into node-artistic-mask

MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Interfaces/INode.cs

     }
 
     public delegate void OnNodeModified(INode node, ModificationScope scope);
-    public delegate void OnNodeReplaced(INode previous, INode current);
 
     public interface INode
     {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/AbstractMaterialGraph.cs

             base.OnAfterDeserialize();
         }
 
-        protected static ShaderGraphRequirements GetRequierments(AbstractMaterialNode nodeForRequirements)
+        protected static ShaderGraphRequirements GetRequirements(AbstractMaterialNode nodeForRequirements)
         {
             if (nodeForRequirements == null)
                 return ShaderGraphRequirements.none;
             surfaceDescriptionFunction.AddShaderChunk(string.Format("{0} {1}(SurfaceInputs IN) {{", surfaceDescriptionName, functionName), false);
             surfaceDescriptionFunction.Indent();
 
-            if ((requirements.requiresNormal & NeededCoordinateSpace.Object) > 0)
-                surfaceDescriptionFunction.AddShaderChunk(string.Format("float3 {0} = IN.{0};", CoordinateSpace.Object.ToVariableName(InterpolatorType.Normal)), false);
-            if ((requirements.requiresNormal & NeededCoordinateSpace.View) > 0)
-                surfaceDescriptionFunction.AddShaderChunk(string.Format("float3 {0} = IN.{0};", CoordinateSpace.View.ToVariableName(InterpolatorType.Normal)), false);
-            if ((requirements.requiresNormal & NeededCoordinateSpace.World) > 0)
-                surfaceDescriptionFunction.AddShaderChunk(string.Format("float3 {0} = IN.{0};", CoordinateSpace.World.ToVariableName(InterpolatorType.Normal)), false);
-            if ((requirements.requiresNormal & NeededCoordinateSpace.Tangent) > 0)
-                surfaceDescriptionFunction.AddShaderChunk(string.Format("float3 {0} = IN.{0};", CoordinateSpace.Tangent.ToVariableName(InterpolatorType.Normal)), false);
-            if ((requirements.requiresTangent & NeededCoordinateSpace.Object) > 0)
-                surfaceDescriptionFunction.AddShaderChunk(string.Format("float3 {0} = IN.{0};", CoordinateSpace.Object.ToVariableName(InterpolatorType.Tangent)), false);
-            if ((requirements.requiresTangent & NeededCoordinateSpace.View) > 0)
-                surfaceDescriptionFunction.AddShaderChunk(string.Format("float3 {0} = IN.{0};", CoordinateSpace.View.ToVariableName(InterpolatorType.Tangent)), false);
-            if ((requirements.requiresTangent & NeededCoordinateSpace.World) > 0)
-                surfaceDescriptionFunction.AddShaderChunk(string.Format("float3 {0} = IN.{0};", CoordinateSpace.World.ToVariableName(InterpolatorType.Tangent)), false);
-            if ((requirements.requiresTangent & NeededCoordinateSpace.Tangent) > 0)
-                surfaceDescriptionFunction.AddShaderChunk(string.Format("float3 {0} = IN.{0};", CoordinateSpace.Tangent.ToVariableName(InterpolatorType.Tangent)), false);
-
-            if ((requirements.requiresBitangent & NeededCoordinateSpace.Object) > 0)
-                surfaceDescriptionFunction.AddShaderChunk(string.Format("float3 {0} = IN.{0};", CoordinateSpace.Object.ToVariableName(InterpolatorType.BiTangent)), false);
-            if ((requirements.requiresBitangent & NeededCoordinateSpace.View) > 0)
-                surfaceDescriptionFunction.AddShaderChunk(string.Format("float3 {0} = IN.{0};", CoordinateSpace.View.ToVariableName(InterpolatorType.BiTangent)), false);
-            if ((requirements.requiresBitangent & NeededCoordinateSpace.World) > 0)
-                surfaceDescriptionFunction.AddShaderChunk(string.Format("float3 {0} = IN.{0};", CoordinateSpace.World.ToVariableName(InterpolatorType.BiTangent)), false);
-            if ((requirements.requiresBitangent & NeededCoordinateSpace.Tangent) > 0)
-                surfaceDescriptionFunction.AddShaderChunk(string.Format("float3 {0} = IN.{0};", CoordinateSpace.Tangent.ToVariableName(InterpolatorType.BiTangent)), false);
-
-            if ((requirements.requiresViewDir & NeededCoordinateSpace.Object) > 0)
-                surfaceDescriptionFunction.AddShaderChunk(string.Format("float3 {0} = IN.{0};", CoordinateSpace.Object.ToVariableName(InterpolatorType.ViewDirection)), false);
-            if ((requirements.requiresViewDir & NeededCoordinateSpace.View) > 0)
-                surfaceDescriptionFunction.AddShaderChunk(string.Format("float3 {0} = IN.{0};", CoordinateSpace.View.ToVariableName(InterpolatorType.ViewDirection)), false);
-            if ((requirements.requiresViewDir & NeededCoordinateSpace.World) > 0)
-                surfaceDescriptionFunction.AddShaderChunk(string.Format("float3 {0} = IN.{0};", CoordinateSpace.World.ToVariableName(InterpolatorType.ViewDirection)), false);
-            if ((requirements.requiresViewDir & NeededCoordinateSpace.Tangent) > 0)
-                surfaceDescriptionFunction.AddShaderChunk(string.Format("float3 {0} = IN.{0};", CoordinateSpace.Tangent.ToVariableName(InterpolatorType.ViewDirection)), false);
-
-            if ((requirements.requiresPosition & NeededCoordinateSpace.Object) > 0)
-                surfaceDescriptionFunction.AddShaderChunk(string.Format("float3 {0} = IN.{0};", CoordinateSpace.Object.ToVariableName(InterpolatorType.Position)), false);
-            if ((requirements.requiresPosition & NeededCoordinateSpace.View) > 0)
-                surfaceDescriptionFunction.AddShaderChunk(string.Format("float3 {0} = IN.{0};", CoordinateSpace.View.ToVariableName(InterpolatorType.Position)), false);
-            if ((requirements.requiresPosition & NeededCoordinateSpace.World) > 0)
-                surfaceDescriptionFunction.AddShaderChunk(string.Format("float3 {0} = IN.{0};", CoordinateSpace.World.ToVariableName(InterpolatorType.Position)), false);
-            if ((requirements.requiresPosition & NeededCoordinateSpace.Tangent) > 0)
-                surfaceDescriptionFunction.AddShaderChunk(string.Format("float3 {0} = IN.{0};", CoordinateSpace.Tangent.ToVariableName(InterpolatorType.Position)), false);
+            foreach (CoordinateSpace space in Enum.GetValues(typeof(CoordinateSpace)))
+            {
+                var neededCoordinateSpace = space.ToNeededCoordinateSpace();
+                if ((requirements.requiresNormal & neededCoordinateSpace) > 0)
+                    surfaceDescriptionFunction.AddShaderChunk(string.Format("float3 {0} = IN.{0};", space.ToVariableName(InterpolatorType.Normal)), false);
+                if ((requirements.requiresTangent & neededCoordinateSpace) > 0)
+                    surfaceDescriptionFunction.AddShaderChunk(string.Format("float3 {0} = IN.{0};", space.ToVariableName(InterpolatorType.Tangent)), false);
+                if ((requirements.requiresBitangent & neededCoordinateSpace) > 0)
+                    surfaceDescriptionFunction.AddShaderChunk(string.Format("float3 {0} = IN.{0};", space.ToVariableName(InterpolatorType.BiTangent)), false);
+                if ((requirements.requiresViewDir & neededCoordinateSpace) > 0)
+                    surfaceDescriptionFunction.AddShaderChunk(string.Format("float3 {0} = IN.{0};", space.ToVariableName(InterpolatorType.ViewDirection)), false);
+                if ((requirements.requiresPosition & neededCoordinateSpace) > 0)
+                    surfaceDescriptionFunction.AddShaderChunk(string.Format("float3 {0} = IN.{0};", space.ToVariableName(InterpolatorType.Position)), false);
+            }
 
             if (requirements.requiresScreenPosition)
                 surfaceDescriptionFunction.AddShaderChunk(string.Format("float4 {0} = IN.{0};", ShaderGeneratorNames.ScreenPosition), false);
 
             surfaceInputs.AddShaderChunk("struct SurfaceInputs{", false);
             surfaceInputs.Indent();
-            var requirements = GetRequierments(node);
+            var requirements = GetRequirements(node);
             ShaderGenerator.GenerateSpaceTranslationSurfaceInputs(requirements.requiresNormal, InterpolatorType.Normal, surfaceInputs);
             ShaderGenerator.GenerateSpaceTranslationSurfaceInputs(requirements.requiresTangent, InterpolatorType.Tangent, surfaceInputs);
             ShaderGenerator.GenerateSpaceTranslationSurfaceInputs(requirements.requiresBitangent, InterpolatorType.BiTangent, surfaceInputs);

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/SubGraph/LayeredShaderGraph.cs

 
             var requirements = ShaderGraphRequirements.none;
             foreach (var layer in layerMap)
-                requirements = requirements.Union(GetRequierments(layer.Value.masterNode as AbstractMaterialNode));
+                requirements = requirements.Union(GetRequirements(layer.Value.masterNode as AbstractMaterialNode));
-            requirements = requirements.Union(GetRequierments(outputNode));
+            requirements = requirements.Union(GetRequirements(outputNode));
 
             ShaderGenerator.GenerateSpaceTranslationSurfaceInputs(requirements.requiresNormal, InterpolatorType.Normal, surfaceInputs);
             ShaderGenerator.GenerateSpaceTranslationSurfaceInputs(requirements.requiresTangent, InterpolatorType.Tangent, surfaceInputs);

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Controls/IControlAttribute.cs

 using System.Reflection;
 using UnityEngine.Experimental.UIElements;
-using UnityEditor.ShaderGraph;
 
 namespace UnityEditor.ShaderGraph.Drawing.Controls
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/PreviewManager.cs

             if (!m_Previews.TryGetValue(nodeGuid, out previewData))
                 return;
 
-            if (node is IMasterNode)
-            {
-                var materialGraph = (AbstractMaterialGraph) node.owner;
-
-                List<PropertyCollector.TextureInfo> defaultTextures;
-                PreviewMode pmode;
-                previewData.shaderString = materialGraph.GetShader(node, GenerationMode.Preview, node.guid + "_preview",  out defaultTextures, out pmode);
-                previewData.previewMode = node.previewMode;
-            }
-            else if (!node.hasPreview || NodeUtils.FindEffectiveShaderStage(node, true) == ShaderStage.Vertex)
+             if (!(node is IMasterNode) && (!node.hasPreview || NodeUtils.FindEffectiveShaderStage(node, true) == ShaderStage.Vertex))
             {
                 previewData.shaderString = null;
             }

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs

             }
 
             UpdatePortInputVisibilities();
+
+            foreach (var control in m_ControlViews)
+            {
+                var listener = control as INodeModificationListener;
+                if (listener != null)
+                    listener.OnNodeModified(scope);
+            }
         }
 
         void AddSlots(IEnumerable<MaterialSlot> slots)

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/INodeModificationListener.cs

+using UnityEditor.Graphing;
+
+namespace UnityEditor.ShaderGraph.Drawing
+{
+    public interface INodeModificationListener
+    {
+        void OnNodeModified(ModificationScope scope);
+    }
+}

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/INodeModificationListener.cs.meta

+fileFormatVersion: 2
+guid: 22f268830a014848b3a8bfdd5142a2d0
+timeCreated: 1510751718