Added Matrix 2 and 3 types

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/MaterialGraphPresenter.cs

             typeMapper[typeof(AddManyNode)] = typeof(AddManyNodePresenter);
             typeMapper[typeof(IfNode)] = typeof(IfNodePresenter);
             typeMapper[typeof(CustomCodeNode)] = typeof(CustomCodePresenter);
+            typeMapper[typeof(Matrix2Node)] = typeof(Matrix2NodePresenter);
+            typeMapper[typeof(Matrix3Node)] = typeof(Matrix3NodePresenter);
         }
     }
 }

MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/AbstractMaterialNode.cs

                     return ConcreteSlotValueType.Vector4;
                 case SlotValueType.sampler2D:
                     return ConcreteSlotValueType.sampler2D;
+                case SlotValueType.Matrix2:
+                    return ConcreteSlotValueType.Matrix2;
+                case SlotValueType.Matrix3:
+                    return ConcreteSlotValueType.Matrix3;
+                case SlotValueType.Matrix4:
+                    return ConcreteSlotValueType.Matrix4;
             }
             return ConcreteSlotValueType.Error;
         }
                     return "4";
                 case ConcreteSlotValueType.sampler2D:
                     return "sampler2D";
+                case ConcreteSlotValueType.Matrix2:
+                    return "2x2";
+                case ConcreteSlotValueType.Matrix3:
+                    return "3x3";
+                case ConcreteSlotValueType.Matrix4:
+                    return "4x4";
                 default:
                     return "Error";
             }
                     return PropertyType.Vector3;
                 case ConcreteSlotValueType.Vector4:
                     return PropertyType.Vector4;
+                case ConcreteSlotValueType.Matrix2:
+                    return PropertyType.Matrix2;
+                case ConcreteSlotValueType.Matrix3:
+                    return PropertyType.Matrix3;
+                case ConcreteSlotValueType.Matrix4:
+                    return PropertyType.Matrix4;
                 default:
                     return PropertyType.Vector4;
             }

MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/MaterialSlot.cs

                     return "(3)";
                 case ConcreteSlotValueType.Vector4:
                     return "(4)";
+                case ConcreteSlotValueType.Matrix2:
+                    return "(2x2)";
+                case ConcreteSlotValueType.Matrix3:
+                    return "(3x3)";
+                case ConcreteSlotValueType.Matrix4:
+                    return "(4x4)";
                 default:
                     return "(E)";
             }
                         break;
                     case SlotValueType.Vector3:
                         concreteValueType = ConcreteSlotValueType.Vector3;
+                        break;
+                    case SlotValueType.Matrix2:
+                        concreteValueType = ConcreteSlotValueType.Matrix2;
+                        break;
+                    case SlotValueType.Matrix3:
+                        concreteValueType = ConcreteSlotValueType.Matrix3;
+                        break;
+                    case SlotValueType.Matrix4:
+                        concreteValueType = ConcreteSlotValueType.Matrix4;
                         break;
                     default:
                         concreteValueType = ConcreteSlotValueType.Vector4;
                     return matOwner.precision + "3 (" + m_CurrentValue.x + "," + m_CurrentValue.y + "," + m_CurrentValue.z + ")";
                 case ConcreteSlotValueType.Vector4:
                     return matOwner.precision + "4 (" + m_CurrentValue.x + "," + m_CurrentValue.y + "," + m_CurrentValue.z + "," + m_CurrentValue.w + ")";
