Merge branch 'master' into node-bugfixes

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

     {
         MaterialGraphView m_GraphView;
         GraphInspectorView m_GraphInspectorView;
+        private EditorWindow m_EditorWindow;
 
         AbstractMaterialGraph m_Graph;
         PreviewManager m_PreviewManager;
         {
             m_Graph = graph;
             AddStyleSheetPath("Styles/MaterialGraph");
-
+            m_EditorWindow = editorWindow;
             previewManager = new PreviewManager(graph);
 
             var content = new VisualElement { name = "content" };
                 m_GraphInspectorView.AddManipulator(new Draggable(OnMouseDrag, true));
                 m_GraphView.RegisterCallback<PostLayoutEvent>(OnPostLayout);
                 m_GraphInspectorView.RegisterCallback<PostLayoutEvent>(OnPostLayout);
+
+                m_GraphView.RegisterCallback<KeyDownEvent>(OnSpaceDown);
 
                 m_GraphView.Add(m_GraphInspectorView);
 
             inspectorViewRect.height = Mathf.Min(inspectorViewRect.height, layout.height);
 
             m_GraphInspectorView.layout = inspectorViewRect;
+        }
+
+        void OnSpaceDown(KeyDownEvent evt)
+        {
+            if( evt.keyCode == KeyCode.Space)
+            {
+                if (graphView.nodeCreationRequest == null)
+                    return;
+
+                Vector2 referencePosition;
+                referencePosition = evt.imguiEvent.mousePosition;
+                Vector2 screenPoint = m_EditorWindow.position.position + referencePosition;
+
+                graphView.nodeCreationRequest(new NodeCreationContext() { screenMousePosition = screenPoint });
+            }
         }
 
         void OnMouseDrag(Vector2 mouseDelta)

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Importers/ShaderGraphImporter.cs

 using UnityEditor;
 using UnityEditor.Experimental.AssetImporters;
 
-[ScriptedImporter(1, ShaderGraphImporter.ShaderGraphExtension)]
+[ScriptedImporter(3, ShaderGraphImporter.ShaderGraphExtension)]
 public class ShaderGraphImporter : ScriptedImporter
 {
     public const string ShaderGraphExtension = "shadergraph";

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Templates/lightweightPBRExtraPasses.template

-        Pass
-        {
-            Tags{"LightMode" = "ShadowCaster"}
+Pass
+{
+    Tags{"LightMode" = "ShadowCaster"}
-            ZWrite On ZTest LEqual
+    ZWrite On ZTest LEqual
-            HLSLPROGRAM
-            // Required to compile gles 2.0 with standard srp library
-            #pragma prefer_hlslcc gles
-            #pragma target 2.0
-            #pragma vertex ShadowPassVertex
-            #pragma fragment ShadowPassFragment
+    HLSLPROGRAM
+    // Required to compile gles 2.0 with standard srp library
+    #pragma prefer_hlslcc gles
+    #pragma target 2.0
-            #include "LWRP/Shaders/LightweightPassShadow.hlsl"
-            ENDHLSL
-        }
+    //--------------------------------------
+    // GPU Instancing
+    #pragma multi_compile_instancing
-        Pass
-        {
-            Tags{"LightMode" = "DepthOnly"}
+    #pragma vertex ShadowPassVertex
+    #pragma fragment ShadowPassFragment
-            ZWrite On
-            ColorMask 0
+    #include "LWRP/ShaderLibrary/LightweightPassShadow.hlsl"
+    ENDHLSL
+}
-            HLSLPROGRAM
-            // Required to compile gles 2.0 with standard srp library
-            #pragma prefer_hlslcc gles
-            #pragma target 2.0
-            #pragma vertex vert
-            #pragma fragment frag
+Pass
+{
+    Tags{"LightMode" = "DepthOnly"}
-            #include "LWRP/Shaders/LightweightShaderLibrary/Core.hlsl"
+    ZWrite On
+    ColorMask 0
-            float4 vert(float4 pos : POSITION) : SV_POSITION
-            {
-                return TransformObjectToHClip(pos.xyz);
-            }
+    HLSLPROGRAM
+    // Required to compile gles 2.0 with standard srp library
+    #pragma prefer_hlslcc gles
+    #pragma target 2.0
+    #pragma vertex vert
+    #pragma fragment frag
-            half4 frag() : SV_TARGET
-            {
-                return 0;
-            }
-            ENDHLSL
-        }
+    #include "LWRP/ShaderLibrary/Core.hlsl"
-        // This pass it not used during regular rendering, only for lightmap baking.
-        Pass
-        {
-            Tags{"LightMode" = "Meta"}
+    float4 vert(float4 pos : POSITION) : SV_POSITION
+    {
+        return TransformObjectToHClip(pos.xyz);
+    }
-            Cull Off
+    half4 frag() : SV_TARGET
+    {
+        return 0;
+    }
+    ENDHLSL
+}
-            HLSLPROGRAM
-            // Required to compile gles 2.0 with standard srp library
-            #pragma prefer_hlslcc gles
+// This pass it not used during regular rendering, only for lightmap baking.
+Pass
+{
+    Tags{"LightMode" = "Meta"}
-            #pragma vertex LightweightVertexMeta
-            #pragma fragment LightweightFragmentMeta
+    Cull Off
-            #pragma shader_feature _EMISSION
-            #pragma shader_feature _METALLICSPECGLOSSMAP
-            #pragma shader_feature _ _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
-            #pragma shader_feature EDITOR_VISUALIZATION
+    HLSLPROGRAM
+    // Required to compile gles 2.0 with standard srp library
+    #pragma prefer_hlslcc gles
-            #pragma shader_feature _SPECGLOSSMAP
+    #pragma vertex LightweightVertexMeta
+    #pragma fragment LightweightFragmentMeta
-            #include "LWRP/Shaders/LightweightPassMeta.hlsl"
-            ENDHLSL
-        }
+    #pragma shader_feature _SPECULAR_SETUP
+    #pragma shader_feature _EMISSION
+    #pragma shader_feature _METALLICSPECGLOSSMAP
+    #pragma shader_feature _ _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+    #pragma shader_feature EDITOR_VISUALIZATION
+
+    #pragma shader_feature _SPECGLOSSMAP
+
+    #include "LWRP/ShaderLibrary/LightweightPassMeta.hlsl"
+    ENDHLSL
+}

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Templates/lightweightPBRForwardPass.template

     #pragma multi_compile _ _ADDITIONAL_LIGHTS
     #pragma multi_compile _ _VERTEX_LIGHTS
     #pragma multi_compile _ _MIXED_LIGHTING_SUBTRACTIVE
+    #pragma multi_compile _ FOG_LINEAR FOG_EXP2
-    #pragma multi_compile _ LIGHTMAP_ON
-    #pragma multi_compile _ DIRLIGHTMAP_COMBINED
-    #pragma multi_compile_fog
+    #pragma multi_compile _ DIRLIGHTMAP_COMBINED LIGHTMAP_ON
+
+    //--------------------------------------
+    // GPU Instancing
+    #pragma multi_compile_instancing
+
+    // LW doesn't support dynamic GI. So we save 30% shader variants if we assume
+    // LIGHTMAP_ON when DIRLIGHTMAP_COMBINED is set
+    #ifdef DIRLIGHTMAP_COMBINED
+    #define LIGHTMAP_ON
+    #endif
 
     #pragma vertex vert
 	#pragma fragment frag
-	#include "LWRP/Shaders/LightweightShaderLibrary/Core.hlsl"
-	#include "LWRP/Shaders/LightweightShaderLibrary/Lighting.hlsl"
+	#include "LWRP/ShaderLibrary/Core.hlsl"
+	#include "LWRP/ShaderLibrary/Lighting.hlsl"
 	#include "CoreRP/ShaderLibrary/Color.hlsl"
 	#include "ShaderGraphLibrary/Functions.hlsl"
 
     {
-        float4 clipPos : SV_POSITION;
-        float4 lightmapUVOrVertexSH : TEXCOORD0;
+        float4 clipPos                : SV_POSITION;
+        float4 lightmapUVOrVertexSH   : TEXCOORD0;
+    	float4 shadowCoord            : TEXCOORD2;
         ${Interpolators}
     };
 
 	    o.fogFactorAndVertexLight = half4(fogFactor, vertexLight);
 	    o.clipPos = clipPos;
 
+#if defined(_SHADOWS_ENABLED) && !defined(_SHADOWS_CASCADE)
+	    o.shadowCoord = ComputeShadowCoord(lwWorldPos);
+#else
+		o.shadowCoord = float4(0, 0, 0, 0);
+#endif
+
 		return o;
 	}
 
 
 		float3 Albedo = float3(0.5, 0.5, 0.5);
 		float3 Specular = float3(0, 0, 0);
-		float Metallic = 0;
+		float Metallic = 1;
 		float3 Normal = float3(0, 0, 1);
 		float3 Emission = 0;
 		float Smoothness = 0.5;
 
         ${SurfaceOutputRemap}
 
-#if _NORMALMAP
-    half3 normalWS = TangentToWorldNormal(Normal, WorldSpaceTangent, WorldSpaceBiTangent, WorldSpaceNormal);
+		InputData inputData;
+		inputData.positionWS = WorldSpacePosition;
+
+#ifdef _NORMALMAP
+	    inputData.normalWS = TangentToWorldNormal(Normal, WorldSpaceTangent, WorldSpaceBiTangent, WorldSpaceNormal);
-    half3 normalWS = normalize(WorldSpaceNormal);
+	    inputData.normalWS = normalize(WorldSpaceNormal);
-	half3 indirectDiffuse = SampleGI(IN.lightmapUVOrVertexSH, normalWS);
+#ifdef SHADER_API_MOBILE
+	    // viewDirection should be normalized here, but we avoid doing it as it's close enough and we save some ALU.
+	    inputData.viewDirectionWS = WorldSpaceViewDirection;
+#else
+	    inputData.viewDirectionWS = normalize(WorldSpaceViewDirection);
+#endif
+
+#ifdef _SHADOWS_ENABLED
+	    inputData.shadowCoord = IN.shadowCoord;
+#else
+	    inputData.shadowCoord = float4(0, 0, 0, 0);
+#endif
-	half4 color = LightweightFragmentPBR(
-			WorldSpacePosition,
-			normalWS,
-			WorldSpaceViewDirection,
-			indirectDiffuse,
-			IN.fogFactorAndVertexLight.yzw,
-			Albedo,
-			Metallic,
-			Specular,
-			Smoothness,
-			Occlusion,
-			Emission,
+	    inputData.fogCoord = IN.fogFactorAndVertexLight.x;
+	    inputData.vertexLighting = IN.fogFactorAndVertexLight.yzw;
+	    inputData.bakedGI = SampleGI(IN.lightmapUVOrVertexSH, inputData.normalWS);
+
+		half4 color = LightweightFragmentPBR(
+			inputData, 
+			Albedo, 
+			Metallic, 
+			Specular, 
+			Smoothness, 
+			Occlusion, 
+			Emission, 
-	// Computes fog factor per-vertex
-    ApplyFog(color.rgb, IN.fogFactorAndVertexLight.x);
+		// Computes fog factor per-vertex
+    	ApplyFog(color.rgb, IN.fogFactorAndVertexLight.x);
 
 #if _AlphaOut
 		color.a = Alpha;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Templates/lightweightUnlitPass.template

     #pragma prefer_hlslcc gles
     #pragma multi_compile _ UNITY_SINGLE_PASS_STEREO STEREO_INSTANCING_ENABLE STEREO_MULTIVIEW_ENABLE
     #pragma multi_compile_fog
+    #pragma multi_compile_instancing
-    #include "LWRP/Shaders/LightweightShaderLibrary/Core.hlsl"
-    #include "LWRP/Shaders/LightweightShaderLibrary/Lighting.hlsl"
+    #include "LWRP/ShaderLibrary/Core.hlsl"
+    #include "LWRP/ShaderLibrary/Lighting.hlsl"
     #include "CoreRP/ShaderLibrary/Color.hlsl"
     #include "ShaderGraphLibrary/Functions.hlsl"
 

MaterialGraphProject/Assets/UnityShaderEditor/package.json

 {
     "name": "com.unity.shadergraph",
     "description": "Shader Graph",
-    "version": "0.1.11",
+    "version": "0.1.13",
     "unity": "2018.1",
     "dependencies": {
     }

MaterialGraphProject/UnityPackageManager/manifest.json

 {
 	"registry": "https://staging-packages.unity.com",
 	"dependencies": {
-		"com.unity.render-pipelines.lightweight" : "0.1.23"
+		"com.unity.render-pipelines.lightweight" : "0.1.25"
 	}
 }