浏览代码

Move graph things from Runtime to Editor

/main
Peter Bay Bastian 7 年前
当前提交
c002d689
共有 52 个文件被更改,包括 111 次插入60 次删除
  1. 4
      MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/SubGraph/AbstractSubGraph.cs.meta
  2. 4
      MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/SubGraph/AbstractSubGraphNode.cs.meta
  3. 4
      MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/SubGraph/MasterRemapNode.cs.meta
  4. 30
      MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/VectorProjectionNode.cs
  5. 31
      MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/VectorRejectionNode.cs
  6. 4
      MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/LightweightPipeline/AbstractLightweightMasterNode.cs.meta
  7. 4
      MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Interfaces/NeededCoordinateSpace.cs.meta
  8. 4
      MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/AbstractShaderProperty.cs.meta
  9. 4
      MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/ColorShaderProperty.cs.meta
  10. 4
      MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/FloatShaderProperty.cs.meta
  11. 4
      MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/IShaderProperty.cs.meta
  12. 4
      MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/SamplerStateShaderProperty.cs.meta
  13. 4
      MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/SerializableTexture.cs.meta
  14. 4
      MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/ShaderGraphRequirements.cs.meta
  15. 4
      MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/TextureSamplerState.cs.meta
  16. 4
      MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/TextureShaderProperty.cs.meta
  17. 4
      MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/Vector2ShaderProperty.cs.meta
  18. 4
      MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/Vector3ShaderProperty.cs.meta
  19. 4
      MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/Vector4ShaderProperty.cs.meta
  20. 4
      MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/VectorShaderProperty.cs.meta
  21. 4
      MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Util/QueuePool.cs.meta
  22. 4
      MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Util/StackPool.cs.meta
  23. 4
      MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Interfaces/GraphChange.cs.meta
  24. 8
      MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data.meta
  25. 9
      MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Runtime.meta
  26. 9
      MaterialGraphProject/Assets/UnityShaderEditor/Runtime.meta
  27. 0
      /MaterialGraphProject/Assets/NewNodes/Editor/Keep.meta
  28. 0
      /MaterialGraphProject/Assets/NewNodes/Editor/Kill.meta
  29. 0
      /MaterialGraphProject/Assets/NewNodes/Editor/ChannelBlendNode.cs
  30. 0
      /MaterialGraphProject/Assets/NewNodes/Editor/ChannelBlendNode.cs.meta
  31. 0
      /MaterialGraphProject/Assets/NewNodes/Editor/CommonMatrixType.cs
  32. 0
      /MaterialGraphProject/Assets/NewNodes/Editor/CommonMatrixType.cs.meta
  33. 0
      /MaterialGraphProject/Assets/NewNodes/Editor/ConstantType.cs
  34. 0
      /MaterialGraphProject/Assets/NewNodes/Editor/ConstantType.cs.meta
  35. 0
      /MaterialGraphProject/Assets/NewNodes/Editor/FractalNode.cs
  36. 0
      /MaterialGraphProject/Assets/NewNodes/Editor/FractalNode.cs.meta
  37. 0
      /MaterialGraphProject/Assets/NewNodes/Editor/FunctionNAddNode.cs
  38. 0
      /MaterialGraphProject/Assets/NewNodes/Editor/FunctionNAddNode.cs.meta
  39. 0
      /MaterialGraphProject/Assets/NewNodes/Editor/FunctionNInNOut.cs
  40. 0
      /MaterialGraphProject/Assets/NewNodes/Editor/FunctionNInNOut.cs.meta
  41. 0
      /MaterialGraphProject/Assets/NewNodes/Editor/Kill
  42. 0
      /MaterialGraphProject/Assets/NewNodes/Editor/Keep
  43. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data
  44. 0
      /MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Assets.meta
  45. 0
      /MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Util.meta
  46. 0
      /MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Implementation.meta
  47. 0
      /MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Interfaces.meta
  48. 0
      /MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Assets
  49. 0
      /MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Util
  50. 0
      /MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Implementation
  51. 0
      /MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Interfaces

4
MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/SubGraph/AbstractSubGraph.cs.meta


fileFormatVersion: 2
guid: f2b67435729448498da7e7b90f052ebd
fileFormatVersion: 2
guid: f2b67435729448498da7e7b90f052ebd
timeCreated: 1506844687

4
MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/SubGraph/AbstractSubGraphNode.cs.meta


fileFormatVersion: 2
guid: bc4cf774a7a6480ba543eb6069cd1c50
fileFormatVersion: 2
guid: bc4cf774a7a6480ba543eb6069cd1c50
timeCreated: 1506847426

4
MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/SubGraph/MasterRemapNode.cs.meta


fileFormatVersion: 2
guid: 861139fc6f60415cae2eb9a9625aaeb8
fileFormatVersion: 2
guid: 861139fc6f60415cae2eb9a9625aaeb8
timeCreated: 1506873607

30
MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/VectorProjectionNode.cs


using System.Reflection;
namespace UnityEngine.MaterialGraph
{
[Title("Vector/Projection Node")]
public class VectorProjectionNode : CodeFunctionNode
{
public VectorProjectionNode()
{
name = "VectorProjection";
}
protected override MethodInfo GetFunctionToConvert()
{
return GetType().GetMethod("Unity_VectorProjection", BindingFlags.Static | BindingFlags.NonPublic);
}
static string Unity_VectorProjection(
[Slot(0, Binding.None)] DynamicDimensionVector first,
[Slot(1, Binding.None)] DynamicDimensionVector second,
[Slot(2, Binding.None)] out DynamicDimensionVector result)
{
return
@"
{
result = second * dot(first, second) / dot(second, second);
}";
}
}
}

31
MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/VectorRejectionNode.cs


using System.Reflection;
namespace UnityEngine.MaterialGraph
{
[Title("Vector/Rejection Node")]
public class VectorRejectionNode : CodeFunctionNode
{
public VectorRejectionNode()
{
name = "VectorRejection";
}
protected override MethodInfo GetFunctionToConvert()
{
return GetType().GetMethod("Unity_VectorRejection", BindingFlags.Static | BindingFlags.NonPublic);
}
static string Unity_VectorRejection(
[Slot(0, Binding.None)] DynamicDimensionVector first,
[Slot(1, Binding.None)] DynamicDimensionVector second,
[Slot(2, Binding.None)] out DynamicDimensionVector result)
{
return
@"
{
result = first - (second * dot(first, second) / dot(second, second));
}
";
}
}
}

4
MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/LightweightPipeline/AbstractLightweightMasterNode.cs.meta


fileFormatVersion: 2
guid: 72c867ea29464bec864ea612e2bcecd3
fileFormatVersion: 2
guid: 72c867ea29464bec864ea612e2bcecd3
timeCreated: 1505799928

4
MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Interfaces/NeededCoordinateSpace.cs.meta


fileFormatVersion: 2
guid: 8ad845bb8ef34e4589bcf630a8a8a31a
fileFormatVersion: 2
guid: 8ad845bb8ef34e4589bcf630a8a8a31a
timeCreated: 1505627582

4
MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/AbstractShaderProperty.cs.meta


fileFormatVersion: 2
guid: b1411039ed1342fa8efff6fa8a4c179d
fileFormatVersion: 2
guid: b1411039ed1342fa8efff6fa8a4c179d
timeCreated: 1505346915

4
MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/ColorShaderProperty.cs.meta


fileFormatVersion: 2
guid: 47cf9e64b21b48b09320f42eb82ac3c3
fileFormatVersion: 2
guid: 47cf9e64b21b48b09320f42eb82ac3c3
timeCreated: 1505346940

4
MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/FloatShaderProperty.cs.meta


fileFormatVersion: 2
guid: 572cce24ed76430db4c21dfe82d01252
fileFormatVersion: 2
guid: 572cce24ed76430db4c21dfe82d01252
timeCreated: 1505346922

4
MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/IShaderProperty.cs.meta


fileFormatVersion: 2
guid: 7594463b49eb4d70a1b938f328f0c0b0
fileFormatVersion: 2
guid: 7594463b49eb4d70a1b938f328f0c0b0
timeCreated: 1505346909

4
MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/SamplerStateShaderProperty.cs.meta


fileFormatVersion: 2
guid: b48a2e97e3e24303833a0062f90f4f13
fileFormatVersion: 2
guid: b48a2e97e3e24303833a0062f90f4f13
timeCreated: 1505436387

4
MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/SerializableTexture.cs.meta


fileFormatVersion: 2
guid: a4a4ff926ce74b059400bb049aefcba2
fileFormatVersion: 2
guid: a4a4ff926ce74b059400bb049aefcba2
timeCreated: 1505346945

4
MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/ShaderGraphRequirements.cs.meta


fileFormatVersion: 2
guid: b80c0c5cd7f940d7bc0f37b22c454d40
fileFormatVersion: 2
guid: b80c0c5cd7f940d7bc0f37b22c454d40
timeCreated: 1505698038

4
MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/TextureSamplerState.cs.meta


fileFormatVersion: 2
guid: a0238123ffe44c05bc05acf347c4d52d
fileFormatVersion: 2
guid: a0238123ffe44c05bc05acf347c4d52d
timeCreated: 1505436371

4
MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/TextureShaderProperty.cs.meta


fileFormatVersion: 2
guid: 08e62564fb95471d9580619b660c6531
fileFormatVersion: 2
guid: 08e62564fb95471d9580619b660c6531
timeCreated: 1505346949

4
MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/Vector2ShaderProperty.cs.meta


fileFormatVersion: 2
guid: dbd5691737554a15ab0b098fca999382
fileFormatVersion: 2
guid: dbd5691737554a15ab0b098fca999382
timeCreated: 1505346926

4
MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/Vector3ShaderProperty.cs.meta


fileFormatVersion: 2
guid: 34a68571f5ae4ebe8221824597dc0675
fileFormatVersion: 2
guid: 34a68571f5ae4ebe8221824597dc0675
timeCreated: 1505346931

4
MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/Vector4ShaderProperty.cs.meta


fileFormatVersion: 2
guid: 3989871719194dbdba09613ac74761b3
fileFormatVersion: 2
guid: 3989871719194dbdba09613ac74761b3
timeCreated: 1505346935

4
MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/VectorShaderProperty.cs.meta


fileFormatVersion: 2
guid: 4f83ebb04c5c4df184601ef18aa7d89d
fileFormatVersion: 2
guid: 4f83ebb04c5c4df184601ef18aa7d89d
timeCreated: 1505408377

4
MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Util/QueuePool.cs.meta


fileFormatVersion: 2
guid: 4e895afeaf2a438195fbc4de17a4bedc
fileFormatVersion: 2
guid: 4e895afeaf2a438195fbc4de17a4bedc
timeCreated: 1505278549

4
MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Util/StackPool.cs.meta


fileFormatVersion: 2
guid: 93c41a4331c94d09a7561ea6b4983439
fileFormatVersion: 2
guid: 93c41a4331c94d09a7561ea6b4983439
timeCreated: 1505275069

4
MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Interfaces/GraphChange.cs.meta


fileFormatVersion: 2
guid: cbfac7ed81744ca281be9e21eae861c7
fileFormatVersion: 2
guid: cbfac7ed81744ca281be9e21eae861c7
timeCreated: 1505620762

8
MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data.meta


fileFormatVersion: 2
guid: f56929b05da66c942ad2e3fe376346fa
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

9
MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Runtime.meta


fileFormatVersion: 2
guid: 96b491f66dc38674cb2874ef6c452b3d
folderAsset: yes
timeCreated: 1464601235
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

9
MaterialGraphProject/Assets/UnityShaderEditor/Runtime.meta


fileFormatVersion: 2
guid: c196fa3d7b5ae4049afeb1cd0400d9b6
folderAsset: yes
timeCreated: 1464601235
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

/MaterialGraphProject/Assets/NewNodes/Keep.meta → /MaterialGraphProject/Assets/NewNodes/Editor/Keep.meta

/MaterialGraphProject/Assets/NewNodes/Kill.meta → /MaterialGraphProject/Assets/NewNodes/Editor/Kill.meta

/MaterialGraphProject/Assets/NewNodes/ChannelBlendNode.cs → /MaterialGraphProject/Assets/NewNodes/Editor/ChannelBlendNode.cs

/MaterialGraphProject/Assets/NewNodes/ChannelBlendNode.cs.meta → /MaterialGraphProject/Assets/NewNodes/Editor/ChannelBlendNode.cs.meta

/MaterialGraphProject/Assets/NewNodes/CommonMatrixType.cs → /MaterialGraphProject/Assets/NewNodes/Editor/CommonMatrixType.cs

/MaterialGraphProject/Assets/NewNodes/CommonMatrixType.cs.meta → /MaterialGraphProject/Assets/NewNodes/Editor/CommonMatrixType.cs.meta

/MaterialGraphProject/Assets/NewNodes/ConstantType.cs → /MaterialGraphProject/Assets/NewNodes/Editor/ConstantType.cs

/MaterialGraphProject/Assets/NewNodes/ConstantType.cs.meta → /MaterialGraphProject/Assets/NewNodes/Editor/ConstantType.cs.meta

/MaterialGraphProject/Assets/NewNodes/FractalNode.cs → /MaterialGraphProject/Assets/NewNodes/Editor/FractalNode.cs

/MaterialGraphProject/Assets/NewNodes/FractalNode.cs.meta → /MaterialGraphProject/Assets/NewNodes/Editor/FractalNode.cs.meta

/MaterialGraphProject/Assets/NewNodes/FunctionNAddNode.cs → /MaterialGraphProject/Assets/NewNodes/Editor/FunctionNAddNode.cs

/MaterialGraphProject/Assets/NewNodes/FunctionNAddNode.cs.meta → /MaterialGraphProject/Assets/NewNodes/Editor/FunctionNAddNode.cs.meta

/MaterialGraphProject/Assets/NewNodes/FunctionNInNOut.cs → /MaterialGraphProject/Assets/NewNodes/Editor/FunctionNInNOut.cs

/MaterialGraphProject/Assets/NewNodes/FunctionNInNOut.cs.meta → /MaterialGraphProject/Assets/NewNodes/Editor/FunctionNInNOut.cs.meta

/MaterialGraphProject/Assets/NewNodes/Kill → /MaterialGraphProject/Assets/NewNodes/Editor/Kill

/MaterialGraphProject/Assets/NewNodes/Keep → /MaterialGraphProject/Assets/NewNodes/Editor/Keep

/MaterialGraphProject/Assets/UnityShaderEditor/Runtime → /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data

/MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Runtime/Assets.meta → /MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Assets.meta

/MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Runtime/Util.meta → /MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Util.meta

/MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Runtime/Implementation.meta → /MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Implementation.meta

/MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Runtime/Interfaces.meta → /MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Interfaces.meta

/MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Runtime/Assets → /MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Assets

/MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Runtime/Util → /MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Util

/MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Runtime/Implementation → /MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Implementation

/MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Runtime/Interfaces → /MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Interfaces

正在加载...
取消
保存