+                case ConcreteSlotValueType.Matrix2:
+                    return matOwner.precision + "2x2 (" + matOwner.precision + "2(" + m_CurrentValue.x + ", " + m_CurrentValue.x + "), " + matOwner.precision + "2(" + m_CurrentValue.y + ", "+ m_CurrentValue.y + "))";
+                case ConcreteSlotValueType.Matrix3:
+                    return matOwner.precision + "3x3 (" + matOwner.precision + "3(" + m_CurrentValue.x + ", " + m_CurrentValue.x + ", " + m_CurrentValue.x + "), " + matOwner.precision + "3(" + m_CurrentValue.y + ", " + m_CurrentValue.y + ", " + m_CurrentValue.y + "), " + matOwner.precision + "3(" + m_CurrentValue.z + ", " + m_CurrentValue.z + ", " + m_CurrentValue.z + "))";
+                case ConcreteSlotValueType.Matrix4:
+                    return matOwner.precision + "4x4 (" + matOwner.precision + "4(" + m_CurrentValue.x + ", " + m_CurrentValue.x + ", " + m_CurrentValue.x + ", " + m_CurrentValue.x + "), " + matOwner.precision + "4(" + m_CurrentValue.y + ", " + m_CurrentValue.y + ", " + m_CurrentValue.y + ", " + m_CurrentValue.y + "), " + matOwner.precision + "4(" + m_CurrentValue.z + ", " + m_CurrentValue.z + ", " + m_CurrentValue.z + ", " + m_CurrentValue.z + "), " + matOwner.precision + "4(" + m_CurrentValue.w + ", " + m_CurrentValue.w + ", " + m_CurrentValue.w + ", " + m_CurrentValue.w + "))";
                 default:
                     return "error";
             }

MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/PropertyType.cs

         Float,
         Vector2,
         Vector3,
-        Vector4
+        Vector4,
+        Matrix2,
+        Matrix3,
+        Matrix4
     }
 }

MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/SlotValue.cs

     [Serializable]
     public enum SlotValueType
     {
+        Matrix4,
+        Matrix3,
+        Matrix2,
         sampler2D,
         Dynamic,
         Vector4,
 
     public enum ConcreteSlotValueType
     {
+        Matrix4 = 8,
+        Matrix3 = 7,
+        Matrix2 = 6,
         sampler2D = 5,
         Vector4 = 4,
         Vector3 = 3,

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/Matrix2NodePresenter.cs

+using System;
+using System.Collections.Generic;
+using RMGUI.GraphView;
+using UnityEditor.Graphing.Drawing;
+using UnityEngine;
+using UnityEngine.MaterialGraph;
+
+namespace UnityEditor.MaterialGraph.Drawing
+{
+    class Matrix2ControlPresenter : GraphControlPresenter
+    {
+        public override void OnGUIHandler()
+        {
+            base.OnGUIHandler();
+
+            var tNode = node as UnityEngine.MaterialGraph.Matrix2Node;
+            if (tNode == null)
+                return;
+
+            tNode[0] = EditorGUILayout.Vector2Field("", tNode[0]);
+            tNode[1] = EditorGUILayout.Vector2Field("", tNode[1]);
+        }
+
+        public override float GetHeight()
+        {
+            return (EditorGUIUtility.singleLineHeight * 2 + EditorGUIUtility.standardVerticalSpacing) + EditorGUIUtility.standardVerticalSpacing;
+        }
+    }
+
+    [Serializable]
+    public class Matrix2NodePresenter : PropertyNodePresenter
+    {
+        protected override IEnumerable<GraphElementPresenter> GetControlData()
+        {
+            var instance = CreateInstance<Matrix2ControlPresenter>();
+            instance.Initialize(node);
+            return new List<GraphElementPresenter>(base.GetControlData()) { instance };
+        }
+    }
+}

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/Matrix2NodePresenter.cs.meta

+fileFormatVersion: 2
+guid: 7a56e192798ff9a45a01f10c9113e539
+timeCreated: 1476871291
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/Matrix3NodePresenter.cs

+using System;
+using System.Collections.Generic;
+using RMGUI.GraphView;
+using UnityEditor.Graphing.Drawing;
+using UnityEngine;
+using UnityEngine.MaterialGraph;
+
+namespace UnityEditor.MaterialGraph.Drawing
+{
+    class Matrix3ControlPresenter : GraphControlPresenter
+    {
+        public override void OnGUIHandler()
+        {
+            base.OnGUIHandler();
+
+            var tNode = node as UnityEngine.MaterialGraph.Matrix3Node;
+            if (tNode == null)
+                return;
+
+            tNode[0] = EditorGUILayout.Vector3Field("", tNode[0]);
+            tNode[1] = EditorGUILayout.Vector3Field("", tNode[1]);
+            tNode[2] = EditorGUILayout.Vector3Field("", tNode[2]);
+        }
+
+        public override float GetHeight()
+        {
+            return (EditorGUIUtility.singleLineHeight * 3 + EditorGUIUtility.standardVerticalSpacing) + EditorGUIUtility.standardVerticalSpacing;
+        }
+    }
+
+    [Serializable]
+    public class Matrix3NodePresenter : PropertyNodePresenter
+    {
+        protected override IEnumerable<GraphElementPresenter> GetControlData()
+        {
+            var instance = CreateInstance<Matrix3ControlPresenter>();
+            instance.Initialize(node);
+            return new List<GraphElementPresenter>(base.GetControlData()) { instance };
+        }
+    }
+}

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/Matrix3NodePresenter.cs.meta

+fileFormatVersion: 2
+guid: 8cb077290891de74d905d2361f73441b
+timeCreated: 1476871291
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Input/Matrix.meta

+fileFormatVersion: 2
+guid: 278936628273864438e48ff64aa20e32
+folderAsset: yes
+timeCreated: 1495662409
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Input/Matrix/Matrix2Node.cs

+using UnityEngine.Graphing;
+
+namespace UnityEngine.MaterialGraph
+{
+    [Title("Input/Matrix/Matrix 2")]
+    public class Matrix2Node : AbstractMaterialNode, IGeneratesBodyCode
+    {
+        private const int kOutputSlotId = 0;
+        private const string kOutputSlotName = "Value";
+
+        [SerializeField]
+        private Vector2[] m_Value = new Vector2[2];
+
+        public Vector2 this[int index]
+        {
+            get { return m_Value[index]; }
+            set
+            {
+                if (m_Value[index] == value)
+                    return;
+
+                m_Value[index] = value;
+
+                if (onModified != null)
+                    onModified(this, ModificationScope.Node);
+            }
+        }
+
+        public Matrix2Node()
+        {
+            name = "Matrix2";
+            UpdateNodeAfterDeserialization();
+        }
+
+        public sealed override void UpdateNodeAfterDeserialization()
+        {
+            AddSlot(new MaterialSlot(kOutputSlotId, kOutputSlotName, kOutputSlotName, SlotType.Output, SlotValueType.Matrix2, Vector4.zero));
+            RemoveSlotsNameNotMatching(new[] { kOutputSlotId });
+        }
+
+        public string propertyName
+        {
+            get
+            {
+                return string.Format("{0}_{1}_Uniform", name, guid.ToString().Replace("-", "_"));
+            }
+        }
+
+        public override string GetVariableNameForSlot(int slotId)
+        {
+            return propertyName;
+        }
+
+        public void GenerateNodeCode(ShaderGenerator visitor, GenerationMode generationMode)
+        {
+            //if (exposedState == ExposedState.Exposed || generationMode.IsPreview())
+            //    return;
+
+            visitor.AddShaderChunk(precision + "2 " +  propertyName + " = " + precision + "2x2 (" + precision + "2(" + m_Value[0].x + ", " + m_Value[0].y + "), " + precision + "2(" + m_Value[1].x + ", " + m_Value[1].y + "))", true);
+        }
+
+        [SerializeField]
+        private string m_Description = string.Empty;
+
+        public string description
+        {
+            get
+            {
+                return string.IsNullOrEmpty(m_Description) ? name : m_Description;
+            }
+            set { m_Description = value; }
+        }
+
+        // TODO - Remove Property entries everywhere?
+        // Matrix cant be a shader property
+        /*public override PropertyType propertyType
+        {
+            get { return PropertyType.Matrix2; }
+        }*/
+
+        /*public override void GeneratePropertyBlock(PropertyGenerator visitor, GenerationMode generationMode)
+        {
+            if (exposedState == ExposedState.Exposed)
+                visitor.AddShaderProperty(new VectorPropertyChunk(propertyName, description, m_Value, PropertyChunk.HideState.Visible));
+        }*/
+
+        /*public override void GeneratePropertyUsages(ShaderGenerator visitor, GenerationMode generationMode)
+        {
+            if (exposedState == ExposedState.Exposed || generationMode.IsPreview())
+                visitor.AddShaderChunk(precision + "2 " + propertyName + ";", true);
+        }*/
+
+        /*public override PreviewProperty GetPreviewProperty()
+        {
+            return new PreviewProperty
+            {
+                m_Name = propertyName,
+                m_PropType = PropertyType.Vector2,
+                m_Vector4 = m_Value
+            };
+        }*/
+    }
+}

MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Input/Matrix/Matrix2Node.cs.meta

+fileFormatVersion: 2
+guid: a01da6bf9ffa118478ae371b28d2e166
+timeCreated: 1446473341
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Input/Matrix/Matrix3Node.cs

+using UnityEngine.Graphing;
+
+namespace UnityEngine.MaterialGraph
+{
+    [Title("Input/Matrix/Matrix 3")]
+    public class Matrix3Node : AbstractMaterialNode, IGeneratesBodyCode
+    {
+        private const int kOutputSlotId = 0;
+        private const string kOutputSlotName = "Value";
+
+        [SerializeField]
+        private Vector3[] m_Value = new Vector3[3];
+
+        public Vector3 this[int index]
+        {
+            get { return m_Value[index]; }
+            set
+            {
+                if (m_Value[index] == value)
+                    return;
+
+                m_Value[index] = value;
+
+                if (onModified != null)
+                    onModified(this, ModificationScope.Node);
+            }
+        }
+
+        public Matrix3Node()
+        {
+            name = "Matrix3";
+            UpdateNodeAfterDeserialization();
+        }
+
+        public sealed override void UpdateNodeAfterDeserialization()
+        {
+            AddSlot(new MaterialSlot(kOutputSlotId, kOutputSlotName, kOutputSlotName, SlotType.Output, SlotValueType.Matrix3, Vector4.zero));
+            RemoveSlotsNameNotMatching(new[] { kOutputSlotId });
+        }
+
+        public string propertyName
+        {
+            get
+            {
+                return string.Format("{0}_{1}_Uniform", name, guid.ToString().Replace("-", "_"));
+            }
+        }
+
+        public override string GetVariableNameForSlot(int slotId)
+        {
+            return propertyName;
+        }
+
+        public void GenerateNodeCode(ShaderGenerator visitor, GenerationMode generationMode)
+        {
+            //if (exposedState == ExposedState.Exposed || generationMode.IsPreview())
+            //    return;
+
+            visitor.AddShaderChunk(precision + "3x3 (" + precision + "3(" + m_Value[0].x + ", " + m_Value[0].y + ", " + m_Value[0].z + "), " + precision + "3(" + m_Value[1].x + ", " + m_Value[1].y + ", " + m_Value[1].z + "), " + precision + "3(" + m_Value[2].x + ", " + m_Value[2].y + ", " + m_Value[2].z + "))", true);
+        }
+
+        [SerializeField]
+        private string m_Description = string.Empty;
+
+        public string description
+        {
+            get
+            {
+                return string.IsNullOrEmpty(m_Description) ? name : m_Description;
+            }
+            set { m_Description = value; }
+        }
+
+        // TODO - Remove Property entries everywhere?
+        // Matrix cant be a shader property
+        /*public override PropertyType propertyType
+        {
+            get { return PropertyType.Matrix2; }
+        }*/
+
+        /*public override void GeneratePropertyBlock(PropertyGenerator visitor, GenerationMode generationMode)
+        {
+            if (exposedState == ExposedState.Exposed)
+                visitor.AddShaderProperty(new VectorPropertyChunk(propertyName, description, m_Value, PropertyChunk.HideState.Visible));
+        }*/
+
+        /*public override void GeneratePropertyUsages(ShaderGenerator visitor, GenerationMode generationMode)
+        {
+            if (exposedState == ExposedState.Exposed || generationMode.IsPreview())
+                visitor.AddShaderChunk(precision + "2 " + propertyName + ";", true);
+        }*/
+
+        /*public override PreviewProperty GetPreviewProperty()
+        {
+            return new PreviewProperty
+            {
+                m_Name = propertyName,
+                m_PropType = PropertyType.Vector2,
+                m_Vector4 = m_Value
+            };
+        }*/
+    }
+}

MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/Input/Matrix/Matrix3Node.cs.meta

+fileFormatVersion: 2
+guid: fec4ad06a8bd71044af822b7d2258a69
+timeCreated: 1446473341
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: